[pkgsrc/trunk]: pkgsrc bl3ify

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1f25964e27c7
branches:  trunk
changeset: 469609:1f25964e27c7
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Wed Feb 25 19:02:39 2004 +0000

description:
bl3ify

diffstat:

 mail/wmbiff/Makefile         |  10 +++++-----
 wm/windowmaker/Makefile      |  18 +++++++++---------
 wm/windowmaker/buildlink3.mk |  28 ++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 14 deletions(-)

diffs (99 lines):

diff -r 21d7b9b507e9 -r 1f25964e27c7 mail/wmbiff/Makefile
--- a/mail/wmbiff/Makefile      Wed Feb 25 19:00:16 2004 +0000
+++ b/mail/wmbiff/Makefile      Wed Feb 25 19:02:39 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/02/25 15:53:17 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2004/02/25 19:04:19 minskim Exp $
 
 DISTNAME=      wmbiff-0.4.19
 PKGREVISION=   2
@@ -10,7 +10,7 @@
 COMMENT=       xbuffy like "mail-checker" for WindowMaker
 
 GNU_CONFIGURE= YES
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 USE_X11=       YES
 USE_GNU_TOOLS+=        make
 
@@ -20,7 +20,7 @@
        ${INSTALL_DATA_DIR} ${EX_DIR}
        ${INSTALL_DATA} ${WRKSRC}/wmbiff/sample.wmbiffrc ${EX_DIR}
 
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../wm/windowmaker/buildlink2.mk"
-.include "../../security/libgcrypt/buildlink2.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../wm/windowmaker/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 21d7b9b507e9 -r 1f25964e27c7 wm/windowmaker/Makefile
--- a/wm/windowmaker/Makefile   Wed Feb 25 19:00:16 2004 +0000
+++ b/wm/windowmaker/Makefile   Wed Feb 25 19:02:39 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2004/02/14 17:21:53 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2004/02/25 19:02:39 minskim Exp $
 
 DISTNAME=              WindowMaker-0.80.2
 PKGNAME=               windowmaker-0.80.2
@@ -14,7 +14,7 @@
 
 BUILD_USES_MSGFMT=     YES
 
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 USE_PKGINSTALL=                YES
 USE_X11BASE=           YES
 USE_PKGLOCALEDIR=      YES
@@ -86,12 +86,12 @@
                FAQ FAQ.I18N \
                ${PREFIX}/share/doc/WindowMaker
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../graphics/hermes/buildlink2.mk"
-.include "../../graphics/libungif/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/hermes/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 21d7b9b507e9 -r 1f25964e27c7 wm/windowmaker/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/windowmaker/buildlink3.mk      Wed Feb 25 19:02:39 2004 +0000
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/25 19:02:39 minskim Exp $
+#
+# This Makefile fragment is included by packages that use windowmaker.
+#
+
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+WINDOWMAKER_BUILDLINK3_MK:=    ${WINDOWMAKER_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    windowmaker
+.endif
+
+.if !empty(WINDOWMAKER_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=                   windowmaker
+BUILDLINK_DEPENDS.windowmaker+=                windowmaker>=0.80.2nb3
+BUILDLINK_PKGSRCDIR.windowmaker?=              ../../wm/windowmaker
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/hermes/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+
+.endif # WINDOWMAKER_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}