1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-28 01:06:17 +00:00

Update to 2.0.0.

This commit is contained in:
Oliver Braun 2008-05-22 14:34:10 +00:00
parent e9146d1dc7
commit 100a136eff
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=213529
12 changed files with 44 additions and 116 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= darcs
PORTVERSION= 1.0.9
PORTVERSION= 2.0.0
CATEGORIES= devel
MASTER_SITES= http://darcs.net/
@ -24,9 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
CFLAGS=""
USE_GMAKE= yes
MAKEFILE= GNUmakefile
ALL_TARGET= darcs darcs.1
INSTALL_TARGET= installbin
USE_AUTOTOOLS= autoconf:261:env
.include <bsd.port.pre.mk>
@ -45,6 +43,7 @@ PLIST_SUB+= SERVER="@comment "
.endif
.if !defined(NOPORTDOCS)
BUILD_DEPENDS+= latex:${PORTSDIR}/print/teTeX-base
ALL_TARGET+= doc/manual/darcs.ps doc/manual/patch-theory.pdf doc/manual/index.html
INSTALL_TARGET+= installdocs
.endif
@ -57,12 +56,6 @@ post-patch:
${WRKSRC}/${MAKEFILE}
.endif
pre-configure:
@(cd ${WRKSRC} && ${AUTORECONF})
post-configure:
@${REINPLACE_CMD} -e 's|$${prefix}|${PREFIX}|' ${WRKSRC}/cgi/darcs.cgi
post-install:
@${STRIP_CMD} ${PREFIX}/bin/darcs

View File

@ -1,3 +1,3 @@
MD5 (darcs-1.0.9.tar.gz) = 07222cd3c500aa31e3332847573a4ab2
SHA256 (darcs-1.0.9.tar.gz) = a5fe4d5a743d8052d6cbfcea480a44593f821afd8a42e6d6d4ae37d40ed23cd8
SIZE (darcs-1.0.9.tar.gz) = 1080280
MD5 (darcs-2.0.0.tar.gz) = 89e48c2fb388692b78b3cceeb86a95a7
SHA256 (darcs-2.0.0.tar.gz) = fd740fa6600b8a768133c7dd0010671fab1c8bc4ccc278532f211eb7e853b5a9
SIZE (darcs-2.0.0.tar.gz) = 1758251

View File

@ -1,23 +0,0 @@
--- aclocal.m4.orig 2007-06-16 19:12:11.000000000 +0200
+++ aclocal.m4 2008-01-04 19:37:37.000000000 +0100
@@ -447,6 +447,20 @@
openFd :: Int -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
openFd fd x y z a b = GHC.Handle.openFd fd x b y z a
]]),
+AC_MSG_RESULT([okay])
+IMPORT_WORKAROUND([
+import qualified GHC.Handle ( fdToHandle' )
+import System.IO ( Handle, IOMode )
+import System.Posix.Internals ( FDType )
+import qualified GHC.IOBase ( FD )
+])
+CODE_WORKAROUND([[
+ {-
+ Work around change in the GHC.Handle.fdToHandle' API.
+ -}
+openFd :: GHC.IOBase.FD -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
+openFd fd x y z a b = GHC.Handle.fdToHandle' fd x b y z a
+]]),
AC_MSG_RESULT([failed])
AC_MSG_ERROR([Couldnt figure out how to call GHC.Handle.openFd!])
)

View File

@ -1,11 +0,0 @@
--- autoconf.mk.in.orig 2007-06-16 19:12:11.000000000 +0200
+++ autoconf.mk.in 2008-01-04 19:37:47.000000000 +0100
@@ -19,7 +19,7 @@
OPTCCFLAGS := $(addprefix -optc,$(CFLAGS) $(CPPFLAGS))
LDFLAGS := @LDFLAGS@ @LIBS@
OPTLLDFLAGS := $(addprefix -optl,$(LDFLAGS))
-GHCFLAGS := -cpp @GHCFLAGS@
+GHCFLAGS := -package containers -cpp @GHCFLAGS@
HAVE_CURSES := @HAVE_CURSES@
HAVE_LIBCURL := @HAVE_LIBCURL@
HAVE_MAPI := @HAVE_MAPI@

View File

