diff options
| author | wiz <wiz> | 2004-05-05 11:18:14 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2004-05-05 11:18:14 +0000 |
| commit | c7e1bd561ecabe895d5562433293038cd700c20c (patch) | |
| tree | 21c06ceb0678f6eac8fa959a983f73e4301d58ac | |
| parent | a795c41155dd32188c2a450846fa0c5a5a0066c2 (diff) | |
| download | pkgsrc-c7e1bd561ecabe895d5562433293038cd700c20c.tar.gz | |
Fix scripts to run the correct guile interpreter.
Somehow broken through the bl3 update, sorry for that.
Bump PKGREVISION to 6.
| -rw-r--r-- | finance/gnucash/Makefile | 13 | ||||
| -rw-r--r-- | finance/gnucash/distinfo | 3 | ||||
| -rw-r--r-- | finance/gnucash/patches/patch-ad | 13 |
3 files changed, 26 insertions, 3 deletions
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index 7cf248048df..d18835c733d 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.63 2004/05/03 15:58:55 wiz Exp $ +# $NetBSD: Makefile,v 1.64 2004/05/05 11:18:14 wiz Exp $ DISTNAME= gnucash-1.8.8 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= finance MASTER_SITES= ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \ ${MASTER_SITE_SOURCEFORGE:=gnucash/} @@ -33,9 +33,18 @@ LDFLAGS+= -L${PREFIX}/${GUILE14_SUBDIR}/lib -Wl,-R${PREFIX}/${GUILE14_SUBDIR}/l AM_MAKEFLAGS= LIBTOOL='${LIBTOOL} ${LIBTOOL_FLAGS}' MAKE_ENV+= AM_MAKEFLAGS="${AM_MAKEFLAGS}" +MAKE_ENV+= GUILE14_SUBDIR=${GUILE14_SUBDIR:Q} INFO_FILES= gnucash-design.info +SUBST_CLASSES+= guile14 +SUBST_STAGE.guile14= pre-configure +SUBST_MESSAGE.guile14= "Substitute interpreter calls to use guile14." +SUBST_FILES.guile14+= src/bin/overrides/gnucash +SUBST_FILES.guile14+= src/bin/overrides/gnucash-make-guids +SUBST_FILES.guile14+= src/bin/overrides/gnucash-run-script +SUBST_SED.guile14+= "s, guile , ${PREFIX}/${GUILE14_SUBDIR}/bin/guile ," + .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo index 6af13e8a85e..09070b17920 100644 --- a/finance/gnucash/distinfo +++ b/finance/gnucash/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.18 2003/12/11 22:57:37 jschauma Exp $ +$NetBSD: distinfo,v 1.19 2004/05/05 11:18:14 wiz Exp $ SHA1 (gnucash-1.8.8.tar.gz) = 64f430eb453d4cf400f97901d6d5aa380010747d Size (gnucash-1.8.8.tar.gz) = 7733806 bytes +SHA1 (patch-ad) = cffcbb86e71ff1f491b36ba14e4a9c0486ca7984 SHA1 (patch-ba) = db2d448e35086a758256ceb0c33599a7bca61c1d SHA1 (patch-bb) = 82d81b2561a2749f6a2d63dfe4dc372764ee12e3 SHA1 (patch-be) = 761cdeed7e055e29edb4483534abb31e83f7222e diff --git a/finance/gnucash/patches/patch-ad b/finance/gnucash/patches/patch-ad new file mode 100644 index 00000000000..1ac9f770600 --- /dev/null +++ b/finance/gnucash/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.5 2004/05/05 11:18:15 wiz Exp $ + +--- src/bin/overrides/Makefile.in.orig 2003-11-18 07:16:55.000000000 +0100 ++++ src/bin/overrides/Makefile.in +@@ -381,7 +381,7 @@ maintainer-clean-generic clean mostlycle + guile: guile.in ${top_builddir}/config.status + rm -f $@.tmp + sed < $< > $@.tmp \ +- -e 's:@-GUILE-@:${GUILE}:' ++ -e 's:@-GUILE-@:${PREFIX}/${GUILE14_SUBDIR}/bin/guile:' + mv $@.tmp $@ + chmod u+x $@ + |