Set ForceNormalLib and SharedFontLib to YES regardless of Linux distribution,

so that the same set of libraries are built on every Linux distribution.
Thanks to Joerg Sonnenberger for guide and review.

3 files changed, 67 insertions, 12 deletions

diff --git a/x11/xorg-libs/PLIST b/x11/xorg-libs/PLIST
index 87e7a00a747..ea5dfbff38e 100644
--- a/x11/xorg-libs/PLIST
+++ b/x11/xorg-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/07/23 16:54:20 minskim Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/07/24 22:00:47 minskim Exp $
 ${X11ROOT_PREFIX}/include/DPS/ColorSB.h
 ${X11ROOT_PREFIX}/include/DPS/ColorSBP.h
 ${X11ROOT_PREFIX}/include/DPS/DPSScrollW.h
@@ -984,9 +984,11 @@ ${X11ROOT_PREFIX}/lib/libXprintUtil.a
 @comment begin Linux
 ${X11ROOT_PREFIX}/include/X11/extensions/dmxext.h
 ${X11ROOT_PREFIX}/include/X11/extensions/dmxproto.h
+${X11ROOT_PREFIX}/lib/libFS.a
 ${X11ROOT_PREFIX}/lib/libFS.so
 ${X11ROOT_PREFIX}/lib/libFS.so.6
 ${X11ROOT_PREFIX}/lib/libFS.so.6.0
+${X11ROOT_PREFIX}/lib/libGL.a
 ${X11ROOT_PREFIX}/lib/libGL.so
 ${X11ROOT_PREFIX}/lib/libGL.so.1
 ${X11ROOT_PREFIX}/lib/libGL.so.1.2
@@ -994,12 +996,15 @@ ${X11ROOT_PREFIX}/lib/libGLU.a
 ${X11ROOT_PREFIX}/lib/libGLU.so
 ${X11ROOT_PREFIX}/lib/libGLU.so.1
 ${X11ROOT_PREFIX}/lib/libGLU.so.1.3
+${X11ROOT_PREFIX}/lib/libGLw.a
 ${X11ROOT_PREFIX}/lib/libGLw.so
 ${X11ROOT_PREFIX}/lib/libGLw.so.1
 ${X11ROOT_PREFIX}/lib/libGLw.so.1.0
+${X11ROOT_PREFIX}/lib/libI810XvMC.a
 ${X11ROOT_PREFIX}/lib/libI810XvMC.so
 ${X11ROOT_PREFIX}/lib/libI810XvMC.so.1
 ${X11ROOT_PREFIX}/lib/libI810XvMC.so.1.0
+${X11ROOT_PREFIX}/lib/libICE.a
 ${X11ROOT_PREFIX}/lib/libICE.so
 ${X11ROOT_PREFIX}/lib/libICE.so.6
 ${X11ROOT_PREFIX}/lib/libICE.so.6.4
@@ -1007,15 +1012,19 @@ ${X11ROOT_PREFIX}/lib/libOSMesa.a
 ${X11ROOT_PREFIX}/lib/libOSMesa.so
 ${X11ROOT_PREFIX}/lib/libOSMesa.so.4
 ${X11ROOT_PREFIX}/lib/libOSMesa.so.4.0
+${X11ROOT_PREFIX}/lib/libSM.a
 ${X11ROOT_PREFIX}/lib/libSM.so
 ${X11ROOT_PREFIX}/lib/libSM.so.6
 ${X11ROOT_PREFIX}/lib/libSM.so.6.0
+${X11ROOT_PREFIX}/lib/libX11.a
 ${X11ROOT_PREFIX}/lib/libX11.so
 ${X11ROOT_PREFIX}/lib/libX11.so.6
 ${X11ROOT_PREFIX}/lib/libX11.so.6.2
+${X11ROOT_PREFIX}/lib/libXRes.a
 ${X11ROOT_PREFIX}/lib/libXRes.so
 ${X11ROOT_PREFIX}/lib/libXRes.so.1
 ${X11ROOT_PREFIX}/lib/libXRes.so.1.0
+${X11ROOT_PREFIX}/lib/libXTrap.a
 ${X11ROOT_PREFIX}/lib/libXTrap.so
 ${X11ROOT_PREFIX}/lib/libXTrap.so.6
 ${X11ROOT_PREFIX}/lib/libXTrap.so.6.4
@@ -1023,6 +1032,7 @@ ${X11ROOT_PREFIX}/lib/libXau.a
 ${X11ROOT_PREFIX}/lib/libXau.so
 ${X11ROOT_PREFIX}/lib/libXau.so.6
 ${X11ROOT_PREFIX}/lib/libXau.so.6.0
+${X11ROOT_PREFIX}/lib/libXaw.a
 ${X11ROOT_PREFIX}/lib/libXaw.so
 ${X11ROOT_PREFIX}/lib/libXaw.so.6
 ${X11ROOT_PREFIX}/lib/libXaw.so.6.1
