From 3414c0df59323d3b6ea562127cd8c37ad2419db6 Mon Sep 17 00:00:00 2001 From: ghen Date: Thu, 5 Jan 2006 10:08:58 +0000 Subject: Change the default for BUILDLINK_DEPMETHOD.qt3-tools from "full" to "build", without affecting packages that are currently using it. Packages which previously didn't set BUILDLINK_DEPMETHOD to neither "full" nor "build" now set it to "full", but should be checked whether they really need it (comment added). Packages which previously set it to "build" now don't set it anymore. Ok by jlam, wiz. --- x11/py-qt3-base/Makefile | 6 +++++- x11/py-qt3-modules/Makefile | 7 ++++++- x11/py-qt3-qscintilla/Makefile | 7 ++++++- x11/py-qt3-sip/Makefile | 7 ++++++- x11/qt3-tools/buildlink3.mk | 3 ++- 5 files changed, 25 insertions(+), 5 deletions(-) (limited to 'x11') diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile index fff2a4594f4..0f6cf0110d6 100644 --- a/x11/py-qt3-base/Makefile +++ b/x11/py-qt3-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:18 rillig Exp $ +# $NetBSD: Makefile,v 1.19 2006/01/05 10:08:59 ghen Exp $ # .include "../../x11/py-qt3-base/Makefile.common" @@ -25,4 +25,8 @@ SUBST_SED.pyversfx= -e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g" .include "../../x11/py-qt3-sip/buildlink3.mk" .include "../../x11/qt3-libs/buildlink3.mk" .include "../../x11/qt3-tools/buildlink3.mk" +# XXX Please verify whether qt3-tools is really needed at run-time. +# If it is, then remove this comment. If it is not, then remove +# this comment and the line below, and bump PKGREVISION. +BUILDLINK_DEPMETHOD.qt3-tools= full .include "../../mk/bsd.pkg.mk" diff --git a/x11/py-qt3-modules/Makefile b/x11/py-qt3-modules/Makefile index 4f0ef6d6579..09b73325013 100644 --- a/x11/py-qt3-modules/Makefile +++ b/x11/py-qt3-modules/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/07/01 01:20:28 reed Exp $ +# $NetBSD: Makefile,v 1.19 2006/01/05 10:09:00 ghen Exp $ # .include "../../x11/py-qt3-base/Makefile.common" @@ -11,5 +11,10 @@ INSTALL_DIRS= ${WRKSRC}/qtcanvas ${WRKSRC}/qtgl ${WRKSRC}/qtnetwork INSTALL_DIRS+= ${WRKSRC}/qtsql ${WRKSRC}/qttable ${WRKSRC}/qtui INSTALL_DIRS+= ${WRKSRC}/qtxml +# XXX Please verify whether qt3-tools is really needed at run-time. +# If it is, then remove this comment. If it is not, then remove +# this comment and the line below, and bump PKGREVISION. +BUILDLINK_DEPMETHOD.qt3-tools= full + .include "../../x11/py-qt3-base/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/py-qt3-qscintilla/Makefile b/x11/py-qt3-qscintilla/Makefile index d5bce991b62..eac67ce7973 100644 --- a/x11/py-qt3-qscintilla/Makefile +++ b/x11/py-qt3-qscintilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/07/01 01:30:21 reed Exp $ +# $NetBSD: Makefile,v 1.18 2006/01/05 10:09:00 ghen Exp $ # .include "../../x11/py-qt3-base/Makefile.common" @@ -12,6 +12,11 @@ CONFIGURE_ARGS+= -o ${QTDIR}/lib INSTALL_DIRS= ${WRKSRC}/qtext +# XXX Please verify whether qt3-tools is really needed at run-time. +# If it is, then remove this comment. If it is not, then remove +# this comment and the line below, and bump PKGREVISION. +BUILDLINK_DEPMETHOD.qt3-tools= full + .include "../../x11/py-qt3-base/buildlink3.mk" .include "../../x11/qt3-qscintilla/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile index 7b63ecfea5e..dd4226522ce 100644 --- a/x11/py-qt3-sip/Makefile +++ b/x11/py-qt3-sip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/12/05 20:51:18 rillig Exp $ +# $NetBSD: Makefile,v 1.24 2006/01/05 10:09:00 ghen Exp $ # DISTNAME= sip-4.3.2 @@ -53,6 +53,11 @@ do-configure: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${PYTHONBIN} configure.py ${CONFIGURE_ARGS}) +# XXX Please verify whether qt3-tools is really needed at run-time. +# If it is, then remove this comment. If it is not, then remove +# this comment and the line below, and bump PKGREVISION. +BUILDLINK_DEPMETHOD.qt3-tools= full + .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk" .include "../../x11/qt3-libs/buildlink3.mk" diff --git a/x11/qt3-tools/buildlink3.mk b/x11/qt3-tools/buildlink3.mk index 8a896c75f5c..ec2649ac14a 100644 --- a/x11/qt3-tools/buildlink3.mk +++ b/x11/qt3-tools/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2005/09/13 12:13:54 dmcmahill Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2006/01/05 10:08:59 ghen Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ QT3_TOOLS_BUILDLINK3_MK:= ${QT3_TOOLS_BUILDLINK3_MK}+ @@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+= qt3-tools BUILDLINK_DEPENDS.qt3-tools+= qt3-tools>=3.1.2nb3 BUILDLINK_RECOMMENDED.qt3-tools+= qt3-tools>=3.3.3nb1 BUILDLINK_PKGSRCDIR.qt3-tools?= ../../x11/qt3-tools +BUILDLINK_DEPMETHOD.qt3-tools?= build .endif # QT3_TOOLS_BUILDLINK3_MK .include "../../x11/qt3-libs/buildlink3.mk" -- cgit v1.2.3