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
--- Makefile 21 Dec 2007 19:38:46 -0000 1.22
+++ Makefile 10 Oct 2008 19:47:35 -0000
@@ -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
--- distinfo 21 Jun 2007 15:13:45 -0000 1.15
+++ distinfo 10 Oct 2008 19:47:35 -0000
@@ -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 -0000 1.10
+++ patches/patch-GNUmakefile 10 Oct 2008 19:47:35 -0000
@@ -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
-+++ GNUmakefile Mon Jun 4 20:47:41 2007
-@@ -122,7 +122,7 @@ installbin: all
+--- GNUmakefile.orig Thu Oct 2 13:47:19 2008
++++ GNUmakefile Thu 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: patches/patch-tests_missed_resolution_pl
===================================================================
RCS file: patches/patch-tests_missed_resolution_pl
diff -N patches/patch-tests_missed_resolution_pl
--- patches/patch-tests_missed_resolution_pl 6 Jun 2007 19:52:17 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
---- tests/missed_resolution.pl.orig Mon Jun 4 13:39:21 2007
-+++ tests/missed_resolution.pl Tue Jun 5 14:56:20 2007
-@@ -46,8 +46,14 @@ darcs "pull --all ../tmp2";
- # we should have a marked conflict now.
- # we resolve it simply by removing conflict markers.
-
--# I'm too lazy to translate this to Perl right now.
--`grep -v '\(\^ \^\|\*\*\|v v\)' A > tmp`;
-+open(A, "A") || die;
-+open(TMP, ">tmp") || die;
-+while (<A>) {
-+ (/\^ \^|\*\*|v v/) or print TMP;
-+}
-+close(A);
-+close(TMP);
-+
- mv('tmp','A');
-
- darcs "record -A x -m 'resolve' --all";
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/darcs/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 30 Jul 2006 21:02:32 -0000 1.10
+++ pkg/PLIST 10 Oct 2008 19:47:35 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.10 2006/07/30 21:02:32 alek Exp $
-bin/darcs
[EMAIL PROTECTED] bin/darcs
libexec/darcs/
libexec/darcs/cgi-bin/
libexec/darcs/cgi-bin/darcs.cgi
@@ -14,6 +14,7 @@ share/darcs/xslt/
share/darcs/xslt/annotate.xslt
share/darcs/xslt/browse.xslt
share/darcs/xslt/common.xslt
+share/darcs/xslt/errors.xml
share/darcs/xslt/errors.xslt
share/darcs/xslt/patches.xslt
share/darcs/xslt/repos.xslt
@@ -24,15 +25,10 @@ share/doc/darcs/examples/
share/doc/darcs/examples/zsh_completion_new
share/doc/darcs/examples/zsh_completion_old
share/doc/darcs/manual/
-share/doc/darcs/manual/WARNINGS
share/doc/darcs/manual/contents.png
-share/doc/darcs/manual/darcs.css
+share/doc/darcs/manual/crossref.png
share/doc/darcs/manual/darcs.html
share/doc/darcs/manual/footnode.html
-share/doc/darcs/manual/images.aux
-share/doc/darcs/manual/images.log
-share/doc/darcs/manual/images.pl
-share/doc/darcs/manual/images.tex
share/doc/darcs/manual/img1.png
share/doc/darcs/manual/img10.png
share/doc/darcs/manual/img11.png
@@ -51,7 +47,18 @@ share/doc/darcs/manual/img22.png
share/doc/darcs/manual/img23.png
share/doc/darcs/manual/img24.png
share/doc/darcs/manual/img25.png
+share/doc/darcs/manual/img26.png
+share/doc/darcs/manual/img27.png
+share/doc/darcs/manual/img28.png
+share/doc/darcs/manual/img29.png
share/doc/darcs/manual/img3.png
+share/doc/darcs/manual/img30.png
+share/doc/darcs/manual/img31.png
+share/doc/darcs/manual/img32.png
+share/doc/darcs/manual/img33.png
+share/doc/darcs/manual/img34.png
+share/doc/darcs/manual/img35.png
+share/doc/darcs/manual/img36.png
share/doc/darcs/manual/img4.png
share/doc/darcs/manual/img5.png
share/doc/darcs/manual/img6.png
@@ -59,13 +66,12 @@ share/doc/darcs/manual/img7.png
share/doc/darcs/manual/img8.png
share/doc/darcs/manual/img9.png
share/doc/darcs/manual/index.html
-share/doc/darcs/manual/internals.pl
-share/doc/darcs/manual/labels.pl
share/doc/darcs/manual/next.png
share/doc/darcs/manual/next_g.png
share/doc/darcs/manual/node1.html
share/doc/darcs/manual/node10.html
share/doc/darcs/manual/node11.html
+share/doc/darcs/manual/node12.html
share/doc/darcs/manual/node2.html
share/doc/darcs/manual/node3.html
share/doc/darcs/manual/node4.html
@@ -74,6 +80,7 @@ share/doc/darcs/manual/node6.html
share/doc/darcs/manual/node7.html
share/doc/darcs/manual/node8.html
share/doc/darcs/manual/node9.html
+share/doc/darcs/manual/nx_grp_g.png
share/doc/darcs/manual/prev.png
share/doc/darcs/manual/prev_g.png
share/doc/darcs/manual/up.png
