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

Update to darcs-1.0.3rc1.

Browse Source 
Cleaner installation settings by using simple configure style.
This commit is contained in:
dons 2005-05-09 03:41:34 +00:00
parent edab9ae2eb
commit 115b124a6c
9 changed files with 45 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devel/darcs/Makefile
View File

@ -1,29 +1,28 @@
# $OpenBSD: Makefile,v 1.10 2005/02/14 01:59:12 dons Exp $
# $OpenBSD: Makefile,v 1.11 2005/05/09 03:41:34 dons Exp $
COMMENT= "advanced revision control system written in Haskell"
V= 1.0.2
V= 1.0.3rc1
DISTNAME= darcs-${V}
CATEGORIES= devel
HOMEPAGE= http://www.darcs.net/
MASTER_SITES= ${HOMEPAGE}
MAINTAINER= Don Stewart <dons@openbsd.org>
MODULES= lang/ghc
LIB_DEPENDS= curl.2::net/curl
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --datadir=${PREFIX}/share --libexecdir=${PREFIX}/libexec
CONFIGURE_STYLE=simple
CONFIGURE_ARGS= --prefix=${PREFIX} --datadir=${PREFIX}/share \
--libexecdir=${PREFIX}/libexec/darcs --sysconfdir=${PREFIX}/share/darcs
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
CFLAGS=""
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" CFLAGS=""
USE_GMAKE= Yes
MAKE_FILE= GNUmakefile
INSTALL_TARGET= install installserver installdocs
MAKE_ENV+= DARCS=${WRKSRC}/darcs
REGRESS_TARGET= check
# GPL
PERMIT_PACKAGE_CDROM= Yes

8
devel/darcs/distinfo
View File

@ -1,4 +1,4 @@
MD5 (darcs-1.0.2.tar.gz) = 74c1297775986ee332bb9d79bbf2a09a
RMD160 (darcs-1.0.2.tar.gz) = 8b067ac8756f6f05a84d388ff134b11378de31a2
SHA1 (darcs-1.0.2.tar.gz) = 657075a4e7a2f7457cf24bfe56b45da68035aa86
SIZE (darcs-1.0.2.tar.gz) = 765292
MD5 (darcs-1.0.3rc1.tar.gz) = 5032c23e20663991889316977830bfee
RMD160 (darcs-1.0.3rc1.tar.gz) = 3274ff32c9b2c54fe09b16eb0794640c1eb0c0f4
SHA1 (darcs-1.0.3rc1.tar.gz) = 2a4fa87754617f5e6531a3a7b7ac1773138a7f42
SIZE (darcs-1.0.3rc1.tar.gz) = 852816

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

