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/ce1aa2311d1c
branches:  trunk
changeset: 472751:ce1aa2311d1c
user:      snj <snj%pkgsrc.org@localhost>
date:      Mon Apr 12 02:20:13 2004 +0000

description:
Convert to buildlink3.

diffstat:

 graphics/GUIlib/Makefile      |   6 +++---
 graphics/GUIlib/buildlink2.mk |  22 ----------------------
 graphics/GUIlib/buildlink3.mk |  20 ++++++++++++++++++++
 x11/qt2-docs/Makefile         |   9 +++------
 4 files changed, 26 insertions(+), 31 deletions(-)

diffs (103 lines):

diff -r 664683dc126f -r ce1aa2311d1c graphics/GUIlib/Makefile
--- a/graphics/GUIlib/Makefile  Mon Apr 12 02:15:40 2004 +0000
+++ b/graphics/GUIlib/Makefile  Mon Apr 12 02:20:13 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/26 21:41:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/12 02:20:13 snj Exp $
 #
 
 DISTNAME=      GUIlib-1.1.0
@@ -10,11 +10,11 @@
 HOMEPAGE=      http://www.libsdl.org/projects/GUIlib/
 COMMENT=       Very simple GUI framework library
 
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 GNU_CONFIGURE=         YES
 
 USE_LIBTOOL=           YES
 LTCONFIG_OVERRIDE=     ${WRKSRC}/ltconfig
 
-.include "../../devel/SDL/buildlink2.mk"
+.include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 664683dc126f -r ce1aa2311d1c graphics/GUIlib/buildlink2.mk
--- a/graphics/GUIlib/buildlink2.mk     Mon Apr 12 02:15:40 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/26 21:41:22 jmmv Exp $
-
-.if !defined(GUILIB_BUILDLINK2_MK)
-GUILIB_BUILDLINK2_MK=  # defined
-
-BUILDLINK_PACKAGES+=           GUIlib
-BUILDLINK_DEPENDS.GUIlib?=     GUIlib>=1.1.0nb2
-BUILDLINK_PKGSRCDIR.GUIlib?=   ../../graphics/GUIlib
-
-EVAL_PREFIX+=                  BUILDLINK_PREFIX.GUIlib=GUIlib
-BUILDLINK_PREFIX.GUIlib_DEFAULT=${LOCALBASE}
-BUILDLINK_FILES.GUIlib=                include/GUI/*.h
-BUILDLINK_FILES.GUIlib+=       lib/libGUI-*
-BUILDLINK_FILES.GUIlib+=       lib/libGUI.*
-
-.include "../../devel/SDL/buildlink2.mk"
-
-BUILDLINK_TARGETS+=    GUIlib-buildlink
-
-GUIlib-buildlink: _BUILDLINK_USE
-
-.endif # GUILIB_BUILDLINK2_MK
diff -r 664683dc126f -r ce1aa2311d1c graphics/GUIlib/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/GUIlib/buildlink3.mk     Mon Apr 12 02:20:13 2004 +0000
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/12 02:20:13 snj Exp $
+
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+GUILIB_BUILDLINK3_MK:= ${GUILIB_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    GUIlib
+.endif
+
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:NGUIlib}
+BUILDLINK_PACKAGES+=   GUIlib
+
+.if !empty(GUILIB_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.GUIlib+=     GUIlib>=1.1.0nb2
+BUILDLINK_PKGSRCDIR.GUIlib?=   ../../graphics/GUIlib
+.endif # GUILIB_BUILDLINK3_MK
+
+.include "../../devel/SDL/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 664683dc126f -r ce1aa2311d1c x11/qt2-docs/Makefile
--- a/x11/qt2-docs/Makefile     Mon Apr 12 02:15:40 2004 +0000
+++ b/x11/qt2-docs/Makefile     Mon Apr 12 02:20:13 2004 +0000
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.15 2003/03/28 21:14:40 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2004/04/12 02:21:00 snj Exp $
 #
 
 PKGNAME=       qt2-docs-${QTVERSION}
 PKGREVISION=   2
 COMMENT=       Documentation for the QT C++ X GUI toolkit
 
-USE_BUILDLINK2=                yes
-BUILDLINK_DEPENDS.qt2-libs=    qt2-libs>=${QTVERSION}nb2
-
 .include "../qt2-libs/Makefile.common"
 
-USE_BUILDLINK2=        yes
+USE_BUILDLINK3=        yes
 NO_CONFIGURE=  yes
 NO_BUILD=      yes
 
@@ -44,6 +41,6 @@
            ${INSTALL_DATA} $${f} ${QTPREFIX}/$${f}; \
        done)
 
-.include "../../x11/qt2-libs/buildlink2.mk"
+.include "../../x11/qt2-libs/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index