@ -1,11 +0,0 @@
--- rts.c.orig 2007-10-26 09:32:02.000000000 +0200
+++ rts.c 2007-10-26 09:28:14.000000000 +0200
@@ -6,7 +6,7 @@
void defaultsHook (void) {
RtsFlags.GcFlags.maxStkSize = 8*1000002 / sizeof(W_); /* 8M */
-#ifdef _SC_PHYS_PAGES
+#if defined(_SC_PHYS_PAGES) && defined(_SC_AVPHYS_PAGES)
/* Try to set reasonable values for when to start compacting the heap to
avoid massive swapping. */
{

View File

@ -7,15 +7,19 @@ etc/bash_completion.d/darcs
%%SERVER%%share/darcs/xslt/browse.xslt
%%SERVER%%share/darcs/xslt/common.xslt
%%SERVER%%share/darcs/xslt/errors.xslt
%%SERVER%%share/darcs/xslt/errors.xml
%%SERVER%%share/darcs/xslt/patches.xslt
%%SERVER%%share/darcs/xslt/repos.xslt
%%SERVER%%share/darcs/xslt/rss.xslt
%%SERVER%%share/darcs/xslt/styles.css
%%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_new
%%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_old
%%PORTDOCS%%%%DOCSDIR%%/manual/WARNINGS
%%PORTDOCS%%%%DOCSDIR%%/manual/contents.png
%%PORTDOCS%%%%DOCSDIR%%/manual/crossref.png
%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.css
%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.html
%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.pdf
%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.ps
%%PORTDOCS%%%%DOCSDIR%%/manual/footnode.html
%%PORTDOCS%%%%DOCSDIR%%/manual/images.aux
@ -40,7 +44,18 @@ etc/bash_completion.d/darcs
%%PORTDOCS%%%%DOCSDIR%%/manual/img23.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img24.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img25.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img26.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img27.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img28.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img29.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img3.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img30.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img31.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img32.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img33.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img34.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img35.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img36.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img4.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img5.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img6.png
@ -63,11 +78,12 @@ etc/bash_completion.d/darcs
%%PORTDOCS%%%%DOCSDIR%%/manual/node7.html
%%PORTDOCS%%%%DOCSDIR%%/manual/node8.html
%%PORTDOCS%%%%DOCSDIR%%/manual/node9.html
%%PORTDOCS%%%%DOCSDIR%%/manual/nx_grp_g.png
%%PORTDOCS%%%%DOCSDIR%%/manual/patch-theory.pdf
%%PORTDOCS%%%%DOCSDIR%%/manual/prev.png
%%PORTDOCS%%%%DOCSDIR%%/manual/prev_g.png
%%PORTDOCS%%%%DOCSDIR%%/manual/up.png
%%PORTDOCS%%%%DOCSDIR%%/manual/up_g.png
%%PORTDOCS%%%%DOCSDIR%%/manual/WARNINGS
@dirrm etc/bash_completion.d
%%SERVER%%@dirrmtry etc/darcs
%%SERVER%%@dirrmtry www/cgi-bin

View File

@ -6,7 +6,7 @@
#
PORTNAME= darcs
PORTVERSION= 1.0.9
PORTVERSION= 2.0.0
CATEGORIES= devel
MASTER_SITES= http://darcs.net/
@ -24,9 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
CFLAGS=""
USE_GMAKE= yes
MAKEFILE= GNUmakefile
ALL_TARGET= darcs darcs.1
INSTALL_TARGET= installbin
USE_AUTOTOOLS= autoconf:261:env
.include <bsd.port.pre.mk>
@ -45,6 +43,7 @@ PLIST_SUB+= SERVER="@comment "
.endif
.if !defined(NOPORTDOCS)
BUILD_DEPENDS+= latex:${PORTSDIR}/print/teTeX-base
ALL_TARGET+= doc/manual/darcs.ps doc/manual/patch-theory.pdf doc/manual/index.html
INSTALL_TARGET+= installdocs
.endif
@ -57,12 +56,6 @@ post-patch:
${WRKSRC}/${MAKEFILE}
.endif
pre-configure:
@(cd ${WRKSRC} && ${AUTORECONF})
post-configure:
@${REINPLACE_CMD} -e 's|$${prefix}|${PREFIX}|' ${WRKSRC}/cgi/darcs.cgi
post-install:
@${STRIP_CMD} ${PREFIX}/bin/darcs

View File

@ -1,3 +1,3 @@
MD5 (darcs-1.0.9.tar.gz) = 07222cd3c500aa31e3332847573a4ab2
SHA256 (darcs-1.0.9.tar.gz) = a5fe4d5a743d8052d6cbfcea480a44593f821afd8a42e6d6d4ae37d40ed23cd8
SIZE (darcs-1.0.9.tar.gz) = 1080280
MD5 (darcs-2.0.0.tar.gz) = 89e48c2fb388692b78b3cceeb86a95a7
SHA256 (darcs-2.0.0.tar.gz) = fd740fa6600b8a768133c7dd0010671fab1c8bc4ccc278532f211eb7e853b5a9
SIZE (darcs-2.0.0.tar.gz) = 1758251

View File

@ -1,23 +0,0 @@
--- aclocal.m4.orig 2007-06-16 19:12:11.000000000 +0200
+++ aclocal.m4 2008-01-04 19:37:37.000000000 +0100
@@ -447,6 +447,20 @@
openFd :: Int -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
openFd fd x y z a b = GHC.Handle.openFd fd x b y z a
]]),
+AC_MSG_RESULT([okay])
+IMPORT_WORKAROUND([
+import qualified GHC.Handle ( fdToHandle' )
+import System.IO ( Handle, IOMode )
+import System.Posix.Internals ( FDType )
+import qualified GHC.IOBase ( FD )
+])
+CODE_WORKAROUND([[
+ {-
+ Work around change in the GHC.Handle.fdToHandle' API.
+ -}
+openFd :: GHC.IOBase.FD -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
+openFd fd x y z a b = GHC.Handle.fdToHandle' fd x b y z a
+]]),
AC_MSG_RESULT([failed])
AC_MSG_ERROR([Couldnt figure out how to call GHC.Handle.openFd!])
)

