[pkgsrc/trunk]: pkgsrc/x11/xorg-imake Added support for Darwin/MacOSX

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1c87d53e0850
branches:  trunk
changeset: 491165:1c87d53e0850
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Mar 22 09:46:10 2005 +0000

description:
Added support for Darwin/MacOSX

diffstat:

 x11/xorg-imake/Makefile         |   4 +-
 x11/xorg-imake/distinfo         |   3 +-
 x11/xorg-imake/patches/patch-aj |  55 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 3 deletions(-)

diffs (91 lines):

diff -r 991110a5b98f -r 1c87d53e0850 x11/xorg-imake/Makefile
--- a/x11/xorg-imake/Makefile   Tue Mar 22 09:45:28 2005 +0000
+++ b/x11/xorg-imake/Makefile   Tue Mar 22 09:46:10 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/03/02 02:07:31 hira Exp $
+# $NetBSD: Makefile,v 1.15 2005/03/22 09:46:10 adam Exp $
 
 DISTNAME=      ${DISTFILES}
 PKGNAME=       xorg-imake-${XORG_VER}
@@ -68,7 +68,7 @@
                -e "s|@LOCALBASE@|${LOCALBASE}|g "      \
                -e "s|@MAKE@|${MAKE_PROGRAM}|"  ${FILESDIR}/host.def > \
                ${WRKSRC}/config/cf/host.def
-       cd ${WRKSRC} && ${MAKE} Makefile.boot &&        \
+       cd ${WRKSRC} && ${MAKE_PROGRAM} Makefile.boot &&        \
        ${MAKE_PROGRAM} -f xmakefile VerifyOS version.def Makefiles includes
 
 pre-install:
diff -r 991110a5b98f -r 1c87d53e0850 x11/xorg-imake/distinfo
--- a/x11/xorg-imake/distinfo   Tue Mar 22 09:45:28 2005 +0000
+++ b/x11/xorg-imake/distinfo   Tue Mar 22 09:46:10 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2005/03/01 19:00:11 xtraeme Exp $
+$NetBSD: distinfo,v 1.12 2005/03/22 09:46:10 adam Exp $
 
 SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c
 RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8
@@ -15,3 +15,4 @@
 SHA1 (patch-ag) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
 SHA1 (patch-ah) = 6960406211ab12eff3044db477c22833c9eaa488
 SHA1 (patch-ai) = eb3853e360dd5e05ca5978791734bcba5541b162
+SHA1 (patch-aj) = 58594b376a62a584c0bc7f056e512fe8700d558e
diff -r 991110a5b98f -r 1c87d53e0850 x11/xorg-imake/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-imake/patches/patch-aj   Tue Mar 22 09:46:10 2005 +0000
@@ -0,0 +1,55 @@
+$NetBSD: patch-aj,v 1.1 2005/03/22 09:46:10 adam Exp $
+
+--- config/cf/darwin.cf.in.orig        Wed Dec 15 05:53:05 2004
++++ config/cf/darwin.cf.in
+@@ -88,7 +88,7 @@ XCOMM operating system:  OSName (OSMajor
+  * Turn off to build on raw Darwin systems.
+  */
+ #ifndef DarwinQuartzSupport
+-# define DarwinQuartzSupport    YES
++# define DarwinQuartzSupport    @@DARWIN_USE_QUARTZ@@
+ #endif
+ 
+ #if DarwinQuartzSupport
+@@ -161,10 +161,10 @@ XCOMM operating system:  OSName (OSMajor
+  * so we use the 3.1-based version.
+  */
+ #if OSMajorVersion >= 7
+-# define CppCmd                 /usr/bin/cpp3
++# define CppCmd                 /usr/bin/cpp
+ # define StandardCppOptions     -traditional -D__GNUC__
+ #else
+-# define CppCmd                 /usr/bin/cpp
++# define CppCmd                /usr/bin/cpp
+ #endif
+ #if HasGcc3
+ # define RawCppCmd              CppCmd -undef
+@@ -173,8 +173,8 @@ XCOMM operating system:  OSName (OSMajor
+ #endif
+ 
+ /* we have a gcc compatible compiler, but its not called gcc */
+-#define CcCmd                   /usr/bin/cc
+-#define CplusplusCmd            /usr/bin/c++
++#define CcCmd                   @@PKGSRC_CC@@
++#define CplusplusCmd            @@PKGSRC_CXX@@
+ 
+ /* default flags to pass to cc */
+ #ifndef DefaultCCOptions
+@@ -202,7 +202,7 @@ XCOMM operating system:  OSName (OSMajor
+ #ifdef PpcDarwinArchitecture
+ # define DarwinMachineDefines   -D__powerpc__
+ # if HasGcc3
+-#  define OptimizedCDebugFlags  -Os
++#  define OptimizedCDebugFlags  @@PKGSRC_CFLAGS@@
+ # else
+ #  define OptimizedCDebugFlags  -O2
+ # endif
+@@ -212,7 +212,7 @@ XCOMM operating system:  OSName (OSMajor
+ #ifdef i386DarwinArchitecture
+ # define DarwinMachineDefines   -D__i386__
+ # if HasGcc3
+-#  define OptimizedCDebugFlags  -Os
++#  define OptimizedCDebugFlags  @@PKGSRC_CFLAGS@@
+ # else
+ #  define OptimizedCDebugFlags  -O2 -fno-strength-reduce
+ # endif