@ -1,20 +1,10 @@
$OpenBSD: patch-GNUmakefile,v 1.6 2005/02/14 01:59:12 dons Exp $
$OpenBSD: patch-GNUmakefile,v 1.7 2005/05/09 03:41:34 dons Exp $
Make the install a bit more standard, get rid of sysconfdir stuff.
Put cgi-bin stuff in darcs dir instead.
Don't try to build or install .ps docs, and don't regen the .html docs.
--- GNUmakefile.orig Wed Feb 2 22:47:52 2005
+++ GNUmakefile Thu Feb 10 11:32:36 2005
@@ -78,15 +78,14 @@ installbin: all
$(INSTALL) -d $(DESTDIR)/$(bindir)
$(INSTALL) darcs $(DESTDIR)/$(bindir)
- $(INSTALL) -d $(DESTDIR)/$(sysconfdir)/bash_completion.d/
- $(INSTALL_DATA) darcs_completion $(DESTDIR)/$(sysconfdir)/bash_completion.d/darcs
+ $(INSTALL) -d $(DESTDIR)/$(datadir)/darcs/bash_completion.d/
+ $(INSTALL_DATA) darcs_completion $(DESTDIR)/$(datadir)/darcs/bash_completion.d/darcs
--- GNUmakefile.orig Thu Apr 21 05:00:03 2005
+++ GNUmakefile Mon May 9 12:21:53 2005
@@ -92,9 +92,8 @@ installbin: all
$(INSTALL) -d $(DESTDIR)/$(mandir)/man1
$(INSTALL_DATA) darcs.1 $(DESTDIR)/$(mandir)/man1/
@ -25,34 +15,3 @@ Don't try to build or install .ps docs, and don't regen the .html docs.
$(INSTALL_DATA) manual/* $(DESTDIR)/$(datadir)/doc/darcs/manual
$(INSTALL) -d $(DESTDIR)/$(datadir)/doc/darcs/examples
@@ -94,16 +93,16 @@ installdocs: darcs.ps manual/index.html
$(INSTALL_DATA) zsh_completion_old $(DESTDIR)/$(datadir)/doc/darcs/examples/
installserver: darcs-createrepo cgi/darcs.cgi
- $(INSTALL) -d $(DESTDIR)/$(libexecdir)/cgi-bin
+ $(INSTALL) -d $(DESTDIR)/$(libexecdir)/darcs
$(INSTALL) -d $(DESTDIR)/$(sbindir)
$(INSTALL) darcs-createrepo $(DESTDIR)/$(sbindir)
- $(INSTALL) -d $(DESTDIR)/$(sysconfdir)/darcs
- test -e $(DESTDIR)/$(sysconfdir)/darcs/cgi.conf || \
- $(INSTALL_DATA) cgi/cgi.conf $(DESTDIR)/$(sysconfdir)/darcs/cgi.conf
- $(INSTALL) cgi/darcs.cgi $(DESTDIR)/$(libexecdir)/cgi-bin/darcs.cgi
$(INSTALL) -d $(DESTDIR)/$(datadir)/darcs
+ test -e $(DESTDIR)/$(datadir)/darcs/cgi.conf || \
+ $(INSTALL_DATA) cgi/cgi.conf $(DESTDIR)/$(datadir)/darcs/cgi.conf
+ $(INSTALL) cgi/darcs.cgi $(DESTDIR)/$(libexecdir)/darcs/darcs.cgi
+ $(INSTALL) -d $(DESTDIR)/$(datadir)/darcs
$(INSTALL) -d $(DESTDIR)/$(datadir)/darcs/xslt
$(INSTALL_DATA) cgi/xslt/*.xslt $(DESTDIR)/$(datadir)/darcs/xslt/
$(INSTALL_DATA) cgi/xslt/styles.css $(DESTDIR)/$(datadir)/darcs/xslt/styles.css
@@ -112,7 +111,7 @@ installserver: darcs-createrepo cgi/darc
# test -e $(DESTDIR)/$(sysconfdir)/darcs/styles.css || \
# ln -s $(datadir)/darcs/xslt/styles.css \
# $(DESTDIR)/$(sysconfdir)/darcs/styles.css
- $(INSTALL) -m 644 cgi/xslt/styles.css $(DESTDIR)/$(sysconfdir)/darcs/styles.css
+ $(INSTALL) -m 644 cgi/xslt/styles.css $(DESTDIR)/$(datadir)/darcs/styles.css
dist: darcs
./darcs dist --dist-name darcs-`./darcs --version`

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

@ -1,10 +1,10 @@
$OpenBSD: patch-configure,v 1.3 2005/02/14 01:59:12 dons Exp $
$OpenBSD: patch-configure,v 1.4 2005/05/09 03:41:34 dons Exp $
Don't build the postscript manual
--- configure.orig Sat Feb 5 00:32:55 2005
+++ configure Thu Feb 10 11:32:36 2005
@@ -4014,7 +4014,7 @@ if test "$enable_mmap" = "no"; then
--- configure.orig Tue Apr 26 17:52:23 2005
+++ configure Wed Apr 27 21:05:21 2005
@@ -3798,7 +3798,7 @@ if test "$enable_mmap" = "no"; then
fi
@ -13,7 +13,7 @@ Don't build the postscript manual
INSTALLWHAT="installbin"
BUILDDOC="no"
@@ -4221,7 +4221,7 @@ if test -z "$DVIPS"; then
@@ -4005,7 +4005,7 @@ if test -z "$DVIPS"; then
echo "$as_me: WARNING: Cannot find dvips in your path!" >&2;}
fi
if test ! '(' '(' -z "$LATEX" ')' -o '(' -z "$DVIPS" ')' ')'; then
@ -22,7 +22,7 @@ Don't build the postscript manual
INSTALLWHAT="$INSTALLWHAT installdocs"
BUILDDOC="yes"
fi
@@ -4342,15 +4342,15 @@ fi
@@ -4126,15 +4126,15 @@ fi
echo "$as_me: WARNING: Cannot find hevea in your path either!" >&2;}
MAKEMANUAL="touch manual/index.html; echo Cannot make manual!"
else

15
devel/darcs/patches/patch-tests_merge_three_patches_sh
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-tests_merge_three_patches_sh,v 1.1 2005/02/14 01:59:12 dons Exp $
Fails test otherwise
--- tests/merge_three_patches.sh.orig Thu Feb 10 11:51:38 2005
+++ tests/merge_three_patches.sh Thu Feb 10 11:51:42 2005
@@ -33,7 +33,7 @@ cat temp | grep -v A | grep -v B | grep
$DARCS record -m A
cd ..
-darcs get tempOld tempB
+$DARCS get tempOld tempB
cd tempB
cp ../tempOld/_darcs/prefs/defaults _darcs/prefs
echo 7 > foo

14
devel/darcs/patches/patch-tests_missed_resolution_pl Normal file
View File

@ -0,0 +1,14 @@
$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";
# 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`;
+#`grep -v '\(\^ \^\|\*\*\|v v\)' A > tmp`;
+`sed '/\*\*/d;/v v/d;/\^ \^/d' A > tmp`;
+
mv('tmp','A');
darcs "record -A x -m 'resolve' --all";

