update to 4.0.3.

o use internal freetype2 for consistency with x11/XFree86-4.
o added xthreads obtained from x11/XFree86-4.
o install "ws" type config sample for xdm.
o build DRI only if kernel source installed in /sys.
o fix Riva128/SGRAM driver(patch-riva_hw.c).

PR:		24338(4.0.2)
Submitted by:	maintainer, keith

7 files changed, 135 insertions, 39 deletions

diff --git a/devel/imake-4/files/patch-c b/devel/imake-4/files/patch-c
index 22623f1c32c..f5b0ae491d7 100644
--- a/devel/imake-4/files/patch-c
+++ b/devel/imake-4/files/patch-c
@@ -1,6 +1,6 @@
---- cf/Imake.tmpl.orig	Tue Jun 27 09:55:44 2000
-+++ cf/Imake.tmpl	Wed Sep  6 13:31:04 2000
-@@ -1385,7 +1385,7 @@
+--- cf/Imake.tmpl.orig	Tue Dec  5 10:16:28 2000
++++ cf/Imake.tmpl	Tue Dec  5 10:39:48 2000
+@@ -1425,7 +1425,7 @@
         CXXOPTIONS = CplusplusOptions
        CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) 
         CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
@@ -9,12 +9,11 @@
  #endif
           COMPRESS = CompressCmd
            GZIPCMD = GzipCmd
-@@ -1574,7 +1574,8 @@
+@@ -1616,7 +1616,7 @@
   */
        ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
         ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES)
 -           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+          SYSCFLAGS := $(CFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
 +           CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
          LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
           LDPRELIB = LdPreLib
diff --git a/devel/imake-4/files/patch-c2 b/devel/imake-4/files/patch-c2
new file mode 100644
index 00000000000..89ebb285a67
--- /dev/null
+++ b/devel/imake-4/files/patch-c2
@@ -0,0 +1,8 @@
+--- cf/Library.tmpl	Wed Oct 13 00:20:41 1999
++++ cf/Library.tmpl	Thu Dec 21 09:22:14 2000
+@@ -69,3 +69,3 @@
+ CLIBDEBUGFLAGS = LibraryDebugOpt
+-     CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
++     CFLAGS += $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
+ # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
+
diff --git a/devel/imake-4/files/patch-d b/devel/imake-4/files/patch-d
index 39662846e4e..27ec6db7e14 100644
--- a/devel/imake-4/files/patch-d
+++ b/devel/imake-4/files/patch-d
@@ -1,14 +1,6 @@
---- cf/FreeBSD.cf.orig	Sun Jun 25 03:15:53 2000
-+++ cf/FreeBSD.cf	Sun Jul 16 18:22:14 2000
-@@ -351,19 +356,22 @@
- #else
- #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
- #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-+#endif
-+#ifndef HasPam
-+#define HasPam			YES
- #endif
- 
+--- cf/FreeBSD.cf~	Tue Dec  5 10:16:28 2000
++++ cf/FreeBSD.cf	Tue Dec  5 10:45:42 2000
+@@ -371,14 +371,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/devel/imake-4/files/patch-h b/devel/imake-4/files/patch-h
index c33c3c04b73..89b9f99e3e8 100644
--- a/devel/imake-4/files/patch-h
+++ b/devel/imake-4/files/patch-h
@@ -1,26 +1,24 @@
---- cf/Imake.rules.orig	Sun Jun 18 03:39:14 2000
-+++ cf/Imake.rules	Fri Sep  1 13:33:50 2000
-@@ -1297,8 +1297,8 @@
- 									@@\
+--- cf/Imake.rules~	Tue Dec  5 10:16:28 2000
++++ cf/Imake.rules	Tue Dec  5 11:01:00 2000
+@@ -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) &&\ @@\
+ 	RunProgram(RMAN,$(RMANOPTIONS) < file.man > dest.suffix-html) && \ @@\
 -	  $(MV) dest.suffix-html $@					@@\
-+	RunProgram(RMAN,$(RMANOPTIONS) < file.man > dest.suffix-html) && \ @@\
 +	  $(MV) dest.suffix-html dest.suffix.html			@@\
  									@@\
  install.man:: dest.suffix.html						@@\
  	MakeDir($(DESTDIR)$(DOCHTMLDIR))				@@\
