7 files changed, 25 insertions, 239 deletions

diff --git a/x11/XFree86-4/files/patch-DRI b/x11/XFree86-4/files/patch-DRI
deleted file mode 100644
index efd3ad52a1ae..000000000000
--- a/x11/XFree86-4/files/patch-DRI
+++ /dev/null
@@ -1,61 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_drv.c~	Sat Jun 17 02:03:32 2000
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_drv.c	Fri Mar 30 02:50:04 2001
-@@ -41,7 +41,7 @@
- #define MGA_NAME	 "mga"
- #define MGA_DESC	 "Matrox g200/g400"
- #define MGA_DATE	 "19991213"
--#define MGA_MAJOR	 1
-+#define MGA_MAJOR	 2
- #define MGA_MINOR	 0
- #define MGA_PATCHLEVEL	 0
- 
---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drmP.h.orig	Sat Jun 17 02:03:28 2000
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drmP.h	Tue Apr 10 02:56:17 2001
-@@ -49,11 +49,11 @@
- #include <sys/sysctl.h>
- #include <sys/select.h>
- #include <sys/bus.h>
--#if __FreeBSD_version >= 500005
-+#if __FreeBSD_version > 410000
- #include <sys/taskqueue.h>
- #endif
- 
--#if __FreeBSD_version >= 500006
-+#if __FreeBSD_version > 410000
- #define DRM_AGP
- #endif
- 
-@@ -128,7 +128,7 @@
-  * Fake out the module macros for versions of FreeBSD where they don't
-  * exist.
-  */
--#if __FreeBSD_version < 500002
-+#if __FreeBSD_version < 420000
- 
- #define MODULE_VERSION(a,b)		struct __hack
- #define MODULE_DEPEND(a,b,c,d,e)	struct __hack
-@@ -517,7 +517,7 @@
- 	int		  last_checked;	/* Last context checked for DMA	   */
- 	int		  last_context;	/* Last current context		   */
- 	int		  last_switch;	/* Time at last context switch  */
--#if __FreeBSD_version >= 500005
-+#if __FreeBSD_version >= 420000
- 	struct task	  task;
- #endif
- 	struct timespec	  ctx_start;
-@@ -548,6 +548,8 @@
- 	void		  *dev_private;
- } drm_device_t;
- 
-+#undef SYSCTL_HANDLER_ARGS
-+#define SYSCTL_HANDLER_ARGS (struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req)
- 
- 				/* Internal function definitions */
- 
---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Makefile.bsd~	Sat Jun 17 02:03:28 2000
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Makefile.bsd	Fri Mar 30 15:02:30 2001
-@@ -2,3 +2,3 @@
- 
--SUBDIR = drm tdfx gamma
-+SUBDIR = drm tdfx gamma mga
- 
diff --git a/x11/XFree86-4/files/patch-a1 b/x11/XFree86-4/files/patch-a1
deleted file mode 100644
index 4b8c723564f1..000000000000
--- a/x11/XFree86-4/files/patch-a1
+++ /dev/null
@@ -1,16 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support//shared/xf86Axp.h~	Mon Nov  6 22:57:11 2000
-+++ programs/Xserver/hw/xfree86/os-support//shared/xf86Axp.h	Fri Apr  6 00:21:23 2001
-@@ -19,13 +19,6 @@
-   IRONGATE
- } axpDevice;
-   
--typedef struct 
-- { char* sysName; 
--   char* sysVari; 
--   char* cpu; 
--   axpDevice sys; }
--AXP;
--
- typedef struct {
-   axpDevice id;
-   unsigned long hae_thresh;
diff --git a/x11/XFree86-4/files/patch-c b/x11/XFree86-4/files/patch-c
index 25c238b43d3e..6a3bc7352bc2 100644
--- a/x11/XFree86-4/files/patch-c
+++ b/x11/XFree86-4/files/patch-c
@@ -1,18 +1,18 @@
---- config/cf/Imake.tmpl.orig	Fri Dec  8 02:50:56 2000
-+++ config/cf/Imake.tmpl	Tue Dec 12 03:17:55 2000
-@@ -1425,7 +1425,7 @@
+--- config/cf/Imake.tmpl~	Thu Apr 26 23:09:38 2001
++++ config/cf/Imake.tmpl	Fri May 25 23:42:07 2001
+@@ -1487,7 +1487,7 @@
         CXXOPTIONS = CplusplusOptions
        CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) 
-        CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
+        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
-@@ -1616,7 +1616,7 @@
+@@ -1682,7 +1682,7 @@
   */
        ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
