add darwin support
This commit is contained in:
danw
parent
aeddb8149a
commit
873317a06c
7 changed files with 479 additions and 11 deletions
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: distinfo,v 1.11 2003/06/12 13:39:58 jschauma Exp $
|
||||
$NetBSD: distinfo,v 1.12 2004/03/16 23:59:42 danw Exp $
|
||||
|
||||
SHA1 (openmotif/openmotif2.1.30.tar.gz) = 34fc82fdf0e200525864665e179246ef64082dcc
|
||||
Size (openmotif/openmotif2.1.30.tar.gz) = 17711487 bytes
|
||||
|
|
@ -29,8 +29,12 @@ SHA1 (patch-an) = 0d0ba4bbbe6742c5a8b2fda475adfe8a05647cc1
|
|||
SHA1 (patch-ao) = 8423174dcf89e00e76ce0a27b3d7c27cf3540a17
|
||||
SHA1 (patch-ap) = 8b9fe7fcf076f6a1162f5b8a3003bbb78204bc8b
|
||||
SHA1 (patch-aq) = f06bde8d2151c3b60fce74e663b7eead965758a8
|
||||
SHA1 (patch-ar) = 496fc6e3ba956f9103fbee6be221af44a26e2afd
|
||||
SHA1 (patch-as) = f59bb1583bb3445e2420b667f6fb30595bca7ce6
|
||||
SHA1 (patch-ar) = f56863037e0167b59e903195f42d7f2c0608c899
|
||||
SHA1 (patch-as) = 3327ecd54c75701e31d462b5f4ed445202fd978a
|
||||
SHA1 (patch-at) = d75e7b060797997f47f0da3099e53d5d8e5c6c68
|
||||
SHA1 (patch-au) = 3559258736a8534b930750294bc0865a17a51e7e
|
||||
SHA1 (patch-av) = 2729c9edbcbbb62016305a1f0293684b805ce50d
|
||||
SHA1 (patch-aw) = 3478eed5789a9e49f68bf472ac9b4f8a75d61bd8
|
||||
SHA1 (patch-ax) = de1ee2594e39bec4cab599aa45d4b9d5af80fc7e
|
||||
SHA1 (patch-ay) = 38187926dcc27c510880e17ff2d6c35cd5e8393e
|
||||
SHA1 (patch-az) = 15f8d029940fc04be246ad7a479f14af6e38af03
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ar,v 1.1 2001/12/06 19:09:18 jlam Exp $
|
||||
$NetBSD: patch-ar,v 1.2 2004/03/16 23:59:42 danw Exp $
|
||||
|
||||
--- config/imake/imakemdep.h.orig Thu Dec 6 10:54:30 2001
|
||||
--- config/imake/imakemdep.h.orig Sat Mar 13 22:27:36 2004
|
||||
+++ config/imake/imakemdep.h
|
||||
@@ -265,10 +265,10 @@
|
||||
@@ -265,10 +265,10 @@ in this Software without prior written a
|
||||
#ifdef _CRAY
|
||||
#define DEFAULT_CPP "/lib/pcpp"
|
||||
#endif
|
||||
|
|
@ -11,7 +11,39 @@ $NetBSD: patch-ar,v 1.1 2001/12/06 19:09:18 jlam Exp $
|
|||
#define DEFAULT_CPP "/usr/libexec/cpp"
|
||||
#endif
|
||||
-#if defined(__FreeBSD__)
|
||||
+#if defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
+#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}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-as,v 1.2 2002/08/25 18:40:41 jlam Exp $
|
||||
$NetBSD: patch-as,v 1.3 2004/03/16 23:59:42 danw Exp $
|
||||
|
||||
--- config/cf/Imake.cf.orig Sat Jun 22 00:09:11 2002
|
||||
--- config/cf/Imake.cf.orig Sat Mar 13 21:19:59 2004
|
||||
+++ config/cf/Imake.cf
|
||||
@@ -73,6 +73,9 @@
|
||||
@@ -73,6 +73,9 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
|
||||
# if defined(__sparc__) || defined(sparc)
|
||||
# define SparcArchitecture
|
||||
# undef sparc
|
||||
|
|
@ -12,7 +12,7 @@ $NetBSD: patch-as,v 1.2 2002/08/25 18:40:41 jlam Exp $
|
|||
# endif
|
||||
# ifdef mips
|
||||
# define MipsArchitecture
|
||||
@@ -129,6 +132,9 @@
|
||||
@@ -129,6 +132,9 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
|
||||
# if defined(__sparc__) || defined(sparc)
|
||||
# define SparcArchitecture
|
||||
# undef sparc
|
||||
|
|
@ -22,3 +22,25 @@ $NetBSD: patch-as,v 1.2 2002/08/25 18:40:41 jlam Exp $
|
|||
# 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!!!
|
||||
|
|
|
|||
134
x11/openmotif/patches/patch-aw
Normal file
134
x11/openmotif/patches/patch-aw
Normal file
|
|
@ -0,0 +1,134 @@
|
|||
$NetBSD: patch-aw,v 1.1 2004/03/16 23:59:42 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 /usr/bin/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 /usr/bin/cc
|
||||
+#endif
|
||||
+#ifndef CplusplusCmd
|
||||
+#define CplusplusCmd /usr/bin/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>
|
||||
201
x11/openmotif/patches/patch-ax
Normal file
201
x11/openmotif/patches/patch-ax
Normal file
|
|
@ -0,0 +1,201 @@
|
|||
$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 */
|
||||
61
x11/openmotif/patches/patch-ay
Normal file
61
x11/openmotif/patches/patch-ay
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
$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
|
||||
14
x11/openmotif/patches/patch-az
Normal file
14
x11/openmotif/patches/patch-az
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
$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 */
|
||||
Loading…
Reference in a new issue