diff options
| -rw-r--r-- | devel/libole2/Makefile | 6 | ||||
| -rw-r--r-- | devel/libole2/buildlink3.mk | 20 | ||||
| -rw-r--r-- | devel/opencm/Makefile | 14 | ||||
| -rw-r--r-- | www/wml/Makefile | 8 | ||||
| -rw-r--r-- | x11/multi-gnome-terminal/Makefile | 10 |
5 files changed, 39 insertions, 19 deletions
diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile index 4864591a822..1d7bc98f529 100644 --- a/devel/libole2/Makefile +++ b/devel/libole2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:38 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2004/04/25 06:10:09 snj Exp $ # DISTNAME= libole2-0.2.4 @@ -12,7 +12,7 @@ COMMENT= OLE2 streams parsing library for GNOME GNU_CONFIGURE= YES USE_LIBTOOL= YES -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES -.include "../../devel/glib/buildlink2.mk" +.include "../../devel/glib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libole2/buildlink3.mk b/devel/libole2/buildlink3.mk new file mode 100644 index 00000000000..909fb898c9f --- /dev/null +++ b/devel/libole2/buildlink3.mk @@ -0,0 +1,20 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 06:10:09 snj Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +LIBOLE2_BUILDLINK3_MK:= ${LIBOLE2_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= libole2 +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibole2} +BUILDLINK_PACKAGES+= libole2 + +.if !empty(LIBOLE2_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.libole2+= libole2>=0.2.4nb1 +BUILDLINK_PKGSRCDIR.libole2?= ../../devel/libole2 +.endif # LIBOLE2_BUILDLINK3_MK + +.include "../../devel/glib/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile index 9634e1883d4..bfdd61d1804 100644 --- a/devel/opencm/Makefile +++ b/devel/opencm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/04/05 21:52:45 reed Exp $ +# $NetBSD: Makefile,v 1.27 2004/04/25 06:12:16 snj Exp $ # DISTNAME= ${OPENCM_VERSION}-1-src @@ -13,7 +13,7 @@ HOMEPAGE= http://www.opencm.org/ COMMENT= Secure, high-integrity replacement for CVS WRKSRC= ${WRKDIR}/${OPENCM_VERSION}/base -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_PKGINSTALL= YES USE_GNU_TOOLS+= make GNU_CONFIGURE= YES @@ -30,10 +30,10 @@ INFO_FILES= opencm.info CPPFLAGS+= -D__unix__ MAKE_ENV+= GZIP_CMD=${GZIP_CMD:Q} -.include "../../devel/boehm-gc/buildlink2.mk" -.include "../../devel/ncurses/buildlink2.mk" -.include "../../devel/readline/buildlink2.mk" -.include "../../devel/zlib/buildlink2.mk" -.include "../../security/openssl/buildlink2.mk" +.include "../../devel/boehm-gc/buildlink3.mk" +.include "../../devel/ncurses/buildlink3.mk" +.include "../../devel/readline/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/wml/Makefile b/www/wml/Makefile index b37cfc73cc8..945f51ca09a 100644 --- a/www/wml/Makefile +++ b/www/wml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/12/29 18:23:09 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2004/04/25 06:17:46 snj Exp $ # DISTNAME= wml-2.0.3 @@ -25,7 +25,7 @@ CONFIGURE_ARGS= --with-perl=${PERL5} \ --with-openworld \ --with-tidy=${LOCALBASE}/bin/tidy -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes TEST_TARGET= test INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* @@ -45,6 +45,6 @@ post-install: ${MV} $${i}.7 $${i}.0 ; \ done -.include "../../devel/ncurses/buildlink2.mk" -.include "../../lang/perl5/buildlink2.mk" +.include "../../devel/ncurses/buildlink3.mk" +.include "../../lang/perl5/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile index 0b000061bdb..a0200eaefcb 100644 --- a/x11/multi-gnome-terminal/Makefile +++ b/x11/multi-gnome-terminal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/04/14 19:30:23 jmmv Exp $ +# $NetBSD: Makefile,v 1.22 2004/04/25 06:18:52 snj Exp $ DISTNAME= multi-gnome-terminal-1.6.1 PKGREVISION= 6 @@ -9,7 +9,7 @@ MAINTAINER= damon@NetBSD.org HOMEPAGE= http://multignometerm.sourceforge.net/ COMMENT= Gnome tabbed terminal emulator -USE_BUILDLINK2= # defined +USE_BUILDLINK3= yes USE_DIRS+= xdg-1.1 USE_X11BASE= # defined USE_GNU_TOOLS+= make @@ -19,9 +19,9 @@ USE_LIBTOOL= # defined CONFIGURE_ENV+= ac_cv_prog_JADE=no CONFIGURE_ARGS+= --enable-gtk-doc=no -.include "../../converters/libiconv/buildlink2.mk" -.include "../../devel/libglade/buildlink2.mk" -.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk" +.include "../../converters/libiconv/buildlink3.mk" +.include "../../devel/libglade/buildlink3.mk" +.include "../../graphics/gdk-pixbuf-gnome/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../mk/bsd.pkg.mk" |