@@ -1030,7 +1040,6 @@ ${X11ROOT_PREFIX}/lib/libXaw.so.7
 ${X11ROOT_PREFIX}/lib/libXaw.so.7.0
 ${X11ROOT_PREFIX}/lib/libXaw.so.8
 ${X11ROOT_PREFIX}/lib/libXaw.so.8.0
-${X11ROOT_PREFIX}/lib/libXdmcp.a
 ${X11ROOT_PREFIX}/lib/libXext.so
 ${X11ROOT_PREFIX}/lib/libXext.so.6
 ${X11ROOT_PREFIX}/lib/libXext.so.6.4
@@ -1038,93 +1047,121 @@ ${X11ROOT_PREFIX}/lib/libXfont.a
 ${X11ROOT_PREFIX}/lib/libXfont.so
 ${X11ROOT_PREFIX}/lib/libXfont.so.1
 ${X11ROOT_PREFIX}/lib/libXfont.so.1.5
+${X11ROOT_PREFIX}/lib/libXi.a
 ${X11ROOT_PREFIX}/lib/libXi.so
 ${X11ROOT_PREFIX}/lib/libXi.so.6
 ${X11ROOT_PREFIX}/lib/libXi.so.6.0
+${X11ROOT_PREFIX}/lib/libXinerama.a
 ${X11ROOT_PREFIX}/lib/libXinerama.so
 ${X11ROOT_PREFIX}/lib/libXinerama.so.1
 ${X11ROOT_PREFIX}/lib/libXinerama.so.1.0
+${X11ROOT_PREFIX}/lib/libXcomposite.a
 ${X11ROOT_PREFIX}/lib/libXcomposite.so
 ${X11ROOT_PREFIX}/lib/libXcomposite.so.1
 ${X11ROOT_PREFIX}/lib/libXcomposite.so.1.0
+${X11ROOT_PREFIX}/lib/libXdamage.a
 ${X11ROOT_PREFIX}/lib/libXdamage.so
 ${X11ROOT_PREFIX}/lib/libXdamage.so.1
 ${X11ROOT_PREFIX}/lib/libXdamage.so.1.0
+${X11ROOT_PREFIX}/lib/libXdmcp.a
 ${X11ROOT_PREFIX}/lib/libXdmcp.so
 ${X11ROOT_PREFIX}/lib/libXdmcp.so.6
 ${X11ROOT_PREFIX}/lib/libXdmcp.so.6.0
+${X11ROOT_PREFIX}/lib/libXevie.a
 ${X11ROOT_PREFIX}/lib/libXevie.so
 ${X11ROOT_PREFIX}/lib/libXevie.so.1
 ${X11ROOT_PREFIX}/lib/libXevie.so.1.0
