update: devel/darcs
Update to darcs-2.8.0.
For a list of changes, please read the announcement email:
http://lists.osuosl.org/pipermail/darcs-users/2012-April/026493.html
Changes of the port itself:
- Use the threaded GHC runtime (yes, this may cause darcs to exit
immediately after startup, but it's required for running the
tests, and nobody else seems to build it with the non-threaded
GHC runtime).
- Don't use groff. mandoc works just fine.
- Add some GNU tools to REGRESS_DEPENDS and install proper symlinks for
running the tests.
This needs the following new ports I just sent a few minutes ago:
devel/hs-split
devel/hs-cmdlib
devel/hs-strict
devel/hs-shellish
devel/hs-ansi-wl-pprint
net/hs-hostname
devel/hs-test-framework
devel/hs-test-framework-hunit
devel/hs-test-framework-quickcheck2
If you run make regress on it, please note that two cases (ask_deps
and issue121) will fail. I don't see any reason to panic because
this ;-)
I've tested this successfully on amd64. Tests on i386 would be nice.
If you use darcs frequently, please give this a try.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/devel/darcs/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile31 Dec 2011 22:30:49 - 1.44
+++ Makefile6 May 2012 17:06:20 -
@@ -2,8 +2,7 @@
COMMENT = advanced revision control system written in Haskell
-DISTNAME = darcs-2.5.2
-REVISION = 5
+DISTNAME = darcs-2.8.0
CATEGORIES = devel
HOMEPAGE = http://www.darcs.net/
@@ -11,30 +10,45 @@ HOMEPAGE = http://www.darcs.net/
WANTLIB = c curl=2 gmp m ncursesw pthread util z
MODULES = lang/ghc converters/libiconv
MODGHC_BUILD = cabal hackage nort
-MODGHC_SETUP_CONF_ARGS =-f '-library -threaded'
+MODGHC_SETUP_CONF_ARGS =-f '-library test'
LIB_DEPENDS = devel/gmp \
net/curl
# Yes, build dependencies, because GHC libs are still static and we
# don't want to pull in all of ghc.
-BUILD_DEPENDS =hs-tar-=0.3,0.4:devel/hs-tar \
- hs-zlib-=0.5.0,0.6.0:archivers/hs-zlib \
- hs-hashed-storage-=0.5.2,0.6:devel/hs-hashed-storage \
- hs-haskeline-=0.6.2.2,0.7:devel/hs-haskeline \
- hs-mtl-=1.0,2.1:devel/hs-mtl \
- hs-parsec-=2.0,3.2:devel/hs-parsec \
- hs-regex-compat-=0.71,0.96:devel/hs-regex-compat \
- hs-text-=0.3:devel/hs-text \
- hs-html-=1.0,1.1:www/hs-html \
- ${RUN_DEPENDS} \
- textproc/latex2html
+BUILD_DEPENDS =archivers/hs-zlib=0.5.1.0,0.6.0.0 \
+ devel/hs-tar=0.3,0.4 \
+ devel/hs-hashed-storage=0.5.6,0.6 \
+ devel/hs-haskeline=0.6.3,0.7 \
+ devel/hs-mmap=0.5,0.6 \
+ devel/hs-mtl=1.0,2.1 \
+ devel/hs-network=2.2,2.4 \
+ devel/hs-parsec=2.0,3.2 \
+ devel/hs-regex-compat=0.95.1 \
+ devel/hs-terminfo=0.3,0.4 \
+ devel/hs-text=0.11.0.6,0.12.0.0 \
+ devel/hs-vector=0.7 \
+ www/hs-html=1.0,1.1 \
+ textproc/latex2html \
+ ${RUN_DEPENDS}
+
+# Used for building the test suite (which is done during normal
+# build time, not during regress time).
+BUILD_DEPENDS += devel/hs-QuickCheck=2.3 \
+ devel/hs-HUnit=1.0 \
+ devel/hs-cmdlib=0.2.1,0.4 \
+ devel/hs-shellish=0.1.3,0.2 \
+ devel/hs-test-framework=0.4.0 \
+ devel/hs-test-framework-hunit=0.2.2 \
+ devel/hs-test-framework-quickcheck2=0.2.8
REGRESS_DEPENDS = devel/hs-hlint \
- shells/bash
+ shells/bash \
+ sysutils/coreutils \
+ textproc/gsed
# For the documentation
USE_GMAKE =Yes
-USE_GROFF =Yes
PORTHOME = ${WRKDIR}
post-build:
@@ -47,6 +61,11 @@ post-install:
rm -rf ${PREFIX}/share/man
${INSTALL_MAN_DIR} ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKBUILD}/dist/build/darcs/darcs.1 ${PREFIX}/man/man1
+
+# Some of the tests rely on GNU functionality.
+pre-regress:
+ ln -fs ${LOCALBASE}/bin/gdate ${WRKDIR}/bin/date
+ ln -fs ${LOCALBASE}/bin/gsed ${WRKDIR}/bin/sed
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/darcs/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo23 Apr 2011
Re: update devel/darcs
On Apr 05, 2011 12:37, Matthias Kilian wrote: On Tue, Apr 05, 2011 at 12:07:01PM +0200, Matthias Kilian wrote: Update to darcs-2.5.2 (minor bug fixes and ghc-7 compatibility). [...] Seems to be fine on amd64: make regress = All tests OK Even the haskell_policy.sh test? This test failed on my box with tons of parse errors (i didn't care much about it because it already failed in darcs-2.5). Oh, you probably don't have hlint installed, but I have. That would explain the different results. Even if it seems pointless, I'll add devel/hs-hlint to REGRESS_DEPENDS to avoid future confusion. Ciao, Kili Yes, the installation of hlint was it.
Re: update devel/darcs
On Apr 04, 2011 18:05, Matthias Kilian wrote: Update to darcs-2.5.2 (minor bug fixes and ghc-7 compatibility). While here, add a workaround for texlive (via latex2html) trying to create fonts under $HOME. Note that this requires the update of devel/hs-text sent earlier this day. Seems to be fine on amd64: make regress = All tests OK
Re: update devel/darcs
On Tue, Apr 05, 2011 at 10:17:15AM +0200, Dawe wrote: Update to darcs-2.5.2 (minor bug fixes and ghc-7 compatibility). [...] Seems to be fine on amd64: make regress = All tests OK Even the haskell_policy.sh test? This test failed on my box with tons of parse errors (i didn't care much about it because it already failed in darcs-2.5). Ciao, Kili
Re: update devel/darcs
On Tue, Apr 05, 2011 at 12:07:01PM +0200, Matthias Kilian wrote: Update to darcs-2.5.2 (minor bug fixes and ghc-7 compatibility). [...] Seems to be fine on amd64: make regress = All tests OK Even the haskell_policy.sh test? This test failed on my box with tons of parse errors (i didn't care much about it because it already failed in darcs-2.5). Oh, you probably don't have hlint installed, but I have. That would explain the different results. Even if it seems pointless, I'll add devel/hs-hlint to REGRESS_DEPENDS to avoid future confusion. Ciao, Kili
update devel/darcs
Update to darcs-2.5.2 (minor bug fixes and ghc-7 compatibility).
While here, add a workaround for texlive (via latex2html) trying
to create fonts under $HOME.
Note that this requires the update of devel/hs-text sent earlier
this day.
Index: Makefile
===
RCS file: /cvs/ports/devel/darcs/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile15 Nov 2010 19:45:57 - 1.36
+++ Makefile4 Apr 2011 16:01:58 -
@@ -2,7 +2,7 @@
COMMENT = advanced revision control system written in Haskell
-DISTNAME = darcs-2.5
+DISTNAME = darcs-2.5.2
CATEGORIES = devel
HOMEPAGE = http://www.darcs.net/
@@ -31,6 +31,7 @@ REGRESS_DEPENDS = shells/bash
# For the documentation
USE_GMAKE =Yes
USE_GROFF =Yes
+PORTHOME = ${WRKDIR}
post-build:
@cd ${WRKBUILD} exec ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html
Index: distinfo
===
RCS file: /cvs/ports/devel/darcs/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo2 Nov 2010 20:22:34 - 1.21
+++ distinfo4 Apr 2011 16:01:58 -
@@ -1,5 +1,5 @@
-MD5 (darcs-2.5.tar.gz) = feizUtiw7VDXGsDDLTttXA==
-RMD160 (darcs-2.5.tar.gz) = y/es+DbxjT5bO72vEUCVCD5IgGE=
-SHA1 (darcs-2.5.tar.gz) = 5202dBCZIRuHIQAfjrbqM+tUGX8=
-SHA256 (darcs-2.5.tar.gz) = 0LJ/N3bUUF7KhTQthp5PJg75SBGnK6BAhjAwp/n4KUU=
-SIZE (darcs-2.5.tar.gz) = 1222513
+MD5 (darcs-2.5.2.tar.gz) = SRtsoB3sJFoWESrSx+B9wQ==
+RMD160 (darcs-2.5.2.tar.gz) = U+NX+4AqcvS3h78cpKbpXhGLCK8=
+SHA1 (darcs-2.5.2.tar.gz) = 2kPr9kyk9BtFbVsf0gOK4OxaNto=
+SHA256 (darcs-2.5.2.tar.gz) = iVP51k+AE4dkZritVHSiEu5OFk9Bm6QBK13MnlkPs4Y=
+SIZE (darcs-2.5.2.tar.gz) = 1231903
Index: patches/patch-tests_hunk-editor_sh
===
RCS file: patches/patch-tests_hunk-editor_sh
diff -N patches/patch-tests_hunk-editor_sh
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-tests_hunk-editor_sh 4 Apr 2011 16:01:58 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- tests/hunk-editor.sh.orig Sun Mar 13 23:40:47 2011
tests/hunk-editor.sh Mon Apr 4 16:18:14 2011
+@@ -34,7 +34,7 @@ echo 'version1' file
+ darcs record -lam version1
+
+ echo 'version2' file
+-(echo e ; echo y ; echo n) | DARCS_EDITOR=sed -i -e s/version2/version1.5/
darcs record -m version1.5
++(echo e ; echo y ; echo n) | DARCS_EDITOR=perl -pi -e
s/version2/version1.5/ darcs record -m version1.5
+
+ cat expected EOF
+ hunk ./file 1
Re: update devel/darcs
On Fri, Apr 09, 2010 at 07:10:19PM +0200, Matthias Kilian wrote:
Update to darcs-2.4.
And comes darcs-2.4.1.
Index: Makefile
===
RCS file: /cvs/ports/devel/darcs/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile4 Oct 2009 21:16:17 - 1.25
+++ Makefile13 Apr 2010 11:47:33 -
@@ -1,45 +1,45 @@
# $OpenBSD: Makefile,v 1.25 2009/10/04 21:16:17 kili Exp $
-COMMENT= advanced revision control system written in Haskell
+COMMENT = advanced revision control system written in Haskell
-DISTNAME= darcs-2.2.0
-PKGNAME= ${DISTNAME}p0
+DISTNAME = darcs-2.4.1
-CATEGORIES=devel
-HOMEPAGE= http://www.darcs.net/
-MASTER_SITES= ${HOMEPAGE}
-
-WANTLIB= c curses crypto idn m pthread ssl z
-MODULES= lang/ghc
-MODGHC_RUNTIME=No
-LIB_DEPENDS= curl.=2::net/curl \
- gmp::devel/gmp
-BUILD_DEPENDS= ${RUN_DEPENDS}
-
-CONFIGURE_STYLE=simple
-CONFIGURE_ARGS=--prefix=${PREFIX} \
- --datadir=${PREFIX}/share \
- --libexecdir=${PREFIX}/libexec/darcs \
- --mandir=${PREFIX}/man \
- --sysconfdir=${PREFIX}/share/darcs \
- --without-manual
-CONFIGURE_ENV= CPPFLAGS=${CPPFLAGS} -I${LOCALBASE}/include \
- LDFLAGS=${LDFLAGS} -L${LOCALBASE}/lib CFLAGS= \
- HOME=/nonexistent \
- AWK=/usr/bin/awk DIFF=/usr/bin/diff GREP=/usr/bin/grep
-
-USE_GMAKE= Yes
-MAKE_FILE= GNUmakefile
-INSTALL_TARGET=install installserver install-html install-examples
-MAKE_ENV+= DARCS=${WRKSRC}/darcs
-MAKE_FLAGS+= VERBOSE=Yes
-REGRESS_TARGET=check
-REGRESS_DEPENDS=::shells/bash
-
-# GPL
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP=Yes
-PERMIT_DISTFILES_CDROM=Yes
-PERMIT_DISTFILES_FTP= Yes
+CATEGORIES = devel
+HOMEPAGE = http://www.darcs.net/
+
+WANTLIB = c m ncurses pthread util z
+MODULES = lang/ghc converters/libiconv
+MODGHC_BUILD = cabal hackage nort
+LIB_DEPENDS = curl.=2::net/curl
+
+# Yes, build dependencies, because GHC libs are still static and we
+# don't want to pull in all of ghc.
+BUILD_DEPENDS =:hs-zlib-=0.5.0,0.6.0:archivers/hs-zlib \
+ :hs-hashed-storage-0.4.11:devel/hs-hashed-storage \
+ :hs-parsec-=2.0,3.1:devel/hs-parsec \
+ :hs-regex-compat-=0.71,0.94:devel/hs-regex-compat \
+ :hs-html-=1.0,1.1:www/hs-html \
+ ${RUN_DEPENDS} \
+ ::textproc/latex2html
+
+# For the documentation
+USE_GMAKE =Yes
+
+post-build:
+ @cd ${WRKBUILD} exec ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/darcs
+ cd ${WRKBUILD}/doc/manual umask 022 pax -rw .
${PREFIX}/share/doc/darcs
+ # Wrong directory, and wrong permissions (600):
+ rm -rf ${PREFIX}/share/man
+ ${INSTALL_MAN_DIR} ${PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKBUILD}/dist/build/darcs/darcs.1 ${PREFIX}/man/man1
+
+# GPLv2
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/devel/darcs/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo25 Jan 2009 18:53:33 - 1.17
+++ distinfo13 Apr 2010 11:47:33 -
@@ -1,5 +1,5 @@
-MD5 (darcs-2.2.0.tar.gz) = jwpeullx588yTGNmTN5Z4g==
-RMD160 (darcs-2.2.0.tar.gz) = hhhvDcZFgMCZ+BW1EeuE7mOHt7A=
-SHA1 (darcs-2.2.0.tar.gz) = qTLuFO/FdJCkMElYqzka18hgMPA=
-SHA256 (darcs-2.2.0.tar.gz) = gWM+/9mDstZ+LV6u4yZm8SB974qa8YnFq9bRqayrNdo=
-SIZE (darcs-2.2.0.tar.gz) = 1793273
+MD5 (darcs-2.4.1.tar.gz) = HP2MrU7AnYjggd87Vvnsow==
+RMD160 (darcs-2.4.1.tar.gz) = WpCbIqGqsfis8H9l39P18S5t4xI=
+SHA1 (darcs-2.4.1.tar.gz) = +hQMA1UUvulTHVbd4OeuHLJF2ZM=
+SHA256 (darcs-2.4.1.tar.gz) = asDoTS7KFg5uM3VWed+xhdm1+fW9xD+Z2zJiEKq7xKo=
+SIZE (darcs-2.4.1.tar.gz) = 1192587
Index: patches/patch-GNUmakefile
===
RCS file: patches/patch-GNUmakefile
diff -N patches/patch-GNUmakefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-GNUmakefile 13 Apr 2010 11:47:33 -
@@ -0,0 +1,32 @@
+$OpenBSD$
+--- GNUmakefile.orig Mon Apr 12 21:42:42 2010
GNUmakefileTue Apr 13 13:27:19 2010
+@@ -8,10 +8,13 @@ PREPROC=./dist/build/darcs/darcs --preprocess-manual
+ PREPROCHTML=--html
+ TEXSOURCES = src/darcs.tex $(wildcard src/*.tex) $(filter
%.lhs,$(DARCS_FILES))
+ doc/manual/darcs.tex: $(TEXSOURCES) $(DARCS)
++ mkdir doc/manual
+ $(PREPROC) darcs.tex $(PREPROCHTML) $@
+ doc/manual/darcs_print.tex: $(TEXSOURCES) $(DARCS)
++
update devel/darcs
Update to darcs-2.4.
The library stuff (which would be subpackaged into something like
hs-darcs) is currently @commented out in the PLIST.
The HTML documentation looks a little bit odd, and images are
missing, but that looks like a problem of latex2html.
Please test this if you're using darcs for managing your own work
(or for pulling from other projects using darcs). You'll have to
fetch a current portstree and apply the ghc diff I mentioned earlier.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/devel/darcs/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile4 Oct 2009 21:16:17 - 1.25
+++ Makefile9 Apr 2010 16:31:26 -
@@ -1,45 +1,45 @@
# $OpenBSD: Makefile,v 1.25 2009/10/04 21:16:17 kili Exp $
-COMMENT= advanced revision control system written in Haskell
+COMMENT = advanced revision control system written in Haskell
-DISTNAME= darcs-2.2.0
-PKGNAME= ${DISTNAME}p0
+DISTNAME = darcs-2.4
-CATEGORIES=devel
-HOMEPAGE= http://www.darcs.net/
-MASTER_SITES= ${HOMEPAGE}
-
-WANTLIB= c curses crypto idn m pthread ssl z
-MODULES= lang/ghc
-MODGHC_RUNTIME=No
-LIB_DEPENDS= curl.=2::net/curl \
- gmp::devel/gmp
-BUILD_DEPENDS= ${RUN_DEPENDS}
-
-CONFIGURE_STYLE=simple
-CONFIGURE_ARGS=--prefix=${PREFIX} \
- --datadir=${PREFIX}/share \
- --libexecdir=${PREFIX}/libexec/darcs \
- --mandir=${PREFIX}/man \
- --sysconfdir=${PREFIX}/share/darcs \
- --without-manual
-CONFIGURE_ENV= CPPFLAGS=${CPPFLAGS} -I${LOCALBASE}/include \
- LDFLAGS=${LDFLAGS} -L${LOCALBASE}/lib CFLAGS= \
- HOME=/nonexistent \
- AWK=/usr/bin/awk DIFF=/usr/bin/diff GREP=/usr/bin/grep
-
-USE_GMAKE= Yes
-MAKE_FILE= GNUmakefile
-INSTALL_TARGET=install installserver install-html install-examples
-MAKE_ENV+= DARCS=${WRKSRC}/darcs
-MAKE_FLAGS+= VERBOSE=Yes
-REGRESS_TARGET=check
-REGRESS_DEPENDS=::shells/bash
-
-# GPL
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP=Yes
-PERMIT_DISTFILES_CDROM=Yes
-PERMIT_DISTFILES_FTP= Yes
+CATEGORIES = devel
+HOMEPAGE = http://www.darcs.net/
+
+WANTLIB = c m ncurses pthread util z
+MODULES = lang/ghc converters/libiconv
+MODGHC_BUILD = cabal hackage nort
+LIB_DEPENDS = curl.=2::net/curl
+
+# Yes, build dependencies, because GHC libs are still static and we
+# don't want to pull in all of ghc.
+BUILD_DEPENDS =:hs-zlib-=0.5.0,0.6.0:archivers/hs-zlib \
+ :hs-hashed-storage-=0.4.7,0.5:devel/hs-hashed-storage
\
+ :hs-parsec-=2.0,3.1:devel/hs-parsec \
+ :hs-regex-compat-=0.71,0.94:devel/hs-regex-compat \
+ :hs-html-=1.0,1.1:www/hs-html \
+ ${RUN_DEPENDS} \
+ ::textproc/latex2html
+
+# For the documentation
+USE_GMAKE =Yes
+
+post-build:
+ cd ${WRKBUILD} exec ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/darcs
+ cd ${WRKBUILD}/doc/manual umask 022 pax -rw .
${PREFIX}/share/doc/darcs
+ # Wrong directory, and wrong permissions (600):
+ rm -rf ${PREFIX}/share/man
+ ${INSTALL_MAN_DIR} ${PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKBUILD}/dist/build/darcs/darcs.1 ${PREFIX}/man/man1
+
+# GPLv2
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/devel/darcs/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo25 Jan 2009 18:53:33 - 1.17
+++ distinfo9 Apr 2010 16:31:26 -
@@ -1,5 +1,5 @@
-MD5 (darcs-2.2.0.tar.gz) = jwpeullx588yTGNmTN5Z4g==
-RMD160 (darcs-2.2.0.tar.gz) = hhhvDcZFgMCZ+BW1EeuE7mOHt7A=
-SHA1 (darcs-2.2.0.tar.gz) = qTLuFO/FdJCkMElYqzka18hgMPA=
-SHA256 (darcs-2.2.0.tar.gz) = gWM+/9mDstZ+LV6u4yZm8SB974qa8YnFq9bRqayrNdo=
-SIZE (darcs-2.2.0.tar.gz) = 1793273
+MD5 (darcs-2.4.tar.gz) = FpptJFoz2pey2qDtpgso5Q==
+RMD160 (darcs-2.4.tar.gz) = KYLw3/JwOp//SNc3rLt3lI9KzVU=
+SHA1 (darcs-2.4.tar.gz) = wz4OW6n0oXm+uk7QR/XVbf9KROk=
+SHA256 (darcs-2.4.tar.gz) = ONEMPcNZAVb/b3PpPDzXTsoD5XaYE2IOUlhoNmIu/WI=
+SIZE (darcs-2.4.tar.gz) = 1173703
Index: pkg/MESSAGE
===
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- pkg/MESSAGE 9 May 2005 03:41:34 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,3 +0,0 @@
-To use the CGI, copy ${PREFIX}/libexec/darcs/cgi-bin/darcs.cgi to the
-cgi-bin directory. An example configuration file for the cgi is in
Update: devel/darcs
Update to darcs-2.2.0. Please test and comment. Changes (from the announcement, trimmed down to entries relevant for the port): * In interactive record, it is now possible to get a list of currently selected hunks (command l). (Christian Kellermann) * It is now possible to specify --in-reply-to when using darcs send, to generate correct references in the mail header. (Pavel Shramov) * New repositories with --no-pristine-tree can no longer be created. This only has effect on legacy darcs-1 repositories. * Performance improvements in darcs repair and robustness improvements in darcs check. (Petr Ro#kai) * Extensive manual and online help improvements. (Trent W. Buck) * Low-level optimisations in filesystem code. (Ganesh Sittampalam) * Numerous major and minor bug fixes, refactorings and cleanups by David Roundy, Eric Kow, Jason Dagit, Dmitry Kurochkin, Thorkil Naur, Salvatore Insalaco, Christian Kellerman, Florent Becker, Duncan Coutts, Reinier Lamers, Ganesh Sittampalam, Petr Ro#kai. Ciao, Kili
update: devel/darcs
Update for real. This should fix many issues seen in the past darcs2
releases. I'm still unsure wether to use libcurl or hs-HTTP, but
most people upstream seem to prefer libcurl, and I didn't see any
problems with darcs+libcurl during the past two or three weeks.
Tested to death on i386 (real-world tests, not only regression
tests).
More real-world tests (i386 and amd64) are welcome.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/devel/darcs/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile21 Dec 2007 19:38:46 - 1.22
+++ Makefile10 Oct 2008 19:47:35 -
@@ -2,18 +2,19 @@
COMMENT= advanced revision control system written in Haskell
-DISTNAME= darcs-1.0.9
-PKGNAME= ${DISTNAME}p1
+DISTNAME= darcs-2.1.0
CATEGORIES=devel
HOMEPAGE= http://www.darcs.net/
MASTER_SITES= ${HOMEPAGE}
MAINTAINER=Matthias Kilian [EMAIL PROTECTED]
+WANTLIB= c curses crypto idn m pthread ssl z
MODULES= lang/ghc
MODGHC_RUNTIME=No
LIB_DEPENDS= curl.=2::net/curl \
gmp::devel/gmp
+BUILD_DEPENDS= ${RUN_DEPENDS}
CONFIGURE_STYLE=simple
CONFIGURE_ARGS=--prefix=${PREFIX} \
@@ -21,23 +22,24 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--libexecdir=${PREFIX}/libexec/darcs \
--mandir=${PREFIX}/man \
--sysconfdir=${PREFIX}/share/darcs \
- --disable-mmap \
- --without-docs
+ --with-curl-pipelining \
+ --without-manual
CONFIGURE_ENV= CPPFLAGS=${CPPFLAGS} -I${LOCALBASE}/include \
LDFLAGS=${LDFLAGS} -L${LOCALBASE}/lib CFLAGS= \
- GREP=/usr/bin/grep AWK=/usr/bin/awk
+ AWK=/usr/bin/awk DIFF=/usr/bin/diff GREP=/usr/bin/grep
USE_GMAKE= Yes
MAKE_FILE= GNUmakefile
INSTALL_TARGET=install installserver installdocs
MAKE_ENV+= DARCS=${WRKSRC}/darcs
+MAKE_FLAGS+= VERBOSE=Yes
REGRESS_TARGET=check
+REGRESS_DEPENDS=::shells/bash
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c crypto curses idn m ssl z
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/devel/darcs/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo21 Jun 2007 15:13:45 - 1.15
+++ distinfo10 Oct 2008 19:47:35 -
@@ -1,5 +1,5 @@
-MD5 (darcs-1.0.9.tar.gz) = ByIs08UAqjHjMyhHVzpKsg==
-RMD160 (darcs-1.0.9.tar.gz) = RZyfhBWXmIja/uAh42jv7wamhaI=
-SHA1 (darcs-1.0.9.tar.gz) = 4IW3OwyC10ZfVHCcke8dFBR8Y+U=
-SHA256 (darcs-1.0.9.tar.gz) = pf5NWnQ9gFLWy/zqSApEWT+CGv2KQubW1K431A7SPNg=
-SIZE (darcs-1.0.9.tar.gz) = 1080280
+MD5 (darcs-2.1.0.tar.gz) = gcFAD0U5E0fj8N9Ifnef3Q==
+RMD160 (darcs-2.1.0.tar.gz) = TwBzt6h59eNXYB+SMguQIJglgUA=
+SHA1 (darcs-2.1.0.tar.gz) = c4oGPme5D1+DG3Fklp8oVpIlDO4=
+SHA256 (darcs-2.1.0.tar.gz) = 1aY+YrzrRZBRY9UIxrJRWNq2rKNnAVVm2MU57DcQerQ=
+SIZE (darcs-2.1.0.tar.gz) = 1851395
Index: patches/patch-GNUmakefile
===
RCS file: /cvs/ports/devel/darcs/patches/patch-GNUmakefile,v
retrieving revision 1.10
diff -u -p -r1.10 patch-GNUmakefile
--- patches/patch-GNUmakefile 6 Jun 2007 19:52:17 - 1.10
+++ patches/patch-GNUmakefile 10 Oct 2008 19:47:35 -
@@ -1,15 +1,20 @@
$OpenBSD: patch-GNUmakefile,v 1.10 2007/06/06 19:52:17 kili Exp $
-Don't try to build or install .ps docs, and don't regen the .html docs.
+Don't rebuild the documentation, and don't install the pdf files
+contained in the distfile.
+This is required in addition to `--without-manual' in CONFIGURE_ARGS.
GNUmakefile.orig Mon Jun 4 13:39:20 2007
-+++ GNUmakefileMon Jun 4 20:47:41 2007
-@@ -122,7 +122,7 @@ installbin:all
+--- GNUmakefile.orig Thu Oct 2 13:47:19 2008
GNUmakefileThu Oct 2 20:10:58 2008
+@@ -191,10 +191,9 @@ installbin: all
$(INSTALL) -d $(DESTDIR)$(mandir)/man1
- $(INSTALL_DATA) darcs.1 $(DESTDIR)$(mandir)/man1/
+ $(INSTALL_DATA) doc/darcs.1 $(DESTDIR)$(mandir)/man1/
--installdocs: manual/darcs.ps manual/index.html
+-installdocs: doc/manual/darcs.pdf doc/manual/patch-theory.pdf
doc/manual/index.html
+installdocs:
- test -d $(DESTDIR)$(datadir)/doc/darcs/manual || \
- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/darcs/manual
- $(INSTALL_DATA) manual/* $(DESTDIR)$(datadir)/doc/darcs/manual
+ test -d $(DESTDIR)$(docdir)/manual || \
+ $(INSTALL) -d $(DESTDIR)$(docdir)/manual
+- $(INSTALL_DATA) doc/manual/*.pdf $(DESTDIR)$(docdir)/manual
+ $(INSTALL_DATA) doc/manual/*.png $(DESTDIR)$(docdir)/manual
+ $(INSTALL_DATA) doc/manual/*.html $(DESTDIR)$(docdir)/manual
+
Index:
Re: update: devel/darcs
FYI: After talking a little bit to the darks people and running some real-world tests, I think it's better to wait for darcs-2.0.3, which will fix some super-annoying bugs wrt accessing remote darcs repositories over HTTP. Ciao, Kili -- f u cn rd ths, u mst hv bn sng nx
Re: update: devel/darcs
On Tue, Aug 26, 2008 at 11:31:19PM +0100, Stuart Henderson wrote: I'd also like to see the output of make regress on amd64. +++ Tue Aug 26 23:04:04 BST 2008 === Checking files for darcs-2.0.2 `/usr/ports/distfiles/darcs-2.0.2.tar.gz' is up to date. (SHA256) darcs-2.0.2.tar.gz: OK [...] Thanks! Before committing it, I'll ask on the darcs users mailing list, just in case someone is using darcs on OpenBSD but isn't subscribed to [EMAIL PROTECTED] Ciao, Kili -- The glibc C runtime library has a function __libc_freeres to free any memory allocated by the runtime. What is the equivalent in OpenBSD's libc? exit(3) -- Vesselin Peev and Tobias Weingartner
update: devel/darcs
Update to darcs-2.0.2. This needs the net/hs-HTTP port I sent to
the list earlier.
I changed the default method for HTTP connections from libcurl to
hs-HTTP, because the Haskell bindings to libcurl used in darcs are
flawed (this problem has been discussed recently on some Haskell
mailinglists). For example, with darcs+libcurl, I was not able to
run ./darcs-all pull -av from a ghc working directory with all the
libraries ghc needs; it alwways bailed out at some point. With
hs-HTTP, ./darcs-all pull -av just worked.
Tests and comments are welcome, escpecially from people who are
actually using darcs. I'd also like to see the output of make regress
on amd64.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/devel/darcs/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile21 Dec 2007 19:38:46 - 1.22
+++ Makefile26 Aug 2008 20:59:34 -
@@ -2,18 +2,19 @@
COMMENT= advanced revision control system written in Haskell
-DISTNAME= darcs-1.0.9
-PKGNAME= ${DISTNAME}p1
+DISTNAME= darcs-2.0.2
CATEGORIES=devel
HOMEPAGE= http://www.darcs.net/
MASTER_SITES= ${HOMEPAGE}
MAINTAINER=Matthias Kilian [EMAIL PROTECTED]
+WANTLIB= c curses m pthread z
MODULES= lang/ghc
MODGHC_RUNTIME=No
-LIB_DEPENDS= curl.=2::net/curl \
- gmp::devel/gmp
+LIB_DEPENDS= gmp::devel/gmp
+RUN_DEPENDS= ::net/hs-HTTP
+BUILD_DEPENDS= ${RUN_DEPENDS}
CONFIGURE_STYLE=simple
CONFIGURE_ARGS=--prefix=${PREFIX} \
@@ -21,8 +22,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--libexecdir=${PREFIX}/libexec/darcs \
--mandir=${PREFIX}/man \
--sysconfdir=${PREFIX}/share/darcs \
- --disable-mmap \
- --without-docs
+ --without-docs \
+ --without-libcurl
CONFIGURE_ENV= CPPFLAGS=${CPPFLAGS} -I${LOCALBASE}/include \
LDFLAGS=${LDFLAGS} -L${LOCALBASE}/lib CFLAGS= \
GREP=/usr/bin/grep AWK=/usr/bin/awk
@@ -32,12 +33,12 @@ MAKE_FILE= GNUmakefile
INSTALL_TARGET=install installserver installdocs
MAKE_ENV+= DARCS=${WRKSRC}/darcs
REGRESS_TARGET=check
+REGRESS_DEPENDS=::shells/bash
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c crypto curses idn m ssl z
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/devel/darcs/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo21 Jun 2007 15:13:45 - 1.15
+++ distinfo26 Aug 2008 20:59:34 -
@@ -1,5 +1,5 @@
-MD5 (darcs-1.0.9.tar.gz) = ByIs08UAqjHjMyhHVzpKsg==
-RMD160 (darcs-1.0.9.tar.gz) = RZyfhBWXmIja/uAh42jv7wamhaI=
-SHA1 (darcs-1.0.9.tar.gz) = 4IW3OwyC10ZfVHCcke8dFBR8Y+U=
-SHA256 (darcs-1.0.9.tar.gz) = pf5NWnQ9gFLWy/zqSApEWT+CGv2KQubW1K431A7SPNg=
-SIZE (darcs-1.0.9.tar.gz) = 1080280
+MD5 (darcs-2.0.2.tar.gz) = 8hawGdyfyDz5IPcVsdo3XA==
+RMD160 (darcs-2.0.2.tar.gz) = 5AG9KrZOLfTGVL3AM1XOIVoFMZU=
+SHA1 (darcs-2.0.2.tar.gz) = daGGuQasi7wRRMUSTCFeTFfAYiI=
+SHA256 (darcs-2.0.2.tar.gz) = FkyHu35B0egcRCNDKAS2NIYiaSkfpJXyXn9n8blb9J4=
+SIZE (darcs-2.0.2.tar.gz) = 1800653
Index: patches/patch-GNUmakefile
===
RCS file: /cvs/ports/devel/darcs/patches/patch-GNUmakefile,v
retrieving revision 1.10
diff -u -p -r1.10 patch-GNUmakefile
--- patches/patch-GNUmakefile 6 Jun 2007 19:52:17 - 1.10
+++ patches/patch-GNUmakefile 26 Aug 2008 20:59:34 -
@@ -1,15 +1,16 @@
$OpenBSD: patch-GNUmakefile,v 1.10 2007/06/06 19:52:17 kili Exp $
-Don't try to build or install .ps docs, and don't regen the .html docs.
+Don't try to build or install .ps and .pdf docs, and don't regen
+the .html docs.
GNUmakefile.orig Mon Jun 4 13:39:20 2007
-+++ GNUmakefileMon Jun 4 20:47:41 2007
-@@ -122,7 +122,7 @@ installbin:all
+--- GNUmakefile.orig Tue Jun 24 03:23:13 2008
GNUmakefileTue Aug 5 20:21:54 2008
+@@ -182,7 +182,7 @@ installbin:all
$(INSTALL) -d $(DESTDIR)$(mandir)/man1
- $(INSTALL_DATA) darcs.1 $(DESTDIR)$(mandir)/man1/
+ $(INSTALL_DATA) doc/darcs.1 $(DESTDIR)$(mandir)/man1/
--installdocs: manual/darcs.ps manual/index.html
+-installdocs: doc/manual/darcs.ps doc/manual/patch-theory.pdf
doc/manual/index.html
+installdocs:
- test -d $(DESTDIR)$(datadir)/doc/darcs/manual || \
- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/darcs/manual
- $(INSTALL_DATA) manual/* $(DESTDIR)$(datadir)/doc/darcs/manual
+ test -d $(DESTDIR)$(docdir)/manual || \
+ $(INSTALL) -d $(DESTDIR)$(docdir)/manual
+ $(INSTALL_DATA) doc/manual/* $(DESTDIR)$(docdir)/manual
Index:
Re: update: devel/darcs 1.0.4 - 1.0.8
On Thu, Jul 20, 2006 at 04:59:01PM -0500, Will Maier wrote:
On Thu, Jul 20, 2006 at 12:14:23AM +0200, Jon Olsson wrote:
Here's the latest diff.
# make lib-depends-check
/usr/ports/packages/i386/all/darcs-1.0.8.tgz:
Extra: readline.3
Extra: ncurses.10
Extra: pthread.6
After removing the extra libs, it compiles and passes regress on
i386/-current.
You're correct. Nifty target that, included is an updated diff.
diffstat:
devel/darcs/Makefile|6 ++-
devel/darcs/distinfo|8 ++--
devel/darcs/patches/patch-GNUmakefile | 20 +-
devel/darcs/patches/patch-configure | 62
devel/darcs/patches/patch-tests_pull_pl | 18 +
devel/darcs/pkg/PLIST |1
lang/ghc/ghc.port.mk|7 +++
7 files changed, 74 insertions(+), 48 deletions(-)
--
Jon
? devel/darcs/w-darcs-1.0.8
? devel/darcs/patches/patch-tests_pull_pl
Index: lang/ghc/ghc.port.mk
===
RCS file: /cvs/ports/lang/ghc/ghc.port.mk,v
retrieving revision 1.3
diff -u -r1.3 ghc.port.mk
--- lang/ghc/ghc.port.mk2005/02/19 03:42:11 1.3
+++ lang/ghc/ghc.port.mk2006/07/21 09:04:06
@@ -7,4 +7,11 @@
# sparc
BUILD_DEPENDS+=bin/ghc::lang/ghc
+
+# Only add runtime when it is actually needed (by default yes)
+GHC_RUNTIME?= YES
+.if ${GHC_RUNTIME} == YES
RUN_DEPENDS+= bin/ghc::lang/ghc
+.else
+LIB_DEPENDS+= gmp::devel/gmp
+.endif
Index: devel/darcs/Makefile
===
RCS file: /cvs/ports/devel/darcs/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- devel/darcs/Makefile2005/11/17 09:31:16 1.14
+++ devel/darcs/Makefile2006/07/21 09:04:06
@@ -2,13 +2,15 @@
COMMENT= advanced revision control system written in Haskell
-V= 1.0.4
+V= 1.0.8
DISTNAME= darcs-${V}
CATEGORIES=devel
HOMEPAGE= http://www.darcs.net/
MASTER_SITES= ${HOMEPAGE}
MAINTAINER=Don Stewart [EMAIL PROTECTED]
+GHC_RUNTIME= no
+
MODULES= lang/ghc
LIB_DEPENDS= curl.2::net/curl
@@ -32,6 +34,6 @@
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c crypto curses gmp m ncurses pthread readline ssl z
+WANTLIB= c crypto curses gmp m ssl z
.include bsd.port.mk
Index: devel/darcs/distinfo
===
RCS file: /cvs/ports/devel/darcs/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- devel/darcs/distinfo2005/11/17 09:31:16 1.11
+++ devel/darcs/distinfo2006/07/21 09:04:06
@@ -1,4 +1,4 @@
-MD5 (darcs-1.0.4.tar.gz) = 0be693b00e4b1bd24906d4f479e78923
-RMD160 (darcs-1.0.4.tar.gz) = 5b8e4b2396c1cd7a373e103aa90d8a47802a43de
-SHA1 (darcs-1.0.4.tar.gz) = 71ab71a9fa94db74ba3b79fa65b797a129a652f2
-SIZE (darcs-1.0.4.tar.gz) = 950528
+MD5 (darcs-1.0.8.tar.gz) = a7a26d1a98c5675dcab4c2cc30eba59d
+RMD160 (darcs-1.0.8.tar.gz) = a95309f7dc79b29d7e4f237627aa300a84aa5331
+SHA1 (darcs-1.0.8.tar.gz) = f69fb2f5deb3c5281b2eaed9fcb8aa3fe55829dd
+SIZE (darcs-1.0.8.tar.gz) = 1010010
Index: devel/darcs/patches/patch-GNUmakefile
===
RCS file: /cvs/ports/devel/darcs/patches/patch-GNUmakefile,v
retrieving revision 1.8
diff -u -r1.8 patch-GNUmakefile
--- devel/darcs/patches/patch-GNUmakefile 2005/11/17 09:31:16 1.8
+++ devel/darcs/patches/patch-GNUmakefile 2006/07/21 09:04:06
@@ -2,17 +2,17 @@
Don't try to build or install .ps docs, and don't regen the .html docs.
GNUmakefile.orig Thu Sep 1 21:33:13 2005
-+++ GNUmakefileMon Sep 12 12:03:02 2005
-@@ -103,10 +103,9 @@ installbin: all
- $(INSTALL) -d $(DESTDIR)/$(mandir)/man1
- $(INSTALL_DATA) darcs.1 $(DESTDIR)/$(mandir)/man1/
+--- GNUmakefile.orig Fri Jun 9 15:01:54 2006
GNUmakefileFri Jun 9 15:02:22 2006
+@@ -120,10 +120,9 @@ installbin: all
+ $(INSTALL) -d $(DESTDIR)$(mandir)/man1
+ $(INSTALL_DATA) darcs.1 $(DESTDIR)$(mandir)/man1/
-installdocs: darcs.ps manual/index.html
+installdocs:
- test -d $(DESTDIR)/$(datadir)/doc/darcs/manual || \
- $(INSTALL) -d $(DESTDIR)/$(datadir)/doc/darcs/manual
-- $(INSTALL_DATA) darcs.ps $(DESTDIR)/$(datadir)/doc/darcs
- $(INSTALL_DATA) manual/* $(DESTDIR)/$(datadir)/doc/darcs/manual
+ test -d $(DESTDIR)$(datadir)/doc/darcs/manual || \
+ $(INSTALL) -d $(DESTDIR)$(datadir)/doc/darcs/manual
+- $(INSTALL_DATA) darcs.ps $(DESTDIR)$(datadir)/doc/darcs
+ $(INSTALL_DATA) manual/* $(DESTDIR)$(datadir)/doc/darcs/manual
- test -d $(DESTDIR)/$(datadir)/doc/darcs/examples || \
+ test -d
Re: update: devel/darcs 1.0.4 - 1.0.8
On Thu, Jul 20, 2006 at 12:14:23AM +0200, Jon Olsson wrote:
Here's the latest diff.
# make lib-depends-check
/usr/ports/packages/i386/all/darcs-1.0.8.tgz:
Extra: readline.3
Extra: ncurses.10
Extra: pthread.6
After removing the extra libs, it compiles and passes regress on
i386/-current.
--
o--{ Will Maier }--o
| web:...http://www.lfod.us/ | [EMAIL PROTECTED] |
*--[ BSD Unix: Live Free or Die ]--*
Re: update: devel/darcs 1.0.4 - 1.0.8
On Thu, Jul 06, 2006 at 01:02:23PM +0200, Jon Olsson wrote:
This patch updates the in-tree darcs from the rather old 1.0.4 to
1.0.8 and removes the unneeded runtime GHC dependency, as darcs is
just a binary. A lot of changes has happened between the versions,
most notably a security issue has been resolved. See the ChangeLog
file for complete version history.
I just sent a similar patch[*] to the MAINTAINER (Don Stewart
[EMAIL PROTECTED]) and received the following:
- Forwarded message from Donald Bruce Stewart [EMAIL PROTECTED] -
From: Donald Bruce Stewart [EMAIL PROTECTED]
Date: Wed, 19 Jul 2006 13:13:57 +1000
To: Will Maier [EMAIL PROTECTED]
Subject: Re: OpenBSD Ports: UPDATE deve/darcs
User-Agent: Mutt/1.5.11
Unfortunately, I don't have the time to maintain this anymore. Two
weeks ago Jon Olsson [EMAIL PROTECTED] sent me the very same patch (and
also to ports@ iirc).
I suggest that either you or John should suggest there to take
maintainership of darcs, with my ok, and then submit patches.
Cheers,
Don
- End forwarded message -
Jon, would you be interested in maintaining the port? I don't use
DARCS at all...
[*] Somehow, I read Jon's patch; forgot about it; wondered if I
could get the DARCS port to build tailor, too; saw that DARCS wanted
upgrading; and went back and redid it. Jon's patch is better than
mine, though. ;)
--
o--{ Will Maier }--o
| web:...http://www.lfod.us/ | [EMAIL PROTECTED] |
*--[ BSD Unix: Live Free or Die ]--*
Re: update: devel/darcs 1.0.4 - 1.0.8
On Wed, Jul 19, 2006 at 07:37:19AM -0500, Will Maier wrote: [snip] Jon, would you be interested in maintaining the port? I don't use DARCS at all... Sure - I use darcs all the time, I'll maintain it. -- Jon
Re: update: devel/darcs 1.0.4 - 1.0.8
Jon Olsson [EMAIL PROTECTED] wrote: On Wed, Jul 19, 2006 at 07:37:19AM -0500, Will Maier wrote: [snip] Jon, would you be interested in maintaining the port? I don't use DARCS at all... Sure - I use darcs all the time, I'll maintain it. I got lost, where is a diff to test? Alek
Re: update: devel/darcs 1.0.4 - 1.0.8
On Wed, Jul 19, 2006 at 11:34:08PM +0200, Aleksander Piotrowski wrote:
Jon Olsson [EMAIL PROTECTED] wrote:
On Wed, Jul 19, 2006 at 07:37:19AM -0500, Will Maier wrote:
[snip]
Jon, would you be interested in maintaining the port? I don't use
DARCS at all...
Sure - I use darcs all the time, I'll maintain it.
I got lost, where is a diff to test?
Here's the latest diff.
--
Jon
Index: lang/ghc/ghc.port.mk
===
RCS file: /cvs/ports/lang/ghc/ghc.port.mk,v
retrieving revision 1.3
diff -u -u -r1.3 ghc.port.mk
--- lang/ghc/ghc.port.mk2005/02/19 03:42:11 1.3
+++ lang/ghc/ghc.port.mk2006/07/19 22:12:20
@@ -7,4 +7,11 @@
# sparc
BUILD_DEPENDS+=bin/ghc::lang/ghc
+
+# Only add runtime when it is actually needed (by default yes)
+GHC_RUNTIME?= YES
+.if ${GHC_RUNTIME} == YES
RUN_DEPENDS+= bin/ghc::lang/ghc
+.else
+LIB_DEPENDS+= gmp::devel/gmp
+.endif
Index: devel/darcs/Makefile
===
RCS file: /cvs/ports/devel/darcs/Makefile,v
retrieving revision 1.14
diff -u -u -r1.14 Makefile
--- devel/darcs/Makefile2005/11/17 09:31:16 1.14
+++ devel/darcs/Makefile2006/07/19 22:12:20
@@ -2,12 +2,14 @@
COMMENT= advanced revision control system written in Haskell
-V= 1.0.4
+V= 1.0.8
DISTNAME= darcs-${V}
CATEGORIES=devel
HOMEPAGE= http://www.darcs.net/
MASTER_SITES= ${HOMEPAGE}
MAINTAINER=Don Stewart [EMAIL PROTECTED]
+
+GHC_RUNTIME= no
MODULES= lang/ghc
LIB_DEPENDS= curl.2::net/curl
Index: devel/darcs/distinfo
===
RCS file: /cvs/ports/devel/darcs/distinfo,v
retrieving revision 1.11
diff -u -u -r1.11 distinfo
--- devel/darcs/distinfo2005/11/17 09:31:16 1.11
+++ devel/darcs/distinfo2006/07/19 22:12:20
@@ -1,4 +1,4 @@
-MD5 (darcs-1.0.4.tar.gz) = 0be693b00e4b1bd24906d4f479e78923
-RMD160 (darcs-1.0.4.tar.gz) = 5b8e4b2396c1cd7a373e103aa90d8a47802a43de
-SHA1 (darcs-1.0.4.tar.gz) = 71ab71a9fa94db74ba3b79fa65b797a129a652f2
-SIZE (darcs-1.0.4.tar.gz) = 950528
+MD5 (darcs-1.0.8.tar.gz) = a7a26d1a98c5675dcab4c2cc30eba59d
+RMD160 (darcs-1.0.8.tar.gz) = a95309f7dc79b29d7e4f237627aa300a84aa5331
+SHA1 (darcs-1.0.8.tar.gz) = f69fb2f5deb3c5281b2eaed9fcb8aa3fe55829dd
+SIZE (darcs-1.0.8.tar.gz) = 1010010
Index: devel/darcs/patches/patch-GNUmakefile
===
RCS file: /cvs/ports/devel/darcs/patches/patch-GNUmakefile,v
retrieving revision 1.8
diff -u -u -r1.8 patch-GNUmakefile
--- devel/darcs/patches/patch-GNUmakefile 2005/11/17 09:31:16 1.8
+++ devel/darcs/patches/patch-GNUmakefile 2006/07/19 22:12:20
@@ -2,17 +2,17 @@
Don't try to build or install .ps docs, and don't regen the .html docs.
GNUmakefile.orig Thu Sep 1 21:33:13 2005
-+++ GNUmakefileMon Sep 12 12:03:02 2005
-@@ -103,10 +103,9 @@ installbin: all
- $(INSTALL) -d $(DESTDIR)/$(mandir)/man1
- $(INSTALL_DATA) darcs.1 $(DESTDIR)/$(mandir)/man1/
+--- GNUmakefile.orig Fri Jun 9 15:01:54 2006
GNUmakefileFri Jun 9 15:02:22 2006
+@@ -120,10 +120,9 @@ installbin: all
+ $(INSTALL) -d $(DESTDIR)$(mandir)/man1
+ $(INSTALL_DATA) darcs.1 $(DESTDIR)$(mandir)/man1/
-installdocs: darcs.ps manual/index.html
+installdocs:
- test -d $(DESTDIR)/$(datadir)/doc/darcs/manual || \
- $(INSTALL) -d $(DESTDIR)/$(datadir)/doc/darcs/manual
-- $(INSTALL_DATA) darcs.ps $(DESTDIR)/$(datadir)/doc/darcs
- $(INSTALL_DATA) manual/* $(DESTDIR)/$(datadir)/doc/darcs/manual
+ test -d $(DESTDIR)$(datadir)/doc/darcs/manual || \
+ $(INSTALL) -d $(DESTDIR)$(datadir)/doc/darcs/manual
+- $(INSTALL_DATA) darcs.ps $(DESTDIR)$(datadir)/doc/darcs
+ $(INSTALL_DATA) manual/* $(DESTDIR)$(datadir)/doc/darcs/manual
- test -d $(DESTDIR)/$(datadir)/doc/darcs/examples || \
+ test -d $(DESTDIR)$(datadir)/doc/darcs/examples || \
Index: devel/darcs/patches/patch-configure
===
RCS file: /cvs/ports/devel/darcs/patches/patch-configure,v
retrieving revision 1.6
diff -u -u -r1.6 patch-configure
--- devel/darcs/patches/patch-configure 2005/11/17 09:31:16 1.6
+++ devel/darcs/patches/patch-configure 2006/07/19 22:12:20
@@ -2,42 +2,42 @@
Don't build the postscript manual
configure.orig Thu Sep 1 21:33:16 2005
-+++ configure Mon Sep 12 12:02:06 2005
-@@ -3980,7 +3980,7 @@ if test $enable_mmap = no; then
+--- configure.orig Sun May 14 02:11:04 2006
configure Fri Jun 9 15:04:52 2006
+@@ -4306,7 +4306,7 @@ if test $enable_mmap = no; then
fi
--TARGETS=darcs darcs-createrepo darcs.1
-+TARGETS=darcs darcs-createrepo
+-TARGETS=darcs darcs.1
++TARGETS=darcs
update: devel/darcs 1.0.4 - 1.0.8
This patch updates the in-tree darcs from the rather old 1.0.4 to
1.0.8 and removes the unneeded runtime GHC dependency, as darcs is
just a binary. A lot of changes has happened between the versions,
most notably a security issue has been resolved. See the ChangeLog file
for complete version history.
File changes:
devel/darcs/Makefile|4 +-
devel/darcs/distinfo|8 ++--
devel/darcs/patches/patch-GNUmakefile | 20 +-
devel/darcs/patches/patch-configure | 62
devel/darcs/patches/patch-tests_pull_pl | 18 +
devel/darcs/pkg/PLIST |1
lang/ghc/ghc.port.mk|5 ++
10 files changed, 71 insertions(+), 47 deletions(-)
--
Jon
This patch updates the in-tree darcs from the rather old 1.0.4 to
1.0.8 and removes the unneeded runtime GHC dependency, as darcs is
just a binary. A lot of changes has happened between the versions,
most notably a security issue has been resolved. See the ChangeLog file
for complete version history.
File changes:
devel/darcs/Makefile|4 +-
devel/darcs/distinfo|8 ++--
devel/darcs/patches/patch-GNUmakefile | 20 +-
devel/darcs/patches/patch-configure | 62
devel/darcs/patches/patch-tests_pull_pl | 18 +
devel/darcs/pkg/PLIST |1
lang/ghc/ghc.port.mk|5 ++
10 files changed, 71 insertions(+), 47 deletions(-)
Index: lang/ghc/ghc.port.mk
===
RCS file: /cvs/ports/lang/ghc/ghc.port.mk,v
retrieving revision 1.3
diff -u -r1.3 ghc.port.mk
--- lang/ghc/ghc.port.mk2005/02/19 03:42:11 1.3
+++ lang/ghc/ghc.port.mk2006/07/06 10:56:02
@@ -7,4 +7,9 @@
# sparc
BUILD_DEPENDS+=bin/ghc::lang/ghc
+
+# Only add runtime when it is actually needed (by default yes)
+GHC_RUNTIME?= YES
+.if ${GHC_RUNTIME} == YES
RUN_DEPENDS+= bin/ghc::lang/ghc
+.endif
Index: devel/darcs/Makefile
===
RCS file: /cvs/ports/devel/darcs/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- devel/darcs/Makefile2005/11/17 09:31:16 1.14
+++ devel/darcs/Makefile2006/07/06 10:56:02
@@ -2,12 +2,14 @@
COMMENT= advanced revision control system written in Haskell
-V= 1.0.4
+V= 1.0.8
DISTNAME= darcs-${V}
CATEGORIES=devel
HOMEPAGE= http://www.darcs.net/
MASTER_SITES= ${HOMEPAGE}
MAINTAINER=Don Stewart [EMAIL PROTECTED]
+
+GHC_RUNTIME= no
MODULES= lang/ghc
LIB_DEPENDS= curl.2::net/curl
Index: devel/darcs/distinfo
===
RCS file: /cvs/ports/devel/darcs/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- devel/darcs/distinfo2005/11/17 09:31:16 1.11
+++ devel/darcs/distinfo2006/07/06 10:56:02
@@ -1,4 +1,4 @@
-MD5 (darcs-1.0.4.tar.gz) = 0be693b00e4b1bd24906d4f479e78923
-RMD160 (darcs-1.0.4.tar.gz) = 5b8e4b2396c1cd7a373e103aa90d8a47802a43de
-SHA1 (darcs-1.0.4.tar.gz) = 71ab71a9fa94db74ba3b79fa65b797a129a652f2
-SIZE (darcs-1.0.4.tar.gz) = 950528
+MD5 (darcs-1.0.8.tar.gz) = a7a26d1a98c5675dcab4c2cc30eba59d
+RMD160 (darcs-1.0.8.tar.gz) = a95309f7dc79b29d7e4f237627aa300a84aa5331
+SHA1 (darcs-1.0.8.tar.gz) = f69fb2f5deb3c5281b2eaed9fcb8aa3fe55829dd
+SIZE (darcs-1.0.8.tar.gz) = 1010010
Index: devel/darcs/patches/patch-GNUmakefile
===
RCS file: /cvs/ports/devel/darcs/patches/patch-GNUmakefile,v
retrieving revision 1.8
diff -u -r1.8 patch-GNUmakefile
--- devel/darcs/patches/patch-GNUmakefile 2005/11/17 09:31:16 1.8
+++ devel/darcs/patches/patch-GNUmakefile 2006/07/06 10:56:02
@@ -2,17 +2,17 @@
Don't try to build or install .ps docs, and don't regen the .html docs.
GNUmakefile.orig Thu Sep 1 21:33:13 2005
-+++ GNUmakefileMon Sep 12 12:03:02 2005
-@@ -103,10 +103,9 @@ installbin: all
- $(INSTALL) -d $(DESTDIR)/$(mandir)/man1
- $(INSTALL_DATA) darcs.1 $(DESTDIR)/$(mandir)/man1/
+--- GNUmakefile.orig Fri Jun 9 15:01:54 2006
GNUmakefileFri Jun 9 15:02:22 2006
+@@ -120,10 +120,9 @@ installbin: all
+ $(INSTALL) -d $(DESTDIR)$(mandir)/man1
+ $(INSTALL_DATA) darcs.1 $(DESTDIR)$(mandir)/man1/
-installdocs: darcs.ps manual/index.html
+installdocs:
- test -d $(DESTDIR)/$(datadir)/doc/darcs/manual || \
- $(INSTALL) -d $(DESTDIR)/$(datadir)/doc/darcs/manual
-- $(INSTALL_DATA) darcs.ps $(DESTDIR)/$(datadir)/doc/darcs
- $(INSTALL_DATA) manual/* $(DESTDIR)/$(datadir)/doc/darcs/manual
+ test -d $(DESTDIR)$(datadir)/doc/darcs/manual || \
+ $(INSTALL) -d
Re: update: devel/darcs 1.0.4 - 1.0.8
On Thu, Jul 06, 2006 at 01:02:23PM +0200, Jon Olsson wrote:
[snip]
lang/ghc/ghc.port.mk|5 ++
This patch was wrong, here's a correct patch, adding libgmp to
LIB_DEPENDS:
Index: ghc.port.mk
===
RCS file: /cvs/ports/lang/ghc/ghc.port.mk,v
retrieving revision 1.3
diff -u -r1.3 ghc.port.mk
--- ghc.port.mk 2005/02/19 03:42:11 1.3
+++ ghc.port.mk 2006/07/06 22:55:11
@@ -7,4 +7,11 @@
# sparc
BUILD_DEPENDS+=bin/ghc::lang/ghc
+
+# Only add runtime when it is actually needed (by default yes)
+GHC_RUNTIME?= YES
+.if ${GHC_RUNTIME} == YES
RUN_DEPENDS+= bin/ghc::lang/ghc
+.else
+LIB_DEPENDS+= gmp::devel/gmp
+.endif
