Convert to buildlink3.

1 files changed, 22 insertions, 30 deletions

diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 89b7bd14a65..7cf248048df 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2004/04/25 04:16:43 xtraeme Exp $
+# $NetBSD: Makefile,v 1.63 2004/05/03 15:58:55 wiz Exp $
 
 DISTNAME=		gnucash-1.8.8
 PKGREVISION=		5
@@ -13,25 +13,24 @@ COMMENT=		Personal double-entry accounting program
 DEPENDS+=		p5-Date-Manip>=5.42a:../../devel/p5-Date-Manip
 DEPENDS+= 		p5-finance-quote>=1.06:../../finance/p5-finance-quote
 
-BUILDLINK_DEPENDS.guile14+=	guile14<1.5.0:../../lang/guile14
-
 BUILD_DEPENDS+=			bison>=1.28:../../devel/bison
 
 USE_DIRS+=		gnome1-1.5
 USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_LIBTOOL=		YES
-# LIBTOOL_FLAGS+=		--preserve-dup-deps
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 
 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"
 
+#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}"
 
@@ -65,29 +64,22 @@ GNUCASH_GUILE_MAKEFILE_IN_FILES= \
 	src/register/register-core/Makefile.in \
 	src/report/report-gnome/Makefile.in
 
-post-patch:
-	cd ${WRKSRC};							\
-	for f in ${GNUCASH_GUILE_MAKEFILE_IN_FILES}; do			\
-		${MV} $$f $$f.orig;					\
-		${SED} -e 's|gnome guile|gnome $${GUILE}|g' $$f.orig > $$f;	\
-	done
-
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../devel/gal/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/glib/buildlink2.mk"
-.include "../../print/gnome-print/buildlink2.mk"
-.include "../../devel/g-wrap/buildlink2.mk"
-.include "../../devel/libglade/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../devel/swig/buildlink2.mk"
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../lang/guile14/buildlink2.mk"
-.include "../../math/guppi/buildlink2.mk"
-.include "../../net/ORBit/buildlink2.mk"
-.include "../../textproc/libxml/buildlink2.mk"
-.include "../../www/gtkhtml/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gal/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib/buildlink3.mk"
+.include "../../print/gnome-print/buildlink3.mk"
+.include "../../devel/g-wrap/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../devel/swig/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../lang/guile14/buildlink3.mk"
+.include "../../math/guppi/buildlink3.mk"
+.include "../../net/ORBit/buildlink3.mk"
+.include "../../textproc/libxml/buildlink3.mk"
+.include "../../www/gtkhtml/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"