diff options
author | snj <snj> | 2004-04-25 06:58:43 +0000 |
---|---|---|
committer | snj <snj> | 2004-04-25 06:58:43 +0000 |
commit | 84d516b2fb70a9c7c37f0410b95462e0a897f01e (patch) | |
tree | 3f2ec27cec855a6431cd2ac0a66f486e2f234bfb | |
parent | 4e072f71c3495d73b67abc00164ba643c5cfbfed (diff) | |
download | pkgsrc-84d516b2fb70a9c7c37f0410b95462e0a897f01e.tar.gz |
Convert to buildlink3.
-rw-r--r-- | devel/eXdbm/Makefile | 4 | ||||
-rw-r--r-- | devel/eXdbm/buildlink3.mk | 19 | ||||
-rw-r--r-- | graphics/pixmap/Makefile | 8 | ||||
-rw-r--r-- | graphics/py-gd/Makefile | 8 | ||||
-rw-r--r-- | lang/gawk/Makefile | 6 | ||||
-rw-r--r-- | lang/p2c/Makefile | 4 | ||||
-rw-r--r-- | net/pxe/Makefile | 4 | ||||
-rw-r--r-- | net/quagga/Makefile | 6 | ||||
-rw-r--r-- | net/slurm/Makefile | 6 | ||||
-rw-r--r-- | net/tinyfugue/Makefile | 6 | ||||
-rw-r--r-- | net/x2vnc/Makefile | 4 | ||||
-rw-r--r-- | net/yafc/Makefile | 6 | ||||
-rw-r--r-- | www/ap-dav/Makefile | 8 | ||||
-rw-r--r-- | x11/gdm1/Makefile | 10 | ||||
-rw-r--r-- | x11/gtk+extra/Makefile | 6 | ||||
-rw-r--r-- | x11/gtk+extra/buildlink3.mk | 20 |
16 files changed, 82 insertions, 43 deletions
diff --git a/devel/eXdbm/Makefile b/devel/eXdbm/Makefile index f50948bc59f..f99f560ddbe 100644 --- a/devel/eXdbm/Makefile +++ b/devel/eXdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/01/22 08:24:29 grant Exp $ +# $NetBSD: Makefile,v 1.4 2004/04/25 07:06:14 snj Exp $ # DISTNAME= eXdbm-beta-1.0b1 @@ -11,6 +11,6 @@ HOMEPAGE= http://www.linux-france.org/pesch/exode/exdbm.html COMMENT= eXode configuration database routines USE_GNU_TOOLS+= make -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES .include "../../mk/bsd.pkg.mk" diff --git a/devel/eXdbm/buildlink3.mk b/devel/eXdbm/buildlink3.mk new file mode 100644 index 00000000000..95656a35b00 --- /dev/null +++ b/devel/eXdbm/buildlink3.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 07:06:14 snj Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +EXDBM_BUILDLINK3_MK:= ${EXDBM_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= eXdbm +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NeXdbm} +BUILDLINK_PACKAGES+= eXdbm + +.if !empty(EXDBM_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.eXdbm+= eXdbm>=1.0b1 +BUILDLINK_PKGSRCDIR.eXdbm?= ../../devel/eXdbm +BUILDLINK_DEPMETHOD.eXdbm?= build +.endif # EXDBM_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile index ca3c17da55d..bfc29aad6fc 100644 --- a/graphics/pixmap/Makefile +++ b/graphics/pixmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/01/20 12:18:16 agc Exp $ +# $NetBSD: Makefile,v 1.23 2004/04/25 07:11:48 snj Exp $ # FreeBSD: Makefile,v 1.8 1996/11/18 09:53:36 asami Exp # @@ -18,13 +18,13 @@ MAINTAINER= tech-pkg@NetBSD.org COMMENT= Pixmap editor based on XPM library WRKSRC= ${WRKDIR}/pixmap -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_IMAKE= YES MAKE_ENV+= LOCAL_LDFLAGS="${LDFLAGS}" MAKE_ENV+= MOTIFBASE="${MOTIFBASE}" -.include "../../graphics/xpm/buildlink2.mk" -.include "../../mk/motif.buildlink2.mk" +.include "../../graphics/xpm/buildlink3.mk" +.include "../../mk/motif.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile index b7866c7dc86..77975494131 100644 --- a/graphics/py-gd/Makefile +++ b/graphics/py-gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/03/26 02:27:42 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2004/04/25 07:17:31 snj Exp $ DISTNAME= gdmodule.c PKGNAME= ${PYPKGPREFIX}-gd-1.3 @@ -15,7 +15,7 @@ EXTRACT_CMD= ${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC} WRKSRC= ${WRKDIR} ALL_TARGET= default -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes # this pkg uses Makefile.pre.in PYTHON_VERSIONS_ACCEPTED= 20 21 @@ -33,7 +33,7 @@ do-configure: ${CP} ${PREFIX}/${PYLIB}/config/Makefile.pre.in ${WRKSRC} cd ${WRKSRC}; ${MAKE} -f Makefile.pre.in boot -.include "../../graphics/freetype-lib/buildlink2.mk" -.include "../../graphics/gd/buildlink2.mk" +.include "../../graphics/freetype-lib/buildlink3.mk" +.include "../../graphics/gd/buildlink3.mk" .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile index 4d7766e36c0..2dc7f85afc1 100644 --- a/lang/gawk/Makefile +++ b/lang/gawk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2003/12/17 15:11:03 sketch Exp $ +# $NetBSD: Makefile,v 1.22 2004/04/25 07:15:51 snj Exp $ # DISTNAME= gawk-3.1.3 @@ -12,7 +12,7 @@ COMMENT= GNU awk CONFLICTS= ja-gawk-[0-9]* -USE_BUILDLINK2= # defined +USE_BUILDLINK3= yes GNU_CONFIGURE= # defined USE_PKGLOCALEDIR= # defined TEST_DIRS= ${WRKSRC} @@ -29,5 +29,5 @@ BUILD_DEFS+= GAWK_ENABLE_PORTALS CONFIGURE_ARGS+= --enable-portals .endif -.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/p2c/Makefile b/lang/p2c/Makefile index 42d9d5b37a9..36829538b5a 100644 --- a/lang/p2c/Makefile +++ b/lang/p2c/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/20 12:19:17 agc Exp $ +# $NetBSD: Makefile,v 1.7 2004/04/25 07:19:25 snj Exp $ DISTNAME= p2c-1.20 CATEGORIES= lang @@ -9,7 +9,7 @@ MAINTAINER= jwise@NetBSD.org COMMENT= Pascal to C compiler (translates Pascal to C) WRKSRC= ${WRKDIR}/src -USE_BUILDLINK2= # defined +USE_BUILDLINK3= yes CFLAGS+= -Dunix=1 .include "../../mk/bsd.pkg.mk" diff --git a/net/pxe/Makefile b/net/pxe/Makefile index d82762b2c5f..f945802dc48 100644 --- a/net/pxe/Makefile +++ b/net/pxe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/11/07 15:51:54 gavan Exp $ +# $NetBSD: Makefile,v 1.8 2004/04/25 07:36:39 snj Exp $ # DISTNAME= pxe-1.4 @@ -10,7 +10,7 @@ HOMEPAGE= http://www.kano.org.uk/projects/pxe/ COMMENT= Preboot eXecution Environment (PXE) daemon GNU_CONFIGURE= YES -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_PKGINSTALL= YES USE_GCC_SHLIB= YES diff --git a/net/quagga/Makefile b/net/quagga/Makefile index 21e737dc35f..b17f8877cf0 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/02/14 00:54:45 grant Exp $ +# $NetBSD: Makefile,v 1.12 2004/04/25 07:38:04 snj Exp $ # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp # @@ -14,7 +14,7 @@ COMMENT= Free multithreaded routing daemon software (fork of zebra) .include "../../mk/bsd.prefs.mk" AUTOMAKE_REQD= 1.6.2 -USE_BUILDLINK2= # defined +USE_BUILDLINK3= yes GNU_CONFIGURE= # defined PKG_SYSCONFSUBDIR?= zebra CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} @@ -34,7 +34,7 @@ PKG_USERS= quagga:quagga .if defined(USE_ZEBRA_VTYSH) && ${USE_ZEBRA_VTYSH} == "YES" USE_GNU_READLINE= # uses rl_pending_input -. include "../../devel/readline/buildlink2.mk" +. include "../../devel/readline/buildlink3.mk" CONFIGURE_ARGS+= --enable-vtysh PLIST_SRC+= ${PKGDIR}/PLIST.vtysh .else diff --git a/net/slurm/Makefile b/net/slurm/Makefile index 78794b5181e..1c97215258c 100644 --- a/net/slurm/Makefile +++ b/net/slurm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/10/16 12:54:14 cube Exp $ +# $NetBSD: Makefile,v 1.6 2004/04/25 07:34:28 snj Exp $ # DISTNAME= slurm-0.3.1 @@ -9,7 +9,7 @@ MAINTAINER= mail@eckigesauge.de HOMEPAGE= http://www.raisdorf.net/projects/slurm/ COMMENT= Realtime traffic statistics -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES GNU_CONFIGURE= YES post-patch: @@ -24,5 +24,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/themes/$${theme}.theme ${PREFIX}/share/slurm ; \ done -.include "../../devel/ncurses/buildlink2.mk" +.include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile index a3385a6ba51..bc01578086c 100644 --- a/net/tinyfugue/Makefile +++ b/net/tinyfugue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/10 19:14:18 kristerw Exp $ +# $NetBSD: Makefile,v 1.12 2004/04/25 07:36:28 snj Exp $ # FreeBSD Id: Makefile,v 1.8 1998/04/11 04:21:19 jseger Exp # @@ -13,7 +13,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://tf.tcp.com/~hawkeye/tf/ COMMENT= Popular programmable MUD client, with macro support and more -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES MAKEFILE= ${WRKSRC}/unix/Makefile MAKE_ENV= TFVER="${DISTNAME:S/^tf-//}" @@ -22,5 +22,5 @@ PATCH_SITES= http://discworld.imaginary.com/external/taffyd/ PATCHFILES= tf-40s1-mccp-patch.gz PATCH_DIST_STRIP=-p1 -.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/x2vnc/Makefile b/net/x2vnc/Makefile index 009bbf135b2..d86cd80525e 100644 --- a/net/x2vnc/Makefile +++ b/net/x2vnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/11/04 20:57:11 heinz Exp $ +# $NetBSD: Makefile,v 1.8 2004/04/25 07:35:03 snj Exp $ # DISTNAME= x2vnc-1.5.1 @@ -12,6 +12,6 @@ COMMENT= Multi-console display using X and VNC GNU_CONFIGURE= yes USE_X11= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes .include "../../mk/bsd.pkg.mk" diff --git a/net/yafc/Makefile b/net/yafc/Makefile index 24c61fc4254..bcd353ce5bf 100644 --- a/net/yafc/Makefile +++ b/net/yafc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/08/09 11:16:21 seb Exp $ +# $NetBSD: Makefile,v 1.7 2004/04/25 07:38:20 snj Exp $ DISTNAME= yafc-0.7.10 CATEGORIES= net @@ -11,7 +11,7 @@ COMMENT= Yet another FTP client GNU_CONFIGURE= yes USE_GNU_READLINE= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} INFO_FILES= yafc.info @@ -24,5 +24,5 @@ CONFIGURE_ARGS+= --with-krb5 --with-krb5-include=/usr/include/krb5 CPPFLAGS+= -I/usr/include/gssapi .endif -.include "../../devel/readline/buildlink2.mk" +.include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-dav/Makefile b/www/ap-dav/Makefile index a77b3fd3205..384d9681400 100644 --- a/www/ap-dav/Makefile +++ b/www/ap-dav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/04/24 22:46:12 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2004/04/25 06:58:43 snj Exp $ DISTNAME= mod_dav-1.0.3-1.3.6 PKGNAME= ap-dav-1.0.3 @@ -13,7 +13,7 @@ COMMENT= Apache WebDAV module # Ugly mess that says apache>=1.3.9 and apache<2.0. BUILDLINK_DEPENDS.apache= {apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*} -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES APACHE_MODULE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat} @@ -30,7 +30,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/LICENSE.html ${HTMLDIR} -.include "../../textproc/expat/buildlink2.mk" -.include "../../www/apache/buildlink2.mk" +.include "../../textproc/expat/buildlink3.mk" +.include "../../www/apache/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gdm1/Makefile b/x11/gdm1/Makefile index 63ff6b479d0..2722b6a8ff4 100644 --- a/x11/gdm1/Makefile +++ b/x11/gdm1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/04/14 19:30:23 jmmv Exp $ +# $NetBSD: Makefile,v 1.5 2004/04/25 07:30:23 snj Exp $ DISTNAME= gdm-2.2.0 PKGREVISION= 6 @@ -13,7 +13,7 @@ COMMENT= Gnome Display Manager - a re-implementation of the xdm program EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_PKGINSTALL= YES DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL @@ -118,8 +118,8 @@ post-install: ${LN} -fs Gnome ${GDMCFGDIR}/Sessions/Default ${INSTALL_SCRIPT} ${WRKDIR}/gdm ${PREFIX}/etc/rc.d/ -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/libglade/buildlink2.mk" -.include "../../x11/gnome-libs/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/libglade/buildlink3.mk" +.include "../../x11/gnome-libs/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk+extra/Makefile b/x11/gtk+extra/Makefile index d41f7ac8644..bfeac6b8434 100644 --- a/x11/gtk+extra/Makefile +++ b/x11/gtk+extra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/24 15:30:33 grant Exp $ +# $NetBSD: Makefile,v 1.14 2004/04/25 07:05:42 snj Exp $ # DISTNAME= gtk+extra-0.99.17 @@ -10,7 +10,7 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://gtkextra.sourceforge.net/ COMMENT= Useful set of GTK+ widgets for creating GUIs -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_X11BASE= YES USE_GNU_TOOLS+= make GNU_CONFIGURE= YES @@ -18,5 +18,5 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -.include "../../x11/gtk/buildlink2.mk" +.include "../../x11/gtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk+extra/buildlink3.mk b/x11/gtk+extra/buildlink3.mk new file mode 100644 index 00000000000..6095d142a01 --- /dev/null +++ b/x11/gtk+extra/buildlink3.mk @@ -0,0 +1,20 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 07:05:42 snj Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GTK+EXTRA_BUILDLINK3_MK:= ${GTK+EXTRA_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= gtk+extra +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk+extra} +BUILDLINK_PACKAGES+= gtk+extra + +.if !empty(GTK+EXTRA_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.gtk+extra+= gtk+extra>=0.99.17nb2 +BUILDLINK_PKGSRCDIR.gtk+extra?= ../../x11/gtk+extra +.endif # GTK+EXTRA_BUILDLINK3_MK + +.include "../../x11/gtk/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |