diff options
| -rw-r--r-- | devel/bonobo-conf/Makefile | 29 | ||||
| -rw-r--r-- | devel/gnome-objc/Makefile | 18 |
2 files changed, 24 insertions, 23 deletions
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile index 5414ad444ae..8b0d4a281ec 100644 --- a/devel/bonobo-conf/Makefile +++ b/devel/bonobo-conf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/08/25 19:22:23 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2002/09/21 10:42:00 jlam Exp $ DISTNAME= bonobo-conf-0.14 PKGREVISION= 2 @@ -12,17 +12,16 @@ COMMENT= Bonobo configuration system BUILD_DEPENDS+= autoconf-[0-9]*:../../devel/autoconf BUILD_USES_MSGFMT= YES -GNU_CONFIGURE= YES +USE_BUILDLINK2= YES USE_X11BASE= YES -USE_LIBTOOL= YES USE_GMAKE= YES +GNU_CONFIGURE= YES -pre-configure: - cd ${WRKSRC} && autoconf +USE_LIBTOOL= YES +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -post-configure: - ${RM} -f ${WRKSRC}/libtool - ${LN} -s ${LOCALBASE}/bin/libtool ${WRKSRC} +pre-configure: + cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bonobo-conf @@ -30,11 +29,11 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/${doc} ${PREFIX}/share/doc/bonobo-conf .endfor -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/bonobo/buildlink.mk" -.include "../../devel/GConf/buildlink.mk" -.include "../../devel/popt/buildlink.mk" -.include "../../devel/oaf/buildlink.mk" -.include "../../graphics/gdk-pixbuf/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/bonobo/buildlink2.mk" +.include "../../devel/GConf/buildlink2.mk" +.include "../../devel/popt/buildlink2.mk" +.include "../../devel/oaf/buildlink2.mk" +.include "../../graphics/gdk-pixbuf/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/devel/gnome-objc/Makefile b/devel/gnome-objc/Makefile index aef84151a6a..275d1eeec21 100644 --- a/devel/gnome-objc/Makefile +++ b/devel/gnome-objc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/08/01 05:48:09 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2002/09/21 10:40:07 jlam Exp $ # DISTNAME= gnome-objc-1.0.40 @@ -10,15 +10,17 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.gnome.org/ COMMENT= Objective C API for gnome and gtk -GNU_CONFIGURE= YES -USE_LIBTOOL= YES -PTHREAD_OPTS+= require +USE_BUILDLINK2= YES +USE_X11= YES +PTHREAD_OPTS+= require +GNU_CONFIGURE= YES +CONFIGURE_ENV+= OBJC="${CC}" + +USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -CONFIGURE_ENV+= OBJC="${CC}" +.include "../../x11/gnome-libs/buildlink2.mk" +.include "../../mk/pthread.buildlink2.mk" -.include "../../x11/gnome-libs/buildlink.mk" -.include "../../mk/pthread.buildlink.mk" -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |