Update to 4.0.1. Remove libraries from -clients. Try to extract

only what each port needs.  Other miscellaneous bug fixes.

Submitted by:	maintainer

17 files changed, 252 insertions, 117 deletions

diff --git a/x11/XFree86-4-libraries/files/patch-d b/x11/XFree86-4-libraries/files/patch-d
index 6be66663dfb1..a6f67765d897 100644
--- a/x11/XFree86-4-libraries/files/patch-d
+++ b/x11/XFree86-4-libraries/files/patch-d
@@ -1,6 +1,25 @@
---- config/cf/FreeBSD.cf.orig	Thu Feb 17 18:09:43 2000
-+++ config/cf/FreeBSD.cf	Sat Mar 18 19:42:06 2000
-@@ -336,14 +336,14 @@
+--- config/cf/FreeBSD.cf.orig	Sat Jun 24 21:15:53 2000
++++ config/cf/FreeBSD.cf	Tue Aug  1 15:19:44 2000
+@@ -135,6 +135,18 @@
+ #endif
+ #endif
+ 
++#ifndef HasAgpGart
++#  ifdef i386Architecture
++#    if OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1)
++#      define HasAgpGart	YES
++#    else
++#      define HasAgpGart	NO
++#    endif
++#  else
++#    define HasAgpGart		NO
++#  endif
++#endif
++
+ /* 
+  * This doesn't work the way it does on every other system. On FreeBSD it's
+  * only a "hint, not a demand", whatever that means. Note that this is not 
+@@ -356,14 +368,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)
@@ -17,14 +36,3 @@
  #endif
  
  #ifndef PreIncDir
-@@ -463,8 +463,9 @@
- /*
-  * A hack to work around an optimisation problem with the compiler on
-  * FreeBSD 4.0-current in late 1999/early 2000.
-+ * (and FreeBSD 5.0-current in early 2000)
-  */
--#if OSMajorVersion == 4 && OSMinorVersion == 0 && OSTeenyVersion == 0
-+#if (OSMajorVersion == 4 || OSMajorVersion == 5)
- #define FreeBSDGccOptBug
- #endif
- 
diff --git a/x11/XFree86-4-libraries/files/patch-s01 b/x11/XFree86-4-libraries/files/patch-s01
index fa7a41a83513..6447aea41198 100644
--- a/x11/XFree86-4-libraries/files/patch-s01
+++ b/x11/XFree86-4-libraries/files/patch-s01
@@ -1,13 +1,11 @@
---- programs/Xserver/xkb/xkbInit.c.orig	Mon Oct  5 05:02:55 1998
-+++ programs/Xserver/xkb/xkbInit.c	Tue May 23 16:52:19 2000
-@@ -910,7 +910,8 @@
- 	return 1;
-     }
-     else if (strncmp(argv[i], "-xkbmap", 7) == 0) {
--	if(++i < argc) {
-+	i++;
-+	if ((i < argc) && (strlen(argv[i]) < PATH_MAX)) {
- 	    XkbInitialMap= argv[i];
- 	    return 2;
- 	}
-
+--- config/cf/xfree86.cf.orig	Fri Jul 28 11:35:18 2000
++++ config/cf/xfree86.cf	Fri Jul 28 11:35:50 2000
+@@ -555,7 +555,7 @@
+  */
+ #if !defined(i386MachArchitecture) && !defined(OS2Architecture)
+ # ifndef InstallXserverSetUID
+-#  define InstallXserverSetUID	YES
++#  define InstallXserverSetUID	NO
+ # endif
+ #endif
+ 
diff --git a/x11/XFree86-4-libraries/files/patch-s02 b/x11/XFree86-4-libraries/files/patch-s02
index d0d323e13b30..6aea4c5f3d81 100644
--- a/x11/XFree86-4-libraries/files/patch-s02
+++ b/x11/XFree86-4-libraries/files/patch-s02
@@ -1,55 +1,11 @@
---- extras/X-TrueType/xttcconv.c.xtt	Mon May  8 16:28:29 2000
-+++ extras/X-TrueType/xttcconv.c	Mon May  8 16:28:33 2000
-@@ -505,17 +505,19 @@ codeconv_search_code_converter(char cons
- 
-             {
-                 char **l;
--				char **tryItFirst = NULL;
-+		char **tryItFirst = NULL;
- 
-                 for (l=list; *l ; l++) {
--					if(!mystrcasecmp(*l,moduleArg.charSetHints->charsetStdName))
--						tryItFirst = l;
--				}
-+			if(!mystrcasecmp(*l,moduleArg.charSetHints->charsetStdName)) {
-+				tryItFirst = l;
-+				break;
-+			}
-+		}
- 
--				if(tryItFirst)
--					l = tryItFirst;
--				else
--					l = list;
-+		if(tryItFirst)
-+			l = tryItFirst;
-+		else
-+			l = list;
- 			
-                 while(*l && !isFound) {
-                     /* load and call module */
---- extras/X-TrueType/xttfuncs.c.xtt	Mon May  8 16:28:29 2000
-+++ extras/X-TrueType/xttfuncs.c	Mon May  8 16:28:33 2000
-@@ -702,7 +702,7 @@ get_metrics(FreeTypeFont *ft, int c, str
- 
-         if ((entry = FontCacheGetEntry()) == NULL) {
-             charInfo = &nocharinfo;
--            fprintf(stderr, "can't get cache entry\n");
-+            fprintf(stderr, "get_metrics: can't get cache entry\n");
-             goto next;
-         }
-         FC_TT_SETVFUNC(entry);
-@@ -790,10 +790,9 @@ get_glyph(FreeTypeFont *ft, int c, int s
-             char_width.pixel = char_width.raw = 0;
-         get_metrics(ft, c, char_width);
-         /* Retry to get it created in get_metrics(). */
--        FontCacheSearchEntry(ft->cache, c, &entry);
--        if (!charInfo) {
-+        if (!FontCacheSearchEntry(ft->cache, c, &entry)) {
-             charInfo = &nocharinfo;
--            fprintf(stderr, "can't get cache entry\n");
-+            fprintf(stderr, "get_glyph: can't get cache entry\n");
-             goto next;
-         }
-     }
-
+--- programs/Xserver/GL/dri/Imakefile.ORIG	Tue Aug  8 15:42:21 2000
++++ programs/Xserver/GL/dri/Imakefile	Tue Aug  8 15:43:34 2000
+@@ -14,7 +14,7 @@
+      INCLUDES = -I$(SERVERSRC)/include -I$(XTOP)/include -I$(EXTINCSRC) \
+ 		-I$(XF86OSSRC) -I$(XF86COMSRC) \
+ 		-I../include -I../glx -I$(LIBSRC)/GL/include \
+-		-I$(SERVERSRC)/mi -I$(FONTINCSRC)
++		-I$(SERVERSRC)/mi -I$(FONTINCSRC) -I$(XF86OSSRC)/bus
+       DEFINES = $(GLX_DEFINES)
+ 
+ LinkSourceFile(xf86dri.h,$(LIBSRC)/GL/dri)
diff --git a/x11/XFree86-4-libraries/files/patch-z02 b/x11/XFree86-4-libraries/files/patch-z02
index 7979d7adea7a..5a086db27a1e 100644
--- a/x11/XFree86-4-libraries/files/patch-z02
+++ b/x11/XFree86-4-libraries/files/patch-z02
@@ -1,6 +1,6 @@
---- Imakefile.orig	Tue Oct  6 20:26:47 1998
-+++ Imakefile	Wed May 31 14:11:50 2000
-@@ -18,8 +18,27 @@
+--- Imakefile.orig	Thu Jun 15 04:36:13 2000
++++ Imakefile	Fri Aug 18 14:40:02 2000
+@@ -18,8 +18,26 @@
  #endif
  #endif
  
@@ -8,13 +8,12 @@
 +        SUBDIRS = include config lib $(NLSSUBDIR) \
 +		programs/Xserver/include \
 +		programs/Xserver/hw/xfree86/parser \
-+		programs/mkfontdir \
-+		programs/bdftopcf
++		programs/proxymngr programs/xrx
 +#else
 +#if defined(FreeBSDBuildXbin) && FreeBSDBuildXbin
 +        SUBDIRS = include config lib $(NLSSUBDIR) \
-+		programs/Xserver/include \
-+		programs
++		programs/Xserver/include programs/Xserver/hw/xfree86/parser \
++		programs programs/Xserver/hw/xfree86/xf86cfg
 +#else
 +#if defined(FreeBSDBuildXfs) && FreeBSDBuildXfs
 +        SUBDIRS = include config lib $(NLSSUBDIR) \
@@ -28,21 +27,21 @@
    LNINSTALLDIRS = lib
  
  #if HasParallelMake
-@@ -202,3 +221,73 @@
+@@ -206,3 +224,97 @@
  #undef BootstrapCleanSubdirs
  #define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)"
  BOOTSTRAPSUBDIRS = imake makedepend
 +
 +#if defined(FreeBSDBuildXlib) && FreeBSDBuildXlib
-+FreeBSDPortsInstallDir = include lib programs/Xserver/include \
-+			programs/Xserver/hw/xfree86/parser \
-+			programs/bdftopcf programs/mkfontdir
++FreeBSDPortsInstallDir = include lib nls programs/Xserver/include \
++			programs/xrx/plugin \
++			programs/Xserver/hw/xfree86/parser
 +#else
 +#if defined(FreeBSDBuildXbin) && FreeBSDBuildXbin
-+FreeBSDPortsInstallDir = lib nls programs
++FreeBSDPortsInstallDir = lib programs programs programs/Xserver/hw/xfree86/xf86cfg
 +#else
 +#if defined(FreeBSDBuildXxserv) && FreeBSDBuildXxserv
-+FreeBSDPortsInstallDir = programs
++FreeBSDPortsInstallDir = programs lib/font lib/GL/mesa/src/drv
 +#else
 +#if defined(FreeBSDBuildXfs) && FreeBSDBuildXfs
 +FreeBSDPortsInstallDir = programs/xfs
@@ -72,10 +71,34 @@
 +	   (cd $$dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) install.man); \
 +	done
 +
++# followings are in XBMPICS and XPMPICS at programs/Xserver/hw/xfree86/xf86cfg
++XLIBADDFILES1= \
++	card.xbm\
++	keyboard.xbm\
++	monitor.xbm\
++	mouse.xbm\
++	left.xbm\
++	right.xbm\
++	up.xbm\
++	down.xbm\
++	wider.xbm\
++	narrower.xbm\
++	shorter.xbm\
++	taller.xbm
++XLIBADDFILES2= \
++	card.xpm\
++	computer.xpm\
++	keyboard.xpm\
++	monitor.xpm\
++	mouse.xpm
++
 +installXlib::
 +	(cd programs/proxymngr && \
 +	  $(INSTALL) -c $(INSTINCFLAGS) PM.h $(INCROOT)/X11/PM && \
 +	  $(INSTALL) -c $(INSTINCFLAGS) PMproto.h $(INCROOT)/X11/PM)
++	(cd programs/Xserver/hw/xfree86/xf86cfg && \
++	  $(INSTALL) -c $(INSTINCFLAGS) $(XLIBADDFILES1) $(INCROOT)/X11/bitmaps && \
++	  $(INSTALL) -c $(INSTINCFLAGS) $(XLIBADDFILES2) $(INCROOT)/X11/pixmaps)
 +
 +installXnest::
 +	(cd programs/Xserver && \
diff --git a/x11/XFree86-4-libraries/files/patch-z03 b/x11/XFree86-4-libraries/files/patch-z03
index edac5d7fcd69..cbae345baefc 100644
--- a/x11/XFree86-4-libraries/files/patch-z03
+++ b/x11/XFree86-4-libraries/files/patch-z03
@@ -1,5 +1,5 @@
---- config/cf/Library.tmpl.ORIG	Sun May  7 21:06:16 2000
-+++ config/cf/Library.tmpl	Sun May  7 21:11:44 2000
+--- config/cf/Library.tmpl.orig	Wed Oct 13 13:20:41 1999
++++ config/cf/Library.tmpl	Wed Jul 19 09:15:07 2000
 @@ -434,10 +434,14 @@
  # ifdef IncSubdir
  #  ifdef IncSubSubdir
diff --git a/x11/XFree86-4-libraries/files/patch-z04 b/x11/XFree86-4-libraries/files/patch-z04
index 3709b6eeb639..f533ae8a2688 100644
--- a/x11/XFree86-4-libraries/files/patch-z04
+++ b/x11/XFree86-4-libraries/files/patch-z04
@@ -1,12 +1,14 @@
---- lib/X11/Imakefile.orig	Sat Feb 12 15:24:39 2000
-+++ lib/X11/Imakefile	Tue May 23 11:37:14 2000
-@@ -946,8 +946,10 @@
+--- lib/X11/Imakefile.orig	Sun Jun 18 03:41:29 2000
++++ lib/X11/Imakefile	Tue Jul 18 22:01:12 2000
+@@ -950,8 +950,12 @@
  #if InstallXcmsTxt
  InstallNonExecFile(Xcms.txt,$(LIBDIR))
  #endif
 +#if !defined(FreeBSDBuildXlib) || !FreeBSDBuildXlib
  InstallNonExecFile(XErrorDB,$(LIBDIR))
  InstallNonExecFile(XKeysymDB,$(LIBDIR))
++test:
++	_LinkBuildLibrary($@)
 +#endif
  InstallLintLibrary(X11,$(LINTLIBDIR))
  
diff --git a/x11/XFree86-4-libraries/files/patch-z06 b/x11/XFree86-4-libraries/files/patch-z06
index d321ac5c0ede..127e554324c6 100644
--- a/x11/XFree86-4-libraries/files/patch-z06
+++ b/x11/XFree86-4-libraries/files/patch-z06
@@ -1,11 +1,11 @@
---- programs/Xserver/hw/xfree86/os-support/Imakefile.orig	Wed Apr 19 09:46:44 2000
-+++ programs/Xserver/hw/xfree86/os-support/Imakefile	Wed Apr 19 09:48:15 2000
-@@ -107,6 +107,8 @@
+--- programs/Xserver/hw/xfree86/os-support/Imakefile.orig	Sat Jul  1 08:39:11 2000
++++ programs/Xserver/hw/xfree86/os-support/Imakefile	Sun Jul 16 21:38:29 2000
+@@ -109,6 +109,8 @@
  SRCS = $(OS_SUBDIR)/?*.c $(BUS_SUBDIR)/?*.c misc/?*.c vbe/?*.c $(DRM_SRC)
  OBJS = $(OS_SUBDIR)/?*.o $(BUS_SUBDIR)/?*.o misc/?*.o vbe/?*.o $(DRM_OBJ)
  
 +HEADERS = xf86_ansic.h
 +
- DONES = $(OS_SUBDIR)/DONE $(BUS_SUBDIR)/DONE misc/DONE vbe/DONE
+ DONES = $(OS_SUBDIR)/DONE $(BUS_SUBDIR)/DONE misc/DONE vbe/DONE $(DRM_DONES)
  
  #if HasParallelMake
diff --git a/x11/XFree86-4-libraries/files/patch-z07 b/x11/XFree86-4-libraries/files/patch-z07
index 92b022fb889f..090c07cbc828 100644
--- a/x11/XFree86-4-libraries/files/patch-z07
+++ b/x11/XFree86-4-libraries/files/patch-z07
@@ -1,6 +1,6 @@
---- programs/Xserver/hw/xfree86/common/Imakefile.orig	Wed Apr 19 09:49:39 2000
-+++ programs/Xserver/hw/xfree86/common/Imakefile	Wed Apr 19 09:50:25 2000
-@@ -151,6 +151,8 @@
+--- programs/Xserver/hw/xfree86/common/Imakefile.orig	Sat Jul  1 08:38:03 2000
++++ programs/Xserver/hw/xfree86/common/Imakefile	Sun Jul 16 21:39:40 2000
+@@ -158,6 +158,8 @@
  	        -I$(XF86SRC)/scanpci -I$(XF86OSSRC)/vbe -I$(XF86SRC)/int10 \
  		-I$(XF86SRC)/ddc
  
diff --git a/x11/XFree86-4-libraries/files/patch-z13 b/x11/XFree86-4-libraries/files/patch-z13
index 6b6df3571951..1d524a91ec48 100644
--- a/x11/XFree86-4-libraries/files/patch-z13
+++ b/x11/XFree86-4-libraries/files/patch-z13
@@ -1,6 +1,6 @@
---- programs/Imakefile.orig	Sat Feb 26 14:37:07 2000
-+++ programs/Imakefile	Wed May 31 15:13:17 2000
-@@ -63,7 +63,11 @@
+--- programs/Imakefile.orig	Sun Jun 18 03:42:14 2000
++++ programs/Imakefile	Sun Jul 16 21:40:39 2000
+@@ -65,7 +65,11 @@
     XPMCLIENTDIRS = cxpm sxpm
  
  #if BuildServersOnly
diff --git a/x11/XFree86-4-libraries/files/patch-z21 b/x11/XFree86-4-libraries/files/patch-z21
index cd5494eaf3f8..1eb5bbc2032d 100644
--- a/x11/XFree86-4-libraries/files/patch-z21
+++ b/x11/XFree86-4-libraries/files/patch-z21
@@ -1,12 +1,11 @@
---- programs/Xserver/hw/xnest/Imakefile.ORIG	Mon May  8 16:57:25 2000
-+++ programs/Xserver/hw/xnest/Imakefile	Mon May  8 16:58:49 2000
-@@ -52,7 +52,8 @@
+--- programs/Xserver/hw/xnest/Imakefile.orig	Sun Jul 16 22:51:45 2000
++++ programs/Xserver/hw/xnest/Imakefile	Sun Jul 16 22:49:18 2000
+@@ -52,7 +52,7 @@
  
  INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \
  	   -I../../mi -I../../include -I../../os \
 -           -I$(EXTINCSRC) -I$(XINCLUDESRC)
-+           -I$(EXTINCSRC) -I$(XINCLUDESRC) \
-+	   -I../xfree86/loader
- 
- all:: $(OBJS)
++           -I$(EXTINCSRC) -I$(XINCLUDESRC) -I../xfree86/loader
+ DEFINES = $(OS_DEFINES) -UXINPUT -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
+ 	  -UMITSHM -UXF86DRI -UXFree86LOADER
  
diff --git a/x11/XFree86-4-libraries/files/patch-z30 b/x11/XFree86-4-libraries/files/patch-z30
new file mode 100644
index 000000000000..ef13579fb010
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-z30
@@ -0,0 +1,13 @@
+--- lib/GL/mesa/src/drv/Imakefile~	Sat Jul  1 08:35:56 2000
++++ lib/GL/mesa/src/drv/Imakefile	Tue Jul 18 16:52:39 2000
+@@ -59,6 +59,10 @@
+ #endif
+ #endif
+ 
++#if (defined(FreeBSDBuildXlib) && FreeBSDBuildXlib) || (defined(ModuleInstall) && !ModuleInstall)
++SUBDIRS = common
++#endif
++
+ MakeSubdirs($(SUBDIRS))
+ DependSubdirs($(SUBDIRS))
+ 
diff --git a/x11/XFree86-4-libraries/files/patch-z31 b/x11/XFree86-4-libraries/files/patch-z31
new file mode 100644
index 000000000000..263d2ece5950
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-z31
@@ -0,0 +1,35 @@
+--- lib/GL/Imakefile.orig	Thu Jul 27 16:05:37 2000
++++ lib/GL/Imakefile	Thu Jul 27 16:08:01 2000
+@@ -283,10 +283,13 @@
+ 
+ #if NormalLibGlx
+ NormalDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(UOBJS))
++#if !defined(LibInstall) || LibInstall
+ InstallLibrary($(LIBNAME),$(USRLIBDIR))
+ #endif
++#endif
+ #if SharedLibGlx
+ SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(GLXSUBDIRS) $(DONES),$(OBJS) $(THREADOBJS),.,.)
++#if !defined(LibInstall) || LibInstall
+ InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
+ #if LinkGLToUsrLib && AlternateUsrLibDir
+ install::
+@@ -296,13 +299,18 @@
+ 	$(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1
+ #endif
+ #endif
++#endif
+ #if DebugLibGlx
+ DebuggedDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(DOBJS))
++#if !defined(LibInstall) || LibInstall
+ InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
+ #endif
++#endif
+ #if ProfileLibGlx
+ ProfiledDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(POBJS))
++#if !defined(LibInstall) || LibInstall
+ InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
++#endif
+ #endif
+ 
+ XCOMM libOSmesa needs libGL, so build it now
diff --git a/x11/XFree86-4-libraries/files/patch-z32 b/x11/XFree86-4-libraries/files/patch-z32
new file mode 100644
index 000000000000..b24439066535
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-z32
@@ -0,0 +1,12 @@
+--- lib/GL/mesa/src/OSmesa/Imakefile.orig	Thu Jul 27 16:09:32 2000
++++ lib/GL/mesa/src/OSmesa/Imakefile	Thu Jul 27 16:10:11 2000
+@@ -243,7 +243,8 @@
+ /*InstallLibrary($(LIBNAME),$(USRLIBDIR))*/
+ 
+ SharedDepLibraryTarget($(LIBNAME),$(SOREV), $(DONES), $(OBJS), ., .)
++#if !defined(LibInstall) || LibInstall
+ InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
+-
++#endif
+ 
+ DependTarget()
diff --git a/x11/XFree86-4-libraries/files/patch-z33 b/x11/XFree86-4-libraries/files/patch-z33
new file mode 100644
index 000000000000..5c5d7498a63e
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-z33
@@ -0,0 +1,20 @@
+--- config/cf/Imake.rules.orig	Thu Jul 27 15:15:59 2000
++++ config/cf/Imake.rules	Thu Jul 27 16:21:00 2000
+@@ -2266,7 +2266,7 @@
+ #endif
+ 
+ #ifndef LinkBuildLibrary
+-#ifdef UseInstalled
++#if defined(UseInstalled) || (defined(LibInstall) && !defined(LibInstallBuild) && !LibInstall) || (defined(LibInstallBuild) && !LibInstallBuild)
+ #define LinkBuildLibrary(lib) $(_NULLCMD_)
+ #else
+ #define LinkBuildLibrary(lib) MakeDir($(BUILDLIBDIR))			@@\
+@@ -3205,7 +3205,7 @@
+ #endif
+ 
+ #ifndef InstallLibraryModule
+-#if !DoLoadableServer
++#if !DoLoadableServer || (defined(ModuleInstall) && !ModuleInstall)
+ #define InstallLibraryModule(module,dest,subdir)	/**/
+ #else
+ #if MakeDllModules
diff --git a/x11/XFree86-4-libraries/files/patch-z34 b/x11/XFree86-4-libraries/files/patch-z34
new file mode 100644
index 000000000000..1e19d6e99592
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-z34
@@ -0,0 +1,33 @@
+--- lib/font/Imakefile~	Sun Feb 13 15:15:23 2000
++++ lib/font/Imakefile	Thu Jul 27 16:26:42 2000
+@@ -120,22 +120,30 @@
+ 
+ #if NormalLibFont
+ NormalDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(STATIC_OBJS))
++#if !defined(LibInstall) || LibInstall
+ InstallLibrary($(LIBNAME),$(USRLIBDIR))
++#endif
+ #endif /* NormalLibFont */
+ 
+ #if SharedLibFont
+ SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(SUBDIRS) $(DONES),$(SHARED_OBJS),.,.)
++#if !defined(LibInstall) || LibInstall
+ InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
++#endif
+ #endif /* SharedLibFont */
+ 
+ #if DebugLibFont
+ DebuggedDepLibraryTarget(Xfont,$(SUBDIRS) $(DONES),$(DEBUG_OBJS))
++#if !defined(LibInstall) || LibInstall
+ InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
++#endif
+ #endif /* DebugLibFont */
+ 
+ #if ProfileLibFont
+ ProfiledDepLibraryTarget(Xfont,$(SUBDIRS) $(DONES),$(PROFILE_OBJS))
++#if !defined(LibInstall) || LibInstall
+ InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
++#endif
+ #endif /* ProfileLibFont */
+ 
+ #if DoLoadableServer
diff --git a/x11/XFree86-4-libraries/files/patch-z35 b/x11/XFree86-4-libraries/files/patch-z35
new file mode 100644
index 000000000000..ffcd2cac7cdd
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-z35
@@ -0,0 +1,12 @@
+--- lib/font/stubs/Imakefile.orig	Thu Jul 27 17:02:54 2000
++++ lib/font/stubs/Imakefile	Thu Jul 27 17:03:24 2000
+@@ -18,7 +18,9 @@
+ NormalLibraryObjectRule()
+ NormalLibraryTarget(fntstubs,$(OBJS))
+ LintLibraryTarget(fntstubs,$(SRCS))
++#if !defined(LibInstall) || LibInstall
+ InstallLibrary(fntstubs,$(USRLIBDIR))
++#endif
+ NormalLintTarget($(SRCS))
+ DependTarget()
+ 
diff --git a/x11/XFree86-4-libraries/files/patch-z37 b/x11/XFree86-4-libraries/files/patch-z37
new file mode 100644
index 000000000000..4f6e5a12a07c
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-z37
@@ -0,0 +1,24 @@
+--- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig	Thu Jun 15 04:42:20 2000
++++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile	Sat Aug 19 18:09:24 2000
+@@ -2,6 +2,10 @@
+ 
+ XCOMM CDEBUGFLAGS=-g -Wall -ansi -pedantic
+ 
++#if defined(FreeBSDBuildXbin) && FreeBSDBuildXbin
++INCLUDES = -I../parser
++#endif
++
+ SRCS	=\
+ 	accessx.c\
+ 	card-cfg.c\
+@@ -67,8 +71,10 @@
+ 
+ NormalProgramTarget($(PROG),$(OBJS),,$(LOCAL_LIBRARIES),)
+ InstallProgramWithFlags($(PROG),$(BINDIR),NullParameter)
++#if !defined(LibHeaders) || LibHeaders
+ InstallMultipleFlags($(XBMPICS),$(INCDIR)/X11/bitmaps,$(INSTINCFLAGS))
+ InstallMultipleFlags($(XPMPICS),$(INCDIR)/X11/pixmaps,$(INSTINCFLAGS))
++#endif
+ InstallAppDefaults(XF86Cfg)
+ InstallManPage(xf86cfg,$(MANDIR))
+