- Welcome X.org 7.2 \o/.

- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.

8 files changed, 268 insertions, 0 deletions

diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
new file mode 100644
index 000000000000..cd59bc22f74e
--- /dev/null
+++ b/x11/xorg-cf-files/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	xorg-cf-files
+# Date created:				Nov 18 2006
+# Whom:					Dave Grochowski
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xorg-cf-files
+PORTVERSION=	1.0.2
+PORTREVISION=	2
+CATEGORIES=	x11
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.org cf files for use with imake builds
+
+XORG_CAT=	util
+
+.include <bsd.port.mk>
diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo
new file mode 100644
index 000000000000..06ed7fc59d3d
--- /dev/null
+++ b/x11/xorg-cf-files/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/util/xorg-cf-files-1.0.2.tar.bz2) = 5f62dd5545b782c74f6e4e70d0e6552c
+SHA256 (xorg/util/xorg-cf-files-1.0.2.tar.bz2) = e34613aec2d3d56e1917bd8469f228b9654558f41e335d7e8e49020779fa9597
+SIZE (xorg/util/xorg-cf-files-1.0.2.tar.bz2) = 264638
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
diff --git a/x11/xorg-cf-files/pkg-descr b/x11/xorg-cf-files/pkg-descr
new file mode 100644
index 000000000000..e0bb5bcf11a3
--- /dev/null
+++ b/x11/xorg-cf-files/pkg-descr
@@ -0,0 +1 @@
+X.org cf files for use with imake based builds.
diff --git a/x11/xorg-cf-files/pkg-plist b/x11/xorg-cf-files/pkg-plist
new file mode 100644
index 000000000000..05bc2a4a748d
--- /dev/null
+++ b/x11/xorg-cf-files/pkg-plist
@@ -0,0 +1,122 @@
+lib/X11/config/Amoeba.cf
+lib/X11/config/DGUX.cf
+lib/X11/config/DragonFly.cf
+lib/X11/config/FreeBSD.cf
+lib/X11/config/Imake.cf
+lib/X11/config/Imake.rules
+lib/X11/config/Imake.tmpl
+lib/X11/config/Library.tmpl
+lib/X11/config/Mips.cf
+lib/X11/config/Motif.rules
+lib/X11/config/Motif.tmpl
+lib/X11/config/NetBSD.cf
+lib/X11/config/Oki.cf
+lib/X11/config/OpenBSD.cf
+lib/X11/config/OpenBSDLib.rules
+lib/X11/config/OpenBSDLib.tmpl
+lib/X11/config/QNX4.cf
+lib/X11/config/QNX4.rules
+lib/X11/config/Server.tmpl
+lib/X11/config/ServerLib.tmpl
+lib/X11/config/Threads.tmpl
+lib/X11/config/Win32.cf
+lib/X11/config/Win32.rules
+lib/X11/config/WinLib.tmpl
+lib/X11/config/X11.rules
+lib/X11/config/X11.tmpl
+lib/X11/config/apollo.cf
+lib/X11/config/bsd.cf
+lib/X11/config/bsdLib.rules
+lib/X11/config/bsdLib.tmpl
+lib/X11/config/bsdi.cf
+lib/X11/config/bsdiLib.rules
+lib/X11/config/bsdiLib.tmpl
+lib/X11/config/cde.rules
+lib/X11/config/cde.tmpl
+lib/X11/config/convex.cf
+lib/X11/config/cray.cf
+lib/X11/config/cross.def
+lib/X11/config/cross.rules
+lib/X11/config/cygwin.cf
+lib/X11/config/cygwin.rules
+lib/X11/config/cygwin.tmpl
+lib/X11/config/darwin.cf
+lib/X11/config/darwinLib.rules
+lib/X11/config/darwinLib.tmpl
+lib/X11/config/date.def
+lib/X11/config/dmx.cf
+lib/X11/config/fujitsu.cf
+lib/X11/config/generic.cf
+lib/X11/config/gnu.cf
+lib/X11/config/gnuLib.rules
+lib/X11/config/gnuLib.tmpl
+lib/X11/config/host.def
+lib/X11/config/hp.cf
+lib/X11/config/hpLib.rules
+lib/X11/config/hpLib.tmpl
+lib/X11/config/ibm.cf
+lib/X11/config/ibmLib.rules
+lib/X11/config/ibmLib.tmpl
+lib/X11/config/isc.cf
+lib/X11/config/linux.cf
+lib/X11/config/lnxLib.rules
+lib/X11/config/lnxLib.tmpl
+lib/X11/config/lnxdoc.rules
+lib/X11/config/lnxdoc.tmpl
+lib/X11/config/luna.cf
+lib/X11/config/lynx.cf
+lib/X11/config/macII.cf
+lib/X11/config/mach.cf
+lib/X11/config/mingw.cf
+lib/X11/config/mingw.rules
+lib/X11/config/mingw.tmpl
+lib/X11/config/minix.cf
+lib/X11/config/moto.cf
+lib/X11/config/ncr.cf
+lib/X11/config/nec.cf
+lib/X11/config/necLib.rules
+lib/X11/config/necLib.tmpl
+lib/X11/config/noop.rules
+lib/X11/config/nto.cf
+lib/X11/config/nto.rules
+lib/X11/config/oldlib.rules
+lib/X11/config/os2.cf
+lib/X11/config/os2.rules
+lib/X11/config/os2Lib.rules
+lib/X11/config/os2Lib.tmpl
+lib/X11/config/osf1.cf
+lib/X11/config/osfLib.rules
+lib/X11/config/osfLib.tmpl
+lib/X11/config/pegasus.cf
+lib/X11/config/sco.cf
+lib/X11/config/sco5.cf
+lib/X11/config/scoLib.rules
+lib/X11/config/sequent.cf
+lib/X11/config/sequentLib.rules
+lib/X11/config/sgi.cf
+lib/X11/config/sgiLib.rules
+lib/X11/config/sgiLib.tmpl
+lib/X11/config/site.def
+lib/X11/config/sony.cf
+lib/X11/config/sun.cf
+lib/X11/config/sunLib.rules
+lib/X11/config/sunLib.tmpl
+lib/X11/config/sv3Lib.rules
+lib/X11/config/sv3Lib.tmpl
+lib/X11/config/sv4Lib.rules
+lib/X11/config/sv4Lib.tmpl
+lib/X11/config/svr3.cf
+lib/X11/config/svr4.cf
+lib/X11/config/ultrix.cf
+lib/X11/config/usl.cf
+lib/X11/config/version.def
+lib/X11/config/x386.cf
+lib/X11/config/xf86.rules
+lib/X11/config/xf86.tmpl
+lib/X11/config/xf86site.def
+lib/X11/config/xfree86.cf
+lib/X11/config/xorg.cf
+lib/X11/config/xorg.tmpl
+lib/X11/config/xorgsite.def
+lib/X11/config/xorgversion.def
+@dirrm lib/X11/config