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/83b628e59d5b
branches: trunk
changeset: 474524:83b628e59d5b
user: snj <snj%pkgsrc.org@localhost>
date: Sat May 01 23:57:00 2004 +0000
description:
Convert to buildlink3.
diffstat:
games/kdegames2/Makefile | 8 +-
sysutils/koncd/Makefile | 8 +-
sysutils/rox-archive/Makefile | 4 +-
sysutils/rox-edit/Makefile | 6 +-
sysutils/rox-lib/Makefile | 6 +-
sysutils/rox-memo/Makefile | 6 +-
sysutils/rox-session/Makefile | 8 +-
sysutils/rox-system/Makefile | 10 ++--
sysutils/rox-wallpaper/Makefile | 6 +-
sysutils/rox/Makefile | 8 +-
x11/kde2/kde2.mk | 84 +++++++++++++++++++++++++++++++++++++++++
x11/kdebase2/Makefile | 12 ++--
x11/kdebase2/buildlink3.mk | 22 ++++++++++
x11/kdelibs2/Makefile | 28 ++++++------
x11/kdelibs2/buildlink3.mk | 34 ++++++++++++++++
x11/qt2-designer-kde/Makefile | 6 +-
16 files changed, 198 insertions(+), 58 deletions(-)
diffs (truncated from 519 to 300 lines):
diff -r e9fc3bd10c78 -r 83b628e59d5b games/kdegames2/Makefile
--- a/games/kdegames2/Makefile Sat May 01 18:31:36 2004 +0000
+++ b/games/kdegames2/Makefile Sat May 01 23:57:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/03/26 02:27:40 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/05/01 23:57:00 snj Exp $
DISTNAME= kdegames-2.2.2
PKGREVISION= 6
@@ -9,9 +9,9 @@
BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
-.include "../../x11/kde2/buildlink2.mk"
-.include "../../x11/kdebase2/buildlink2.mk"
+.include "../../x11/kde2/kde2.mk"
+.include "../../x11/kdebase2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e9fc3bd10c78 -r 83b628e59d5b sysutils/koncd/Makefile
--- a/sysutils/koncd/Makefile Sat May 01 18:31:36 2004 +0000
+++ b/sysutils/koncd/Makefile Sat May 01 23:57:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/03/26 02:27:55 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2004/05/02 00:07:33 snj Exp $
DISTNAME= koncd-0.7.1
PKGREVISION= 6
@@ -12,10 +12,10 @@
BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
DEPENDS+= cdrecord>=1.9:../../sysutils/cdrecord
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
GNU_CONFIGURE= YES
-.include "../../x11/kde2/buildlink2.mk"
-.include "../../x11/kdebase2/buildlink2.mk"
+.include "../../x11/kde2/kde2.mk"
+.include "../../x11/kdebase2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e9fc3bd10c78 -r 83b628e59d5b sysutils/rox-archive/Makefile
--- a/sysutils/rox-archive/Makefile Sat May 01 18:31:36 2004 +0000
+++ b/sysutils/rox-archive/Makefile Sat May 01 23:57:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:26:16 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/02 00:00:17 snj Exp $
#
DISTNAME= Archive-0.1.2
@@ -18,7 +18,7 @@
WRKSRC= ${WRKDIR}/Archive
DIST_SUBDIR= rox
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
USE_PERL5= yes
NO_CONFIGURE= yes
diff -r e9fc3bd10c78 -r 83b628e59d5b sysutils/rox-edit/Makefile
--- a/sysutils/rox-edit/Makefile Sat May 01 18:31:36 2004 +0000
+++ b/sysutils/rox-edit/Makefile Sat May 01 23:57:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:26:16 agc Exp $
+# $NetBSD: Makefile,v 1.12 2004/05/02 00:00:17 snj Exp $
#
DISTNAME= Edit-0.1.2
@@ -19,7 +19,7 @@
NO_CONFIGURE= yes
NO_BUILD= yes
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
PYTHON_PATCH_SCRIPTS= AppRun
@@ -36,5 +36,5 @@
${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox
.include "../../lang/python/application.mk"
-.include "../../x11/pygtk/buildlink2.mk"
+.include "../../x11/pygtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e9fc3bd10c78 -r 83b628e59d5b sysutils/rox-lib/Makefile
--- a/sysutils/rox-lib/Makefile Sat May 01 18:31:36 2004 +0000
+++ b/sysutils/rox-lib/Makefile Sat May 01 23:57:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:26:16 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/02 00:00:17 snj Exp $
#
DISTNAME= ROX-Lib-0.1.4
@@ -19,7 +19,7 @@
NO_CONFIGURE= yes
NO_BUILD= yes
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
PYTHON_PATCH_SCRIPTS= AppRun bin/savebox
@@ -37,5 +37,5 @@
${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox
.include "../../lang/python/application.mk"
-.include "../../x11/pygtk/buildlink2.mk"
+.include "../../x11/pygtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e9fc3bd10c78 -r 83b628e59d5b sysutils/rox-memo/Makefile
--- a/sysutils/rox-memo/Makefile Sat May 01 18:31:36 2004 +0000
+++ b/sysutils/rox-memo/Makefile Sat May 01 23:57:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:26:16 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/02 00:00:17 snj Exp $
#
DISTNAME= Memo-1.0.0
@@ -19,7 +19,7 @@
NO_CONFIGURE= yes
NO_BUILD= yes
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
PYTHON_PATCH_SCRIPTS= AppRun
@@ -36,5 +36,5 @@
${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox
.include "../../lang/python/application.mk"
-.include "../../x11/pygtk/buildlink2.mk"
+.include "../../x11/pygtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e9fc3bd10c78 -r 83b628e59d5b sysutils/rox-session/Makefile
--- a/sysutils/rox-session/Makefile Sat May 01 18:31:36 2004 +0000
+++ b/sysutils/rox-session/Makefile Sat May 01 23:57:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/23 21:50:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/05/02 00:00:17 snj Exp $
#
DISTNAME= ROX-Session-0.1.14
@@ -17,7 +17,7 @@
WRKSRC= ${WRKDIR}/${DISTNAME}/ROX-Session/src
DIST_SUBDIR= rox
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
GNU_CONFIGURE= yes
USE_X11= yes
@@ -36,6 +36,6 @@
< ${WRKDIR}/${DISTNAME}/ROX-Session/AppRun \
> ${PREFIX}/share/rox/ROX-Session/AppRun
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e9fc3bd10c78 -r 83b628e59d5b sysutils/rox-system/Makefile
--- a/sysutils/rox-system/Makefile Sat May 01 18:31:36 2004 +0000
+++ b/sysutils/rox-system/Makefile Sat May 01 23:57:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/04/02 12:18:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2004/05/02 00:00:17 snj Exp $
#
DISTNAME= System-0.1.2
@@ -17,7 +17,7 @@
WRKSRC= ${WRKDIR}/System/src
DIST_SUBDIR= rox
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
GNU_CONFIGURE= yes
APPDIR= ${PREFIX}/share/rox
@@ -34,7 +34,7 @@
${INSTALL_PROGRAM} ${WRKDIR}/src/System ${PREFIX}/libexec/rox
${CP} -Rf ${WRKDIR}/System ${APPDIR}
-.include "../../sysutils/libgtop/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../sysutils/libgtop/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e9fc3bd10c78 -r 83b628e59d5b sysutils/rox-wallpaper/Makefile
--- a/sysutils/rox-wallpaper/Makefile Sat May 01 18:31:36 2004 +0000
+++ b/sysutils/rox-wallpaper/Makefile Sat May 01 23:57:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:26:16 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/02 00:00:18 snj Exp $
#
DISTNAME= Wallpaper-0.1.1
@@ -20,7 +20,7 @@
NO_CONFIGURE= yes
NO_BUILD= yes
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
PYTHON_PATCH_SCRIPTS= AppRun
@@ -37,5 +37,5 @@
${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox
.include "../../lang/python/application.mk"
-.include "../../x11/pygtk/buildlink2.mk"
+.include "../../x11/pygtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e9fc3bd10c78 -r 83b628e59d5b sysutils/rox/Makefile
--- a/sysutils/rox/Makefile Sat May 01 18:31:36 2004 +0000
+++ b/sysutils/rox/Makefile Sat May 01 23:57:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/23 21:50:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2004/05/02 00:00:17 snj Exp $
#
DISTNAME= rox-1.2.0
@@ -16,7 +16,7 @@
WRKSRC= ${WRKDIR}/${DISTNAME}/ROX-Filer/src
DIST_SUBDIR= rox
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
USE_X11= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-gtk2
@@ -45,6 +45,6 @@
${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/rox ${PREFIX}/bin
${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/rox.1 ${PREFIX}/man/man1
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e9fc3bd10c78 -r 83b628e59d5b x11/kde2/kde2.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kde2/kde2.mk Sat May 01 23:57:00 2004 +0000
@@ -0,0 +1,84 @@
+# $NetBSD: kde2.mk,v 1.1 2004/05/01 23:57:00 snj Exp $
+#
+# This Makefile fragment is included by packages that use the KDE2
+# configure-and-build process.
+#
+# To use this Makefile fragment, simply include this Makefile fragment in
+# the package Makefile.
+#
+# The buildlink strategy with KDE2 packages is:
+#
+# * pass UIC to the configure script, as most of the KDE2 packages need
+# the path to the QT2 uic to build.
+#
+# * pass USER_LDFLAGS to the configure script, containing the value of
+# LDFLAGS as set by bsd.pkg.mk; this should pass all of the necessary
+# library directory and rpath settings to the compiler/linker to find
+# the X11, Qt-2.x, and KDE-2.x libraries.
+#
+# We pass the following values via options to the configure script:
+#
+# * datadir is where all of the KDE2 data files go
+# * qt-dir is the location of QT2 for build purposes
+# * extra-includes is where headers for dependencies may be found
+#
+# We _don't_ pass the following values via options to the configure script:
+#
+# * extra-libs contains library directories that are added to both the
+# rpath via -R and to the linker flags via -L; we don't need this
+# since we pass them in directly via ${USER_LDFLAGS}
+#
+# We also disable the rpath setting by the configure script since it often
+# guesses wrong on odd setups, and since we already pass all of the required
+# flags through USER_LDFLAGS.
+
+.if !defined(KDE2_MK)
+KDE2_MK= # defined
+
+# All KDE2 packages satisfy the requirements for USE_X11BASE. This also
+# forces all KDE2 packages to have a common installation prefix.
+#
+USE_X11BASE= YES
+
+.include "../../mk/bsd.prefs.mk"
+
+KDEDIR?= ${X11PREFIX}
+QTDIR?= ${X11PREFIX}/qt2
+
+CONFIGURE_ARGS+= --datadir="${KDEDIR}/share/kde"
+CONFIGURE_ARGS+= --with-qt-dir="${QTDIR}"
+CONFIGURE_ARGS+= --with-extra-includes="${_KDE2_EXTRA_INCLUDES}"
Home |
Main Index |
Thread Index |
Old Index