17
devel/darcs/patches/patch-tests_push_pl
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-tests_push_pl,v 1.1 2005/02/14 01:59:12 dons Exp $
Fails due to verbosity, disable for now.
--- tests/push.pl.orig Mon Jan 24 02:17:30 2005
+++ tests/push.pl Thu Feb 10 23:03:03 2005
@@ -31,8 +31,8 @@ chdir '../../'; # now in temp2
`$DARCS add one`;
`$DARCS record --patch-name 'uno' --all --author foo\@bar`;
chdir '../'; # now outside of any repo
-like(`$DARCS push --repodir temp2 --all ../temp1`, # temp2 is relative to temp1
- qr/Finished apply./i, $test_name);
+like(`$DARCS push -q --repodir temp2 --all ../temp1`, # temp2 is relative to temp1
+ qr//i, $test_name);
SELF_PUSH: {
chdir './temp1';

6
devel/darcs/pkg/MESSAGE
View File

@ -1,3 +1,3 @@
To use the CGI, copy ${PREFIX}/libexec/darcs/darcs.cgi to the
cgi-bin directory. An example configuration file for the cgi is
in ${PREFIX}/share/darcs, and should be copied to ${SYSCONFDIR}/darcs.
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
${PREFIX}/share/darcs/darcs, and should be copied to ${SYSCONFDIR}/darcs.

11
devel/darcs/pkg/PLIST
View File

@ -1,14 +1,16 @@
@comment $OpenBSD: PLIST,v 1.8 2005/02/14 01:59:12 dons Exp $
@comment $OpenBSD: PLIST,v 1.9 2005/05/09 03:41:34 dons Exp $
bin/darcs
libexec/darcs/
libexec/darcs/darcs.cgi
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
share/darcs/cgi.conf
share/darcs/styles.css
share/darcs/darcs/
share/darcs/darcs/cgi.conf
share/darcs/darcs/styles.css
share/darcs/xslt/
share/darcs/xslt/annotate.xslt
share/darcs/xslt/browse.xslt
@ -49,6 +51,7 @@ share/doc/darcs/manual/img21.png
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/img3.png
share/doc/darcs/manual/img4.png
share/doc/darcs/manual/img5.png