summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2008-10-08 09:35:49 +0000
committerwiz <wiz@pkgsrc.org>2008-10-08 09:35:49 +0000
commit5c4b36bf6974e4597f344589a580ab5beefc2e67 (patch)
treed7a4485526d616ac4d2643042eb5809b77a57be8 /x11
parent07aa79a89156e5f63d39ed9b68402a0fa316fd80 (diff)
downloadpkgsrc-5c4b36bf6974e4597f344589a580ab5beefc2e67.tar.gz
Fix qmake.conf to handle shared libraries correctly.
Bump qt4-tools PKGREVISION.
Diffstat (limited to 'x11')
-rw-r--r--x11/qt4-libs/files/qmake.conf8
-rw-r--r--x11/qt4-tools/Makefile3
2 files changed, 6 insertions, 5 deletions
diff --git a/x11/qt4-libs/files/qmake.conf b/x11/qt4-libs/files/qmake.conf
index 518f033acd9..338051bc698 100644
--- a/x11/qt4-libs/files/qmake.conf
+++ b/x11/qt4-libs/files/qmake.conf
@@ -1,5 +1,5 @@
-# $NetBSD: qmake.conf,v 1.2 2006/07/17 15:30:16 minskim Exp $
-# $Id: qmake.conf,v 1.2 2006/07/17 15:30:16 minskim Exp $
+# $NetBSD: qmake.conf,v 1.3 2008/10/08 09:35:49 wiz Exp $
+# $Id: qmake.conf,v 1.3 2008/10/08 09:35:49 wiz Exp $
#
# qmake configuration for pkgsrc
#
@@ -20,7 +20,7 @@ QMAKE_CFLAGS_WARN_ON =
QMAKE_CFLAGS_WARN_OFF =
QMAKE_CFLAGS_RELEASE =
QMAKE_CFLAGS_DEBUG = -g
-QMAKE_CFLAGS_SHLIB =
+QMAKE_CFLAGS_SHLIB = -fPIC
QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
QMAKE_CFLAGS_THREAD = -D_REENTRANT
@@ -50,7 +50,7 @@ QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE
QMAKE_LFLAGS = $(LDFLAGS) -L$(QTDIR)/lib
QMAKE_LFLAGS_RELEASE =
QMAKE_LFLAGS_DEBUG =
-QMAKE_LFLAGS_SHLIB =
+QMAKE_LFLAGS_SHLIB = -shared
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME =
QMAKE_LFLAGS_THREAD =
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index 0b6c2fdc43d..ff5119dbaaa 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2008/07/24 12:55:21 markd Exp $
+# $NetBSD: Makefile,v 1.22 2008/10/08 09:35:49 wiz Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-tools-${QTVERSION}
+PKGREVISION= 1
COMMENT= QT GUI (WYSIWYG) builder and other tools
DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base