[Midnightbsd-cvs] mports: x11/xorg-cf-files: Rip out all the version checks in freebsd.cf.

ctriv at midnightbsd.org ctriv at midnightbsd.org
Tue Oct 16 23:14:23 EDT 2007 

Log Message:
-----------
Rip out all the version checks in freebsd.cf.  Eventaully we need to write
our own MidnightBSD.cf, but this will work for the moment.

Modified Files:
--------------
    mports/x11/xorg-cf-files:
        Makefile (r1.1 -> r1.2)
    mports/x11/xorg-cf-files/files:
        patch-FreeBSD.cf (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11/xorg-cf-files/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lx11/xorg-cf-files/Makefile -Lx11/xorg-cf-files/Makefile -u -r1.1 -r1.2
--- x11/xorg-cf-files/Makefile
+++ x11/xorg-cf-files/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	xorg-cf-files
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	ports at MidnightBSD.org
Index: patch-FreeBSD.cf
===================================================================
RCS file: /home/cvs/mports/x11/xorg-cf-files/files/patch-FreeBSD.cf,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lx11/xorg-cf-files/files/patch-FreeBSD.cf -Lx11/xorg-cf-files/files/patch-FreeBSD.cf -u -r1.1 -r1.2
--- x11/xorg-cf-files/files/patch-FreeBSD.cf
+++ x11/xorg-cf-files/files/patch-FreeBSD.cf
@@ -1,17 +1,75 @@
---- FreeBSD.cf.orig	Sat Aug 14 17:03:36 2004
-+++ FreeBSD.cf	Fri Sep 10 19:52:31 2004
-@@ -78,6 +78,7 @@
+--- ./FreeBSD.cf.orig	Tue Oct 16 22:57:20 2007
++++ ./FreeBSD.cf	Tue Oct 16 23:09:35 2007
+@@ -47,19 +47,10 @@
+ #define HasNdbm			YES
+ #define HasPutenv		YES
+ #define HasSnprintf		YES
+-#if OSMajorVersion == 3 && OSMinorVersion >= 3 || OSMajorVersion > 3
+-# define HasStrlcat		YES
+-#endif
+-#if OSMajorVersion == 4 && OSMinorVersion >= 2 || OSMajorVersion > 4
+-# define HasBasename		YES
+-#else
+-# define HasBasename		NO
+-#endif
++#define HasStrlcat		YES
++#define HasBasename		YES
+ #define HasBSD44Sockets 	YES
+ #define HasDlopen		YES
+-#if ((OSRelVersion >= 410002) && OSRelVersion < 500000) || (OSRelVersion >= 500012)
+-#define HasSetProcTitle		YES
+-#endif
+ #ifndef HasLibCrypt
+ # define HasLibCrypt		YES
+ #endif
+@@ -74,63 +65,28 @@
+ #ifndef BuildPDFdocs
+ # define BuildPDFdocs NO
+ #endif
+-#if (OSMajorVersion >= 3)
  #define HasIssetugid		YES
  #define HasPoll			YES
- #endif
-+#define BuildHtmlManPages	NO
- 
- #if OSMajorVersion >= 4
+-#endif
+-
+-#if OSMajorVersion >= 4
  #define HasGetIfAddrs		YES
-@@ -117,14 +118,8 @@
- # if (OSRelVersion < 500043)
- #  define NeedUIThrStubs	YES
- # endif
+-#endif
+-
+-/* All versions define AF_INET6. 3.x and earlier don't have IPv6 support. */
+-#if OSMajorVersion < 4
+-#ifndef BuildIPv6
+-#define BuildIPv6		NO
+-#endif
+-#endif
++#define HasSetProcTitle         YES
+ 
+ #define IPv6SocketsAlsoIPv4	NO
+ 
+-#if (OSMajorVersion > 1)
+ #define InstallXloadSetGID	NO
+-#else
+-#define InstallXloadSetGID	YES
+-#endif
+ 
+ #define HasWeakSymbols		UseElfFormat
+ 
+ /*
+  * Multi-thread safe libs 
+  */	
+-/* 2.2.7 and later has libc_r (POSIX threads) */
+-#if OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7 || \
+-    OSMajorVersion >= 3
+-# define HasPosixThreads	YES
+-# define ThreadedX		YES
+-# define HasThreadSafeAPI	YES
+-# if OSRelVersion < 501000
+-#  define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
+-# else
+-#  define MTSafeAPIDefines	-DXUSE_MTSAFE_API
+-# endif
+-# if (OSRelVersion < 500043)
+-#  define NeedUIThrStubs	YES
+-# endif
 -# if (OSRelVersion >= 502102)
 -#  define ThreadsLibraries	-lpthread
 -# elif (OSRelVersion >= 500016)
@@ -20,45 +78,202 @@
 -#  define ThreadsLibraries	-pthread
 -# endif
 -# define SystemMTDefines	-D_THREAD_SAFE
-+# define ThreadsLibraries	-lpthread
-+# define SystemMTDefines	
+-#endif
++/* 
++#define HasPosixThreads	YES
++#define ThreadedX		YES
++#define HasThreadSafeAPI	YES
++#define MTSafeAPIDefines	-DXUSE_MTSAFE_API
++#define ThreadsLibraries	-lpthread
++#define SystemMTDefines	-D_THREAD_SAFE
+ 
+-/* This fixes linking C programs against libGLU on FreeBSD 3.x */
+-#if (OSMajorVersion == 3)
+-#define SharedGLUReqs		$(LDPRELIB) $(XLIB) $(GLXLIB) -lstdc++ -lgcc
+-#endif
+ 
+ #define AvoidNullMakeCommand	YES
+ #define StripInstalledPrograms	YES
+@@ -155,22 +111,9 @@
+ #endif
+ 
+ #ifndef HasMktemp
+-#if (OSMajorVersion >= 4) || (OSMajorVersion == 3 && OSMinorVersion >= 1) || \
+-	(OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7)
+ #define HasMktemp		YES
+-#else
+-#define HasMktemp		NO
+-#endif
+ #endif
+ 
+-/*
+- * 2.2.x has perl 4 by default, not perl 5.
+- */
+-#if (OSMajorVersion <= 2)
+-#ifndef HasPerl5
+-#define HasPerl5		NO
+-#endif
+-#endif
+ 
+ #ifndef CcCmd
+ #define CcCmd			cc
+@@ -195,41 +138,12 @@
+ 	GccWarningOptions
+ #endif
+ #endif
+-#ifndef ExtraLibraries
+-/* support for multi-byte locales is in libxpg4 rather than libc */
+-#if (OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)) && \
+-    !(OSMajorVersion == 4 && OSRelVersion >= 400020) && \
+-    !(OSRelVersion >= 500005)
+-#define ExtraLibraries		-lxpg4
+-#else
+-#define ExtraLibraries		/**/
+-#endif
+-#endif
+-#ifndef UseGnuMalloc
+-/* 2.2 doesn't really have GnuMalloc */
+-#if OSMajorVersion < 2 || (OSMajorVersion == 2 && OSMinorVersion < 2)
+-#define UseGnuMalloc		YES
+-#else
+-#define UseGnuMalloc		NO
+-#endif
+-#endif
+-/* 2.2.2 and later has setusercontext() */
+-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 2) || \
+-     (OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 2)
+-#define HasSetUserContext	YES
+-#endif
+ 
+-#if OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 6)
++#define HasSetUserContext	YES
+ #define HasGetpeereid		YES
+-#endif
+ 
+-/* 3.3(?) and later has support for setting MTRRs */
+ #ifndef HasMTRRSupport
+-#if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion >= 3)
+ #define HasMTRRSupport		YES
+-#else
+-#define HasMTRRSupport		NO
+-#endif
+ #endif
+ 
+ /*
+@@ -237,17 +151,14 @@
+  * mechanism for specifying a subset of drivers in the OS.cf files yet.
+  */
+ #ifndef BuildXF86DRI
+-#if OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1)
+ #define BuildXF86DRI		YES
  #endif
