[pkgsrc/trunk]: pkgsrc/x11/qt4-libs Make this build on Mac OS X (tested: 10.4...

[hubertf <hubertf%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2274782e3520
branches:  trunk
changeset: 538527:2274782e3520
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Mon Feb 11 23:06:01 2008 +0000

description:
Make this build on Mac OS X (tested: 10.4.11/intel).  Bump ro revision 2.

diffstat:

 x11/qt4-libs/Makefile         |   4 ++--
 x11/qt4-libs/distinfo         |   3 ++-
 x11/qt4-libs/patches/patch-ar |  13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diffs (48 lines):

diff -r c09e1a458851 -r 2274782e3520 x11/qt4-libs/Makefile
--- a/x11/qt4-libs/Makefile     Mon Feb 11 22:50:23 2008 +0000
+++ b/x11/qt4-libs/Makefile     Mon Feb 11 23:06:01 2008 +0000
@@ -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 -r c09e1a458851 -r 2274782e3520 x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo     Mon Feb 11 22:50:23 2008 +0000
+++ b/x11/qt4-libs/distinfo     Mon Feb 11 23:06:01 2008 +0000
@@ -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-ao) = 04361d820325b1b8a0bc66ecaf47bab5f92e7825
 SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7
 SHA1 (patch-aq) = afdc1fcacc6f2f421a209d96d2c80141f1aa6dc3
+SHA1 (patch-ar) = 7ed6f3e8db11e15c907eeeb11f691612633f1c34
diff -r c09e1a458851 -r 2274782e3520 x11/qt4-libs/patches/patch-ar
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt4-libs/patches/patch-ar     Mon Feb 11 23:06:01 2008 +0000
@@ -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