diff options
| author | jlam <jlam@pkgsrc.org> | 2003-01-24 04:28:52 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-01-24 04:28:52 +0000 |
| commit | 42bcfaf307772ea3f12bd926d3d70b7b898c4147 (patch) | |
| tree | 01f6b2f8dc053de016a1f6fa4e9b01e058264af9 /finance/gnucash | |
| parent | 1f56eff0a91196999ad9f3956bb74bbfcb6e611f (diff) | |
| download | pkgsrc-42bcfaf307772ea3f12bd926d3d70b7b898c4147.tar.gz | |
Fix build after the guile 1.4/1.6 split by properly using the pkgsrc
libtool. Also move a post-extract step that created fake headers to
post-buildlink time where it is more appropriate.
Diffstat (limited to 'finance/gnucash')
| -rw-r--r-- | finance/gnucash/Makefile | 24 | ||||
| -rw-r--r-- | finance/gnucash/distinfo | 3 | ||||
| -rw-r--r-- | finance/gnucash/patches/patch-bc | 13 |
3 files changed, 28 insertions, 12 deletions
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index 510a0000e1f..c13f78ffb59 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2003/01/16 23:02:23 rh Exp $ +# $NetBSD: Makefile,v 1.36 2003/01/24 04:28:52 jlam Exp $ DISTNAME= gnucash-1.6.8 PKGREVISION= 3 @@ -19,7 +19,8 @@ BUILD_DEPENDS+= bison>=1.28:../../devel/bison USE_GMAKE= YES USE_X11= YES USE_LIBTOOL= YES -#LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +LIBTOOL_FLAGS+= --preserve-dup-deps USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES @@ -27,19 +28,20 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-included-gettext CONFIGURE_ARGS+= --with-perl-includes=${PERL5_ARCHLIB} CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} +CONFIGURE_ENV+= GUILE="${GUILE14}" CONFIGURE_ENV+= PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${X11BASE}/lib/pkgconfig" -.include "../../mk/bsd.prefs.mk" +AM_MAKEFLAGS= LIBTOOL='${PKGLIBTOOL} ${LIBTOOL_FLAGS}' +MAKE_ENV+= AM_MAKEFLAGS="${AM_MAKEFLAGS}" -.if (${OPSYS} == NetBSD) -CPPFLAGS+= -I${WRKSRC}/include +.include "../../mk/bsd.prefs.mk" -post-extract: - ${MKDIR} ${WRKSRC}/include - ${LN} -s /usr/include/db.h ${WRKSRC}/include/db_185.h -.if !exists(/usr/include/wctype.h) - ${TOUCH} ${WRKSRC}/include/wctype.h -.endif +.if ${OPSYS} == "NetBSD" +post-buildlink: + ${LN} -s /usr/include/db.h ${BUILDLINK_DIR}/include/db_185.h + if [ ! -f /usr/include/wctype.h ]; then \ + ${TOUCH} ${BUILDLINK_DIR}/include/wctype.h; \ + fi .endif .include "../../converters/libiconv/buildlink2.mk" diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo index 95e1b9d9fee..0abc63181a3 100644 --- a/finance/gnucash/distinfo +++ b/finance/gnucash/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2003/01/15 22:24:13 wiz Exp $ +$NetBSD: distinfo,v 1.13 2003/01/24 04:28:52 jlam Exp $ SHA1 (gnucash-1.6.8.tar.gz) = c748f13f1596003289244b6cd146d011bf6bde05 Size (gnucash-1.6.8.tar.gz) = 16655207 bytes @@ -6,3 +6,4 @@ SHA1 (patch-ac) = c85d28ba9574b69b71fdaa17aba39f5bc45154e5 SHA1 (patch-ad) = 2d75c021d2a53f70a7dfb9ff67f112f17df1ff3e SHA1 (patch-ba) = d723f98279341603ceee4ed2db57b00c8a84c300 SHA1 (patch-bb) = 23cbdefd3af4bee51f3c73b5a1a1862f63d0eb19 +SHA1 (patch-bc) = 39a7a64bdc1395f055d445d2fc4cdfe614a6ae37 diff --git a/finance/gnucash/patches/patch-bc b/finance/gnucash/patches/patch-bc new file mode 100644 index 00000000000..fd02daef81c --- /dev/null +++ b/finance/gnucash/patches/patch-bc @@ -0,0 +1,13 @@ +$NetBSD: patch-bc,v 1.1 2003/01/24 04:28:52 jlam Exp $ + +--- src/guile/Makefile.in.orig Thu Jan 23 13:35:12 2003 ++++ src/guile/Makefile.in +@@ -577,7 +577,7 @@ maintainer-clean-generic clean mostlycle + + + gnc.h gnc.c gnc.html: gnc.gwp +- FLAVOR=gnome guile -c \ ++ FLAVOR=gnome ${GUILE} -c \ + "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \ + (primitive-load \"./gnc.gwp\") \ + (gw:generate-module \"gnc\")" |