diff options
author | snj <snj> | 2004-04-26 04:55:28 +0000 |
---|---|---|
committer | snj <snj> | 2004-04-26 04:55:28 +0000 |
commit | b4f279232c5bee12e691729baae30e9d1ceca241 (patch) | |
tree | c4c114232e887087d17bb67715ad8ce0f95adfcf | |
parent | 8a22bc5ef3978a1eefcddf62d03c4941bc9485c7 (diff) | |
download | pkgsrc-b4f279232c5bee12e691729baae30e9d1ceca241.tar.gz |
Convert to buildlink3.
-rw-r--r-- | editors/gnotepad/Makefile | 8 | ||||
-rw-r--r-- | games/gnome-breakout/Makefile | 8 | ||||
-rw-r--r-- | games/gnome-chess/Makefile | 6 | ||||
-rw-r--r-- | graphics/ee/Makefile | 6 | ||||
-rw-r--r-- | x11/gnome-core/Makefile | 24 | ||||
-rw-r--r-- | x11/gnome-core/Makefile.common | 4 | ||||
-rw-r--r-- | x11/gnome1-panel/Makefile | 20 | ||||
-rw-r--r-- | x11/gnome1-panel/buildlink3.mk | 29 | ||||
-rw-r--r-- | x11/gnome1-session/Makefile | 20 | ||||
-rw-r--r-- | x11/gnome1-session/buildlink3.mk | 29 |
10 files changed, 106 insertions, 48 deletions
diff --git a/editors/gnotepad/Makefile b/editors/gnotepad/Makefile index ca354cd08e0..114b883b8f6 100644 --- a/editors/gnotepad/Makefile +++ b/editors/gnotepad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/03/26 02:27:39 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2004/04/26 05:08:21 snj Exp $ DISTNAME= gnotepad+-1.3.3 PKGNAME= ${DISTNAME:S/+//} @@ -12,7 +12,7 @@ COMMENT= Easy-to-use, yet feature-rich, simple HTML/text editor for X11 BUILD_USES_MSGFMT= YES -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_PKGLOCALEDIR= YES USE_X11BASE= YES USE_GNU_TOOLS+= make @@ -21,7 +21,7 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../x11/gnome-core/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../x11/gnome-core/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/gnome-breakout/Makefile b/games/gnome-breakout/Makefile index e5e79fffcab..27a48610dd7 100644 --- a/games/gnome-breakout/Makefile +++ b/games/gnome-breakout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/04/14 19:30:22 jmmv Exp $ +# $NetBSD: Makefile,v 1.20 2004/04/26 04:55:48 snj Exp $ # DISTNAME= gnome-breakout-0.5.2 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.senet.com.au/~alcaron/software.html COMMENT= Gnome version of the classic breakout game GNU_CONFIGURE= YES -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES USE_X11BASE= YES @@ -21,6 +21,6 @@ post-install: ${CHOWN} games:games /var/games/gnome-breakout.scores ${CHMOD} 664 /var/games/gnome-breakout.scores -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../x11/gnome-core/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../x11/gnome-core/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile index 647a53c1e4c..5c2240d0816 100644 --- a/games/gnome-chess/Makefile +++ b/games/gnome-chess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2004/04/14 16:15:22 jmmv Exp $ +# $NetBSD: Makefile,v 1.30 2004/04/26 04:59:26 snj Exp $ DISTNAME= gnome-chess-0.3.3 PKGREVISION= 13 @@ -9,14 +9,14 @@ MAINTAINER= tron@NetBSD.org HOMEPAGE= http://www.gnome.org/softwaremap/projects/gnome-chess/ COMMENT= GNOME\'s graphical interface for playing chess -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= yes USE_X11BASE= yes GNU_CONFIGURE= yes .include "../../textproc/scrollkeeper/omf.mk" -.include "../../x11/gnome-core/buildlink2.mk" +.include "../../x11/gnome-core/buildlink3.mk" .include "../../mk/bsd.pkg.mk" .if ${OPSYS} == "SunOS" diff --git a/graphics/ee/Makefile b/graphics/ee/Makefile index 0e72d7614c1..fd98632a84b 100644 --- a/graphics/ee/Makefile +++ b/graphics/ee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2004/04/14 16:15:23 jmmv Exp $ +# $NetBSD: Makefile,v 1.39 2004/04/26 05:00:45 snj Exp $ DISTNAME= ee-0.3.12 PKGREVISION= 10 @@ -9,7 +9,7 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://www.gnome.org/ COMMENT= Image viewer based on imlib by the Rasterman. Gtk clone of xv -USE_BUILDLINK2= # defined +USE_BUILDLINK3= yes USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= # defined USE_X11BASE= # defined @@ -24,5 +24,5 @@ GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \ --with-glib-prefix=${BUILDLINK_PREFIX.glib} -.include "../../x11/gnome-core/buildlink2.mk" +.include "../../x11/gnome-core/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile index 87c2871bca9..6ad12c62f3d 100644 --- a/x11/gnome-core/Makefile +++ b/x11/gnome-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.99 2004/04/14 16:15:29 jmmv Exp $ +# $NetBSD: Makefile,v 1.100 2004/04/26 04:55:28 snj Exp $ # .include "Makefile.common" @@ -35,17 +35,17 @@ post-install: . endfor .endfor -.include "../../archivers/bzip2/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/libglade/buildlink2.mk" -.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk" -.include "../../graphics/gnome-pixmaps/buildlink2.mk" -.include "../../lang/perl5/buildlink2.mk" -.include "../../textproc/libxml/buildlink2.mk" +.include "../../archivers/bzip2/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/libglade/buildlink3.mk" +.include "../../graphics/gdk-pixbuf-gnome/buildlink3.mk" +.include "../../graphics/gnome-pixmaps/buildlink3.mk" +.include "../../lang/perl5/buildlink3.mk" +.include "../../textproc/libxml/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" -.include "../../www/gtkhtml/buildlink2.mk" -.include "../../www/libghttp/buildlink2.mk" -.include "../../x11/gnome1-session/buildlink2.mk" -.include "../../x11/gnome1-panel/buildlink2.mk" +.include "../../www/gtkhtml/buildlink3.mk" +.include "../../www/libghttp/buildlink3.mk" +.include "../../x11/gnome1-session/buildlink3.mk" +.include "../../x11/gnome1-panel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-core/Makefile.common b/x11/gnome-core/Makefile.common index 20bec3e96a1..0571a631ebb 100644 --- a/x11/gnome-core/Makefile.common +++ b/x11/gnome-core/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2004/04/14 19:30:23 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.10 2004/04/26 04:55:28 snj Exp $ # DISTNAME= gnome-core-1.4.2 @@ -11,7 +11,7 @@ HOMEPAGE?= http://www.gnome.org/ BUILD_USES_MSGFMT= YES -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= YES USE_X11BASE= YES diff --git a/x11/gnome1-panel/Makefile b/x11/gnome1-panel/Makefile index 6da1e9e1baa..a309fbc8aba 100644 --- a/x11/gnome1-panel/Makefile +++ b/x11/gnome1-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/04/14 16:15:29 jmmv Exp $ +# $NetBSD: Makefile,v 1.13 2004/04/26 04:55:29 snj Exp $ # .include "../../x11/gnome-core/Makefile.common" @@ -27,15 +27,15 @@ PATCHDIR= ${.CURDIR}/../../x11/gnome-core/patches BUILD_DIRS= ${WRKSRC}/panel BUILD_DIRS+= ${WRKSRC}/applets -.include "../../archivers/bzip2/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/libglade/buildlink2.mk" -.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk" -.include "../../graphics/gnome-pixmaps/buildlink2.mk" -.include "../../lang/perl5/buildlink2.mk" -.include "../../textproc/libxml/buildlink2.mk" +.include "../../archivers/bzip2/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/libglade/buildlink3.mk" +.include "../../graphics/gdk-pixbuf-gnome/buildlink3.mk" +.include "../../graphics/gnome-pixmaps/buildlink3.mk" +.include "../../lang/perl5/buildlink3.mk" +.include "../../textproc/libxml/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" -.include "../../www/gtkhtml/buildlink2.mk" -.include "../../www/libghttp/buildlink2.mk" +.include "../../www/gtkhtml/buildlink3.mk" +.include "../../www/libghttp/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome1-panel/buildlink3.mk b/x11/gnome1-panel/buildlink3.mk new file mode 100644 index 00000000000..e2f456ec319 --- /dev/null +++ b/x11/gnome1-panel/buildlink3.mk @@ -0,0 +1,29 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/04/26 04:55:29 snj Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GNOME_PANEL_BUILDLINK3_MK:= ${GNOME_PANEL_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= gnome-panel +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-panel} +BUILDLINK_PACKAGES+= gnome-panel + +.if !empty(GNOME_PANEL_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.gnome-panel?= gnome-panel>=1.4.2nb5 +BUILDLINK_RECOMMENDED.gnome-panel?= gnome-panel>=1.4.2nb8 +BUILDLINK_PKGSRCDIR.gnome-panel?= ../../x11/gnome1-panel +.endif # GNOME_PANEL_BUILDLINK3_MK + +.include "../../archivers/bzip2/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/libglade/buildlink3.mk" +.include "../../graphics/gdk-pixbuf-gnome/buildlink3.mk" +.include "../../graphics/gnome-pixmaps/buildlink3.mk" +.include "../../lang/perl5/buildlink3.mk" +.include "../../textproc/libxml/buildlink3.mk" +.include "../../www/gtkhtml/buildlink3.mk" +.include "../../www/libghttp/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/gnome1-session/Makefile b/x11/gnome1-session/Makefile index 19d8859490c..411fe304e28 100644 --- a/x11/gnome1-session/Makefile +++ b/x11/gnome1-session/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/04/14 16:15:29 jmmv Exp $ +# $NetBSD: Makefile,v 1.12 2004/04/26 04:55:29 snj Exp $ # .include "../../x11/gnome-core/Makefile.common" @@ -26,15 +26,15 @@ PATCHDIR= ${.CURDIR}/../../x11/gnome-core/patches BUILD_DIRS= ${WRKSRC}/gsm BUILD_DIRS+= ${WRKSRC}/smproxy -.include "../../archivers/bzip2/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/libglade/buildlink2.mk" -.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk" -.include "../../graphics/gnome-pixmaps/buildlink2.mk" -.include "../../lang/perl5/buildlink2.mk" -.include "../../textproc/libxml/buildlink2.mk" +.include "../../archivers/bzip2/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/libglade/buildlink3.mk" +.include "../../graphics/gdk-pixbuf-gnome/buildlink3.mk" +.include "../../graphics/gnome-pixmaps/buildlink3.mk" +.include "../../lang/perl5/buildlink3.mk" +.include "../../textproc/libxml/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" -.include "../../www/gtkhtml/buildlink2.mk" -.include "../../www/libghttp/buildlink2.mk" +.include "../../www/gtkhtml/buildlink3.mk" +.include "../../www/libghttp/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome1-session/buildlink3.mk b/x11/gnome1-session/buildlink3.mk new file mode 100644 index 00000000000..5d05b8d3864 --- /dev/null +++ b/x11/gnome1-session/buildlink3.mk @@ -0,0 +1,29 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/04/26 04:55:29 snj Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GNOME_SESSION_BUILDLINK3_MK:= ${GNOME_SESSION_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= gnome-session +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-session} +BUILDLINK_PACKAGES+= gnome-session + +.if !empty(GNOME_SESSION_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.gnome-session?= gnome-session>=1.4.2nb5 +BUILDLINK_RECOMMENDED.gnome-session?= gnome-session>=1.4.2nb8 +BUILDLINK_PKGSRCDIR.gnome-session?= ../../x11/gnome1-session +.endif # GNOME_SESSION_BUILDLINK3_MK + +.include "../../archivers/bzip2/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/libglade/buildlink3.mk" +.include "../../graphics/gdk-pixbuf-gnome/buildlink3.mk" +.include "../../graphics/gnome-pixmaps/buildlink3.mk" +.include "../../lang/perl5/buildlink3.mk" +.include "../../textproc/libxml/buildlink3.mk" +.include "../../www/gtkhtml/buildlink3.mk" +.include "../../www/libghttp/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |