From 5273b6382a365f3e6dc62d267aef18e7033ddd20 Mon Sep 17 00:00:00 2001
From: markd <markd>
Date: Tue, 19 Oct 2004 13:27:48 +0000
Subject: Bring the qmake.conf we use in line with those from qt 3.3.3. Bump
 PKGREVISION of qt3-tools. Noted by Christoph Badura.

---
 x11/qt3-libs/Makefile.common  | 3 ++-
 x11/qt3-libs/files/qmake.conf | 7 ++++---
 x11/qt3-tools/Makefile        | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'x11')

diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index d3083c87996..3292fdb39a2 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2004/10/13 15:15:52 tv Exp $
+# $NetBSD: Makefile.common,v 1.38 2004/10/19 13:27:48 markd Exp $
 #
 DISTNAME=		qt-x11-free-${QTVERSION}
 CATEGORIES=		x11
@@ -100,6 +100,7 @@ post-patch:
 		-e 's:@LEX@:${LEX}:g' \
 		-e 's:@YACC@:${YACC}:g' \
 		-e 's:@AR@:${AR}:g' \
+		-e 's:@MKDIR@:${MKDIR}:g' \
 		-e 's:@LIBQT@:${LIBQT}:g' \
 		-e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS}:g' \
 		-e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \
diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf
index 11df1f83758..31372cb532b 100644
--- a/x11/qt3-libs/files/qmake.conf
+++ b/x11/qt3-libs/files/qmake.conf
@@ -1,5 +1,5 @@
-# $NetBSD: qmake.conf,v 1.15 2004/08/27 18:44:11 jlam Exp $
-# $Id: qmake.conf,v 1.15 2004/08/27 18:44:11 jlam Exp $
+# $NetBSD: qmake.conf,v 1.16 2004/10/19 13:27:48 markd Exp $
+# $Id: qmake.conf,v 1.16 2004/10/19 13:27:48 markd Exp $
 #
 # qmake configuration for netbsd-g++
 #
@@ -91,6 +91,7 @@ QMAKE_GZIP		= gzip -9f
 
 QMAKE_COPY		= cp -f
 QMAKE_MOVE		= mv
-QMAKE_SYMBOLIC_LINK	= ln -sf
 QMAKE_DEL_FILE		= rm -f
 QMAKE_DEL_DIR		= rmdir
+QMAKE_CHK_DIR_EXISTS	= test -d
+QMAKE_MKDIR		= @MKDIR@
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index 36ace86174e..47a6b8c6ab5 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2004/10/13 03:11:50 tv Exp $
+# $NetBSD: Makefile,v 1.29 2004/10/19 13:27:48 markd 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 \
-- 
cgit v1.2.3