-@@ -1533,7 +1533,7 @@
+@@ -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 | \				@@\
++	  RELPATH=`cd opath/cdir; pwd | \					@@\
  		sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \		@@\
  	  cd Concat($(DESTDIR),opath/cdir); \				@@\
  	  if [ -d rdir -a ! -h rdir ]; then \ 				@@\
-@@ -1580,7 +1580,7 @@
+@@ -1586,7 +1586,7 @@
  	MakeDir(Concat($(DESTDIR),npath))				@@\
  	@MakeFlagsToShellFlags(i,set +e); \				@@\
  	if [ -d Concat($(DESTDIR),opath) ]; then \			@@\
diff --git a/devel/imake-4/files/patch-i b/devel/imake-4/files/patch-i
deleted file mode 100644
index 9234130815e..00000000000
--- a/devel/imake-4/files/patch-i
+++ /dev/null
@@ -1,11 +0,0 @@
---- cf/Library.tmpl~	Wed Oct 13 13:20:41 1999
-+++ cf/Library.tmpl	Wed Sep  6 13:32:03 2000
-@@ -67,7 +67,7 @@
- STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
- CDEBUGFLAGS = LibraryCDebugFlags
- CLIBDEBUGFLAGS = LibraryDebugOpt
--     CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
-+     CFLAGS = $(SYSCFLAGS) $(CLIBDEBUGFLAGS)
- # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
-    PICFLAGS = LargePositionIndependentCFlags
- # endif
diff --git a/devel/imake-4/files/patch-t01 b/devel/imake-4/files/patch-t01
index 6d605f8e369..ce994b4f2ce 100644
--- a/devel/imake-4/files/patch-t01
+++ b/devel/imake-4/files/patch-t01
@@ -1,6 +1,15 @@
---- imake/imake.c~	Thu Jun 15 04:36:17 2000
-+++ imake/imake.c	Thu Sep 28 13:58:02 2000
-@@ -1184,6 +1184,19 @@
+--- imake/imake.c.ORIG	Mon Dec 18 14:54:34 2000
++++ imake/imake.c	Mon Dec 18 14:55:25 2000
+@@ -399,7 +399,7 @@
+ int
+ main(int argc, char *argv[])
+ {
+-	FILE	*tmpfd;
++	FILE	*tmpfd = (FILE *)NULL;
+ 	char	makeMacro[ BUFSIZ ];
+ 	char	makefileMacro[ BUFSIZ ];
+ 
+@@ -1208,6 +1208,19 @@
  	if (uname(&name) < 0)
  		LogFatal("Cannot invoke uname", "");
  
diff --git a/devel/imake-4/files/patch-xthreads b/devel/imake-4/files/patch-xthreads
new file mode 100644
index 00000000000..0be90302ebd
--- /dev/null
+++ b/devel/imake-4/files/patch-xthreads
@@ -0,0 +1,101 @@
+--- ../include/Xos_r.h.orig	Sat Mar 24 16:49:23 2001
++++ ../include/Xos_r.h	Sat Mar 24 16:49:25 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
+ 
+--- cf/FreeBSD.cf.orig	Sat Mar 24 16:49:25 2001
++++ cf/FreeBSD.cf	Sat Mar 24 16:49:49 2001
+@@ -66,6 +66,41 @@
+ #define InstallXloadSetGID	YES
+ #endif
+ 
++/*
++ * 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 
++#  if (OSRelVersion >= 500016)
++#   define ThreadsLibraries 	-lc_r
++#  else
++#   define ThreadsLibraries 	-pthread
++#  endif
++#  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
++#  define SharedXtReqs		$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
++# endif
++#endif
++
+ #define AvoidNullMakeCommand	YES
+ #define StripInstalledPrograms	YES
+ #define CompressAllFonts	YES
+@@ -97,7 +132,23 @@
+ #endif
+ #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
+--- cf/bsdLib.tmpl.orig	Tue Aug 29 03:43:49 2000
++++ cf/bsdLib.tmpl	Sat Mar 24 16:49:25 2001
+@@ -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)