diff options
author | drochner <drochner> | 2003-08-01 15:31:07 +0000 |
---|---|---|
committer | drochner <drochner> | 2003-08-01 15:31:07 +0000 |
commit | 67c1bc8b3ca463169f0125f5d567e44a0472ac30 (patch) | |
tree | a01bbf8ce377db1b72b764079799b278743d221b | |
parent | 5a2a795d4cf127c6edaf52a0921766828da3d8ce (diff) | |
download | pkgsrc-67c1bc8b3ca463169f0125f5d567e44a0472ac30.tar.gz |
Don't USE_X11BASE; there is no reason to install there.
Bump PKGREVISION on everything which installs into the QTDIR tree.
(Applications which just use qt3 shouldn't be affected because each
program using qt3 has an RPATH into both LOCALBASE and X11BASE.)
-rw-r--r-- | x11/qt3-docs/Makefile | 3 | ||||
-rw-r--r-- | x11/qt3-libs/Makefile | 4 | ||||
-rw-r--r-- | x11/qt3-libs/Makefile.common | 4 | ||||
-rw-r--r-- | x11/qt3-libs/buildlink2.mk | 4 | ||||
-rw-r--r-- | x11/qt3-mysql/Makefile | 4 | ||||
-rw-r--r-- | x11/qt3-psql/Makefile | 4 | ||||
-rw-r--r-- | x11/qt3-tools/Makefile | 4 | ||||
-rw-r--r-- | x11/qt3-tools/buildlink2.mk | 4 | ||||
-rw-r--r-- | x11/qt3/Makefile | 12 |
9 files changed, 22 insertions, 21 deletions
diff --git a/x11/qt3-docs/Makefile b/x11/qt3-docs/Makefile index bb2e37c292a..bf3b74ccf49 100644 --- a/x11/qt3-docs/Makefile +++ b/x11/qt3-docs/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.11 2003/03/28 21:14:41 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2003/08/01 15:31:08 drochner Exp $ # .include "../qt3-libs/Makefile.common" PKGNAME= qt3-docs-${QTVERSION} +PKGREVISION= 1 COMMENT= Documentation for the QT C++ X GUI toolkit USE_BUILDLINK2= yes diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index e0b64f699b4..b6683c47784 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/05/02 12:16:57 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2003/08/01 15:31:08 drochner Exp $ # LIBQT= ${WRKSRC}/lib/libqt-mt.la @@ -6,7 +6,7 @@ LIBQT= ${WRKSRC}/lib/libqt-mt.la .include "../qt3-libs/Makefile.common" PKGNAME= qt3-libs-${QTVERSION} -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= C++ X GUI toolkit USE_BUILDLINK2= yes diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index 51177740e96..8673df8a97f 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2003/05/29 23:53:13 grant Exp $ +# $NetBSD: Makefile.common,v 1.19 2003/08/01 15:31:08 drochner Exp $ # DISTNAME= qt-x11-free-${QTVERSION} CATEGORIES= x11 @@ -13,7 +13,7 @@ FILESDIR= ${.CURDIR}/../../x11/qt3-libs/files PATCHDIR= ${.CURDIR}/../../x11/qt3-libs/patches HAS_CONFIGURE= yes -USE_X11BASE= yes +USE_X11= yes USE_GMAKE= yes USE_GCC_SHLIB= yes USE_LIBTOOL= yes diff --git a/x11/qt3-libs/buildlink2.mk b/x11/qt3-libs/buildlink2.mk index 5c8fed10976..7f8bebc5b12 100644 --- a/x11/qt3-libs/buildlink2.mk +++ b/x11/qt3-libs/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.14 2003/05/02 11:57:30 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.15 2003/08/01 15:31:09 drochner Exp $ .if !defined(QT3_LIBS_BUILDLINK2_MK) QT3_LIBS_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= qt3-libs -BUILDLINK_DEPENDS.qt3-libs?= qt3-libs>=3.1.2nb1 +BUILDLINK_DEPENDS.qt3-libs?= qt3-libs>=3.1.2nb2 BUILDLINK_PKGSRCDIR.qt3-libs?= ../../x11/qt3-libs EVAL_PREFIX+= BUILDLINK_PREFIX.qt3-libs=qt3-libs diff --git a/x11/qt3-mysql/Makefile b/x11/qt3-mysql/Makefile index ab3247bc578..78900d00118 100644 --- a/x11/qt3-mysql/Makefile +++ b/x11/qt3-mysql/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:31 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2003/08/01 15:31:09 drochner Exp $ # .include "../qt3-libs/Makefile.common" PKGNAME= qt3-mysql-${QTVERSION} -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= QT mysql driver CONFIGURE_ARGS+= -I${QTDIR}/include \ diff --git a/x11/qt3-psql/Makefile b/x11/qt3-psql/Makefile index 1cfd89971bf..378364f231f 100644 --- a/x11/qt3-psql/Makefile +++ b/x11/qt3-psql/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2003/05/02 11:57:31 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2003/08/01 15:31:09 drochner Exp $ # .include "../qt3-libs/Makefile.common" PKGNAME= qt3-psql-${QTVERSION} -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= QT postgresql driver CONFIGURE_ARGS+= -I${QTDIR}/include \ diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile index 2a5ce7f323b..a0678e8c519 100644 --- a/x11/qt3-tools/Makefile +++ b/x11/qt3-tools/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.21 2003/07/23 09:41:41 drochner Exp $ +# $NetBSD: Makefile,v 1.22 2003/08/01 15:31:10 drochner Exp $ # .include "../qt3-libs/Makefile.common" PKGNAME= qt3-tools-${QTVERSION} -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= QT GUI (WYSIWYG) builder and other tools CONFIGURE_ARGS+= -I${QTDIR}/include \ diff --git a/x11/qt3-tools/buildlink2.mk b/x11/qt3-tools/buildlink2.mk index 85c0eb9d850..12edb47b962 100644 --- a/x11/qt3-tools/buildlink2.mk +++ b/x11/qt3-tools/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.11 2003/07/27 21:42:21 jdolecek Exp $ +# $NetBSD: buildlink2.mk,v 1.12 2003/08/01 15:31:10 drochner Exp $ .if !defined(QT3_TOOLS_BUILDLINK2_MK) QT3_TOOLS_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= qt3-tools -BUILDLINK_DEPENDS.qt3-tools?= qt3-tools>=3.1.2nb1 +BUILDLINK_DEPENDS.qt3-tools?= qt3-tools>=3.1.2nb3 BUILDLINK_PKGSRCDIR.qt3-tools?= ../../x11/qt3-tools EVAL_PREFIX+= BUILDLINK_PREFIX.qt3-tools=qt3-tools diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile index 22b9474d733..c93f212167d 100644 --- a/x11/qt3/Makefile +++ b/x11/qt3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2003/07/23 11:10:15 tron Exp $ +# $NetBSD: Makefile,v 1.19 2003/08/01 15:31:07 drochner Exp $ DISTNAME= qt3-${QTVERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 MASTER_SITES= # empty DISTFILES= # empty @@ -10,12 +10,12 @@ COMMENT= "meta-package" for the QT GUI C++ toolkit .include "./Makefile.common" -DEPENDS+= qt3-libs-${QTVERSION}nb1:../../x11/qt3-libs -DEPENDS+= qt3-tools-${QTVERSION}nb2:../../x11/qt3-tools -DEPENDS+= qt3-docs-${QTVERSION}:../../x11/qt3-docs +DEPENDS+= qt3-libs-${QTVERSION}nb2:../../x11/qt3-libs +DEPENDS+= qt3-tools-${QTVERSION}nb3:../../x11/qt3-tools +DEPENDS+= qt3-docs-${QTVERSION}nb1:../../x11/qt3-docs USE_BUILDLINK2= yes -USE_X11BASE= yes +USE_X11= yes EXTRACT_ONLY= # empty NO_CHECKSUM= yes NO_CONFIGURE= yes |