ports/devel/imake-4/files/patch-d
Joe Marcus Clarke 42c2cdc260 Update XFree86 clients to 4.4 release. Release notes are available at
http://www.xfree86.org/4.4.0/RELNOTES.html

PR:		ports/67733 imake
		ports/67508 libraries
		ports/67510 clients
		ports/67513 server
		ports/67776 100dpi fonts
		ports/67777 75dpi fonts
		ports/67778 cyrillic fonts
		ports/67779 default bitmap fonts
		ports/67781 font encodings
		ports/67783 scalable fonts
		ports/67784 font server
		ports/67785 XFree86 meta-port
		ports/67775 documents
		ports/67786 manpages
		ports/67787 nest server
		ports/67788 print server
		ports/67789 virtual framebuffer server
		ports/56487 (Upgrading Xfree86-clients from ports overwrites xdm config files)
		ports/44252 (XFree86-4-Server port removes/overwrites config files)
Submitted by:	Dejan Lesjak (dejan DOT lesjak AT ijs DOT si)
Additional changes by:	anholt
			Jung-uk Kim (jkim AT niksun DOT com)
			arved
Tested by:	pointyhat
		linimon
2004-08-10 01:29:22 +00:00

49 lines
1.6 KiB
Text

--- cf/FreeBSD.cf.orig Wed Jun 9 04:53:53 2004
+++ cf/FreeBSD.cf Wed Jun 9 04:56:47 2004
@@ -108,14 +108,14 @@
# endif
# define HasPosixThreads YES
# define ThreadedX YES
-# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE
+# define SystemMTDefines %%PTHREAD_CFLAGS%%
/*
* FreeBSD has tread-safe api but no getpwnam_r yet.
*/
# define HasThreadSafeAPI YES
# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
# if HasLibPthread
-# define ThreadsLibraries -lpthread
+# define ThreadsLibraries %%PTHREAD_LIBS%%
# else
# if OSRelVersion >= 500043
# define BuildThreadStubLibrary NO
@@ -125,10 +125,10 @@
# define NeedUIThrStubs YES
# endif
# if (OSRelVersion >= 500016)
-# define ThreadsLibraries -lc_r
+# define ThreadsLibraries %%PTHREAD_LIBS%%
# define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc
# else
-# define ThreadsLibraries -pthread
+# define ThreadsLibraries %%PTHREAD_LIBS%%
# endif
# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB)
# define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
@@ -442,14 +442,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)
-#define DefaultGcc2i386Opt -O2 GccAliasingArgs
+#define DefaultGcc2i386Opt
#endif
#endif
#ifdef i386Architecture
# define OptimizedCDebugFlags DefaultGcc2i386Opt
#else
-# define OptimizedCDebugFlags -O
+# define OptimizedCDebugFlags
#endif
#ifndef PreIncDir