summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>2008-02-11 23:06:01 +0000
committerhubertf <hubertf@pkgsrc.org>2008-02-11 23:06:01 +0000
commit6e4eff0531a3db16c2dcf7aa16b2db0bbcc35f0f (patch)
treebb2169c0040cc09b41b7d869022dd4c70e2f3dae /x11
parenta88f93870b68156e7f1d3ee62259e649a25477ed (diff)
downloadpkgsrc-6e4eff0531a3db16c2dcf7aa16b2db0bbcc35f0f.tar.gz
Make this build on Mac OS X (tested: 10.4.11/intel). Bump ro revision 2.
Diffstat (limited to 'x11')
-rw-r--r--x11/qt4-libs/Makefile4
-rw-r--r--x11/qt4-libs/distinfo3
-rw-r--r--x11/qt4-libs/patches/patch-ar13
3 files changed, 17 insertions, 3 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index c5695c76555..942deabaadc 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2008/02/04 18:07:53 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2008/02/11 23:06:01 hubertf Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-libs-${QTVERSION}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= C++ X GUI toolkit
BUILD_TARGET= sub-src
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index ce4d3295b62..8fae3a57cb4 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2008/01/08 08:35:18 markd Exp $
+$NetBSD: distinfo,v 1.21 2008/02/11 23:06:01 hubertf Exp $
SHA1 (qt-x11-opensource-src-4.3.3.tar.gz) = 77d00e2438efa793f6c16c54b64c8ba440ee3228
RMD160 (qt-x11-opensource-src-4.3.3.tar.gz) = 410daca03b6802ba5cc6662219c2ba7a190bd292
@@ -20,3 +20,4 @@ SHA1 (patch-an) = 6c9044134516d089e97b47a2750beab0e4c4952f
SHA1 (patch-ao) = 04361d820325b1b8a0bc66ecaf47bab5f92e7825
SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7
SHA1 (patch-aq) = afdc1fcacc6f2f421a209d96d2c80141f1aa6dc3
+SHA1 (patch-ar) = 7ed6f3e8db11e15c907eeeb11f691612633f1c34
diff --git a/x11/qt4-libs/patches/patch-ar b/x11/qt4-libs/patches/patch-ar
new file mode 100644
index 00000000000..73bcec3700b
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2008/02/11 23:06:01 hubertf Exp $
+
+--- src/corelib/global/qglobal.h.orig 2007-12-04 17:42:55.000000000 +0100
++++ src/corelib/global/qglobal.h
+@@ -89,7 +89,7 @@
+ */
+
+ #if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))
+-# define Q_OS_DARWIN
++/* # define Q_OS_DARWIN *//* Else it'll try to use MacOS, no X, stuff - HF */
+ # define Q_OS_BSD4
+ # ifdef __LP64__
+ # define Q_OS_DARWIN64