diff options
author | Florent Thoumie <flz@FreeBSD.org> | 2007-05-19 20:36:56 +0000 |
---|---|---|
committer | Florent Thoumie <flz@FreeBSD.org> | 2007-05-19 20:36:56 +0000 |
commit | d4f0d0048a8755106a4b0445221a19761e746984 (patch) | |
tree | c87184c5bfeaf942c827c5f706186ce9786a2588 /x11/xorg-cf-files/files | |
parent | e82affd309fc2d8e5ea19b2e003f1296920bd825 (diff) | |
download | ports-d4f0d0048a8755106a4b0445221a19761e746984.tar.gz ports-d4f0d0048a8755106a4b0445221a19761e746984.zip |
Notes
Diffstat (limited to 'x11/xorg-cf-files/files')
-rw-r--r-- | x11/xorg-cf-files/files/patch-FreeBSD.cf | 64 | ||||
-rw-r--r-- | x11/xorg-cf-files/files/patch-Imake.rules | 29 | ||||
-rw-r--r-- | x11/xorg-cf-files/files/patch-Imake.tmpl | 20 | ||||
-rw-r--r-- | x11/xorg-cf-files/files/patch-Library.tmpl | 11 |
4 files changed, 124 insertions, 0 deletions
diff --git a/x11/xorg-cf-files/files/patch-FreeBSD.cf b/x11/xorg-cf-files/files/patch-FreeBSD.cf new file mode 100644 index 000000000000..524dee86e0ae --- /dev/null +++ b/x11/xorg-cf-files/files/patch-FreeBSD.cf @@ -0,0 +1,64 @@ +--- FreeBSD.cf.orig Sat Aug 14 17:03:36 2004 ++++ 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 (OSRelVersion >= 502102) +-# define ThreadsLibraries -lpthread +-# 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 +-# define LibraryRpathLoadFlags -rpath $(USRLIBDIRPATH) ++# define LibraryRpathLoadFlags -Wl,-rpath $(USRLIBDIRPATH) + # else + # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) + # endif +@@ -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) +-#define DefaultGcc2i386Opt -O2 GccAliasingArgs ++#define DefaultGcc2i386Opt + #endif + #endif + + #ifdef i386Architecture + # define OptimizedCDebugFlags DefaultGcc2i386Opt + #else +-# define OptimizedCDebugFlags -O ++# define OptimizedCDebugFlags + #endif + + #ifndef PreIncDir +@@ -493,6 +493,10 @@ + #define SystemManDirectory /usr/share/man + #endif + ++#ifndef UseConfDirForAppDefaults ++#define UseConfDirForAppDefaults NO ++#endif ++ + #define InstKmemFlags -g kmem -m 2755 + + /* diff --git a/x11/xorg-cf-files/files/patch-Imake.rules b/x11/xorg-cf-files/files/patch-Imake.rules new file mode 100644 index 000000000000..6542cdc94180 --- /dev/null +++ b/x11/xorg-cf-files/files/patch-Imake.rules @@ -0,0 +1,29 @@ +--- Imake.rules.orig Tue Dec 18 05:00:37 2001 ++++ Imake.rules Mon Jan 21 02:34:48 2002 +@@ -1399,7 +1399,7 @@ + dest.suffix.html: file.$(MANNEWSUFFIX) RmanCmdDependency @@\ + RemoveFiles(dest.suffix.html dest.suffix-html) @@\ + RunProgram(RMAN,$(RMANOPTIONS) < file.$(MANNEWSUFFIX) \ @@\ +- > dest.suffix-html) && $(MV) dest.suffix-html $@ @@\ ++ > dest.suffix-html) && $(MV) dest.suffix-html dest.suffix.html @@\ + @@\ + install.man:: dest.suffix.html @@\ + MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\ +@@ -1644,7 +1644,7 @@ + MakeDir(Concat($(DESTDIR),npath/mdir)) @@\ + @MakeFlagsToShellFlags(i,set +e); \ @@\ + if [ -d Concat($(DESTDIR),opath/cdir) ]; then \ @@\ +- RELPATH=`echo opath/cdir | \ @@\ ++ RELPATH=`cd opath/cdir; pwd | \ @@\ + sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ @@\ + cd Concat($(DESTDIR),opath/cdir); \ @@\ + if [ -d rdir -a ! -h rdir ]; then \ @@\ +@@ -1691,7 +1691,7 @@ + MakeDir(Concat($(DESTDIR),npath)) @@\ + @MakeFlagsToShellFlags(i,set +e); \ @@\ + if [ -d Concat($(DESTDIR),opath) ]; then \ @@\ +- RELPATH=`echo opath | \ @@\ ++ RELPATH=`cd opath; pwd | \ @@\ + sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\ + cd Concat($(DESTDIR),opath); \ @@\ + if [ -f lfile -a ! -h lfile ]; then \ @@\ diff --git a/x11/xorg-cf-files/files/patch-Imake.tmpl b/x11/xorg-cf-files/files/patch-Imake.tmpl new file mode 100644 index 000000000000..442fb64463b3 --- /dev/null +++ b/x11/xorg-cf-files/files/patch-Imake.tmpl @@ -0,0 +1,20 @@ +--- Imake.tmpl.orig Tue Jul 27 20:24:29 2004 ++++ Imake.tmpl Fri Sep 10 18:45:12 2004 +@@ -1798,7 +1798,7 @@ + CXXOPTIONS = CplusplusOptions + CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) + CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES) +- CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) ++ CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) + #endif + COMPRESS = CompressCmd + GZIPCMD = GzipCmd +@@ -2038,7 +2038,7 @@ + */ + ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) +- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) ++ CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) + LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) + LDPRELIB = LdPreLib $(INSTALLED_LIBS) + LDPOSTLIB = LdPostLib diff --git a/x11/xorg-cf-files/files/patch-Library.tmpl b/x11/xorg-cf-files/files/patch-Library.tmpl new file mode 100644 index 000000000000..1bb60edbd009 --- /dev/null +++ b/x11/xorg-cf-files/files/patch-Library.tmpl @@ -0,0 +1,11 @@ +--- Library.tmpl.orig Thu Jan 18 01:22:30 2001 ++++ Library.tmpl Mon Jun 4 19:30:34 2001 +@@ -67,7 +67,7 @@ + STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) + CDEBUGFLAGS = LibraryCDebugFlags + CLIBDEBUGFLAGS = LibraryDebugOpt +- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) ++ CFLAGS += $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) + # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags) + PICFLAGS = LargePositionIndependentCFlags + # endif |