pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/finance/gnucash Convert to use guile-1.6. Bump PKGREVI...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2a5ff6125943
branches: trunk
changeset: 485146:2a5ff6125943
user: wiz <wiz%pkgsrc.org@localhost>
date: Sat Dec 04 16:24:17 2004 +0000
description:
Convert to use guile-1.6. Bump PKGREVISION.
Based on PR 28526 by Andreas Hallmann.
diffstat:
finance/gnucash/Makefile | 19 +++----------------
finance/gnucash/PLIST | 8 +-------
finance/gnucash/distinfo | 4 ++--
finance/gnucash/patches/patch-aa | 13 +++++++++++++
finance/gnucash/patches/patch-ad | 13 -------------
5 files changed, 19 insertions(+), 38 deletions(-)
diffs (120 lines):
diff -r c8c8b8698073 -r 2a5ff6125943 finance/gnucash/Makefile
--- a/finance/gnucash/Makefile Sat Dec 04 16:23:42 2004 +0000
+++ b/finance/gnucash/Makefile Sat Dec 04 16:24:17 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2004/12/03 16:06:31 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2004/12/04 16:24:17 wiz Exp $
DISTNAME= gnucash-1.8.9
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= finance
MASTER_SITES= ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \
${MASTER_SITE_SOURCEFORGE:=gnucash/}
@@ -31,27 +31,14 @@
# code is using char/unsigned char inconsistently
BUILDLINK_TRANSFORM+= rm:-Werror
-CFLAGS+= -Wl,-R${PREFIX}/${GUILE14_SUBDIR}/lib
-#CFLAGS+= -L${PREFIX}/${GUILE14_SUBDIR}/lib -Wl,-R${PREFIX}/${GUILE14_SUBDIR}/lib
-LDFLAGS+= -L${PREFIX}/${GUILE14_SUBDIR}/lib -Wl,-R${PREFIX}/${GUILE14_SUBDIR}/lib
-
AM_MAKEFLAGS= LIBTOOL='${LIBTOOL} ${LIBTOOL_FLAGS}'
MAKE_ENV+= AM_MAKEFLAGS="${AM_MAKEFLAGS}"
-MAKE_ENV+= GUILE14_SUBDIR=${GUILE14_SUBDIR:Q}
INFO_FILES= gnucash-design.info
# 1.8.9 includes empty info file, so we must rebuild it
USE_MAKEINFO= yes
-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"
@@ -93,7 +80,7 @@
.include "../../devel/popt/buildlink3.mk"
.include "../../devel/swig/buildlink3.mk"
.include "../../graphics/gdk-pixbuf/buildlink3.mk"
-.include "../../lang/guile14/buildlink3.mk"
+.include "../../lang/guile/buildlink3.mk"
.include "../../math/guppi/buildlink3.mk"
.include "../../net/ORBit/buildlink3.mk"
.include "../../textproc/libxml/buildlink3.mk"
diff -r c8c8b8698073 -r 2a5ff6125943 finance/gnucash/PLIST
--- a/finance/gnucash/PLIST Sat Dec 04 16:23:42 2004 +0000
+++ b/finance/gnucash/PLIST Sat Dec 04 16:24:17 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2004/10/23 09:22:46 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.16 2004/12/04 16:24:17 wiz Exp $
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnucash.mo
${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnucash.mo
${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnucash.mo
@@ -546,12 +546,6 @@
share/gnucash/guile-modules/gnucash/report/view-column.scm
share/gnucash/guile-modules/gnucash/report/welcome-to-gnucash.scm
share/gnucash/guile-modules/gnucash/tax/us.scm
-share/gnucash/guile-modules/srfi/srfi-1.scm
-share/gnucash/guile-modules/srfi/srfi-11.scm
-share/gnucash/guile-modules/srfi/srfi-19.scm
-share/gnucash/guile-modules/srfi/srfi-2.scm
-share/gnucash/guile-modules/srfi/srfi-8.scm
-share/gnucash/guile-modules/srfi/srfi-9.scm
share/gnucash/guile-modules/www/cgi.scm
share/gnucash/guile-modules/www/http.scm
share/gnucash/guile-modules/www/main.scm
diff -r c8c8b8698073 -r 2a5ff6125943 finance/gnucash/distinfo
--- a/finance/gnucash/distinfo Sat Dec 04 16:23:42 2004 +0000
+++ b/finance/gnucash/distinfo Sat Dec 04 16:24:17 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2004/10/23 09:26:09 jdolecek Exp $
+$NetBSD: distinfo,v 1.22 2004/12/04 16:24:17 wiz Exp $
SHA1 (gnucash-1.8.9.tar.gz) = d6006916319e31d715963d07f483024cef7a6b86
Size (gnucash-1.8.9.tar.gz) = 7786000 bytes
-SHA1 (patch-ad) = cffcbb86e71ff1f491b36ba14e4a9c0486ca7984
+SHA1 (patch-aa) = ad7ed5fdb10f28094e9121092da85095ba592fd1
SHA1 (patch-ba) = db2d448e35086a758256ceb0c33599a7bca61c1d
SHA1 (patch-be) = 761cdeed7e055e29edb4483534abb31e83f7222e
SHA1 (patch-bf) = f51620ab3f2009a735c2977eac72da1cbe6a862f
diff -r c8c8b8698073 -r 2a5ff6125943 finance/gnucash/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/finance/gnucash/patches/patch-aa Sat Dec 04 16:24:17 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2004/12/04 16:24:17 wiz Exp $
+
+--- src/gnome-utils/gnc-html.c.orig 2003-04-12 19:03:30.000000000 +0200
++++ src/gnome-utils/gnc-html.c
+@@ -1335,7 +1335,7 @@ gnc_html_export(gnc_html * html, const c
+ if (!fh)
+ return FALSE;
+
+- gtk_html_save (GTK_HTML(html->html), raw_html_receiver, fh);
++ gtk_html_save (GTK_HTML(html->html), (GtkHTMLSaveReceiverFn)raw_html_receiver, fh);
+
+ fclose (fh);
+
diff -r c8c8b8698073 -r 2a5ff6125943 finance/gnucash/patches/patch-ad
--- a/finance/gnucash/patches/patch-ad Sat Dec 04 16:23:42 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$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 $@
-
Home |
Main Index |
Thread Index |
Old Index