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

4 files changed, 102 insertions, 82 deletions

diff --git a/x11-fonts/XFree86-4-fontScalable/Makefile b/x11-fonts/XFree86-4-fontScalable/Makefile
index 17cef02dc6fd..51fc9a8892e7 100644
--- a/x11-fonts/XFree86-4-fontScalable/Makefile
+++ b/x11-fonts/XFree86-4-fontScalable/Makefile
@@ -6,15 +6,11 @@
 #
 
 PORTNAME=	fontScalable
-PORTVERSION=	4.0.1
+PORTVERSION=	4.0.3
 CATEGORIES=	x11-fonts
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/
+MASTER_SITES=	${MASTER_SITE_XFREE}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X401src-2.tgz
+DISTFILES=	X402src-2.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -27,12 +23,39 @@ PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/fonts
 WRKSRC=			${WRKDIR}/xc/fonts
-# User Config:
-# To disable following fonts, set variable to "NO"
-BuildSpeedoFonts?=	YES
-BuildType1Fonts?=	YES
-BuildCIDFonts?=		YES
-BuildTTFonts?=		YES
+
+# XFree86 User Config:
+# ---
+# Name          	Default		Meaning
+# ----------------------------------------------------------------------------
+# BuildSpeedoFonts	YES		build/install Speedo fonts
+# BuildType1Fonts	YES		build/install Type1 fonts
+# BuildCIDFonts		YES		build/install CID fonts
+BuildSpeedoFonts?=	DEFAULT
+BuildType1Fonts?=	DEFAULT
+BuildCIDFonts?=		DEFAULT
+
+.if ${BuildSpeedoFonts} == DEFAULT || ${BuildSpeedoFonts} == YES
+PLIST_SUB+=	SPEEDO:=""
+SPEEDO:=	-DBuildSpeedoFonts=YES
+.elif ${BuildSpeedoFonts} == NO
+PLIST_SUB+=	SPEEDO:="@comment "
+SPEEDO:=	-DBuildSpeedoFonts=NO
+.endif
+.if ${BuildType1Fonts} == DEFAULT || ${BuildType1Fonts} == YES
+PLIST_SUB+=	TYPE1:=""
+TYPE1:=	-DBuildType1Fonts=YES
+.elif ${BuildType1Fonts} == NO
+PLIST_SUB+=	TYPE1:="@comment "
+TYPE1:=	-DBuildType1Fonts=NO
+.endif
+.if ${BuildCIDFonts} == DEFAULT || ${BuildCIDFonts} == YES
+PLIST_SUB+=	CID:=""
+CID:=	-DBuildCIDFonts=YES
+.elif ${BuildCIDFonts} == NO
+PLIST_SUB+=	CID:="@comment "
+CID:=	-DBuildCIDFonts=NO
+.endif
 
 do-configure:
 	(cd ${WRKDIR}/xc/fonts/encodings && \
@@ -43,10 +66,7 @@ do-configure:
 	 ${MAKE} depend)
 	(cd ${WRKSRC} && \
 	 imake -DUseInstalled ${PROJECTROOT} -I${PREFIX}/lib/X11/config \
-		-DBuildSpeedoFonts=${BuildSpeedoFonts} \
-		-DBuildType1Fonts=${BuildType1Fonts} \
-		-DBuildCIDFonts=${BuildCIDFonts} \
-		-DBuildTTFonts=${BuildTTFonts} \
+		${SPEEDO} ${TYPE1} ${CID} \
 		-DMakeLocalFontDir=YES \
 		-DFreeBSDBuildXscl=YES \
 		-DTOPDIR=.. -DCURDIR=.; \
diff --git a/x11-fonts/XFree86-4-fontScalable/distinfo b/x11-fonts/XFree86-4-fontScalable/distinfo
index 1102a3a2abd1..caf1b3b79c0f 100644
--- a/x11-fonts/XFree86-4-fontScalable/distinfo
+++ b/x11-fonts/XFree86-4-fontScalable/distinfo
@@ -1 +1 @@
-MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff
+MD5 (xc/X402src-2.tgz) = 7dc2f848c7466f6704c8dfc3492628ae
diff --git a/x11-fonts/XFree86-4-fontScalable/files/patch-01 b/x11-fonts/XFree86-4-fontScalable/files/patch-01
index e4b42d59be5d..fd75cf0a14a4 100644
--- a/x11-fonts/XFree86-4-fontScalable/files/patch-01
+++ b/x11-fonts/XFree86-4-fontScalable/files/patch-01
@@ -1,5 +1,5 @@
---- Imakefile.orig	Sun May 16 23:38:09 1999
-+++ Imakefile	Wed May 10 14:45:01 2000
+--- Imakefile.orig	Thu Nov 30 01:37:41 2000
++++ Imakefile	Wed Jan  3 11:13:47 2001
 @@ -14,7 +14,11 @@
  PEXDIR = PEX
  #endif
@@ -7,7 +7,7 @@
 +#if defined(FreeBSDBuildXscl) || FreeBSDBuildXscl
 +SUBDIRS = $(SCALEDDIR) $(PEXDIR)
 +#else
- SUBDIRS = $(ENCODINGDIR) bdf $(SCALEDDIR) $(PEXDIR)
+ SUBDIRS = $(ENCODINGDIR) bdf $(SCALEDDIR) $(PEXDIR) util
 +#endif
  
  #if MakeLocalFontDir
diff --git a/x11-fonts/XFree86-4-fontScalable/pkg-plist b/x11-fonts/XFree86-4-fontScalable/pkg-plist
index 66e739af014b..0a840b370a41 100644
--- a/x11-fonts/XFree86-4-fontScalable/pkg-plist
+++ b/x11-fonts/XFree86-4-fontScalable/pkg-plist
@@ -1,64 +1,64 @@
-lib/X11/fonts/CID/fonts.dir
-lib/X11/fonts/CID/fonts.scale
+%%CID:%%lib/X11/fonts/CID/fonts.dir
+%%CID:%%lib/X11/fonts/CID/fonts.scale
 lib/X11/fonts/PEX/Roman.phont
 lib/X11/fonts/PEX/Roman_M.phont
-lib/X11/fonts/Speedo/encodings.dir
-lib/X11/fonts/Speedo/font0419.spd
-lib/X11/fonts/Speedo/font0582.spd
-lib/X11/fonts/Speedo/font0583.spd
-lib/X11/fonts/Speedo/font0611.spd
-lib/X11/fonts/Speedo/font0648.spd
-lib/X11/fonts/Speedo/font0649.spd
-lib/X11/fonts/Speedo/font0709.spd
-lib/X11/fonts/Speedo/font0710.spd
-lib/X11/fonts/Speedo/fonts.dir
-lib/X11/fonts/Speedo/fonts.scale
-lib/X11/fonts/Type1/UTBI____.afm
-lib/X11/fonts/Type1/UTBI____.pfa
-lib/X11/fonts/Type1/UTB_____.afm
-lib/X11/fonts/Type1/UTB_____.pfa
-lib/X11/fonts/Type1/UTI_____.afm
-lib/X11/fonts/Type1/UTI_____.pfa
-lib/X11/fonts/Type1/UTRG____.afm
-lib/X11/fonts/Type1/UTRG____.pfa
-lib/X11/fonts/Type1/c0419bt_.afm
-lib/X11/fonts/Type1/c0419bt_.pfb
-lib/X11/fonts/Type1/c0582bt_.afm
-lib/X11/fonts/Type1/c0582bt_.pfb
-lib/X11/fonts/Type1/c0583bt_.afm
-lib/X11/fonts/Type1/c0583bt_.pfb
-lib/X11/fonts/Type1/c0611bt_.afm
-lib/X11/fonts/Type1/c0611bt_.pfb
-lib/X11/fonts/Type1/c0632bt_.afm
-lib/X11/fonts/Type1/c0632bt_.pfb
-lib/X11/fonts/Type1/c0633bt_.afm
-lib/X11/fonts/Type1/c0633bt_.pfb
-lib/X11/fonts/Type1/c0648bt_.afm
-lib/X11/fonts/Type1/c0648bt_.pfb
-lib/X11/fonts/Type1/c0649bt_.afm
-lib/X11/fonts/Type1/c0649bt_.pfb
-lib/X11/fonts/Type1/cour.afm
-lib/X11/fonts/Type1/cour.pfa
-lib/X11/fonts/Type1/courb.afm
-lib/X11/fonts/Type1/courb.pfa
-lib/X11/fonts/Type1/courbi.afm
-lib/X11/fonts/Type1/courbi.pfa
-lib/X11/fonts/Type1/couri.afm
-lib/X11/fonts/Type1/couri.pfa
-lib/X11/fonts/Type1/cursor.pfa
-lib/X11/fonts/Type1/encodings.dir
-lib/X11/fonts/Type1/fonts.dir
-lib/X11/fonts/Type1/fonts.scale
-lib/X11/fonts/Type1/lcdxmo.afm
-lib/X11/fonts/Type1/lcdxmo.pfa
-lib/X11/fonts/Type1/lcdxmr.afm
-lib/X11/fonts/Type1/lcdxmr.pfa
-lib/X11/fonts/Type1/lcdxro.afm
-lib/X11/fonts/Type1/lcdxro.pfa
-lib/X11/fonts/Type1/lcdxrr.afm
-lib/X11/fonts/Type1/lcdxrr.pfa
-lib/X11/fonts/Type1/lcdxso.afm
-lib/X11/fonts/Type1/lcdxso.pfa
-lib/X11/fonts/Type1/lcdxsr.afm
-lib/X11/fonts/Type1/lcdxsr.pfa
+%%SPEEDO:%%lib/X11/fonts/Speedo/encodings.dir
+%%SPEEDO:%%lib/X11/fonts/Speedo/font0419.spd
+%%SPEEDO:%%lib/X11/fonts/Speedo/font0582.spd
+%%SPEEDO:%%lib/X11/fonts/Speedo/font0583.spd
+%%SPEEDO:%%lib/X11/fonts/Speedo/font0611.spd
+%%SPEEDO:%%lib/X11/fonts/Speedo/font0648.spd
+%%SPEEDO:%%lib/X11/fonts/Speedo/font0649.spd
+%%SPEEDO:%%lib/X11/fonts/Speedo/font0709.spd
+%%SPEEDO:%%lib/X11/fonts/Speedo/font0710.spd
+%%SPEEDO:%%lib/X11/fonts/Speedo/fonts.dir
+%%SPEEDO:%%lib/X11/fonts/Speedo/fonts.scale
+%%TYPE1:%%lib/X11/fonts/Type1/UTBI____.afm
+%%TYPE1:%%lib/X11/fonts/Type1/UTBI____.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/UTB_____.afm
+%%TYPE1:%%lib/X11/fonts/Type1/UTB_____.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/UTI_____.afm
+%%TYPE1:%%lib/X11/fonts/Type1/UTI_____.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/UTRG____.afm
+%%TYPE1:%%lib/X11/fonts/Type1/UTRG____.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/c0419bt_.afm
+%%TYPE1:%%lib/X11/fonts/Type1/c0419bt_.pfb
+%%TYPE1:%%lib/X11/fonts/Type1/c0582bt_.afm
+%%TYPE1:%%lib/X11/fonts/Type1/c0582bt_.pfb
+%%TYPE1:%%lib/X11/fonts/Type1/c0583bt_.afm
+%%TYPE1:%%lib/X11/fonts/Type1/c0583bt_.pfb
+%%TYPE1:%%lib/X11/fonts/Type1/c0611bt_.afm
+%%TYPE1:%%lib/X11/fonts/Type1/c0611bt_.pfb
+%%TYPE1:%%lib/X11/fonts/Type1/c0632bt_.afm
+%%TYPE1:%%lib/X11/fonts/Type1/c0632bt_.pfb
+%%TYPE1:%%lib/X11/fonts/Type1/c0633bt_.afm
+%%TYPE1:%%lib/X11/fonts/Type1/c0633bt_.pfb
+%%TYPE1:%%lib/X11/fonts/Type1/c0648bt_.afm
+%%TYPE1:%%lib/X11/fonts/Type1/c0648bt_.pfb
+%%TYPE1:%%lib/X11/fonts/Type1/c0649bt_.afm
+%%TYPE1:%%lib/X11/fonts/Type1/c0649bt_.pfb
+%%TYPE1:%%lib/X11/fonts/Type1/cour.afm
+%%TYPE1:%%lib/X11/fonts/Type1/cour.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/courb.afm
+%%TYPE1:%%lib/X11/fonts/Type1/courb.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/courbi.afm
+%%TYPE1:%%lib/X11/fonts/Type1/courbi.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/couri.afm
+%%TYPE1:%%lib/X11/fonts/Type1/couri.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/cursor.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/encodings.dir
+%%TYPE1:%%lib/X11/fonts/Type1/fonts.dir
+%%TYPE1:%%lib/X11/fonts/Type1/fonts.scale
+%%TYPE1:%%lib/X11/fonts/Type1/lcdxmo.afm
+%%TYPE1:%%lib/X11/fonts/Type1/lcdxmo.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/lcdxmr.afm
+%%TYPE1:%%lib/X11/fonts/Type1/lcdxmr.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/lcdxro.afm
+%%TYPE1:%%lib/X11/fonts/Type1/lcdxro.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/lcdxrr.afm
+%%TYPE1:%%lib/X11/fonts/Type1/lcdxrr.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/lcdxso.afm
+%%TYPE1:%%lib/X11/fonts/Type1/lcdxso.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/lcdxsr.afm
+%%TYPE1:%%lib/X11/fonts/Type1/lcdxsr.pfa
 @unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi