pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Convert to buildlink3.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2bc2534da94d
branches:  trunk
changeset: 474189:2bc2534da94d
user:      snj <snj%pkgsrc.org@localhost>
date:      Mon Apr 26 04:55:28 2004 +0000

description:
Convert to buildlink3.

diffstat:

 editors/gnotepad/Makefile        |   8 ++++----
 games/gnome-breakout/Makefile    |   8 ++++----
 games/gnome-chess/Makefile       |   6 +++---
 graphics/ee/Makefile             |   6 +++---
 x11/gnome-core/Makefile          |  24 ++++++++++++------------
 x11/gnome-core/Makefile.common   |   4 ++--
 x11/gnome1-panel/Makefile        |  20 ++++++++++----------
 x11/gnome1-panel/buildlink3.mk   |  29 +++++++++++++++++++++++++++++
 x11/gnome1-session/Makefile      |  20 ++++++++++----------
 x11/gnome1-session/buildlink3.mk |  29 +++++++++++++++++++++++++++++
 10 files changed, 106 insertions(+), 48 deletions(-)

diffs (296 lines):

diff -r 6bc05644e358 -r 2bc2534da94d editors/gnotepad/Makefile
--- a/editors/gnotepad/Makefile Mon Apr 26 04:53:23 2004 +0000
+++ b/editors/gnotepad/Makefile Mon Apr 26 04:55:28 2004 +0000
@@ -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 @@
 
 BUILD_USES_MSGFMT=     YES
 
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 USE_PKGLOCALEDIR=      YES
 USE_X11BASE=           YES
 USE_GNU_TOOLS+=                make
@@ -21,7 +21,7 @@
 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 -r 6bc05644e358 -r 2bc2534da94d games/gnome-breakout/Makefile
--- a/games/gnome-breakout/Makefile     Mon Apr 26 04:53:23 2004 +0000
+++ b/games/gnome-breakout/Makefile     Mon Apr 26 04:55:28 2004 +0000
@@ -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 @@
 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 @@
        ${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 -r 6bc05644e358 -r 2bc2534da94d games/gnome-chess/Makefile
--- a/games/gnome-chess/Makefile        Mon Apr 26 04:53:23 2004 +0000
+++ b/games/gnome-chess/Makefile        Mon Apr 26 04:55:28 2004 +0000
@@ -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 @@
 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 -r 6bc05644e358 -r 2bc2534da94d graphics/ee/Makefile
--- a/graphics/ee/Makefile      Mon Apr 26 04:53:23 2004 +0000
+++ b/graphics/ee/Makefile      Mon Apr 26 04:55:28 2004 +0000
@@ -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 @@
 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 @@
 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 -r 6bc05644e358 -r 2bc2534da94d x11/gnome-core/Makefile
--- a/x11/gnome-core/Makefile   Mon Apr 26 04:53:23 2004 +0000
+++ b/x11/gnome-core/Makefile   Mon Apr 26 04:55:28 2004 +0000
@@ -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 @@
 .  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 -r 6bc05644e358 -r 2bc2534da94d x11/gnome-core/Makefile.common
--- a/x11/gnome-core/Makefile.common    Mon Apr 26 04:53:23 2004 +0000
+++ b/x11/gnome-core/Makefile.common    Mon Apr 26 04:55:28 2004 +0000
@@ -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 @@
 
 BUILD_USES_MSGFMT=     YES
 
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 USE_DIRS+=             xdg-1.1
 USE_PKGLOCALEDIR=      YES
 USE_X11BASE=           YES
diff -r 6bc05644e358 -r 2bc2534da94d x11/gnome1-panel/Makefile
--- a/x11/gnome1-panel/Makefile Mon Apr 26 04:53:23 2004 +0000
+++ b/x11/gnome1-panel/Makefile Mon Apr 26 04:55:28 2004 +0000
@@ -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 @@
 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 -r 6bc05644e358 -r 2bc2534da94d x11/gnome1-panel/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome1-panel/buildlink3.mk    Mon Apr 26 04:55:28 2004 +0000
@@ -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 -r 6bc05644e358 -r 2bc2534da94d x11/gnome1-session/Makefile
--- a/x11/gnome1-session/Makefile       Mon Apr 26 04:53:23 2004 +0000
+++ b/x11/gnome1-session/Makefile       Mon Apr 26 04:55:28 2004 +0000
@@ -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 @@
 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 -r 6bc05644e358 -r 2bc2534da94d x11/gnome1-session/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome1-session/buildlink3.mk  Mon Apr 26 04:55:28 2004 +0000
@@ -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/+$//}



Home | Main Index | Thread Index | Old Index