-        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES)
+        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)
diff --git a/x11/XFree86-4/files/patch-d b/x11/XFree86-4/files/patch-d
index aa9b40fe1c97..fba7b1f8b570 100644
--- a/x11/XFree86-4/files/patch-d
+++ b/x11/XFree86-4/files/patch-d
@@ -1,6 +1,6 @@
---- config/cf/FreeBSD.cf.orig	Tue Dec  5 01:45:27 2000
-+++ config/cf/FreeBSD.cf	Tue Dec 19 23:08:57 2000
-@@ -371,14 +373,14 @@
+--- config/cf/FreeBSD.cf~	Thu May  3 22:12:35 2001
++++ config/cf/FreeBSD.cf	Fri May 25 23:45:58 2001
+@@ -444,14 +444,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)
diff --git a/x11/XFree86-4/files/patch-f b/x11/XFree86-4/files/patch-f
index 33642a0326d4..93e7d910dadf 100644
--- a/x11/XFree86-4/files/patch-f
+++ b/x11/XFree86-4/files/patch-f
@@ -16,9 +16,9 @@
 -zh_TW.big5/Compose:	zh_TW.Big5
 +zh_TW.Big5/Compose:	zh_TW.Big5
  zh_TW/Compose:		zh_TW.eucTW
---- nls/locale.alias~	Tue Dec 12 03:18:29 2000
-+++ nls/locale.alias	Tue Dec 12 03:58:51 2000
-@@ -444,11 +444,11 @@
+--- nls/locale.alias~	Wed May 23 20:32:14 2001
++++ nls/locale.alias	Sat May 26 02:37:21 2001
+@@ -493,12 +493,12 @@
  zh						zh_CN.eucCN
  zh_CN						zh_CN.eucCN
  zh_CN.big5					zh_TW.big5
@@ -27,30 +27,29 @@
  zh_CN.EUC					zh_CN.eucCN
  zh_CN.euc					zh_CN.eucCN
  zh_CN.gb2312					zh_CN.eucCN
+ zh_CN.gbk					zh_CN.GBK
 -zh_TW						zh_TW.big5
 +zh_TW						zh_TW.Big5
  zh_TW.EUC					zh_TW.eucTW
  zh_TW.euc					zh_TW.eucTW
  
-@@ -1034,15 +1034,15 @@
+@@ -1182,13 +1182,13 @@
  yi_US.MICROSOFT-CP1255:				yi_US.CP1255
  zh:						zh_CN.eucCN
  zh_CN:						zh_CN.eucCN
 -zh_CN.big5:					zh_TW.big5
 -zh_CN.Big5:					zh_TW.big5
-+zh_CN.Big5:					zh_TW.Big5
++zh_CN.big5:					zh_TW.Big5
 +zh_CN.Big5:					zh_TW.Big5
  zh_CN.EUC:					zh_CN.eucCN
  zh_CN.euc:					zh_CN.eucCN
  zh_CN.gb2312:					zh_CN.eucCN
- zh_TW:						zh_TW.big5
+ zh_CN.gbk:					zh_CN.GBK
+-zh_TW:						zh_TW.big5
++zh_TW:						zh_TW.Big5
  zh_TW.EUC:					zh_TW.eucTW
  zh_TW.euc:					zh_TW.eucTW
--zh_TW.big5:					zh_TW.big5
-+zh_TW.Big5:					zh_TW.Big5
- 
- XCOMM The following locale names are used in SCO 3.0
- english_uk.8859:				en_GB.ISO8859-1
+ zh_TW.big5:					zh_TW.big5
 --- nls/locale.dir~	Tue Dec 12 03:18:29 2000
 +++ nls/locale.dir	Tue Dec 12 04:01:54 2000
 @@ -199,7 +199,7 @@
@@ -98,15 +97,15 @@
 +# Special Character
 +
 +# End of Sequence Definition
---- nls/XLC_LOCALE/Imakefile~	Tue Dec 12 03:18:29 2000
-+++ nls/XLC_LOCALE/Imakefile	Tue Dec 12 04:07:10 2000
-@@ -86,7 +86,7 @@
- LTarget(vi_VN.viscii)
- LTarget(zh)
+--- nls/XLC_LOCALE/Imakefile~	Tue Mar  6 19:54:45 2001
++++ nls/XLC_LOCALE/Imakefile	Sat May 26 02:38:44 2001
+@@ -88,7 +88,7 @@
+ LTarget(zh_CN.gbk)
+ LTarget(zh_HK.big5hkscs)
  LTarget(zh_TW)
 -LTarget(zh_TW.big5)
 +LTarget(zh_TW.Big5)
- LTarget(th_TH.TACTIS)
+ LTarget(th_TH)
  LTarget(en_US.UTF-8)
  #ifdef UXPArchitecture
 --- nls/XLC_LOCALE/zh_TW.Big5.orig	Sun Jul 16 04:33:35 2000
