cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.0.9, from Jon Olsson (maintainer).

Browse Source 
Tested by me with both ghc-6.2.2 and upcoming ghc-6.6.1 on i386 and
by R.D. Thrush on amd64. Some spaces vs. tabs detected by sturm@.

ok sturm@
This commit is contained in:
kili 2007-06-06 19:52:17 +00:00
parent 20bf2e60a1
commit 5bf0c0778f
6 changed files with 32 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
devel/darcs/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.18 2007/05/14 20:40:15 naddy Exp $
# $OpenBSD: Makefile,v 1.19 2007/06/06 19:52:17 kili Exp $
COMMENT= "advanced revision control system written in Haskell"
DISTNAME= darcs-1.0.8
PKGNAME= ${DISTNAME}p1
DISTNAME= darcs-1.0.9
CATEGORIES= devel
HOMEPAGE= http://www.darcs.net/
MASTER_SITES= ${HOMEPAGE}
@ -16,18 +16,19 @@ LIB_DEPENDS= curl.>=2::net/curl \
CONFIGURE_STYLE=simple
CONFIGURE_ARGS= --prefix=${PREFIX} \
--datadir=${PREFIX}/share \
--libexecdir=${PREFIX}/libexec/darcs \
--sysconfdir=${PREFIX}/share/darcs \
--disable-mmap
--datadir=${PREFIX}/share \
--libexecdir=${PREFIX}/libexec/darcs \
--sysconfdir=${PREFIX}/share/darcs \
--disable-mmap \
--without-docs
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" CFLAGS=""
USE_GMAKE= Yes
MAKE_FILE= GNUmakefile
INSTALL_TARGET= install installserver installdocs
INSTALL_TARGET= install installserver installdocs
MAKE_ENV+= DARCS=${WRKSRC}/darcs
REGRESS_TARGET= check
REGRESS_TARGET= check
# GPL
PERMIT_PACKAGE_CDROM= Yes

10
devel/darcs/distinfo
View File

@ -1,5 +1,5 @@
MD5 (darcs-1.0.8.tar.gz) = p6JtGpjFZ13KtMLMMOulnQ==
RMD160 (darcs-1.0.8.tar.gz) = qVMJ99x5sp1+TyN2J6owCoSqUzE=
SHA1 (darcs-1.0.8.tar.gz) = 9p+y9d6zxSgbLq7Z/LiqP+VYKd0=
SHA256 (darcs-1.0.8.tar.gz) = Ns9ksQqeCeS7LUvHg3GotRHn5bvxPesadU6Gew78/Kw=
SIZE (darcs-1.0.8.tar.gz) = 1010010
MD5 (darcs-1.0.9.tar.gz) = B3Qg7sQ37N1F2Nxmgu5h+g==
RMD160 (darcs-1.0.9.tar.gz) = Opcfd45DQ9kOiPG6iBXqPIgKwqE=
SHA1 (darcs-1.0.9.tar.gz) = stIjjAHVMHlsKdtLRv1P2cIb6bY=
SHA256 (darcs-1.0.9.tar.gz) = +EimM2OtctMhex60acJnwA6mCFpJEXLThatu2iELMNw=
SIZE (darcs-1.0.9.tar.gz) = 1059363

13
devel/darcs/patches/patch-GNUmakefile
View File

@ -1,18 +1,15 @@
$OpenBSD: patch-GNUmakefile,v 1.9 2006/07/30 21:02:32 alek Exp $
$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.
--- GNUmakefile.orig Fri Jun 9 15:01:54 2006
+++ GNUmakefile Fri Jun 9 15:02:22 2006
@@ -120,10 +120,9 @@ installbin: all
--- GNUmakefile.orig Mon Jun 4 13:39:20 2007
+++ GNUmakefile Mon Jun 4 20:47:41 2007
@@ -122,7 +122,7 @@ installbin: all
$(INSTALL) -d $(DESTDIR)$(mandir)/man1
$(INSTALL_DATA) darcs.1 $(DESTDIR)$(mandir)/man1/
-installdocs: darcs.ps manual/index.html
-installdocs: manual/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/examples || \

43
devel/darcs/patches/patch-configure
View File

@ -1,43 +0,0 @@
$OpenBSD: patch-configure,v 1.7 2006/07/30 21:02:32 alek Exp $
Don't build the postscript manual
--- 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.1"
+TARGETS="darcs"
INSTALLWHAT="installbin"
BUILDDOC="no"
@@ -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
@@ -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

19
devel/darcs/patches/patch-tests_missed_resolution_pl
View File

@ -1,13 +1,18 @@
$OpenBSD: patch-tests_missed_resolution_pl,v 1.1 2005/05/09 03:41:34 dons Exp $
--- tests/missed_resolution.pl.orig Mon May 9 11:03:08 2005
+++ tests/missed_resolution.pl Mon May 9 11:14:37 2005
@@ -47,7 +47,9 @@ darcs "pull --all ../tmp2";
--- 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.
-# I'm too lazy to translate this to Perl right now.
-`grep -v '\(\^ \^\|\*\*\|v v\)' A > tmp`;
+#`grep -v '\(\^ \^\|\*\*\|v v\)' A > tmp`;
+`sed '/\*\*/d;/v v/d;/\^ \^/d' A > tmp`;
+open(A, "A") || die;
+open(TMP, ">tmp") || die;
+while (<A>) {
+ (/\^ \^|\*\*|v v/) or print TMP;
+}
+close(A);
+close(TMP);
+
mv('tmp','A');

18
devel/darcs/patches/patch-tests_pull_pl
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-tests_pull_pl,v 1.1 2006/07/30 21:02:32 alek Exp $
--- 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');
+ }
}
};