diff options
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/XFree86-4-libraries/Makefile | 6 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-d | 29 |
2 files changed, 22 insertions, 13 deletions
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index 0c2a2766d585..db42069e364d 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -7,7 +7,7 @@ PORTNAME= libraries PORTVERSION= 4.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} @@ -96,8 +96,8 @@ PLIST_SUB+= OSMESA:="@comment " PLIST_SUB+= OSMESA:="" .endif -# sparc64 doesn't have a working libc_r yet. -.if ${MACHINE_ARCH} == "sparc64" +# sparc64 doesn't have a working libc_r yet, and -current doesn't need libXThrStub. +.if ${MACHINE_ARCH} == "sparc64" || ${OSVERSION} >= 500043 PLIST_SUB+= XTHRSTUB:="@comment " .else PLIST_SUB+= XTHRSTUB:="" diff --git a/x11/XFree86-4-libraries/files/patch-d b/x11/XFree86-4-libraries/files/patch-d index 6dd191f728b3..fd2afa685745 100644 --- a/x11/XFree86-4-libraries/files/patch-d +++ b/x11/XFree86-4-libraries/files/patch-d @@ -1,5 +1,5 @@ ---- config/cf/FreeBSD.cf.orig Wed Oct 16 20:31:40 2002 -+++ config/cf/FreeBSD.cf Wed Oct 16 20:32:04 2002 +--- config/cf/FreeBSD.cf.orig Fri Nov 1 14:06:38 2002 ++++ config/cf/FreeBSD.cf Fri Nov 1 14:15:57 2002 @@ -43,11 +43,15 @@ #define GccUsesGas YES #define UseGas YES @@ -37,12 +37,21 @@ * FreeBSD has tread-safe api but no getpwnam_r yet. */ # define HasThreadSafeAPI YES -@@ -95,8 +95,12 @@ +@@ -93,10 +93,19 @@ + # if HasLibPthread + # define ThreadsLibraries -lpthread # else - # define BuildThreadStubLibrary YES - # define NeedUIThrStubs YES +-# define BuildThreadStubLibrary YES +-# define NeedUIThrStubs YES -# define ThreadsCompileFlags -pthread -# define ThreadsLibraries -pthread ++# if OSRelVersion >= 500043 ++# define BuildThreadStubLibrary NO ++# define NeedUIThrStubs NO ++# else ++# define BuildThreadStubLibrary YES ++# define NeedUIThrStubs YES ++# endif +# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE +# if (OSRelVersion >= 500016) +# define ThreadsLibraries -lc_r @@ -52,7 +61,7 @@ # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) # define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) # endif -@@ -149,11 +153,11 @@ +@@ -149,11 +158,11 @@ * ld: warning: libXThrStub.so.6, needed by libX11.so, not found */ #if BuildThreadStubLibrary && !UseInstalled @@ -68,7 +77,7 @@ #endif #define CppCmd /usr/bin/cpp -@@ -220,6 +224,20 @@ +@@ -224,6 +233,20 @@ #endif #endif @@ -89,7 +98,7 @@ /* * This doesn't work the way it does on every other system. On FreeBSD it's * only a "hint, not a demand", whatever that means. Note that this is not -@@ -424,6 +442,9 @@ +@@ -428,6 +451,9 @@ #ifdef AlphaArchitecture #define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 #endif @@ -99,7 +108,7 @@ #define StandardDefines -DCSRG_BASED -@@ -445,18 +466,8 @@ +@@ -449,18 +475,8 @@ #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif @@ -120,7 +129,7 @@ #ifndef PreIncDir # define PreIncDir /usr/include -@@ -509,6 +520,10 @@ +@@ -513,6 +529,10 @@ #ifndef PamLibraries #define PamLibraries -lpam DlLibrary |