[pkgsrc/trunk]: pkgsrc/x11/qt3-libs qt3 build system makes a difference betwe...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/974ef7b378a1
branches:  trunk
changeset: 492488:974ef7b378a1
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Wed Apr 13 21:58:05 2005 +0000

description:
qt3 build system makes a difference between MacOS X and Darwin: it will
build with X11 support on Darwin and MacOS X native interface on MacOS X.
But the Free qt3 only includes X11 support, and so the build fails on
MacOS X.
Change the build defines to use the same options on MacOS X and Darwin.

diffstat:

 x11/qt3-libs/distinfo         |   4 ++--
 x11/qt3-libs/patches/patch-ad |  18 +++++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diffs (51 lines):

diff -r 9cbac3bc46d5 -r 974ef7b378a1 x11/qt3-libs/distinfo
--- a/x11/qt3-libs/distinfo     Wed Apr 13 20:41:03 2005 +0000
+++ b/x11/qt3-libs/distinfo     Wed Apr 13 21:58:05 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2005/02/23 17:36:19 wiz Exp $
+$NetBSD: distinfo,v 1.31 2005/04/13 21:58:05 bouyer Exp $
 
 SHA1 (qt-x11-free-3.3.4.tar.bz2) = cb5f452bcdc9d2ed0201481f4b8f152edfda9523
 RMD160 (qt-x11-free-3.3.4.tar.bz2) = 3298331d545511956eb0910cbc5867a2a453ea1e
@@ -6,7 +6,7 @@
 SHA1 (patch-aa) = 0247c3694db7bf29556e00809b5d7f26817f3055
 SHA1 (patch-ab) = 4dfee5c06bc322646465f43fe850126873d7bb75
 SHA1 (patch-ac) = 1914c348846ae2ab0358e554d29ba49a0be90d52
-SHA1 (patch-ad) = 09afcc6c8a3a2f93131fdbf4be50d3e313792374
+SHA1 (patch-ad) = 366c411ad5cb8227d5e40165d877c627dbf9c670
 SHA1 (patch-ae) = 2ec0b408edd78daa03c02c654e0ce515933f36e7
 SHA1 (patch-af) = 513b0419dcbe0d2e65d9912868effcf0681119ae
 SHA1 (patch-ag) = a413055f8df258b0bb91e46d6f611e9ec511b913
diff -r 9cbac3bc46d5 -r 974ef7b378a1 x11/qt3-libs/patches/patch-ad
--- a/x11/qt3-libs/patches/patch-ad     Wed Apr 13 20:41:03 2005 +0000
+++ b/x11/qt3-libs/patches/patch-ad     Wed Apr 13 21:58:05 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.7 2004/10/13 02:08:43 tv Exp $
+$NetBSD: patch-ad,v 1.8 2005/04/13 21:58:05 bouyer Exp $
 
---- src/tools/qglobal.h.orig   Thu Aug  5 10:41:56 2004
-+++ src/tools/qglobal.h
+--- src/tools/qglobal.h.orig   Fri Jan 21 18:16:04 2005
++++ src/tools/qglobal.h        Fri Apr  8 21:19:49 2005
 @@ -63,6 +63,7 @@
       NETBSD   - NetBSD
       OPENBSD  - OpenBSD
@@ -10,6 +10,18 @@
       IRIX     - SGI Irix
       OSF      - HP Tru64 UNIX
       SCO      - SCO OpenServer 5
+@@ -82,9 +83,9 @@
+ #if defined(__DARWIN_X11__)
+ #  define Q_OS_DARWIN
+ #elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__))
+-#  define Q_OS_MACX
++#  define Q_OS_DARWIN
+ #elif defined(__MACOSX__)
+-#  define Q_OS_MACX
++#  define Q_OS_DARWIN
+ #elif defined(macintosh)
+ #  define Q_OS_MAC9
+ #elif defined(__CYGWIN__)
 @@ -119,6 +120,9 @@
  #  define Q_OS_BSD4
  #elif defined(__NetBSD__)