From 952bfda99e719c17898e04ef6fcea63279827387 Mon Sep 17 00:00:00 2001 From: xtraeme Date: Mon, 23 May 2005 19:14:14 +0000 Subject: Apply patches from Joerg Sonnenberger for DragonFlyBSD and GCC 3.x.x, while I'm here remove redundant DragonFly.cf from xorg-imake/files, we'll use the same file from xorg-libs. --- x11/xorg-imake/Makefile | 5 +- x11/xorg-imake/distinfo | 4 +- x11/xorg-imake/files/DragonFly.cf | 278 -------------------------------------- x11/xorg-imake/patches/patch-ak | 39 ++++++ x11/xorg-imake/patches/patch-al | 59 ++++++++ 5 files changed, 104 insertions(+), 281 deletions(-) delete mode 100644 x11/xorg-imake/files/DragonFly.cf create mode 100644 x11/xorg-imake/patches/patch-ak create mode 100644 x11/xorg-imake/patches/patch-al (limited to 'x11/xorg-imake') diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile index 04cdf055851..7750e53b6ad 100644 --- a/x11/xorg-imake/Makefile +++ b/x11/xorg-imake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:48:15 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/05/23 19:14:14 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-imake-${XORG_VER} @@ -33,7 +33,8 @@ PLIST_SUBST+= LNDIR= post-extract: @${TOUCH} ${WRKSRC}/config/cf/date.def - @${CP} ${FILESDIR}/DragonFly.cf ${WRKSRC}/config/cf/ + @${CP} ${PKGSRCDIR}/x11/xorg-libs/files/DragonFly.cf \ + ${WRKSRC}/config/cf/ .for F in ${SYSTEMS} @${MV} ${WRKSRC}/config/cf/${F}.cf ${WRKSRC}/config/cf/${F}.cf.in .endfor diff --git a/x11/xorg-imake/distinfo b/x11/xorg-imake/distinfo index a901bc19990..ddeb0bd94a1 100644 --- a/x11/xorg-imake/distinfo +++ b/x11/xorg-imake/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2005/03/22 09:46:10 adam Exp $ +$NetBSD: distinfo,v 1.13 2005/05/23 19:14:14 xtraeme Exp $ SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8 @@ -16,3 +16,5 @@ SHA1 (patch-ag) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad SHA1 (patch-ah) = 6960406211ab12eff3044db477c22833c9eaa488 SHA1 (patch-ai) = eb3853e360dd5e05ca5978791734bcba5541b162 SHA1 (patch-aj) = 58594b376a62a584c0bc7f056e512fe8700d558e +SHA1 (patch-ak) = c7e83c91d5192b5bd9e40c5b3ae3501900487a9f +SHA1 (patch-al) = 14701767d5719cb2a47d2b828e69cffc1a6063bc diff --git a/x11/xorg-imake/files/DragonFly.cf b/x11/xorg-imake/files/DragonFly.cf deleted file mode 100644 index 53f872d430c..00000000000 --- a/x11/xorg-imake/files/DragonFly.cf +++ /dev/null @@ -1,278 +0,0 @@ -/* xc/config/cf/DragonFly.cf */ - -#define UseElfFormat YES -#define OSBinaryFormat [ELF] - -#ifndef OSName -# define OSName DefaultOSName OSBinaryFormat -#endif -#ifndef OSVendor -# define OSVendor /**/ -#endif -#ifndef OSMajorVersion -# define OSMajorVersion DefaultOSMajorVersion -#endif -#ifndef OSMinorVersion -# define OSMinorVersion DefaultOSMinorVersion -#endif -#ifndef OSTeenyVersion -# define OSTeenyVersion DefaultOSTeenyVersion -#endif - -/* #ifndef OSRelVersion */ -/* Include this to get finer-grained information about the OS version */ -#include "/usr/include/osreldate.h" -#define OSRelVersion __DragonFly_version -/* #endif */ - -XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) (OSRelVersion) - - -#define HasCplusplus YES -#define GccUsesGas YES -#define UseGas YES -#define GnuCpp YES -#define HasNdbm YES -#define HasPutenv YES -#define HasSnprintf YES -#define HasBSD44Sockets YES -#define HasDlopen YES -#define HasSetProcTitle YES -#define HasLibCrypt YES -#define HasShm YES -#define HasWChar32 YES -#define HasUsableFileMmap YES -#define HasNCurses YES -#define HasVarRun YES -#define HasVarDb YES -#define HasIssetugid YES -#define HasPoll YES -#define HasGetIfAddrs YES - -#define IPv6SocketsAlsoIPv4 NO -#define InstallXloadSetGID NO -#define HasWeakSymbols UseElfFormat - -/* - * Multi-thread safe libs - */ -#ifndef HasLibPthread -# define HasLibPthread NO -#endif -#define HasPosixThreads YES -#define ThreadedX YES -#define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE -#define HasThreadSafeAPI YES -#define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI - -#if HasLibPthread -# define ThreadsLibraries -lpthread -#else -# define BuildThreadStubLibrary YES -# define NeedUIThrStubs YES -# define ThreadsLibraries -pthread -# define SharedX11Reqs $(LDPRELIB) -# define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) -#endif - -#define AvoidNullMakeCommand YES -#define StripInstalledPrograms YES -#define CompressAllFonts YES -#define Malloc0ReturnsNull YES -#define NeedConstPrototypes YES -#define NeedFunctionPrototypes YES -#define NeedNestedPrototypes YES -#define NeedVarargsPrototypes YES -#define NeedWidePrototypes NO - -#define HasPlugin YES -#define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */ - -#define CppCmd cpp -#define PreProcessCmd CppCmd - -#define StandardCppOptions -traditional -#define StandardCppDefines /**/ -#ifndef DefaultCCOptions -# if defined(UseInstalled) -# define DefaultCCOptions /**/ -# else -# if defined(HasGcc3) && HasGcc3 -# define NoSystemWarn -Wno-system-headers -# else -# define NoSystemWarn -# endif -# define DefaultCCOptions -ansi -Dasm=__asm NoSystemWarn -# endif -#endif - -#define HasSetUserContext YES -#define HasGetpeereid YES -#define HasMTRRSupport YES - -#ifndef BuildXF86DRI -# define BuildXF86DRI YES -#endif - -#if defined(i386Architecture) -# define HasAgpGart YES -#endif - -/* - * SSE and 3DNow will be autodetected, so binutils is the only - * requirement for enabling this. By 4.2 they were all supported. - */ -#if defined(i386Architecture) -# define HasX86Support YES -# define HasMMXSupport YES -# define Has3DNowSupport YES -# define HasSSESupport YES -#else -# define HasX86Support NO -# define HasMMXSupport NO -# define Has3DNowSupport NO -# define HasSSESupport NO -#endif - -#ifndef UseRpath -# define UseRpath YES -#endif - -#ifndef RpathLoadFlags -# if UseRpath -# define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -# else -# define RpathLoadFlags /**/ -# endif -#endif - -#ifndef ExtraLoadFlags -# if !defined(UseInstalled) -# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR) -# else -# define ExtraLoadFlags RpathLoadFlags -# endif -#endif - -#ifndef StaticLibrary -# define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic -#endif - -#define DlLibrary -Wl,--export-dynamic - -#ifndef HasPam -# define HasPam YES -#endif -#ifndef PamLibraries -# define PamLibraries -lpam DlLibrary -#endif - -#ifndef UseGnuMalloc -# define UseGnuMalloc NO -#endif -#ifndef GnuMallocLibrary -# define GnuMallocLibrary -lgnumalloc -#endif - -#ifndef HasZlib -# define HasZlib YES -#endif - -#ifdef AlphaArchitecture -# define IoLibrary -lio -#else -# define IoLibrary /**/ -#endif -#define ServerExtraSysLibs IoLibrary - -#ifndef HasExpat -# define HasExpat YES -#endif - -#ifndef HasFreetype2 -# define HasFreetype2 YES -#endif - -#undef InstallCmd -#define InstallCmd /usr/bin/install - -#define AsmElfDefines -D__ELF__ - -#if GccUsesGas -# define GccGasOption -DGCCUSESGAS -# define AsmDefines -DUSE_GAS AsmElfDefines -#else -# define GccGasOption /**/ -# define AsmDefines AsmElfDefines -#endif - -#ifdef i386Architecture -# define ServerExtraDefines GccGasOption XFree86ServerDefines -#endif -#if defined(AlphaArchitecture) || defined(Sparc64Architecture) || \ - defined(ia64Architecture) || defined(AMD64Architecture) -# define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 -#endif - -#ifdef Sparc64Architecture -# define AsVISOption -Av9a -# define AsOutputArchSize 64 -#endif - -#define StandardDefines -DCSRG_BASED - -#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -#define XawI18nDefines -DUSE_XWCHAR_STRING -#define HasMakefileSafeInclude YES -#define IncludeMakefile(file) @@# dependencies are in .depend -#define DependFileName .depend -#ifndef DoLoadableServer -# define DoLoadableServer YES -#endif -#ifndef ForceNormalLib -# define ForceNormalLib YES -#endif -#define HasMkstemp YES - -#ifndef PreIncDir -# define PreIncDir /usr/include -#endif - -#define HasGroff YES -#define NroffCmd env GROFF_NO_SGR=y groff -Tascii -#define SetTtyGroup YES - -#ifndef ExtraFilesToClean -# define ExtraFilesToClean *.core -#endif - -#define DefaultUserPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/local/bin -#define DefaultSystemPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR) - -#ifndef SystemManDirectory -# define SystemManDirectory /usr/share/man -#endif - -#define InstKmemFlags -g kmem -m 2755 - -#ifndef CompressManPages -# define CompressManPages NO -#endif - -#define HasBsdMake YES - -#ifndef SharedLibXdmGreet -# define SharedLibXdmGreet NO -#endif - -#ifndef HasCookieMaker -/* Which versions have /dev/urandom? */ -#define HasCookieMaker YES -#define MkCookieCmd \ - 'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"' -#endif - - -#include - -#include diff --git a/x11/xorg-imake/patches/patch-ak b/x11/xorg-imake/patches/patch-ak new file mode 100644 index 00000000000..c0e83fd1bfb --- /dev/null +++ b/x11/xorg-imake/patches/patch-ak @@ -0,0 +1,39 @@ +$NetBSD: patch-ak,v 1.1 2005/05/23 19:14:14 xtraeme Exp $ + +--- config/imake/imake.c.orig 2004-03-04 18:45:52.000000000 +0100 ++++ config/imake/imake.c 2004-08-10 17:20:20.000000000 +0200 +@@ -145,7 +145,7 @@ + * #include INCLUDE_IMAKEFILE + * + */ +-#if defined(__FreeBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) + /* This needs to be before _POSIX_SOURCE gets defined */ + # include + # include +@@ -1020,7 +1020,7 @@ + } + #endif + +-#if defined(__OpenBSD__) ++#if defined(__OpenBSD__) || defined(__DragonFly__) + static void + get_stackprotector(FILE *inFile) + { +@@ -1285,6 +1285,7 @@ + defined(__NetBSD__) || \ + defined(__OpenBSD__) || \ + defined(__FreeBSD__) || \ ++ defined(__DragonFly__) || \ + defined(__APPLE__) || \ + defined(__GNU__) + "/usr/bin/cc", /* for Linux PostIncDir */ +@@ -1603,7 +1604,7 @@ + fprintf(inFile, "#define DefaultOSTeenyVersion 0\n"); + } + #endif /* EMX */ +-#if defined(__OpenBSD__) ++#if defined(__OpenBSD__) || defined(__DragonFly__) + get_stackprotector(inFile); + #endif + return FALSE; diff --git a/x11/xorg-imake/patches/patch-al b/x11/xorg-imake/patches/patch-al new file mode 100644 index 00000000000..c6b9284ac06 --- /dev/null +++ b/x11/xorg-imake/patches/patch-al @@ -0,0 +1,59 @@ +$NetBSD: patch-al,v 1.1 2005/05/23 19:14:14 xtraeme Exp $ + +--- config/imake/imakemdep.h.orig 2004-08-09 09:54:09.000000000 +0000 ++++ config/imake/imakemdep.h 2004-08-09 09:55:07.000000000 +0000 +@@ -285,7 +285,7 @@ + #if defined(__386BSD__) + #define DEFAULT_CPP "/usr/libexec/cpp" + #endif +-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) + #define USE_CC_E + #endif + #if defined(__sgi) && defined(__ANSI_CPP__) +@@ -348,7 +348,7 @@ + #endif + #endif + #if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \ +- defined(__FreeBSD__) || defined(MACH) || defined(linux) || \ ++ defined(__FreeBSD__) || defined(__DragonFly__) || defined(MACH) || defined(linux) || \ + defined(__GNU__) || defined(__bsdi__) || defined(__GNUC__) + # ifdef __i386__ + "-D__i386__", +@@ -807,14 +807,14 @@ + # define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" + # define DEFAULT_OS_TEENY_REV "v %[0-9]" + /* # define DEFAULT_OS_NAME "srm %[^\n]" */ /* Not useful on ISC */ +-# elif defined(__FreeBSD__) || defined(__OpenBSD__) ++# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) + /* BSD/OS too? */ + /* uname -r returns "x.y[.z]-mumble", e.g. "2.1.5-RELEASE" or "2.2-0801SNAP" */ + # define DEFAULT_OS_MAJOR_REV "r %[0-9]" + # define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" + # define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]" + # define DEFAULT_OS_NAME "srm %[^\n]" +-# if defined(__FreeBSD__) ++# if defined(__FreeBSD__) || defined(__DragonFly__) + /* Use an alternate way to find the teeny version for -STABLE, -SNAP versions */ + # ifndef CROSSCOMPILE_CPP + # define DEFAULT_OS_TEENY_REV_FROB(buf, size) \ +@@ -1228,7 +1228,9 @@ + #ifdef _MIPS_SZPTR + {"_MIPS_SZPTR", DEF_STRINGIFY(_MIPS_SZPTR)}, + #endif +-#ifdef __FreeBSD__ ++#ifdef __DragonFly__ ++ {"__DragonFly__", "1"}, ++#elif defined(__FreeBSD__) + {"__FreeBSD__", "1"}, + #endif + #ifdef __OpenBSD__ +@@ -1395,7 +1397,7 @@ + + # ifdef linux + System sys = LinuX; +-# elif defined __FreeBSD__ ++# elif defined __FreeBSD__ || defined(__DragonFly__) + System sys = freebsd; + # elif defined __NetBSD__ + System sys = netBSD; -- cgit v1.2.3