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.mk 2005/02/19 03:42:11 1.3 +++ lang/ghc/ghc.port.mk 2006/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/Makefile 2005/11/17 09:31:16 1.14 +++ devel/darcs/Makefile 2006/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/distinfo 2005/11/17 09:31:16 1.11 +++ devel/darcs/distinfo 2006/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 -+++ GNUmakefile Mon 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 ++++ GNUmakefile Fri 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" INSTALLWHAT="installbin" BUILDDOC="no" -@@ -4170,7 +4170,7 @@ if test -z "$DVIPS"; then +@@ -4510,7 +4510,7 @@ fi echo "$as_me: WARNING: Cannot find dvips in your path!" >&2;} - fi - if test ! '(' '(' -z "$LATEX" ')' -o '(' -z "$DVIPS" ')' ')'; then -- TARGETS="$TARGETS darcs.ps" -+ TARGETS="$TARGETS" - INSTALLWHAT="$INSTALLWHAT installdocs" - BUILDDOC="yes" - fi -@@ -4291,15 +4291,15 @@ fi + fi + if test ! '(' '(' -z "$LATEX" ')' -o '(' -z "$DVIPS" ')' ')'; then +- TARGETS="$TARGETS darcs.ps" ++ TARGETS="$TARGETS" + INSTALLWHAT="$INSTALLWHAT installdocs" + BUILDDOC="yes" + fi +@@ -4631,15 +4631,15 @@ fi echo "$as_me: WARNING: Cannot find hevea in your path either!" >&2;} - MAKEMANUAL="touch manual/index.html; echo Cannot make manual!" - else -- TARGETS="$TARGETS manual/index.html" -+ TARGETS="$TARGETS" - MAKEMANUAL="$HEVEA -o manual/index.html darcs.tex" - fi - else -- TARGETS="$TARGETS manual/index.html" -+ TARGETS="$TARGETS" - MAKEMANUAL="cd manual && $HTLATEX ../darcs.tex && ln -sf darcs.html index.html" - fi - else -- TARGETS="$TARGETS manual/index.html" -+ TARGETS="$TARGETS" - MAKEMANUAL="$LATEX2HTML -split +1 -dir manual darcs.tex" - PREPROCHTML="--html" - fi + MAKEMANUAL="touch manual/index.html; echo Cannot make manual!" + else +- TARGETS="$TARGETS manual/index.html" ++ TARGETS="$TARGETS" + MAKEMANUAL="$HEVEA -o manual/index.html darcs.tex" + fi + else +- TARGETS="$TARGETS manual/index.html" ++ TARGETS="$TARGETS" + MAKEMANUAL="cd manual && $HTLATEX ../darcs.tex && ln -sf darcs.html index.html" + fi + else +- TARGETS="$TARGETS manual/index.html" ++ TARGETS="$TARGETS" + MAKEMANUAL="$LATEX2HTML -split +1 -dir manual darcs.tex" + PREPROCHTML="--html" + fi Index: devel/darcs/pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/darcs/pkg/PLIST,v retrieving revision 1.9 diff -u -u -r1.9 PLIST --- devel/darcs/pkg/PLIST 2005/05/09 03:41:34 1.9 +++ devel/darcs/pkg/PLIST 2006/07/19 22:12:20 @@ -4,7 +4,6 @@ libexec/darcs/cgi-bin/ libexec/darcs/cgi-bin/darcs.cgi @man man/man1/darcs.1 -sbin/darcs-createrepo share/darcs/ share/darcs/bash_completion.d/ share/darcs/bash_completion.d/darcs --- /dev/null Thu Jul 20 00:12:49 2006 +++ devel/darcs/patches/patch-tests_pull_pl Thu Jul 6 12:34:30 2006 @@ -0,0 +1,18 @@ +$OpenBSD$ +--- tests/pull.pl.orig Fri Jun 16 20:59:27 2006 ++++ tests/pull.pl Thu Jul 6 12:34:14 2006 +@@ -54,8 +54,12 @@ TAKE_LOCK: { + } elsif ($^O =~ /msys/i) { + pass('this test fails on windows, so ignore it'); + } else { +- like($out, qr#one/date\.t.+: permission denied#i, +- 'expect permission denied error'); ++ if(getuid() == 0) { ++ pass("root never gets permission denied"); ++ } else { ++ like($out, qr#one/date\.t.+: permission denied#i, ++ 'expect permission denied error'); ++ } + } + }; +