42c2cdc260
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
39 lines
1.2 KiB
CFEngine3
39 lines
1.2 KiB
CFEngine3
--- config/cf/FreeBSD.cf.orig Sat Nov 1 20:38:01 2003
|
|
+++ config/cf/FreeBSD.cf Tue Nov 11 20:47:11 2003
|
|
@@ -172,11 +172,11 @@
|
|
* ld: warning: libXThrStub.so.6, needed by libX11.so, not found
|
|
*/
|
|
#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
|
|
-# define CcCmd $(CLIENTENVSETUP) cc
|
|
-# define CplusplusCmd $(CLIENTENVSETUP) c++
|
|
+# define CcCmd $(CLIENTENVSETUP) FreeBSDCC
|
|
+# define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX
|
|
#else
|
|
-# define CcCmd cc
|
|
-# define CplusplusCmd c++
|
|
+# define CcCmd FreeBSDCC
|
|
+# define CplusplusCmd FreeBSDCXX
|
|
#endif
|
|
|
|
#define CppCmd /usr/bin/cpp
|
|
@@ -393,18 +393,8 @@
|
|
#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
|
|
-#endif
|
|
-#endif
|
|
-
|
|
-#ifdef i386Architecture
|
|
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
|
|
-#else
|
|
-# define OptimizedCDebugFlags -O
|
|
-#endif
|
|
+#define DefaultGcc2i386Opt
|
|
+#define OptimizedCDebugFlags FreeBSDCFLAGS
|
|
|
|
#ifndef PreIncDir
|
|
# define PreIncDir /usr/include
|