diff options
author | jlam <jlam@pkgsrc.org> | 2003-01-07 23:56:54 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2003-01-07 23:56:54 +0000 |
commit | d15f3624302955323a7ec32bb8cd46300d4bf977 (patch) | |
tree | 059b297eb9d8482cbac38ab2d111792f237e9cef | |
parent | 87966f807959d3e611492c6421b602591e512a12 (diff) | |
download | pkgsrc-d15f3624302955323a7ec32bb8cd46300d4bf977.tar.gz |
Correctly define some variables that qmake expects to be defined:
QMAKE_SYMBOLIC_LINK, QMAKE_DEL_FILE, QMAKE_DEL_DIR. This suppresses some
ignored build errors when building qt3-* packages. Bump PKGREVISION of
qt3-tools (which installs the qmake.conf file) to 2.
-rw-r--r-- | doc/CHANGES | 4 | ||||
-rw-r--r-- | x11/qt3-libs/files/qmake.conf | 9 | ||||
-rw-r--r-- | x11/qt3-tools/Makefile | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 294dbbcf694..d1c80252900 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.1043 2003/01/07 13:37:50 jmmv Exp $ +$NetBSD: CHANGES,v 1.1044 2003/01/07 23:57:41 jlam Exp $ Changes to the packages collection and infrastructure in 2003: @@ -140,4 +140,4 @@ Changes to the packages collection and infrastructure in 2003: Updated transfig to 3.2.4 [rh 2003-01-07] Updated xfig to 3.2.4 [rh 2003-01-07] Updated patch to 2.5.4nb2 [grant 2003-01-07] - Updated opencm to 0.1.0rc18pl2nb1 [jmmv 2003-01-07] + Updated qt3-tools to 3.0.6nb2 [jlam 2003-01-07] diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf index c62f5626d93..0897386be4c 100644 --- a/x11/qt3-libs/files/qmake.conf +++ b/x11/qt3-libs/files/qmake.conf @@ -1,5 +1,5 @@ -# $NetBSD: qmake.conf,v 1.5 2002/10/01 13:25:36 markd Exp $ -# $Id: qmake.conf,v 1.5 2002/10/01 13:25:36 markd Exp $ +# $NetBSD: qmake.conf,v 1.6 2003/01/07 23:56:54 jlam Exp $ +# $Id: qmake.conf,v 1.6 2003/01/07 23:56:54 jlam Exp $ # # qmake configuration for netbsd-g++ # @@ -89,5 +89,6 @@ QMAKE_GZIP = gzip -9f QMAKE_COPY = cp -f QMAKE_MOVE = mv -QMAKE_DEL = rm -f - +QMAKE_SYMBOLIC_LINK = ln -sf +QMAKE_DEL_FILE = rm -f +QMAKE_DEL_DIR = rmdir diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile index 0659e885b6f..bc7c869f00f 100644 --- a/x11/qt3-tools/Makefile +++ b/x11/qt3-tools/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.14 2002/12/24 06:10:35 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2003/01/07 23:56:56 jlam Exp $ # .include "../qt3-libs/Makefile.common" PKGNAME= qt3-tools-${QTVERSION} -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= QT GUI (WYSIWYG) builder and other tools CONFIGURE_ARGS+= -I${QTDIR}/include \ |