XFree86 4.2.0 Stage 2: XFree86-4-* miniport upgrades

	[1] Upgrade to 4.2.0.
	[2] Allow Wraphelp.c to be fetched by default, set HasXdmAuth=YES
	    by default.

Submitted by:	[1] sf, taguchi@tohoku.iij.ad.jp
Approved by:	[2] core

3 files changed, 54 insertions, 18 deletions

diff --git a/x11-fonts/XFree86-4-fontScalable/Makefile b/x11-fonts/XFree86-4-fontScalable/Makefile
index 60b9cfb3787b..61ca89a7ee70 100644
--- a/x11-fonts/XFree86-4-fontScalable/Makefile
+++ b/x11-fonts/XFree86-4-fontScalable/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	fontScalable
-PORTVERSION=	4.1.0
+PORTVERSION=	4.2.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR=	4.1.0
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X410src-2.tgz
+DISTFILES=	X${PORTVERSION:S/.//g}src-2.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -32,9 +32,11 @@ WRKSRC=			${WRKDIR}/xc/fonts
 # BuildSpeedoFonts	YES		build/install Speedo fonts
 # BuildType1Fonts	YES		build/install Type1 fonts
 # BuildCIDFonts		YES		build/install CID fonts
+# BuildTTFonts		YES		build/install TrueType fonts
 BuildSpeedoFonts?=	DEFAULT
 BuildType1Fonts?=	DEFAULT
 BuildCIDFonts?=		DEFAULT
+BuildTTFonts?=		DEFAULT
 
 .if ${BuildSpeedoFonts} == DEFAULT || ${BuildSpeedoFonts} == YES
 PLIST_SUB+=	SPEEDO:=""
@@ -57,6 +59,14 @@ CID:=	-DBuildCIDFonts=YES
 PLIST_SUB+=	CID:="@comment "
 CID:=	-DBuildCIDFonts=NO
 .endif
+.if ${BuildTTFonts} == DEFAULT || ${BuildTTFonts} == YES
+PLIST_SUB+=	TT:=""
+TT:=	-DBuildTTFonts=YES
+.elif ${BuildTTFonts} == NO
+PLIST_SUB+=	TT:="@comment "
+TT:=	-DBuildTTFonts=NO
+.endif
+
 
 do-configure:
 	(cd ${WRKDIR}/xc/fonts/encodings && \
@@ -67,7 +77,7 @@ do-configure:
 	 ${MAKE} depend)
 	(cd ${WRKSRC} && \
 	 imake -DUseInstalled ${PROJECTROOT} -I${PREFIX}/lib/X11/config \
-		${SPEEDO} ${TYPE1} ${CID} \
+		${SPEEDO} ${TYPE1} ${CID} ${TT} \
 		-DMakeLocalFontDir=YES \
 		-DFreeBSDBuildXscl=YES \
 		-DTOPDIR=.. -DCURDIR=.; \
diff --git a/x11-fonts/XFree86-4-fontScalable/distinfo b/x11-fonts/XFree86-4-fontScalable/distinfo
index 43df2fc40a8c..f30a822c4c32 100644
--- a/x11-fonts/XFree86-4-fontScalable/distinfo
+++ b/x11-fonts/XFree86-4-fontScalable/distinfo
@@ -1 +1 @@
-MD5 (xc/X410src-2.tgz) = beaffed1cbdb700e5fed6a5490a7f222
+MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
diff --git a/x11-fonts/XFree86-4-fontScalable/pkg-plist b/x11-fonts/XFree86-4-fontScalable/pkg-plist
index fc1d88ed4347..bde8957714cc 100644
--- a/x11-fonts/XFree86-4-fontScalable/pkg-plist
+++ b/x11-fonts/XFree86-4-fontScalable/pkg-plist
@@ -13,6 +13,21 @@ lib/X11/fonts/PEX/Roman_M.phont
 %%SPEEDO:%%lib/X11/fonts/Speedo/font0710.spd
 %%SPEEDO:%%lib/X11/fonts/Speedo/fonts.dir
 %%SPEEDO:%%lib/X11/fonts/Speedo/fonts.scale
+%%TT:%%lib/X11/fonts/TTF/encodings.dir
+%%TT:%%lib/X11/fonts/TTF/fonts.dir
+%%TT:%%lib/X11/fonts/TTF/fonts.scale
+%%TT:%%lib/X11/fonts/TTF/luximb.ttf
+%%TT:%%lib/X11/fonts/TTF/luximbi.ttf
+%%TT:%%lib/X11/fonts/TTF/luximr.ttf
+%%TT:%%lib/X11/fonts/TTF/luximri.ttf
+%%TT:%%lib/X11/fonts/TTF/luxirb.ttf
+%%TT:%%lib/X11/fonts/TTF/luxirbi.ttf
+%%TT:%%lib/X11/fonts/TTF/luxirr.ttf
+%%TT:%%lib/X11/fonts/TTF/luxirri.ttf
+%%TT:%%lib/X11/fonts/TTF/luxisb.ttf
+%%TT:%%lib/X11/fonts/TTF/luxisbi.ttf
+%%TT:%%lib/X11/fonts/TTF/luxisr.ttf
+%%TT:%%lib/X11/fonts/TTF/luxisri.ttf
 %%TYPE1:%%lib/X11/fonts/Type1/UTBI____.afm
 %%TYPE1:%%lib/X11/fonts/Type1/UTBI____.pfa
 %%TYPE1:%%lib/X11/fonts/Type1/UTB_____.afm
@@ -21,7 +36,6 @@ lib/X11/fonts/PEX/Roman_M.phont
 %%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/XftCache
 %%TYPE1:%%lib/X11/fonts/Type1/c0419bt_.afm
 %%TYPE1:%%lib/X11/fonts/Type1/c0419bt_.pfb
 %%TYPE1:%%lib/X11/fonts/Type1/c0582bt_.afm
@@ -50,16 +64,28 @@ lib/X11/fonts/PEX/Roman_M.phont
 %%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
+%%TYPE1:%%lib/X11/fonts/Type1/l047013t.afm
+%%TYPE1:%%lib/X11/fonts/Type1/l047013t.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/l047016t.afm
+%%TYPE1:%%lib/X11/fonts/Type1/l047016t.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/l047033t.afm
+%%TYPE1:%%lib/X11/fonts/Type1/l047033t.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/l047036t.afm
+%%TYPE1:%%lib/X11/fonts/Type1/l047036t.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/l048013t.afm
+%%TYPE1:%%lib/X11/fonts/Type1/l048013t.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/l048016t.afm
+%%TYPE1:%%lib/X11/fonts/Type1/l048016t.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/l048033t.afm
+%%TYPE1:%%lib/X11/fonts/Type1/l048033t.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/l048036t.afm
+%%TYPE1:%%lib/X11/fonts/Type1/l048036t.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/l049013t.afm
+%%TYPE1:%%lib/X11/fonts/Type1/l049013t.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/l049016t.afm
+%%TYPE1:%%lib/X11/fonts/Type1/l049016t.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/l049033t.afm
+%%TYPE1:%%lib/X11/fonts/Type1/l049033t.pfa
+%%TYPE1:%%lib/X11/fonts/Type1/l049036t.afm
+%%TYPE1:%%lib/X11/fonts/Type1/l049036t.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