diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2004-12-23 01:35:49 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2004-12-23 01:35:49 +0000 |
| commit | c90ee83f03de6ce87bf86a6daf09a0010f59c46d (patch) | |
| tree | 589d40624d0cb825807bd5fe7f399d8769657bb1 /devel/imake-6/files/patch-FreeBSD.cf | |
| parent | - Re-do mozilla 1.7.5 patch so kazehakase still works with pre-mozilla 1.7.5 (diff) | |
Update X.Org ports to 6.8.1, and the DRI port to use Mesa 6.2. Because Mesa 6.2
DRI drivers are incompatible with the old libGL in XFree86, they have been
repocopied to graphics/xfree86-dri. Also note that with this commit the html
manpages are going away, and with it the runtime dependency on perl for the
imake port.
Release notes at: http://www.x.org/X11R6.8.1/RELNOTES.txt
Props to: kris (multiple cluster runs and sorting through logs)
lesi (fixing all the issues in those logs, and more)
Notes
Notes:
svn path=/head/; revision=124866
Diffstat (limited to 'devel/imake-6/files/patch-FreeBSD.cf')
| -rw-r--r-- | devel/imake-6/files/patch-FreeBSD.cf | 69 |
1 files changed, 27 insertions, 42 deletions
diff --git a/devel/imake-6/files/patch-FreeBSD.cf b/devel/imake-6/files/patch-FreeBSD.cf index 8b0bf8f8202e..520a175ed6dd 100644 --- a/devel/imake-6/files/patch-FreeBSD.cf +++ b/devel/imake-6/files/patch-FreeBSD.cf @@ -1,46 +1,31 @@ ---- cf/FreeBSD.cf.orig Fri Apr 2 13:47:10 2004 -+++ cf/FreeBSD.cf Fri Jun 18 19:26:35 2004 -@@ -109,32 +109,20 @@ - # endif - # define HasPosixThreads YES - # define ThreadedX YES --# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE --/* -- * FreeBSD has tread-safe api but no getpwnam_r yet. -- */ -+# define SystemMTDefines %%PTHREAD_CFLAGS%% - # define HasThreadSafeAPI YES - # if OSRelVersion < 501000 - # define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI - # else - # define MTSafeAPIDefines -DXUSE_MTSAFE_API +--- cf/FreeBSD.cf.orig Sat Aug 14 17:03:36 2004 ++++ cf/FreeBSD.cf Fri Sep 10 19:52:31 2004 +@@ -78,6 +78,7 @@ + #define HasIssetugid YES + #define HasPoll YES + #endif ++#define BuildHtmlManPages NO + + #if OSMajorVersion >= 4 + #define HasGetIfAddrs YES +@@ -117,14 +118,8 @@ + # if (OSRelVersion < 500043) + # define NeedUIThrStubs YES # endif --# if HasLibPthread +-# if (OSRelVersion >= 502102) -# define ThreadsLibraries -lpthread -+# define ThreadsLibraries %%PTHREAD_LIBS%% -+# if OSRelVersion >= 500043 -+# define BuildThreadStubLibrary NO -+# define NeedUIThrStubs NO - # else --# if OSRelVersion >= 500043 --# define BuildThreadStubLibrary NO --# define NeedUIThrStubs NO --# else --# define BuildThreadStubLibrary YES --# define NeedUIThrStubs YES --# endif --# if (OSRelVersion >= 500016) --# define ThreadsLibraries -lc_r --# define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc --# else --# define ThreadsLibraries -pthread --# endif -+# define BuildThreadStubLibrary YES -+# define NeedUIThrStubs YES - # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) - # define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) - # endif -@@ -359,7 +347,7 @@ +-# elif (OSRelVersion >= 500016) +-# define ThreadsLibraries -lc_r +-# else +-# define ThreadsLibraries -pthread +-# endif +-# define SystemMTDefines -D_THREAD_SAFE ++# define ThreadsLibraries -lpthread ++# define SystemMTDefines + #endif + + /* This fixes linking C programs against libGLU on FreeBSD 3.x */ +@@ -338,7 +333,7 @@ #ifndef LibraryRpathLoadFlags # if UseRpath # if UseElfFormat @@ -49,7 +34,7 @@ # else # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) # endif -@@ -455,14 +443,14 @@ +@@ -466,14 +461,14 @@ /* 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) |