[pkgsrc/trunk]: pkgsrc/x11 bl3ify

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/961fee32b530
branches:  trunk
changeset: 469676:961fee32b530
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Thu Feb 26 17:31:40 2004 +0000

description:
bl3ify

diffstat:

 x11/xscreensaver-demo/Makefile   |  12 ++++++------
 x11/xscreensaver-gnome/Makefile  |  12 ++++++------
 x11/xscreensaver/Makefile.common |  14 ++++----------
 x11/xscreensaver/buildlink3.mk   |  24 ++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 22 deletions(-)

diffs (115 lines):

diff -r dfd6cc097925 -r 961fee32b530 x11/xscreensaver-demo/Makefile
--- a/x11/xscreensaver-demo/Makefile    Thu Feb 26 17:29:24 2004 +0000
+++ b/x11/xscreensaver-demo/Makefile    Thu Feb 26 17:31:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/01 10:41:43 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/26 17:31:40 jmmv Exp $
 #
 
 PKGNAME=       ${DISTNAME:S/-/-demo-/}
@@ -7,7 +7,7 @@
 
 CONFLICTS+=    xscreensaver<4.14 xscreensaver-gnome-[0-9]*
 
-USE_BUILDLINK2=        yes
+USE_BUILDLINK3=        yes
 
 .include "../../x11/xscreensaver/Makefile.common"
 
@@ -23,8 +23,8 @@
 post-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/driver/xscreensaver-demo ${PREFIX}/bin
 
-.include "../../devel/libglade2/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
-.include "../../x11/xscreensaver/buildlink2.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/xscreensaver/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r dfd6cc097925 -r 961fee32b530 x11/xscreensaver-gnome/Makefile
--- a/x11/xscreensaver-gnome/Makefile   Thu Feb 26 17:29:24 2004 +0000
+++ b/x11/xscreensaver-gnome/Makefile   Thu Feb 26 17:31:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/02/01 10:41:43 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2004/02/26 17:31:41 jmmv Exp $
 #
 
 PKGNAME=       ${DISTNAME:S/-/-gnome-/}
@@ -7,7 +7,7 @@
 
 CONFLICTS+=    xscreensaver<4.14 xscreensaver-demo-[0-9]*
 
-USE_BUILDLINK2=        yes
+USE_BUILDLINK3=        yes
 
 .include "../../x11/xscreensaver/Makefile.common"
 
@@ -37,8 +37,8 @@
        ${LN} -s ${BUILDLINK_PREFIX.xscreensaver}/libexec/xscreensaver/config \
                ${PREFIX}/share/control-center/screensavers
 
-.include "../../devel/libglade/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/controlcenter/buildlink2.mk"
-.include "../../x11/xscreensaver/buildlink2.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/controlcenter/buildlink3.mk"
+.include "../../x11/xscreensaver/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r dfd6cc097925 -r 961fee32b530 x11/xscreensaver/Makefile.common
--- a/x11/xscreensaver/Makefile.common  Thu Feb 26 17:29:24 2004 +0000
+++ b/x11/xscreensaver/Makefile.common  Thu Feb 26 17:31:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.71 2004/02/18 13:33:41 jlam Exp $
+# $NetBSD: Makefile.common,v 1.72 2004/02/26 17:31:40 jmmv Exp $
 #
 
 DISTNAME=              xscreensaver-4.14
@@ -70,12 +70,6 @@
 GCC_REQD+=             2.95.3
 .endif
 
-.if !empty(USE_BUILDLINK3:M[yY][eE][sS])
-.  include "../../devel/gettext-lib/buildlink3.mk"
-.  include "../../graphics/gle/buildlink3.mk"
-.  include "../../graphics/jpeg/buildlink3.mk"
-.elif empty(USE_BUILDLINK2:M[nN][oO])
-.  include "../../devel/gettext-lib/buildlink2.mk"
-.  include "../../graphics/gle/buildlink2.mk"
-.  include "../../graphics/jpeg/buildlink2.mk"
-.endif
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/gle/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
diff -r dfd6cc097925 -r 961fee32b530 x11/xscreensaver/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xscreensaver/buildlink3.mk    Thu Feb 26 17:31:40 2004 +0000
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/26 17:31:40 jmmv Exp $
+#
+# This Makefile fragment is included by packages that use xscreensaver.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+XSCREENSAVER_BUILDLINK3_MK:=   ${XSCREENSAVER_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    xscreensaver
+.endif
+
+.if !empty(XSCREENSAVER_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=                   xscreensaver
+BUILDLINK_DEPENDS.xscreensaver+=               xscreensaver>=4.14
+BUILDLINK_PKGSRCDIR.xscreensaver?=             ../../x11/xscreensaver
+
+.include "../../textproc/libxml2/buildlink3.mk"
+
+.endif # XSCREENSAVER_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}