View File

@ -1,11 +0,0 @@
--- autoconf.mk.in.orig 2007-06-16 19:12:11.000000000 +0200
+++ autoconf.mk.in 2008-01-04 19:37:47.000000000 +0100
@@ -19,7 +19,7 @@
OPTCCFLAGS := $(addprefix -optc,$(CFLAGS) $(CPPFLAGS))
LDFLAGS := @LDFLAGS@ @LIBS@
OPTLLDFLAGS := $(addprefix -optl,$(LDFLAGS))
-GHCFLAGS := -cpp @GHCFLAGS@
+GHCFLAGS := -package containers -cpp @GHCFLAGS@
HAVE_CURSES := @HAVE_CURSES@
HAVE_LIBCURL := @HAVE_LIBCURL@
HAVE_MAPI := @HAVE_MAPI@

View File

@ -1,11 +0,0 @@
--- rts.c.orig 2007-10-26 09:32:02.000000000 +0200
+++ rts.c 2007-10-26 09:28:14.000000000 +0200
@@ -6,7 +6,7 @@
void defaultsHook (void) {
RtsFlags.GcFlags.maxStkSize = 8*1000002 / sizeof(W_); /* 8M */
-#ifdef _SC_PHYS_PAGES
+#if defined(_SC_PHYS_PAGES) && defined(_SC_AVPHYS_PAGES)
/* Try to set reasonable values for when to start compacting the heap to
avoid massive swapping. */
{

View File

@ -7,15 +7,19 @@ etc/bash_completion.d/darcs
%%SERVER%%share/darcs/xslt/browse.xslt
%%SERVER%%share/darcs/xslt/common.xslt
%%SERVER%%share/darcs/xslt/errors.xslt
%%SERVER%%share/darcs/xslt/errors.xml
%%SERVER%%share/darcs/xslt/patches.xslt
%%SERVER%%share/darcs/xslt/repos.xslt
%%SERVER%%share/darcs/xslt/rss.xslt
%%SERVER%%share/darcs/xslt/styles.css
%%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_new
%%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_old
%%PORTDOCS%%%%DOCSDIR%%/manual/WARNINGS
%%PORTDOCS%%%%DOCSDIR%%/manual/contents.png
%%PORTDOCS%%%%DOCSDIR%%/manual/crossref.png
%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.css
%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.html
%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.pdf
%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.ps
%%PORTDOCS%%%%DOCSDIR%%/manual/footnode.html
%%PORTDOCS%%%%DOCSDIR%%/manual/images.aux
@ -40,7 +44,18 @@ etc/bash_completion.d/darcs
%%PORTDOCS%%%%DOCSDIR%%/manual/img23.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img24.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img25.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img26.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img27.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img28.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img29.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img3.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img30.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img31.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img32.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img33.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img34.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img35.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img36.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img4.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img5.png
%%PORTDOCS%%%%DOCSDIR%%/manual/img6.png
@ -63,11 +78,12 @@ etc/bash_completion.d/darcs
%%PORTDOCS%%%%DOCSDIR%%/manual/node7.html
%%PORTDOCS%%%%DOCSDIR%%/manual/node8.html
%%PORTDOCS%%%%DOCSDIR%%/manual/node9.html
%%PORTDOCS%%%%DOCSDIR%%/manual/nx_grp_g.png
%%PORTDOCS%%%%DOCSDIR%%/manual/patch-theory.pdf
%%PORTDOCS%%%%DOCSDIR%%/manual/prev.png
%%PORTDOCS%%%%DOCSDIR%%/manual/prev_g.png
%%PORTDOCS%%%%DOCSDIR%%/manual/up.png
%%PORTDOCS%%%%DOCSDIR%%/manual/up_g.png
%%PORTDOCS%%%%DOCSDIR%%/manual/WARNINGS
@dirrm etc/bash_completion.d
%%SERVER%%@dirrmtry etc/darcs
%%SERVER%%@dirrmtry www/cgi-bin