+-#endif
+ 
+ /*
+  * 4.1/i386 and 5.0/i386,alpha,ia64,amd64 have the AGP driver.
+  */
+ #ifndef HasAgpGart
+-#if defined(i386Architecture) && \
+-	(OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1))
++#if defined(i386Architecture) 
+ #define HasAgpGart		YES
+ #endif
+ #if (defined(AlphaArchitecture) || defined(ia64Architecture) || \
+@@ -260,8 +171,7 @@
+  * SSE and 3DNow will be autodetected, so binutils is the only 
+  * requirement for enabling this.  By 4.2 they were all supported.
+  */
+-#if defined(AMD64Architecture) || defined(i386Architecture) && \
+-	(OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 2))
++#if defined(AMD64Architecture) || defined(i386Architecture)
+ # define HasX86Support          YES
+ # define HasMMXSupport		YES
+ # define Has3DNowSupport	YES
+@@ -311,8 +221,6 @@
+ # define UseRpath		YES
+ #endif
+ 
+-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
+-
+ # ifndef RpathLoadFlags
+ #  if UseRpath
+ #   if UseElfFormat
+@@ -333,7 +241,6 @@
+ #  endif
+ # endif
+ 
+-#endif
  
- /* This fixes linking C programs against libGLU on FreeBSD 3.x */
-@@ -338,7 +333,7 @@
  #ifndef LibraryRpathLoadFlags
  # if UseRpath
