Drop ppc-macos keyword, remove darwin patch and conditionals.

(Portage version: 2.1.1-r2)
 (Unsigned Manifest commit)

2 files changed, 20 insertions, 539 deletions

diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 3c4cf0f62145..0ff51a532777 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX CAN-2005-0605.patch 1118 RMD160 56a1a4433bb71d54b6d5df33fab68aca74158730 SHA1 f9198a5629998790c2dfd112f71134f39f4b3e11 SHA256 20517fc5c4b61419528b658422fdcc9ed972762cffd605a844a4cfd1f628a331
 MD5 b38be118160b49f6b0f9e31d26f01594 files/CAN-2005-0605.patch 1118
 RMD160 56a1a4433bb71d54b6d5df33fab68aca74158730 files/CAN-2005-0605.patch 1118
@@ -13,10 +10,6 @@ AUX openmotif-2.1.30-CAN-2004-0914_sec8.patch 471 RMD160 a0aabad67c15d11b9cf5464
 MD5 62870f12ebc148c6319223ec659c290f files/openmotif-2.1.30-CAN-2004-0914_sec8.patch 471
 RMD160 a0aabad67c15d11b9cf5464ed855ba7f6338f65d files/openmotif-2.1.30-CAN-2004-0914_sec8.patch 471
 SHA256 e79a59ed3fe6f33d783e675cc4113976625ec8b10b42c580b449a678aa0152fd files/openmotif-2.1.30-CAN-2004-0914_sec8.patch 471
-AUX openmotif-2.1.30-darwin-netbsd.diff 16799 RMD160 04549c9d18b4a0969cfc6bd9ef5099c76288c612 SHA1 53568ae0eb8cad81e80d677a32e960ae05b515a0 SHA256 76b27d33f134328890ac5bcbd1960d4cff5d68272235ecd70646a7499c1bed25
-MD5 61fb956ff4bc34bc503cdb2226fd037b files/openmotif-2.1.30-darwin-netbsd.diff 16799
-RMD160 04549c9d18b4a0969cfc6bd9ef5099c76288c612 files/openmotif-2.1.30-darwin-netbsd.diff 16799
-SHA256 76b27d33f134328890ac5bcbd1960d4cff5d68272235ecd70646a7499c1bed25 files/openmotif-2.1.30-darwin-netbsd.diff 16799
 AUX openmotif-2.1.30-imake-ansi.patch 6554 RMD160 7c51aebd40221a8aa89ece890629585ac4711945 SHA1 c2ff17e6d8f68b3c84b64c1a996d888011485090 SHA256 43575ce2a79e4ffb47f34b5a76175839c71ca85413a625fcc60adf3617c84d20
 MD5 ed2738dd3cbdc87b0800fe9710092d18 files/openmotif-2.1.30-imake-ansi.patch 6554
 RMD160 7c51aebd40221a8aa89ece890629585ac4711945 files/openmotif-2.1.30-imake-ansi.patch 6554
@@ -101,26 +94,26 @@ DIST openMotif-2.2.3.tar.gz 5149785 RMD160 b99230d508da57bca72b6920d28fce4187bf5
 DIST openmotif-2.1.30-4_MLI.src.tar.gz 8645792 RMD160 082e1eeaf7bb1c27aceef7c5a310b2121d3001e8 SHA1 2a0bedcff22e9a35f97b08747079cadb5d5bd5e6 SHA256 a25d6f7a420ea74c504cc6fe832e6af80812e77e749d099c91e75454e96d8a0b
 DIST openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2 12300 RMD160 308c3f96f6fcc82ce503fd1bb6f3291bd1641d6f SHA1 9911693e7e10f8caff1063f995f00cf19a080ff3 SHA256 a693d7c10bf6648b2af5fb260645526e5651b1c4a9cf9a60405a67df8aa349f5
 DIST openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986 RMD160 f04ccc46b82782d53e30c6a08475353ae8a1d4ad SHA1 7b67f9849ab315466fd3942079b2e39df7a05eb0 SHA256 89a44c191d3ffcb09bebc2d2c859560af0c93a56300b502cad77d77801f57cd7
