[pkgsrc/trunk]: pkgsrc bl3ify

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8f64fd3b68b4
branches:  trunk
changeset: 468053:8f64fd3b68b4
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Feb 10 02:04:54 2004 +0000

description:
bl3ify

diffstat:

 devel/libgtop2/Makefile |  10 +++++-----
 x11/gtk2/Makefile       |  22 +++++++++++-----------
 x11/gtk2/buildlink3.mk  |  31 +++++++++++++++++++++++++++++++
 x11/gtk2/modules.mk     |   6 +++---
 4 files changed, 50 insertions(+), 19 deletions(-)

diffs (125 lines):

diff -r ccdf9a8ebbe6 -r 8f64fd3b68b4 devel/libgtop2/Makefile
--- a/devel/libgtop2/Makefile   Tue Feb 10 02:00:57 2004 +0000
+++ b/devel/libgtop2/Makefile   Tue Feb 10 02:04:54 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/02/06 21:40:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2004/02/10 02:08:09 xtraeme Exp $
 
 DISTNAME=              libgtop-2.0.8
 PKGNAME=               ${DISTNAME:S/-/2-/}
@@ -31,7 +31,7 @@
 .endif
 
 USE_PERL5=             build
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 USE_PKGLOCALEDIR=      YES
 USE_X11=               YES
 USE_GNU_TOOLS+=                make
@@ -57,7 +57,7 @@
 post-install:
        @${CHMOD} g+s ${PREFIX}/bin/libgtop_server2
 
-.include "../../devel/popt/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/glib2/buildlink2.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ccdf9a8ebbe6 -r 8f64fd3b68b4 x11/gtk2/Makefile
--- a/x11/gtk2/Makefile Tue Feb 10 02:00:57 2004 +0000
+++ b/x11/gtk2/Makefile Tue Feb 10 02:04:54 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2004/01/24 15:30:33 grant Exp $
+# $NetBSD: Makefile,v 1.41 2004/02/10 02:04:54 xtraeme Exp $
 #
 
 DISTNAME=              gtk+-2.2.4
@@ -15,7 +15,7 @@
 COMMENT=               The GIMP Toolkit - libraries for building X11 user interfaces
 
 BUILD_USES_MSGFMT=     yes
-USE_BUILDLINK2=                yes
+USE_BUILDLINK3=                yes
 USE_PKGINSTALL=                yes
 USE_PKGLOCALEDIR=      yes
 USE_X11=               yes
@@ -44,14 +44,14 @@
        ${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/engines
        ${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/modules
 
-.include "../../devel/atk/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pango/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
+.include "../../devel/atk/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r ccdf9a8ebbe6 -r 8f64fd3b68b4 x11/gtk2/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gtk2/buildlink3.mk    Tue Feb 10 02:04:54 2004 +0000
@@ -0,0 +1,31 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 02:04:54 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use gtk2+.
+#
+# This file was created automatically using createbuildlink-3.0.
+#
+
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+GTK2+_BUILDLINK3_MK:=  ${GTK2+_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    gtk2+
+.endif
+
+.if !empty(GTK2+_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=                   gtk2+
+BUILDLINK_DEPENDS.gtk2+?=              gtk2+>=2.2.4nb3
+BUILDLINK_PKGSRCDIR.gtk2+?=            ../../x11/gtk2
+
+.include "../../devel/atk/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+
+.endif # GTK2+_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r ccdf9a8ebbe6 -r 8f64fd3b68b4 x11/gtk2/modules.mk
--- a/x11/gtk2/modules.mk       Tue Feb 10 02:00:57 2004 +0000
+++ b/x11/gtk2/modules.mk       Tue Feb 10 02:04:54 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.3 2004/01/26 14:59:46 jmmv Exp $
+# $NetBSD: modules.mk,v 1.4 2004/02/10 02:04:54 xtraeme Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # GTK2 modules.  It takes care of rebuilding the corresponding databases at
@@ -33,7 +33,7 @@
 USE_PKGINSTALL=                YES
 .endif
 
-USE_BUILDLINK2=                YES
-.include "../../x11/gtk2/buildlink2.mk"
+USE_BUILDLINK3=                YES
+.include "../../x11/gtk2/buildlink3.mk"
 
 .endif                 # GTK2_MODULES_MK