- #  if UseElfFormat
--#   define LibraryRpathLoadFlags	-rpath $(USRLIBDIRPATH)
-+#   define LibraryRpathLoadFlags	-Wl,-rpath $(USRLIBDIRPATH)
- #  else
- #   define LibraryRpathLoadFlags	-R $(USRLIBDIRPATH)
- #  endif
-@@ -466,14 +461,14 @@
+@@ -359,20 +266,13 @@
+ #define GnuMallocLibrary	-lgnumalloc
+ #endif
+ 
+-#if (OSMajorVersion > 2) || (OSMajorVersion == 2 && OSMinorVersion >= 2) \
+-	|| (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 6)
+-/* 2.1.6 and 2.2 have libz */
+ #ifndef HasZlib
+ #define HasZlib		YES
+ #endif
+-#endif
+ 
+-/* PAM appeared in FreeBSD 3.1 */
+-#if (OSMajorVersion > 3) || (OSMajorVersion == 3 && OSMinorVersion >=1 )
+ #ifndef HasPam
+ #define HasPam		YES
+ #endif
+-#endif
+ 
+ /* There are two options for building.  One is to assume that the system has
+  * many of the dependencies provided by the ports tree.  The other is to just
+@@ -449,7 +349,6 @@
+ 
+ #define StandardDefines	-DCSRG_BASED
+ 
+-#if OSMajorVersion > 1
+ #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
+ #define XawI18nDefines		-DUSE_XWCHAR_STRING
+ #define HasMakefileSafeInclude	YES
+@@ -462,17 +361,11 @@
+ #define ForceNormalLib		YES
+ #endif
+ #define HasMkstemp		YES
+-#else
+-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
+-#define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
+-#endif
+ 
  /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
  #ifndef DefaultGcc2i386Opt
- #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
--#define DefaultGcc2i386Opt -O2 GccAliasingArgs
-+#define DefaultGcc2i386Opt
- #endif
+-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
+ #define DefaultGcc2i386Opt -O2 GccAliasingArgs
  #endif
+-#endif
  
  #ifdef i386Architecture
  # define OptimizedCDebugFlags DefaultGcc2i386Opt
- #else
--# define OptimizedCDebugFlags -O
-+# define OptimizedCDebugFlags
+@@ -507,9 +400,7 @@
+ # define CompressManPages	YES
  #endif
  
- #ifndef PreIncDir
-@@ -493,6 +493,10 @@
- #define SystemManDirectory	/usr/share/man
- #endif
+-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1)
+ #define HasBsdMake	YES
+-#endif
+ 
+ #ifndef StaticLibrary
+ #define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
+@@ -561,13 +452,9 @@
  
-+#ifndef UseConfDirForAppDefaults
-+#define UseConfDirForAppDefaults	NO
-+#endif
-+
- #define InstKmemFlags	-g kmem -m 2755
+ #ifndef HasCookieMaker
+ /* Which versions have /dev/urandom? */
+-#if OSMajorVersion >= 4
+ #define HasCookieMaker		YES
+ #define MkCookieCmd \
+ 	'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
+-#else
+-#define HasCookieMaker		NO
+-#endif
+ #endif
  
  /*

More information about the Midnightbsd-cvs mailing list