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/0087f1da9317
branches: trunk
changeset: 474520:0087f1da9317
user: snj <snj%pkgsrc.org@localhost>
date: Sat May 01 17:57:21 2004 +0000
description:
Convert to buildlink3.
diffstat:
wm/fvwm2-themes/Makefile | 6 +++---
wm/icepref/Makefile | 6 +++---
wm/icewmconf/Makefile | 6 +++---
wm/olvwm/Makefile | 8 ++++----
wm/sawfish/Makefile.common | 10 +++++-----
wm/wm2/Makefile | 4 ++--
wm/wmx-gnome/Makefile | 4 ++--
wm/wmx/Makefile | 4 ++--
wm/wmx/Makefile.common | 4 ++--
x11/pygtk/Makefile | 15 ++++++++-------
x11/pygtk/buildlink3.mk | 20 ++++++++++++++++++++
11 files changed, 54 insertions(+), 33 deletions(-)
diffs (241 lines):
diff -r 3acd27e17adc -r 0087f1da9317 wm/fvwm2-themes/Makefile
--- a/wm/fvwm2-themes/Makefile Sat May 01 16:55:28 2004 +0000
+++ b/wm/fvwm2-themes/Makefile Sat May 01 17:57:21 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/03 18:49:54 reed Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/01 17:57:53 snj Exp $
#
DISTNAME= fvwm-themes-${THEM_VER}
@@ -19,7 +19,7 @@
THEM_VER= 0.6.2
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
USE_PERL5= YES
USE_X11BASE= YES
GNU_CONFIGURE= YES
@@ -30,5 +30,5 @@
${PREFIX}/bin/fvwm-themes-config --site --install \
${DISTDIR}/fvwm-themes-extra-${THEM_VER}.tar.bz2
-.include "../../graphics/ImageMagick/buildlink2.mk"
+.include "../../graphics/ImageMagick/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 3acd27e17adc -r 0087f1da9317 wm/icepref/Makefile
--- a/wm/icepref/Makefile Sat May 01 16:55:28 2004 +0000
+++ b/wm/icepref/Makefile Sat May 01 17:57:21 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:27:35 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/01 17:57:53 snj Exp $
#
DISTNAME= icepref-1.1
@@ -12,10 +12,10 @@
COMMENT= Graphical configuration utility for IceWM
WRKSRC= ${WRKDIR}/icepref
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
PYTHON_PATCH_SCRIPTS= icepref
.include "../../lang/python/application.mk"
-.include "../../x11/pygtk/buildlink2.mk"
+.include "../../x11/pygtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 3acd27e17adc -r 0087f1da9317 wm/icewmconf/Makefile
--- a/wm/icewmconf/Makefile Sat May 01 16:55:28 2004 +0000
+++ b/wm/icewmconf/Makefile Sat May 01 17:57:21 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/03/08 20:27:16 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/01 17:57:54 snj Exp $
DISTNAME= icewmconf-2.1.0
CATEGORIES= wm
@@ -9,7 +9,7 @@
COMMENT= Graphical configuration tool for IceWM
WRKSRC= ${WRKDIR}
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= yes
FILENAME= ${WRKDIR}/${DISTNAME:C/-.*//}
NO_BUILD= # defined
@@ -24,5 +24,5 @@
do-install:
${INSTALL_SCRIPT} ${FILENAME} ${PREFIX}/bin/
-.include "../../x11/tk83/buildlink2.mk"
+.include "../../x11/tk83/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 3acd27e17adc -r 0087f1da9317 wm/olvwm/Makefile
--- a/wm/olvwm/Makefile Sat May 01 16:55:28 2004 +0000
+++ b/wm/olvwm/Makefile Sat May 01 17:57:21 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:27:35 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/01 17:57:54 snj Exp $
#
DISTNAME= olvwm4.src4
@@ -14,10 +14,10 @@
DEPENDS+= xview-clients>=3.2.1:../../x11/xview-clients
WRKSRC= ${WRKDIR}
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= yes
USE_IMAKE= # defined
USE_X11BASE= # defined
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/xview-lib/buildlink2.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/xview-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 3acd27e17adc -r 0087f1da9317 wm/sawfish/Makefile.common
--- a/wm/sawfish/Makefile.common Sat May 01 16:55:28 2004 +0000
+++ b/wm/sawfish/Makefile.common Sat May 01 17:57:21 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2004/04/24 22:46:12 jlam Exp $
+# $NetBSD: Makefile.common,v 1.22 2004/05/01 17:57:54 snj Exp $
DISTNAME= sawfish-${SF_VERS}-gtk1
SF_VERS= 1.2
@@ -11,7 +11,7 @@
DEPENDS+= rep-gtk>=0.15nb2:../../x11/rep-gtk
USE_X11= # defined
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= yes
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= # defined
USE_GNU_TOOLS+= make
@@ -20,7 +20,7 @@
DISTINFO_FILE= ${.CURDIR}/../../wm/sawfish/distinfo
PATCHDIR= ${.CURDIR}/../../wm/sawfish/patches
-.include "../../graphics/imlib/buildlink2.mk"
-.include "../../lang/librep/buildlink2.mk"
-.include "../../x11/controlcenter/buildlink2.mk"
+.include "../../graphics/imlib/buildlink3.mk"
+.include "../../lang/librep/buildlink3.mk"
+.include "../../x11/controlcenter/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 3acd27e17adc -r 0087f1da9317 wm/wm2/Makefile
--- a/wm/wm2/Makefile Sat May 01 16:55:28 2004 +0000
+++ b/wm/wm2/Makefile Sat May 01 17:57:21 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/02/08 04:03:15 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/01 17:57:54 snj Exp $
DISTNAME= wm2-4
PKGNAME= wm2-4.0
@@ -11,7 +11,7 @@
ALL_TARGET= depend wm2
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
USE_X11BASE= YES
USE_GCC_SHLIB= YES
MAKE_ENV+= CCC="${CXX}"
diff -r 3acd27e17adc -r 0087f1da9317 wm/wmx-gnome/Makefile
--- a/wm/wmx-gnome/Makefile Sat May 01 16:55:28 2004 +0000
+++ b/wm/wmx-gnome/Makefile Sat May 01 17:57:21 2004 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 17:34:06 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/01 17:57:54 snj Exp $
PKGNAME= wmx-gnome-${WMX_VERS}
CATEGORIES+= gnome
COMMENT= Another X11 window manager based on wm2, with GNOME compliance
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= yes
USE_GCC_SHLIB= # defined
.include "../../wm/wmx/Makefile.common"
diff -r 3acd27e17adc -r 0087f1da9317 wm/wmx/Makefile
--- a/wm/wmx/Makefile Sat May 01 16:55:28 2004 +0000
+++ b/wm/wmx/Makefile Sat May 01 17:57:21 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 17:34:06 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/01 17:57:54 snj Exp $
PKGNAME= wmx-${WMX_VERS}
COMMENT= Another X11 window manager based on wm2
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= yes
.include "../../wm/wmx/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r 3acd27e17adc -r 0087f1da9317 wm/wmx/Makefile.common
--- a/wm/wmx/Makefile.common Sat May 01 16:55:28 2004 +0000
+++ b/wm/wmx/Makefile.common Sat May 01 17:57:21 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2004/04/24 22:46:12 jlam Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/05/01 17:57:54 snj Exp $
DISTNAME= wmx-6
WMX_VERS= 6.0
@@ -27,4 +27,4 @@
${INSTALL_DATA} ${WRKSRC}/README.contrib ${PREFIX}/share/doc/wmx
${INSTALL_DATA_DIR} ${PREFIX}/etc/wmx
-.include "../../graphics/xpm/buildlink2.mk"
+.include "../../graphics/xpm/buildlink3.mk"
diff -r 3acd27e17adc -r 0087f1da9317 x11/pygtk/Makefile
--- a/x11/pygtk/Makefile Sat May 01 16:55:28 2004 +0000
+++ b/x11/pygtk/Makefile Sat May 01 17:57:21 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/04/25 04:16:44 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2004/05/01 17:57:21 snj Exp $
#
DISTNAME= pygtk-0.6.9
@@ -17,12 +17,13 @@
USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
PY_PATCHPLIST= yes
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
-.include "../../graphics/imlib/buildlink2.mk"
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../devel/libglade/buildlink2.mk"
+.include "../../graphics/imlib/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
.include "../../lang/python/extension.mk"
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../x11/gtkglarea/buildlink2.mk"
+.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtkglarea/buildlink3.mk"
+
.include "../../mk/bsd.pkg.mk"
diff -r 3acd27e17adc -r 0087f1da9317 x11/pygtk/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/pygtk/buildlink3.mk Sat May 01 17:57:21 2004 +0000
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/01 17:57:21 snj Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+PY_GTK_BUILDLINK3_MK:= ${PY_GTK_BUILDLINK3_MK}+
+
+.include "../../lang/python/pyversion.mk"
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= pygtk
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npygtk}
+BUILDLINK_PACKAGES+= pygtk
+
+.if !empty(PY_GTK_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.pygtk+= ${PYPKGPREFIX}-gtk>=0.6.9nb4
+BUILDLINK_PKGSRCDIR.pygtk?= ../../x11/pygtk
+.endif # PY_GTK_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
Home |
Main Index |
Thread Index |
Old Index