--h31gzZEtNLTqOjlF
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,
building qt3-lib on MacOS X fails trying to include a nonexistent file.
It is because qt3 hanble darwin and osX in a different way: it builds
the x11 interface on darwin, and the native osX interface on osX.
But the later isn't inclued in the free qt3 (and I want the x11 interface
anyway, as this is on a headless xserve :)
The attached patch fix it, by making osX equivalent to darwin.

Is it OK to commit ?

-- 
Manuel Bouyer <bouyer@antioche.eu.org>
     NetBSD: 26 ans d'experience feront toujours la difference
--

--h31gzZEtNLTqOjlF
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff

? work
? src
? config.tests
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt3-libs/distinfo,v
retrieving revision 1.30
diff -u -r1.30 distinfo
--- distinfo	23 Feb 2005 17:36:19 -0000	1.30
+++ distinfo	11 Apr 2005 09:21:54 -0000
@@ -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
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt3-libs/patches/patch-ad,v
retrieving revision 1.7
diff -u -r1.7 patch-ad
--- patches/patch-ad	13 Oct 2004 02:08:43 -0000	1.7
+++ patches/patch-ad	11 Apr 2005 09:21:54 -0000
@@ -1,7 +1,7 @@
 $NetBSD: patch-ad,v 1.7 2004/10/13 02:08:43 tv 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__)

--h31gzZEtNLTqOjlF--