diff --git a/x11/XFree86-4/files/patch-h b/x11/XFree86-4/files/patch-h
deleted file mode 100644
index 4046c34183c2..000000000000
--- a/x11/XFree86-4/files/patch-h
+++ /dev/null
@@ -1,29 +0,0 @@
---- config/cf/Imake.rules	2000/12/02 01:16:01	3.85
-+++ config/cf/Imake.rules	2000/12/12 03:28:06
-@@ -1303,7 +1303,7 @@
- dest.suffix.html: file.man RmanCmdDependency				@@\
- 	RemoveFiles(dest.suffix.html dest.suffix-html)			@@\
- 	RunProgram(RMAN,$(RMANOPTIONS) < file.man > dest.suffix-html) && \ @@\
--	  $(MV) dest.suffix-html $@					@@\
-+	  $(MV) dest.suffix-html dest.suffix.html			@@\
- 									@@\
- install.man:: dest.suffix.html						@@\
- 	MakeDir($(DESTDIR)$(DOCHTMLDIR))				@@\
-@@ -1539,7 +1539,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`; \		@@\
- 	  cd Concat($(DESTDIR),opath/cdir); \				@@\
- 	  if [ -d rdir -a ! -h rdir ]; then \ 				@@\
-@@ -1586,7 +1586,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/XFree86-4/files/patch-xthreads b/x11/XFree86-4/files/patch-xthreads
deleted file mode 100644
index 2238775a095b..000000000000
--- a/x11/XFree86-4/files/patch-xthreads
+++ /dev/null
@@ -1,107 +0,0 @@
---- include/Xos_r.h.orig	Sun Mar 18 00:12:23 2001
-+++ include/Xos_r.h	Sun Mar 18 00:26:45 2001
-@@ -245,7 +245,7 @@
- 
- /* NetBSD, at least, is missing several of the unixware passwd fields. */
-    
--#if defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
- __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
- {
-    memcpy(&(p).pws, (p).pwp, sizeof(struct passwd));
-@@ -412,7 +412,7 @@
- /* UnixWare 2.0, or other systems with thread support but no _r API. */
- /* WARNING:  The h_addr_list and s_aliases values are *not* copied! */
- 
--#if defined(__NetBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__)
- #include <sys/param.h>
- #endif
- 
---- config/cf/FreeBSD.cf.old	Wed Dec 20 02:56:11 2000
-+++ config/cf/FreeBSD.cf	Wed Dec 20 02:56:24 2000
-@@ -60,6 +60,38 @@
- #define HasVarRun		YES
- #define HasVarDb		YES
- 
-+/*
-+ * Multi-thread safe libs 
-+ */	
-+/* 2.2.7 and later has libc_r (POSIX threads) */
-+#if OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7 || \
-+    OSMajorVersion >= 3
-+# ifndef HasLibPthread
-+#  define HasLibPthread		NO
-+# endif
-+# define HasPosixThreads	YES
-+# define ThreadedX		YES
-+/*
-+ * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-+ */
-+# define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
-+/*
-+ * 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
-+# else
-+#  define BuildThreadStubLibrary  YES 
-+#  define NeedUIThrStubs          YES 
-+#  define ThreadsCompileFlags	-pthread
-+#  define ThreadsLibraries 	-pthread
-+#  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
-+#  define SharedXtReqs		$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
-+# endif
-+#endif
-+
- #define AvoidNullMakeCommand	YES
- #define StripInstalledPrograms	YES
- #define CompressAllFonts	YES
-@@ -82,7 +114,23 @@
- #define HasFlex			YES
- #endif
- 
--#define CcCmd			cc
-+/*
-+ * Add an LD_LIBRARY_PATH environment variable, defined by $(CLIENTENVSETUP),
-+ * when building X to avoid that for each client ld give the message
-+ *
-+ *    ld: warning: libXThrStub.so.6, needed by libX11.so, not found
-+ */
-+#if BuildThreadStubLibrary && !UseInstalled
-+# define CcCmd			$(CLIENTENVSETUP) cc
-+# define CplusplusCmd		$(CLIENTENVSETUP) c++
-+#else
-+# define CcCmd			cc
-+# define CplusplusCmd		c++
-+#endif
-+
-+#define CppCmd			/usr/bin/cpp
-+#define PreProcessCmd		CppCmd
-+#define StandardCppOptions	-traditional
- #define CppCmd			/usr/bin/cpp
- #define PreProcessCmd		CppCmd
- #define StandardCppOptions	-traditional
---- config/cf/bsdLib.tmpl~	Mon Aug 28 20:43:49 2000
-+++ config/cf/bsdLib.tmpl	Wed Dec 20 04:31:46 2000
-@@ -47,7 +47,9 @@
- #define SharedX11Reqs
- #endif
- #define SharedOldXReqs	$(LDPRELIB) $(XLIBONLY)
-+#ifndef SharedXtReqs
- #define SharedXtReqs	$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
-+#endif
- #define SharedXawReqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
- #define SharedXaw6Reqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
- #define SharedXmuReqs	$(LDPRELIB) $(XTOOLLIB) $(XLIB)
---- programs/glxinfo/Imakefile.orig	Fri Sep 22 13:35:46 2000
-+++ programs/glxinfo/Imakefile	Thu Dec 21 02:11:55 2000
-@@ -1,5 +1,6 @@
- XCOMM $XConsortium: Imakefile /main/7 1995/12/04 15:10:00 dpw $
- XCOMM $XFree86: xc/programs/glxinfo/Imakefile,v 1.1 2000/09/22 11:35:46 alanh Exp $
-+#include <Threads.tmpl>
-         DEPLIBS = $(DEPXTESTLIB) $(DEPXIELIB) $(DEPXLIB) $(DEPXKBFILELIB) $(DEPXF86LIBS) $(DEPXILIB)
- #ifndef OS2Architecture
- LOCAL_LIBRARIES = $(GLXLIB) $(XLIB)