-EBUILD openmotif-2.1.30-r14.ebuild 5329 RMD160 f20da3a5e6db3c64fe6b720933bf85430bdd7287 SHA1 b60f0215e2ea74a1f3746a4b0ed7f81288c4f700 SHA256 d7b1cebaabcbffefc03c9d97940847c5a954dd6e80eb8878c8f6307e3b8bde2e
-MD5 b48ac8b076105f8695e1afe913287b77 openmotif-2.1.30-r14.ebuild 5329
-RMD160 f20da3a5e6db3c64fe6b720933bf85430bdd7287 openmotif-2.1.30-r14.ebuild 5329
-SHA256 d7b1cebaabcbffefc03c9d97940847c5a954dd6e80eb8878c8f6307e3b8bde2e openmotif-2.1.30-r14.ebuild 5329
-EBUILD openmotif-2.2.3-r3.ebuild 3346 RMD160 28249711a4f111b9382b175271641c3666f14d47 SHA1 3ae82d61136a73abf3be745d504e5402ceefedfe SHA256 8271837cdb37425bdce20b2874ceffb57a7215bacb638223549860cd1dab5613
-MD5 7b96ad37bdc7593f6f8a6f0833e21a01 openmotif-2.2.3-r3.ebuild 3346
-RMD160 28249711a4f111b9382b175271641c3666f14d47 openmotif-2.2.3-r3.ebuild 3346
-SHA256 8271837cdb37425bdce20b2874ceffb57a7215bacb638223549860cd1dab5613 openmotif-2.2.3-r3.ebuild 3346
-EBUILD openmotif-2.2.3-r8.ebuild 3873 RMD160 02435640234f6eb69f2185b07bb33d8089de35f7 SHA1 41d0b3a403107fbabf2f725e202827f33c839205 SHA256 e8d54c0845d652d09021b0a33fcdca8b647f5e6ea7238440fc772759eee73e35
-MD5 3d67d8bbf71fa64dfa344c3d428eac0d openmotif-2.2.3-r8.ebuild 3873
-RMD160 02435640234f6eb69f2185b07bb33d8089de35f7 openmotif-2.2.3-r8.ebuild 3873
-SHA256 e8d54c0845d652d09021b0a33fcdca8b647f5e6ea7238440fc772759eee73e35 openmotif-2.2.3-r8.ebuild 3873
-EBUILD openmotif-2.2.3-r9.ebuild 3680 RMD160 27a3455843293c5707896fdfe1c3785689639716 SHA1 2ee24fa2ebfd61b1cc63ef185322fabb31169304 SHA256 3cc0b44948717c7feb201e5538ac292db70bc92e5337f724c4b8bc34030db86b
-MD5 df9c4428c7e7124fb508233c31422a23 openmotif-2.2.3-r9.ebuild 3680
-RMD160 27a3455843293c5707896fdfe1c3785689639716 openmotif-2.2.3-r9.ebuild 3680
-SHA256 3cc0b44948717c7feb201e5538ac292db70bc92e5337f724c4b8bc34030db86b openmotif-2.2.3-r9.ebuild 3680
-MISC ChangeLog 20437 RMD160 08202176e539f6e26b729fda6712d0b54b450954 SHA1 e3052b68b74bb33384222199c61ee499a9739646 SHA256 fc72cb266a68398e14bcfc045981127dba17624bcd55102d282f7f8bde420a63
-MD5 e24e9698e3299bdb552efa8a2e4d06aa ChangeLog 20437
-RMD160 08202176e539f6e26b729fda6712d0b54b450954 ChangeLog 20437
-SHA256 fc72cb266a68398e14bcfc045981127dba17624bcd55102d282f7f8bde420a63 ChangeLog 20437
+EBUILD openmotif-2.1.30-r14.ebuild 5167 RMD160 6bb663e1c4bd46d00731c0791112a8748e41ab2b SHA1 0f0d184f99613a793fc5472925bf5affd4c90e80 SHA256 03686774013353c9dbdc6971cd0207d42bd55ca14a2e80a11df689a4ff4bcfa6
+MD5 c52cfa8786bbeda9ce15b8cf24d3d348 openmotif-2.1.30-r14.ebuild 5167
+RMD160 6bb663e1c4bd46d00731c0791112a8748e41ab2b openmotif-2.1.30-r14.ebuild 5167
+SHA256 03686774013353c9dbdc6971cd0207d42bd55ca14a2e80a11df689a4ff4bcfa6 openmotif-2.1.30-r14.ebuild 5167
+EBUILD openmotif-2.2.3-r3.ebuild 2991 RMD160 12c90702c5f6efda32c49e79fc87f4581dffb03d SHA1 3e8c3fbe03ec140da3af1fc338de4cb938c83c4a SHA256 fec04a7a60fe3ea0d3e2422672a45d3cb05de950440a04a8791fdee12af9d089
+MD5 ac5ad140aa8cdac688998b78f741f8a3 openmotif-2.2.3-r3.ebuild 2991
+RMD160 12c90702c5f6efda32c49e79fc87f4581dffb03d openmotif-2.2.3-r3.ebuild 2991
+SHA256 fec04a7a60fe3ea0d3e2422672a45d3cb05de950440a04a8791fdee12af9d089 openmotif-2.2.3-r3.ebuild 2991
+EBUILD openmotif-2.2.3-r8.ebuild 3518 RMD160 ce774f1e1470593cd9c231877fa88507c960b0a6 SHA1 f1f40a5eea6f1783e6a43109ff7deaaafbb2594f SHA256 9feb91e53312716d98535c5ee0e3843c721c7e6bb526e169921950f4cb6e4a34
+MD5 ecd178706755318102f71f8674d18ad6 openmotif-2.2.3-r8.ebuild 3518
+RMD160 ce774f1e1470593cd9c231877fa88507c960b0a6 openmotif-2.2.3-r8.ebuild 3518
+SHA256 9feb91e53312716d98535c5ee0e3843c721c7e6bb526e169921950f4cb6e4a34 openmotif-2.2.3-r8.ebuild 3518
+EBUILD openmotif-2.2.3-r9.ebuild 3667 RMD160 5932ebdee98b47821cc99b0fa89658e3c140206d SHA1 b96b692a0669b027291d67c801fa567d2dc226d4 SHA256 ee0d4b024fd9d20d762e4f1583a3050ed1f6e182cbc45bf636d4e40620017e73
+MD5 c188c53e47b79f0384b3924b327a4b2c openmotif-2.2.3-r9.ebuild 3667
+RMD160 5932ebdee98b47821cc99b0fa89658e3c140206d openmotif-2.2.3-r9.ebuild 3667
+SHA256 ee0d4b024fd9d20d762e4f1583a3050ed1f6e182cbc45bf636d4e40620017e73 openmotif-2.2.3-r9.ebuild 3667
+MISC ChangeLog 20711 RMD160 8913ccb82af28f95be925522e231bf4e0b6ccfb4 SHA1 8285608e9c99f1abb017aa0fdc8bbe868b4d51bb SHA256 1a1b5166dd35180f7784c2a65f825397830eb53854f8ae868c0d5b7c536c4000
+MD5 1164c84ac314a1e15f58085c4d4de545 ChangeLog 20711
+RMD160 8913ccb82af28f95be925522e231bf4e0b6ccfb4 ChangeLog 20711
+SHA256 1a1b5166dd35180f7784c2a65f825397830eb53854f8ae868c0d5b7c536c4000 ChangeLog 20711
 MISC metadata.xml 170 RMD160 0c6b102787098d03cbf0bdbed37dabbd0de6654e SHA1 ba2300f5740c3b005419388cec650037e927799f SHA256 53b07ee8fc55e6e45232b2d798d00da0d1056ef3f963816e46b410bbdb676623
 MD5 a62858e8c9d87aaaaa3356a1c94ef18d metadata.xml 170
 RMD160 0c6b102787098d03cbf0bdbed37dabbd0de6654e metadata.xml 170