+${X11ROOT_PREFIX}/lib/libXfixes.a
 ${X11ROOT_PREFIX}/lib/libXfixes.so
 ${X11ROOT_PREFIX}/lib/libXfixes.so.3
 ${X11ROOT_PREFIX}/lib/libXfixes.so.3.0
 ${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
 ${X11ROOT_PREFIX}/lib/libXprintUtil.a
 ${X11ROOT_PREFIX}/lib/libdmx.a
+${X11ROOT_PREFIX}/lib/libXmu.a
 ${X11ROOT_PREFIX}/lib/libXmu.so
 ${X11ROOT_PREFIX}/lib/libXmu.so.6
 ${X11ROOT_PREFIX}/lib/libXmu.so.6.2
+${X11ROOT_PREFIX}/lib/libXmuu.a
 ${X11ROOT_PREFIX}/lib/libXmuu.so
 ${X11ROOT_PREFIX}/lib/libXmuu.so.1
 ${X11ROOT_PREFIX}/lib/libXmuu.so.1.0
+${X11ROOT_PREFIX}/lib/libXp.a
 ${X11ROOT_PREFIX}/lib/libXp.so
 ${X11ROOT_PREFIX}/lib/libXp.so.6
 ${X11ROOT_PREFIX}/lib/libXp.so.6.2
+${X11ROOT_PREFIX}/lib/libXpm.a
 ${X11ROOT_PREFIX}/lib/libXpm.so
 ${X11ROOT_PREFIX}/lib/libXpm.so.4
 ${X11ROOT_PREFIX}/lib/libXpm.so.4.11
+${X11ROOT_PREFIX}/lib/libXss.a
 ${X11ROOT_PREFIX}/lib/libXss.so
 ${X11ROOT_PREFIX}/lib/libXss.so.1
 ${X11ROOT_PREFIX}/lib/libXss.so.1.0
+${X11ROOT_PREFIX}/lib/libXt.a
 ${X11ROOT_PREFIX}/lib/libXt.so
 ${X11ROOT_PREFIX}/lib/libXt.so.6
 ${X11ROOT_PREFIX}/lib/libXt.so.6.0
+${X11ROOT_PREFIX}/lib/libXtst.a
 ${X11ROOT_PREFIX}/lib/libXtst.so
 ${X11ROOT_PREFIX}/lib/libXtst.so.6
 ${X11ROOT_PREFIX}/lib/libXtst.so.6.1
+${X11ROOT_PREFIX}/lib/libXv.a
 ${X11ROOT_PREFIX}/lib/libXv.so
 ${X11ROOT_PREFIX}/lib/libXv.so.1
 ${X11ROOT_PREFIX}/lib/libXv.so.1.0
+${X11ROOT_PREFIX}/lib/libXvMC.a
 ${X11ROOT_PREFIX}/lib/libXvMC.so
 ${X11ROOT_PREFIX}/lib/libXvMC.so.1
 ${X11ROOT_PREFIX}/lib/libXvMC.so.1.0
+${X11ROOT_PREFIX}/lib/libXvMCW.a
 ${X11ROOT_PREFIX}/lib/libXvMCW.so
 ${X11ROOT_PREFIX}/lib/libXvMCW.so.1
 ${X11ROOT_PREFIX}/lib/libXvMCW.so.1.0
+${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.a
 ${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.so
 ${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
 ${DGA}${X11ROOT_PREFIX}/lib/libXxf86dga.so.1.0
+${X11ROOT_PREFIX}/lib/libXxf86misc.a
 ${X11ROOT_PREFIX}/lib/libXxf86misc.so
 ${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
 ${X11ROOT_PREFIX}/lib/libXxf86misc.so.1.1
+${X11ROOT_PREFIX}/lib/libXxf86rush.a
 ${X11ROOT_PREFIX}/lib/libXxf86rush.so
 ${X11ROOT_PREFIX}/lib/libXxf86rush.so.1
 ${X11ROOT_PREFIX}/lib/libXxf86rush.so.1.0
+${X11ROOT_PREFIX}/lib/libXxf86vm.a
 ${X11ROOT_PREFIX}/lib/libXxf86vm.so
 ${X11ROOT_PREFIX}/lib/libXxf86vm.so.1
 ${X11ROOT_PREFIX}/lib/libXxf86vm.so.1.0
+${X11ROOT_PREFIX}/lib/libdps.a
 ${X11ROOT_PREFIX}/lib/libdps.so
 ${X11ROOT_PREFIX}/lib/libdps.so.1
 ${X11ROOT_PREFIX}/lib/libdps.so.1.0
+${X11ROOT_PREFIX}/lib/libdpstk.a
 ${X11ROOT_PREFIX}/lib/libdpstk.so
 ${X11ROOT_PREFIX}/lib/libdpstk.so.1
 ${X11ROOT_PREFIX}/lib/libdpstk.so.1.0
 ${X11ROOT_PREFIX}/lib/libfntstubs.a
+${X11ROOT_PREFIX}/lib/libfontenc.a
 ${X11ROOT_PREFIX}/lib/libfontenc.so
 ${X11ROOT_PREFIX}/lib/libfontenc.so.1
 ${X11ROOT_PREFIX}/lib/libfontenc.so.1.0
 ${X11ROOT_PREFIX}/lib/liboldX.a
+${X11ROOT_PREFIX}/lib/libviaXvMC.a
 ${X11ROOT_PREFIX}/lib/libviaXvMC.so
 ${X11ROOT_PREFIX}/lib/libviaXvMC.so.1
 ${X11ROOT_PREFIX}/lib/libviaXvMC.so.1.0
+${X11ROOT_PREFIX}/lib/libviaXvMCPro.a
 ${X11ROOT_PREFIX}/lib/libviaXvMCPro.so
 ${X11ROOT_PREFIX}/lib/libviaXvMCPro.so.1
 ${X11ROOT_PREFIX}/lib/libviaXvMCPro.so.1.0
 ${X11ROOT_PREFIX}/lib/libxf86config.a
+${X11ROOT_PREFIX}/lib/libxkbfile.a
 ${X11ROOT_PREFIX}/lib/libxkbfile.so
 ${X11ROOT_PREFIX}/lib/libxkbfile.so.1
 ${X11ROOT_PREFIX}/lib/libxkbfile.so.1.0
+${X11ROOT_PREFIX}/lib/libxkbui.a
 ${X11ROOT_PREFIX}/lib/libxkbui.so
 ${X11ROOT_PREFIX}/lib/libxkbui.so.1
 ${X11ROOT_PREFIX}/lib/libxkbui.so.1.0
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index e06462b0254..8115d5f3cbc 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.48 2006/07/23 15:45:36 minskim Exp $
+$NetBSD: distinfo,v 1.49 2006/07/24 22:00:47 minskim Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -12,7 +12,7 @@ Size (X11R6.9.0-src3.tar.gz) = 10872474 bytes
 SHA1 (patch-aa) = 009b7a2679ae98ebd7071e4fa6169c3401273ca1
 SHA1 (patch-ab) = 45f06a7d1ac2316621c5707bb202b7f6042699be
 SHA1 (patch-ac) = 841979893b72455ce59b951ac137ca0c236a39f3
-SHA1 (patch-ad) = 33233761a745b4c62cf64855a5d9c196cd679cf2
+SHA1 (patch-ad) = 8b803d38021a0762e503c445a302f133e5c1f3b1
 SHA1 (patch-ae) = 4d4e00a8f9e226323975596070a8fb3f59c34b4d
 SHA1 (patch-af) = 62127e39c829cba6b01bd9f3aaaea682eec52c9e
 SHA1 (patch-ag) = d300aa92052bdfe13e799223cf055c7955e7bb8f
diff --git a/x11/xorg-libs/patches/patch-ad b/x11/xorg-libs/patches/patch-ad
index b977fd8ae8a..ad22ff59fc5 100644
--- a/x11/xorg-libs/patches/patch-ad
+++ b/x11/xorg-libs/patches/patch-ad
@@ -1,8 +1,26 @@
-$NetBSD: patch-ad,v 1.5 2006/06/12 00:36:25 joerg Exp $
+$NetBSD: patch-ad,v 1.6 2006/07/24 22:00:47 minskim Exp $
 
---- config/cf/linux.cf.in.orig	2005-12-06 11:06:50.000000000 +0100
-+++ config/cf/linux.cf.in	2005-12-06 11:09:08.000000000 +0100
-@@ -609,10 +609,10 @@
+--- config/cf/linux.cf.in.orig	2005-10-21 19:10:27.000000000 +0000
++++ config/cf/linux.cf.in
+@@ -94,6 +94,9 @@ XCOMM operating system:  OSName (OSMajor
+ XCOMM libc:	(LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
+ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
+ 
++#define ForceNormalLib		YES
++#define SharedLibFont		YES
++
+ #if LinuxDistribution == LinuxDebian
+ # if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
+ #  define SystemManDirectory	/usr/share/man
+@@ -116,7 +119,6 @@ InstallNamedTargetNoClobber(install,file
+ # define SharedLibXdmGreet	NO
+ # define LinkGLToUsrInclude	NO
+ # define LinkGLToUsrLib		NO
+-# define SharedLibFont		NO
+ # define SharedLibGlu		YES
+ # define NormalLibGlu		YES
+ # define FSUseSyslog		YES
+@@ -609,10 +611,10 @@ InstallNamedTargetNoClobber(install,file
  #  if defined (i386Architecture) && ((GccMajorVersion >3) \
     || ((GccMajorVersion == 3) &&  (GccMinorVersion >= 1)))
  #   ifndef CcCmd
@@ -15,7 +33,7 @@ $NetBSD: patch-ad,v 1.5 2006/06/12 00:36:25 joerg Exp $
  #   endif
  #  endif
  #  if defined (Ppc64Architecture)
-@@ -624,8 +624,8 @@
+@@ -624,8 +626,8 @@ InstallNamedTargetNoClobber(install,file
  #   endif
  #  endif
  #  ifndef CcCmd
@@ -26,7 +44,7 @@ $NetBSD: patch-ad,v 1.5 2006/06/12 00:36:25 joerg Exp $
  #  endif
  #  ifndef AsCmd
  #   define AsCmd		CcCmd -c -x assembler
-@@ -779,7 +779,6 @@
+@@ -779,7 +781,6 @@ InstallNamedTargetNoClobber(install,file
  #define YaccCmd			bison -y
  #define LexCmd			flex -l
  #define HasFlex			YES
@@ -34,7 +52,7 @@ $NetBSD: patch-ad,v 1.5 2006/06/12 00:36:25 joerg Exp $
  #define PreProcessCmd		CcCmd -E
  #define PostIncDir		DefaultGccIncludeDir
  #define LdCombineFlags		-r
-@@ -853,7 +852,7 @@
+@@ -853,7 +854,7 @@ InstallNamedTargetNoClobber(install,file
  
  #ifdef i386Architecture
  # ifndef OptimizedCDebugFlags
@@ -43,7 +61,7 @@ $NetBSD: patch-ad,v 1.5 2006/06/12 00:36:25 joerg Exp $
  # endif
  # define LinuxMachineDefines	-D__i386__
  # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-@@ -1053,9 +1052,6 @@ InstallNamedTargetNoClobber(install,file
+@@ -1053,9 +1054,6 @@ InstallNamedTargetNoClobber(install,file
  #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
  
  #if HaveLib64