@@ -137,10 +130,3 @@ SHA256 4333e38dae316879724e878cafd5d5477975edfe50134b36cec4ddf40c0eecc6 files/di
 MD5 e38a0e0825238206da7e31703f5eb0a3 files/digest-openmotif-2.2.3-r9 563
 RMD160 7d060c5bbe733493b9e67db1a864923c2bb35013 files/digest-openmotif-2.2.3-r9 563
 SHA256 4333e38dae316879724e878cafd5d5477975edfe50134b36cec4ddf40c0eecc6 files/digest-openmotif-2.2.3-r9 563
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFIJPPAiZjviIA2XgRApP7AJ4n1R87kMUl1R4OhuSRgD2rM9/8qACfcuNM
-7qfRF0U+5NeY3ivdhIWN0V0=
-=kJ2u
------END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/files/openmotif-2.1.30-darwin-netbsd.diff b/x11-libs/openmotif/files/openmotif-2.1.30-darwin-netbsd.diff
deleted file mode 100644
index f8c8c8ce6fb6..000000000000
--- a/x11-libs/openmotif/files/openmotif-2.1.30-darwin-netbsd.diff
+++ /dev/null
@@ -1,505 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2004/03/16 23:59:42 danw Exp $
-
---- config/imake/imakemdep.h.orig	Sat Mar 13 22:27:36 2004
-+++ config/imake/imakemdep.h
-@@ -265,10 +265,10 @@ in this Software without prior written a
- #ifdef _CRAY
- #define DEFAULT_CPP "/lib/pcpp"
- #endif
--#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__386BSD__) || defined(__OpenBSD__)
- #define DEFAULT_CPP "/usr/libexec/cpp"
- #endif
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
- #define USE_CC_E
- #endif
- #if defined(__sgi) && defined(__ANSI_CPP__)
-@@ -326,7 +326,7 @@ char *cpp_argv[ARGUMENTS] = {
- 	"-Uunix",	/* remove unix symbol so that filename unix.c okay */
- #endif
- #endif
--#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(linux) || defined(__GNU__)
-+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(linux) || defined(__GNU__) || defined(__APPLE__)
- # ifdef __i386__
- 	"-D__i386__",
- # endif
-@@ -336,6 +336,9 @@ char *cpp_argv[ARGUMENTS] = {
- # ifdef __m68k__
- 	"-D__m68k__",
- # endif
-+# ifdef __ppc__
-+	"-D__ppc__",
-+# endif
- # ifdef __GNUC__
- 	"-traditional",
- # endif
-@@ -988,6 +991,12 @@ struct symtab	predefs[] = {
- #endif
- #ifdef __QNXNTO__
- 	{"__QNXNTO__", "1"},
-+#endif
-+#ifdef __ppc__
-+	{"__ppc__", "1"},
-+#endif
-+#ifdef __BIG_ENDIAN__
-+	{"__BIG_ENDIAN__", "1"},
- #endif
- 	/* add any additional symbols before this line */
- 	{NULL, NULL}
-$NetBSD: patch-as,v 1.3 2004/03/16 23:59:42 danw Exp $
-
---- config/cf/Imake.cf.orig	Sat Mar 13 21:19:59 2004
-+++ config/cf/Imake.cf
-@@ -73,6 +73,9 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 
- # if defined(__sparc__) || defined(sparc)
- #  define SparcArchitecture
- #  undef sparc
-+#  if defined(__sparc64__)
-+#   define Sparc64Architecture
-+#  endif
- # endif
- # ifdef mips
- #   define MipsArchitecture
-@@ -129,6 +132,9 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 
- # if defined(__sparc__) || defined(sparc)
- #  define SparcArchitecture
- #  undef sparc
-+#  if defined(__sparc64__)
-+#   define Sparc64Architecture
-+#  endif
- # endif
- # ifdef mips
- #   define MipsArchitecture
-@@ -720,6 +726,21 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 
- #endif
- #endif
- #endif /* QNX/Neutrino */
-+
-+#if defined(__APPLE__)
-+# undef __APPLE__
-+# define MacroIncludeFile <darwin.cf>
-+# define MacroFile darwin.cf
-+# define DarwinArchitecture
-+# ifdef __ppc__
-+#  define PpcDarwinArchitecture
-+#  undef __ppc__
-+# endif
-+# ifdef __i386__
-+#  define i386DarwinArchitecture
-+#  undef __i386__
-+# endif
-+#endif
- 
- #ifndef MacroIncludeFile
- XCOMM WARNING:  Imake.cf not configured; guessing at definitions!!!
-$NetBSD: patch-aw,v 1.2 2004/08/31 03:10:16 danw Exp $
-
---- config/cf/darwin.cf.orig	Sun Mar 14 11:07:29 2004
-+++ config/cf/darwin.cf
-@@ -0,0 +1,129 @@
-+XCOMM platform:  $XFree86: xc/config/cf/darwin.cf,v 1.34 2002/12/04 04:40:15 torrey Exp $
-+
-+/* Darwin / Mac OS X configuration by John Carmack <johnc@idsoftware.com> */
-+
-+/* imake determines the default values by parsing uname */
-+#ifndef OSName
-+#define OSName                  DefaultOSName
-+#endif
-+#ifndef OSVendor
-+#define OSVendor                Apple Computer, Inc.
-+#endif
-+#ifndef OSMajorVersion
-+#define OSMajorVersion          DefaultOSMajorVersion
-+#endif
-+#ifndef OSMinorVersion
-+#define OSMinorVersion          DefaultOSMinorVersion
-+#endif
-+#ifndef OSTeenyVersion
-+#define OSTeenyVersion          DefaultOSTeenyVersion
-+#endif
-+
-+XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-+
-+/*
-+ * Define the operating system's capabilities
-+ */
-+#define HasSnprintf             YES
-+#define HasPutenv               YES
-+#define HasBSD44Sockets         YES
-+#define Malloc0ReturnsNull      NO
-+#define HasShadowPasswd         NO
-+#define HasUsableFileMmap       YES
-+#define HasZlib                 YES
-+#ifndef HasShm
-+# define HasShm                 YES
-+#endif
-+#define HasNdbm                 YES
-+#if OSMajorVersion >= 6
-+# define HasNCurses             YES
-+#else
-+# define HasNCurses             NO
-+#endif
-+#ifndef HasGroff
-+# define HasGroff               YES
-+#endif
-+#ifndef HasGcc3
-+# define HasGcc3                NO
-+#endif
-+
-+/* Thread support */
-+#define HasPosixThreads         YES
-+#define SystemMTDefines         -D_REENTRANT
-+#if OSMajorVersion >= 6
-+# define HasThreadSafeAPI       YES
-+# define MTSafeAPIDefines       -DXUSE_MTSAFE_API -DXNO_MTSAFE_UNISTDAPI
-+#else
-+# define HasThreadSafeAPI       NO
-+# define MTSafeAPIDefines       -DXOS_USE_MTSAFE_NETDBAPI
-+#endif
-+
-+/* Libtool on Darwin always uses minor numbers */
-+#define LibtoolMinorVersions	YES
-+
-+/* we don't need -lm */
-+#define MathLibrary             /**/
-+
-+#define TermcapLibrary          -lcurses
-+#define SetTtyGroup             YES             /* for xterm */
-+
-+/* we don't have a dbm library */
-+#define DBMLibrary              /**/
-+
-+#define MkdirHierCmd            mkdir -p
-+
-+/* our cpp isn't in /lib/cpp and early versions don't like -undef */
-+#define CppCmd                  cpp
-+#if HasGcc3
-+# define RawCppCmd              CppCmd -undef
-+#else
-+# define RawCppCmd              CppCmd
-+#endif
-+
-+/* we have a gcc compatible compiler, but its not called gcc */
-+#ifndef CcCmd
-+#define CcCmd                   cc
-+#endif
-+#ifndef CplusplusCmd
-+#define CplusplusCmd            c++
-+#endif
-+
-+/* default flags to pass to cc */
-+#ifndef DefaultCCOptions
-+# define DefaultCCOptions       -no-cpp-precomp
-+#endif
-+
-+/* flags to pass to cc when building libraries */
-+#ifndef LibraryCCOptions
-+# define LibraryCCOptions       DefaultCCOptions -fno-common
-+#endif
-+
-+#define OptimizedCDebugFlags	-g -Os
-+
-+/*
-+ * __DARWIN__ will be used for platform specific #ifdefs that can't
-+ * be handled by existing X defines.
-+ *
-+ * Darwin's alloca() seg faults (rather than returning NULL) on failed
-+ * allocations, so we can't use it.
-+ *
-+ * Darwin's setlocale() doesn't work properly, so use X11's instead.
-+ */
-+#define StandardDefines         -D__DARWIN__ -DNO_ALLOCA -DX_LOCALE -DCSRG_BASED
-+
-+#define BuildLibPathVar         DYLD_LIBRARY_PATH
-+
-+/* include rules to build shared libraries */
-+#include <darwinLib.rules>
-+
-+/*
-+ * Darwin specific Imake Config files
-+ */
-+#ifndef LocalConfigFiles
-+#define LocalConfigFiles \
-+	darwinLib.rules \
-+	darwinLib.tmpl
-+#endif
-+
-+/* include all the XFree86 rules */
-+#include <xfree86.cf>
-$NetBSD: patch-ax,v 1.1 2004/03/16 23:59:42 danw Exp $
-
---- config/cf/darwinLib.rules.orig	Sun Mar 14 11:07:29 2004
-+++ config/cf/darwinLib.rules
-@@ -0,0 +1,196 @@
-+XCOMM $XFree86: xc/config/cf/darwinLib.rules,v 1.4.2.1 2002/07/16 22:03:05 torrey Exp $
-+/*
-+ * Darwin/Mac OS X shared library rules
-+ */
-+
-+#ifndef UseElfFormat
-+#define UseElfFormat NO
-+#endif
-+#ifndef HasSharedLibraries
-+#define HasSharedLibraries YES
-+#endif
-+#ifndef ForceNormalLib
-+#define ForceNormalLib YES
-+#endif
-+
-+#ifndef SharedDataSeparation
-+#define SharedDataSeparation NO
-+#endif
-+#ifndef SharedCodeDef
-+#define SharedCodeDef /**/
-+#endif
-+#ifndef SharedLibraryDef
-+#define SharedLibraryDef /**/
-+#endif
-+#ifndef ShLibIncludeFile
-+#define ShLibIncludeFile <darwinLib.tmpl>
-+#endif
-+#ifndef SharedLibraryLoadFlags
-+#define SharedLibraryLoadFlags -dynamiclib
-+#endif
-+#ifndef PositionIndependentCFlags
-+#define PositionIndependentCFlags -dynamic
-+#endif
-+#ifndef ExtraLoadFlags
-+#define ExtraLoadFlags /**/
-+#endif
-+
-+/*
-+ * InstallSharedLibrary - generate rules to install the shared library.
-+ */
-+#ifndef InstallSharedLibrary
-+#define InstallSharedLibrary(libname,rev,dest)				@@\
-+install:: Concat(lib,libname.rev.dylib)					@@\
-+	MakeDir($(DESTDIR)dest)						@@\
-+	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.rev.dylib) $(DESTDIR)dest @@\
-+	@MAJREV=`expr rev : '\([^.]*\)'`; \				@@\
-+	  set -x; $(RM) Concat($(DESTDIR)dest/lib,libname.$$MAJREV.dylib) && \ @@\
-+	  $(LN) Concat(lib,libname.rev.dylib) Concat($(DESTDIR)dest/lib,libname.$$MAJREV.dylib) @@\
-+	@(set -x; \							@@\
-+	  $(RM) Concat($(DESTDIR)dest/lib,libname.dylib); \		@@\
-+	  $(LN) Concat(lib,libname.rev.dylib) Concat($(DESTDIR)dest/lib,libname.dylib))
-+#endif /* InstallSharedLibrary */
-+
-+/*
-+ * SharedLibraryTarget - generate rules to create a shared library;
-+ * build it into a different name so that we do not hose people by having
-+ * the library gone for long periods.
-+ */
-+#ifndef SharedLibraryTarget
-+# ifdef UseInstalled
-+#  define LinkBuildSonameLibrary(lib) true
-+# else
-+#  define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
-+	cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
-+# endif
-+
-+# define SharedLibraryTarget(libname,rev,solist,down,up)		@@\
-+AllTarget(Concat(lib,libname.rev.dylib))				@@\
-+									@@\
-+Concat(lib,libname.rev.dylib):  solist $(EXTRALIBRARYDEPS)		@@\
-+	$(RM) $@~							@@\
-+	@MAJREV=`expr rev : '\([^.]*\)'`; \				@@\
-+	  INSTALLNAME=Concat(lib,libname.$$MAJREV.dylib); \		@@\
-+	  set -x; (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -install_name $(USRLIBDIR)/$$INSTALLNAME -current_version rev -compatibility_version rev -seg_addr_table_filename $(USRLIBDIR)/$@ solist $(REQUIREDLIBS)); \ @@\
-+	  $(RM) $$INSTALLNAME; $(LN) $@ $$INSTALLNAME; \		@@\
-+	  LinkBuildSonameLibrary($$INSTALLNAME)				@@\
-+	$(RM) $@							@@\
-+	$(MV) $@~ $@							@@\
-+	@(set -x;			 \				@@\
-+	  $(RM) Concat(lib,libname.dylib); \				@@\
-+	  $(LN) $@ Concat(lib,libname.dylib))				@@\
-+	LinkBuildLibrary($@)						@@\
-+	LinkBuildLibrary(Concat(lib,libname.dylib))			@@\
-+									@@\
-+clean::									@@\
-+	@MAJREV=`expr rev : '\([^.]*\)'`; \				@@\
-+	set -x; $(RM) Concat(lib,libname.$$MAJREV.dylib)		@@\
-+	$(RM) Concat(lib,libname.rev.dylib) Concat(lib,libname.dylib)
-+
-+#endif /* SharedLibraryTarget */
-+
-+/*
-+ * SharedDepLibraryTarget - generate rules to create a shared library.
-+ */
-+#ifndef SharedDepLibraryTarget
-+# ifdef UseInstalled
-+#  ifndef LinkBuildSonameLibrary
-+#   define LinkBuildSonameLibrary(lib) true
-+#  endif
-+# else
-+#  ifndef LinkBuildSonameLibrary
-+#   define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
-+	cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
-+#  endif
-+# endif
-+
-+# define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
-+AllTarget(Concat(lib,libname.rev.dylib))				@@\
-+									@@\
-+Concat(lib,libname.rev.dylib):  deplist $(EXTRALIBRARYDEPS)		@@\
-+	$(RM) $@~							@@\
-+	@MAJREV=`expr rev : '\([^.]*\)'`; \				@@\
-+	  INSTALLNAME=Concat(lib,libname.$$MAJREV.dylib); \		@@\
-+	  set -x; (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -install_name $(USRLIBDIR)/$$INSTALLNAME -current_version rev -compatibility_version rev -seg_addr_table_filename $(USRLIBDIR)/$@ solist $(REQUIREDLIBS)); \ @@\
-+	  $(RM) $$INSTALLNAME; $(LN) $@ $$INSTALLNAME; \		@@\
-+	  LinkBuildSonameLibrary($$INSTALLNAME)				@@\
-+	$(RM) $@							@@\
-+	$(MV) $@~ $@							@@\
-+	@(set -x; \							@@\
-+	  $(RM) Concat(lib,libname.dylib); \				@@\
-+	  $(LN) $@ Concat(lib,libname.dylib))				@@\
-+	LinkBuildLibrary($@)						@@\
-+	LinkBuildLibrary(Concat(lib,libname.dylib))			@@\
-+									@@\
-+clean::									@@\
-+	@MAJREV=`expr rev : '\([^.]*\)'`; \				@@\
-+	set -x; $(RM) Concat(lib,libname.$$MAJREV.dylib)		@@\
-+	$(RM) Concat(lib,libname.rev.dylib) Concat(lib,libname.dylib)
-+
-+#endif /* SharedDepLibraryTarget */
-+
-+/*
-+ * SharedDepCplusplusLibraryTarget - generate rules to create a shared library.
-+ */
-+#ifndef SharedDepCplusplusLibraryTarget
-+# ifdef UseInstalled
-+#  ifndef LinkBuildSonameLibrary
-+#   define LinkBuildSonameLibrary(lib) true
-+#  endif
-+# else
-+#  ifndef LinkBuildSonameLibrary
-+#   define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
-+	cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
-+#  endif
-+# endif
-+
-+# define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
-+AllTarget(Concat(lib,libname.rev.dylib))				@@\
-+									@@\
-+Concat(lib,libname.rev.dylib):  deplist $(EXTRALIBRARYDEPS)		@@\
-+	$(RM) $@~							@@\
-+	@MAJREV=`expr rev : '\([^.]*\)'`; \				@@\
-+	  INSTALLNAME=Concat(lib,libname.$$MAJREV.dylib); \		@@\
-+	  set -x; (cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -install_name $(USRLIBDIR)/$$INSTALLNAME -current_version rev -compatibility_version rev -seg_addr_table_filename $(USRLIBDIR)/$@ solist $(REQUIREDLIBS)); \ @@\
-+	  $(RM) $$INSTALLNAME; $(LN) $@ $$INSTALLNAME; \		@@\
-+	  LinkBuildSonameLibrary($$INSTALLNAME)				@@\
-+	$(RM) $@							@@\
-+	$(MV) $@~ $@							@@\
-+	@(set -x; \							@@\
-+	  $(RM) Concat(lib,libname.dylib); \				@@\
-+	  $(LN) $@ Concat(lib,libname.dylib))				@@\
-+	LinkBuildLibrary($@)						@@\
-+	LinkBuildLibrary(Concat(lib,libname.dylib))			@@\
-+									@@\
-+clean::									@@\
-+	@MAJREV=`expr rev : '\([^.]*\)'`; \				@@\
-+	set -x; $(RM) Concat(lib,libname.$$MAJREV.dylib)		@@\
-+	$(RM) Concat(lib,libname.rev.dylib) Concat(lib,libname.dylib)
-+
-+#endif /* SharedDepCplusplusLibraryTarget */
-+
-+#ifndef SharedDepModuleTarget
-+#define SharedDepModuleTarget(name,deps,solist)				@@\
-+AllTarget(name)								@@\
-+									@@\
-+name: deps								@@\
-+	$(RM) $@~							@@\
-+	$(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)		@@\
-+	$(RM) $@							@@\
-+	$(MV) $@~ $@							@@\
-+									@@\
-+clean::									@@\
-+	$(RM) name
-+
-+#endif /* SharedDepModuleTarget */
-+
-+/*
-+ * SharedLibraryDataTarget - generate rules to create shlib data file;
-+ */
-+#ifndef SharedLibraryDataTarget
-+#define SharedLibraryDataTarget(libname,rev,salist)
-+#endif /* SharedLibraryDataTarget */
-+
-+#ifndef InstallSharedLibraryData
-+#define InstallSharedLibraryData(libname,rev,dest)
-+#endif /* InstallSharedLibraryData */
-$NetBSD: patch-ay,v 1.1 2004/03/16 23:59:42 danw Exp $
-
---- config/cf/darwinLib.tmpl.orig	Sun Mar 14 11:07:29 2004
-+++ config/cf/darwinLib.tmpl
-@@ -0,0 +1,56 @@
-+XCOMM $XFree86: xc/config/cf/darwinLib.tmpl,v 1.10 2003/02/04 23:04:59 torrey Exp $
-+/*
-+ * Darwin/Mac OS X shared library template
-+ */
-+
-+#ifndef FixupLibReferences
-+#define FixupLibReferences()						@@\
-+XMULIBONLY = -lXmu							@@\
-+XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)				@@\
-+GLXLIB := $(GLXLIB) $(XPLUGIN_LIB)
-+#endif
-+
-+#ifndef XawClientLibs
-+#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-+#endif
-+
-+/* Allow for libpthread, as overridden by OS definitions */
-+#if !defined(SharedX11Reqs)
-+#define SharedX11Reqs
-+#endif
-+
-+#ifndef FontLibSharedFreeType
-+#define FontLibSharedFreeType YES
-+#endif
-+#if FontLibSharedFreeType
-+#define SharedXfontReqs     $(LDPRELIB) $(FONTSTUBLIB) GzipLibrary $(FREETYPE2LIB) -flat_namespace
-+#else
-+#define SharedXfontReqs     $(LDPRELIB) $(FONTSTUBLIB) GzipLibrary -flat_namespace
-+#endif
-+
-+#define SharedGLReqs        $(LDPRELIB) $(XLIB)
-+#define SharedGLUReqs       $(LDPRELIB) $(XLIB) $(GLXLIB)
-+#define SharedSMReqs        $(LDPRELIB) $(ICELIB)
-+#define SharedXawReqs       $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-+#define SharedXaw6Reqs      $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-+#define SharedXcursorReqs   $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-+#define SharedXextReqs      $(LDPRELIB) $(XLIBONLY)
-+#define SharedXiReqs        $(LDPRELIB) $(XLIB)
-+#define SharedXmuReqs       $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-+#define SharedXmuuReqs      $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-+#define SharedXpReqs        $(LDPRELIB) $(XAUTHLIB) $(EXTENSIONLIB) $(XLIBONLY)
-+#define SharedXpmReqs       $(LDPRELIB) $(XLIB)
-+#define SharedXrandrReqs    $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-+#define SharedXrenderReqs   $(LDPRELIB) $(EXTENSIONLIB) $(XLIB)
-+#define SharedXssReqs       $(LDPRELIB) $(XLIB) $(EXTENSIONLIB) $(XTOOLLIB)
-+#define SharedXtReqs        $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) -flat_namespace
-+#define SharedXtstReqs      $(LDPRELIB) $(XLIB)
-+#define SharedXvReqs        $(LDPRELIB) $(XLIB)
-+#define SharedDPSReqs       $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
-+#define SharedDPSTKReqs     $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB)
-+#define SharedOldXReqs      $(LDPRELIB) $(XLIBONLY)
-+#define SharedpsresReqs     $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
-+
-+#define SharedXmReqs        $(LDPRELIBS) $(XTOOLONLYLIB) $(EXTENSIONLIB) $(XPLIB) $(XLIB)
-+#define SharedMrmReqs       $(LDPRELIB) $(XMLIB) SharedXmReqs
-+#define SharedUilReqs       $(LDPRELIB) $(MRESOURCELIB) $(XMLIB) SharedXmReqs
-$NetBSD: patch-az,v 1.1 2004/03/16 23:59:42 danw Exp $
-
---- lib/Xm/Scale.c.orig	Sat Mar 13 22:17:01 2004
-+++ lib/Xm/Scale.c
-@@ -82,6 +82,9 @@ static char rcsid[] = "$TOG: Scale.c /ma
- extern "C" { /* some 'locale.h' do not have prototypes (sun) */
- #endif
- #include <X11/Xlocale.h>
-+#ifdef __DARWIN__
-+#include <locale.h> /* Xlocale.h doesn't define struct lconv */
-+#endif
- #ifdef __cplusplus
- } /* Close scope of 'extern "C"' declaration */
- #endif /* __cplusplus */