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, 226 insertions, 152 deletions

diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 68a240fb23ed..fcfaab2804c8 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -6,12 +6,17 @@
 #
 
 PORTNAME=	clients
-PORTVERSION=	4.0.1
+PORTVERSION=	4.0.3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X401src-1.tgz
+DISTFILES=	X402src-1.tgz X402src-2.tgz
+EXTRACT_ONLY=	X402src-1.tgz
+
+PATCH_SITES=	${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g}
+PATCHFILES=	4.0.2-4.0.3.diff.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -19,117 +24,40 @@ XFREE86_VERSION=	4
 USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
-PATCHDIR=		${PORTSDIR}/x11/XFree86-4-libraries/files
-SCRIPTS_ENV+=		PREFIX=${PREFIX} \
-			X11BASE=${X11BASE} \
-			WRKDIR=${WRKDIR} \
-			DISTDIR=${DISTDIR} \
-			InstallXdmConfig=${InstallXdmConfig} \
+PATCHDIR=		${.CURDIR}/../XFree86-4-libraries/files
+SCRIPTS_ENV=		InstallXdmConfig=${InstallXdmConfig} \
 			InstallXinitConfig=${InstallXinitConfig} \
 			InstallAppDefFiles=${InstallAppDefFiles} \
-			BuildAoutLibraries=${BuildAoutLibraries}
+			HasXdmAuth=${HasXdmAuth} \
+			HasSecureRPC=${HasSecureRPC} \
+			HasPam=${HasPam}
+MAKE_ENV=		PKGNAMEPREFIX=${PKGNAMEPREFIX} \
+			PORTNAME=${PORTNAME} \
+			PORTVERSION=${PORTVERSION}
 ALL_TARGET=		FreeBSDPortsBuild
-INSTALL_TARGET= 	FreeBSDPortsInstall FreeBSDPortsInstall.man
-MANCOMPRESSED=		yes
-MAN1=			appres.1 \
-			atobm.1 \
-			bdftopcf.1 \
-			beforelight.1 \
-			bitmap.1 \
-			bmtoa.1 \
-			cxpm.1 \
-			dga.1 \
-			editres.1 \
-			fsinfo.1 \
-			fslsfonts.1 \
-			fstobdf.1 \
-			iceauth.1 \
-			ico.1 \
-			imake.1 \
-			lbxproxy.1 \
-			libxrx.1 \
-			listres.1 \
-			lndir.1 \
-			makedepend.1 \
-			makeg.1 \
-			makepsres.1 \
-			makestrs.1 \
-			mkcfm.1 \
-			mkdirhier.1 \
-			mkfontdir.1 \
-			oclock.1 \
-			proxymngr.1 \
-			pswrap.1 \
-			resize.1 \
-			revpath.1 \
-			rman.1 \
-			rstart.1 \
-			rstartd.1 \
-			sessreg.1 \
-			setxkbmap.1 \
-			showfont.1 \
-			smproxy.1 \
-			startx.1 \
-			sxpm.1 \
-			twm.1 \
-			viewres.1 \
-			x11perf.1 \
-			x11perfcomp.1 \
-			xauth.1 \
-			xbiff.1 \
-			xcalc.1 \
-			xclipboard.1 \
-			xclock.1 \
-			xcmsdb.1 \
-			xconsole.1 \
-			xcutsel.1 \
-			xditview.1 \
-			xdm.1 \
-			xdpyinfo.1 \
-			xedit.1 \
-			xev.1 \
-			xeyes.1 \
-			xf86cfg.1 \
-			xfd.1 \
-			xfindproxy.1 \
-			xfontsel.1 \
-			xfwp.1 \
-			xgamma.1 \
-			xgc.1 \
-			xhost.1 \
-			xieperf.1 \
-			xinit.1 \
-			xkbcomp.1 \
-			xkbevd.1 \
-			xkbprint.1 \
-			xkill.1 \
-			xload.1 \
-			xlogo.1 \
-			xlsatoms.1 \
-			xlsclients.1 \
-			xlsfonts.1 \
-			xmag.1 \
-			xman.1 \
-			xmessage.1 \
-			xmkmf.1 \
-			xmodmap.1 \
-			xon.1 \
-			xprop.1 \
-			xrdb.1 \
-			xrefresh.1 \
-			xset.1 \
-			xsetmode.1 \
-			xsetpointer.1 \
-			xsetroot.1 \
-			xsm.1 \
-			xstdcmap.1 \
-			xterm.1 \
-			xvidtune.1 \
-			xwd.1 \
-			xwininfo.1 \
-			xwud.1
+INSTALL_TARGET=		FreeBSDPortsInstall FreeBSDPortsInstall.man
+
+# ---
+# XFree86 User Config:
+# Name          Default		Meaning
+# ----------------------------------------------------------------------------
+# HasXdmAuth	YES		support XDM-AUTHORIZATION-1.
+# HasSecureRPC	YES		build with SecureRPC (require FreeBSD-3 or later)
+# HasPam	YES		support PAM (require FreeBSD-3.1 or later)
+# InstallXdmConfig      YES     install config files for xdm.
+# InstallXinitConfig    YES     install config files for xinit.
+# InstallAppDefFiles    YES	install resource files.
+# ----------------------------------------------------------------------------
+# DEFAULT means ports will use values which set by ${PORTSDIR}/devel/imake-4
+#
+InstallXdmConfig?=	DEFAULT
+InstallXinitConfig?=	DEFAULT
+InstallAppDefFiles?=	DEFAULT
+HasXdmAuth?=		DEFAULT
+HasSecureRPC?=		DEFAULT
+HasPam?=		DEFAULT
 
-.if defined(XDM_DES)
+.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
 .if ${USA_RESIDENT} == YES
 pre-fetch:
 	@${ECHO}
@@ -138,25 +66,22 @@ pre-fetch:
 MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
 		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
-EXTRACT_ONLY=	X401src-1.tgz
+EXTRACT_ONLY=	X402src-1.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
 .endif
 
+.include <bsd.port.pre.mk>
+.include "${FILESDIR}/manpages"
+
+post-extract:
+	( cd ${WRKDIR} && \
+	 ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+	   ${DISTDIR}/${DIST_SUBDIR}/X402src-2.tgz \
+	    | ${TAR} -xf - xc/fonts/util )
+
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
-# User Config:
-# If you want to save your current config files for Xdm, set following as NO
-InstallXdmConfig?=	YES
-# If you want to save your current config files for Xinit, set following as NO
-InstallXinitConfig?=	YES
-# If you want to save your current apprication default files (aka. resource
-# files), set following as NO
-InstallAppDefFiles?=	YES
-# If you want to build Aout libraries (for some application which use legacy
-# aout libs, such as Netscape), then set following as YES
-BuildAoutLibraries?=	NO
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/XFree86-4-clients/distinfo b/x11/XFree86-4-clients/distinfo
index e9125a5f32c4..f8914f6e46bf 100644
--- a/x11/XFree86-4-clients/distinfo
+++ b/x11/XFree86-4-clients/distinfo
@@ -1 +1,4 @@
-MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
+MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4
+MD5 (xc/X402src-2.tgz) = 7dc2f848c7466f6704c8dfc3492628ae
+MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4
+MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11/XFree86-4-clients/files/manpages b/x11/XFree86-4-clients/files/manpages
new file mode 100644
index 000000000000..14c113d49973
--- /dev/null
+++ b/x11/XFree86-4-clients/files/manpages
@@ -0,0 +1,90 @@
+MAN1=	Xmark.1 \
+	appres.1 \
+	atobm.1 \
+	bdftopcf.1 \
+	beforelight.1 \
+	bitmap.1 \
+	bmtoa.1 \
+	cxpm.1 \
+	dga.1 \
+	editres.1 \
+	fsinfo.1 \
+	fslsfonts.1 \
+	fstobdf.1 \
+	glxinfo.1 \
+	iceauth.1 \
+	ico.1 \
+	lbxproxy.1 \
+	listres.1 \
+	makepsres.1 \
+	mkcfm.1 \
+	mkfontdir.1 \
+	oclock.1 \
+	proxymngr.1 \
+	resize.1 \
+	rstart.1 \
+	rstartd.1 \
+	sessreg.1 \
+	setxkbmap.1 \
+	showfont.1 \
+	showrgb.1 \
+	smproxy.1 \
+	startx.1 \
+	sxpm.1 \
+	twm.1 \
+	viewres.1 \
+	x11perf.1 \
+	x11perfcomp.1 \
+	xauth.1 \
+	xbiff.1 \
+	xcalc.1 \
+	xclipboard.1 \
+	xclock.1 \
+	xcmsdb.1 \
+	xconsole.1 \
+	xcutsel.1 \
+	xditview.1 \
+	xdm.1 \
+	xdpyinfo.1 \
+	xedit.1 \
+	xev.1 \
+	xeyes.1 \
+	xf86cfg.1 \
+	xfd.1 \
+	xfindproxy.1 \
+	xfontsel.1 \
+	xfwp.1 \
+	xgamma.1 \
+	xgc.1 \
+	xhost.1 \
+	xieperf.1 \
+	xinit.1 \
+	xkbcomp.1 \
+	xkbevd.1 \
+	xkbprint.1 \
+	xkill.1 \
+	xload.1 \
+	xlogo.1 \
+	xlsatoms.1 \
+	xlsclients.1 \
+	xlsfonts.1 \
+	xmag.1 \
+	xman.1 \
+	xmessage.1 \
+	xmodmap.1 \
+	xon.1 \
+	xprop.1 \
+	xrdb.1 \
+	xrefresh.1 \
+	xset.1 \
+	xsetmode.1 \
+	xsetpointer.1 \
+	xsetroot.1 \
+	xsm.1 \
+	xstdcmap.1 \
+	xterm.1 \
+	xvidtune.1 \
+	xvinfo.1 \
+	xwd.1 \
+	xwininfo.1 \
+	xwud.1
diff --git a/x11/XFree86-4-clients/pkg-comment b/x11/XFree86-4-clients/pkg-comment
index 24c2812bf87e..98276b17a4c4 100644
--- a/x11/XFree86-4-clients/pkg-comment
+++ b/x11/XFree86-4-clients/pkg-comment
@@ -1 +1 @@
-X11R6.4/XFree86-4.0: only Client environments
+X11R6.4/XFree86-4.0 Client environments
diff --git a/x11/XFree86-4-clients/pkg-descr b/x11/XFree86-4-clients/pkg-descr
index 9a634d26a952..8dbac99e617f 100644
--- a/x11/XFree86-4-clients/pkg-descr
+++ b/x11/XFree86-4-clients/pkg-descr
@@ -4,8 +4,3 @@ included this package. Also library files and resource
 files are included.
 
 WWW: http://www.xfree86.org/
-
-Note:
-This is part of the XFree86 distribution, there is a
-complete distribution available in the ports collection
-as well.
diff --git a/x11/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist
index 0666883a7322..bacda37e4438 100644
--- a/x11/XFree86-4-clients/pkg-plist
+++ b/x11/XFree86-4-clients/pkg-plist
@@ -2,6 +2,7 @@ bin/Xmark
 bin/appres
 bin/atobm
 bin/bdftopcf
+bin/bdftruncate.pl
 bin/beforelight
 bin/bitmap
 bin/bmtoa
@@ -11,6 +12,7 @@ bin/editres
 bin/fsinfo
 bin/fslsfonts
 bin/fstobdf
+bin/glxinfo
 bin/iceauth
 bin/ico
 bin/lbxproxy
@@ -26,10 +28,12 @@ bin/rstartd
 bin/sessreg
 bin/setxkbmap
 bin/showfont
+bin/showrgb
 bin/smproxy
 bin/startx
 bin/sxpm
 bin/twm
+bin/ucs2any.pl
 bin/viewres
 bin/x11perf
 bin/x11perfcomp
@@ -85,6 +89,7 @@ bin/xsm
 bin/xstdcmap
 bin/xterm
 bin/xvidtune
+bin/xvinfo
 bin/xwd
 bin/xwininfo
 bin/xwud
@@ -101,8 +106,8 @@ include/X11/bitmaps/RotateRight
 include/X11/bitmaps/Stipple
 include/X11/bitmaps/Term
 include/X11/bitmaps/Up
-include/bitmaps/ldblarrow
-include/bitmaps/rdblarrow
+include/X11/bitmaps/ldblarrow
+include/X11/bitmaps/rdblarrow
 lib/X11/XErrorDB
 lib/X11/XKeysymDB
 lib/X11/app-defaults/Beforelight
@@ -138,8 +143,23 @@ lib/X11/app-defaults/Xmessage
 lib/X11/app-defaults/Xvidtune
 lib/X11/doc/html/manindex1.html
 lib/X11/doc/html/manindex3.html
+lib/X11/fonts/util/map-ISO8859-1
+lib/X11/fonts/util/map-ISO8859-2
+lib/X11/fonts/util/map-ISO8859-3
+lib/X11/fonts/util/map-ISO8859-4
+lib/X11/fonts/util/map-ISO8859-5
+lib/X11/fonts/util/map-ISO8859-7
+lib/X11/fonts/util/map-ISO8859-8
+lib/X11/fonts/util/map-ISO8859-9
+lib/X11/fonts/util/map-ISO8859-10
+lib/X11/fonts/util/map-ISO8859-13
+lib/X11/fonts/util/map-ISO8859-14
+lib/X11/fonts/util/map-ISO8859-15
+lib/X11/fonts/util/map-JISX0201.1976-0
+lib/X11/fonts/util/map-KOI8-R
 lib/X11/lbxproxy/AtomControl
 lib/X11/proxymngr/pmconfig
+lib/X11/rgb.txt
 lib/X11/rstart/commands/@List
 lib/X11/rstart/commands/ListContexts
 lib/X11/rstart/commands/ListGenericCommands
@@ -179,6 +199,7 @@ lib/X11/xkb/compat/group_led
 lib/X11/xkb/compat/iso9995
 lib/X11/xkb/compat/japan
 lib/X11/xkb/compat/keypad
+lib/X11/xkb/compat/leds
 lib/X11/xkb/compat/misc
 lib/X11/xkb/compat/mousekeys
 lib/X11/xkb/compat/norepeat
@@ -218,6 +239,7 @@ lib/X11/xkb/keycodes/fujitsu
 lib/X11/xkb/keycodes/hp
 lib/X11/xkb/keycodes/ibm
 lib/X11/xkb/keycodes/macintosh
+lib/X11/xkb/keycodes/powerpcps2
 lib/X11/xkb/keycodes/sgi/indigo
 lib/X11/xkb/keycodes/sgi/indy
 lib/X11/xkb/keycodes/sgi/iris
@@ -256,7 +278,14 @@ lib/X11/xkb/keymap/sgi/th
 lib/X11/xkb/keymap/sgi/us
 lib/X11/xkb/keymap/sony
 lib/X11/xkb/keymap/sun/de
+lib/X11/xkb/keymap/sun/es
+lib/X11/xkb/keymap/sun/fi
+lib/X11/xkb/keymap/sun/fr
+lib/X11/xkb/keymap/sun/no
+lib/X11/xkb/keymap/sun/pl
+lib/X11/xkb/keymap/sun/ru
 lib/X11/xkb/keymap/sun/se
+lib/X11/xkb/keymap/sun/uk
 lib/X11/xkb/keymap/sun/us
 lib/X11/xkb/keymap/xfree86
 lib/X11/xkb/keymap/xfree98
@@ -272,12 +301,15 @@ lib/X11/xkb/semantics/complete
 lib/X11/xkb/semantics/default
 lib/X11/xkb/semantics/xtest
 lib/X11/xkb/symbols.dir
+lib/X11/xkb/symbols/am
+lib/X11/xkb/symbols/az
 lib/X11/xkb/symbols/be
 lib/X11/xkb/symbols/bg
 lib/X11/xkb/symbols/br
 lib/X11/xkb/symbols/ca
 lib/X11/xkb/symbols/ca_enhanced
 lib/X11/xkb/symbols/cs
+lib/X11/xkb/symbols/cs_qwerty
 lib/X11/xkb/symbols/ctrl
 lib/X11/xkb/symbols/czsk
 lib/X11/xkb/symbols/de
@@ -297,9 +329,13 @@ lib/X11/xkb/symbols/fr_CH
 lib/X11/xkb/symbols/fujitsu/jp
 lib/X11/xkb/symbols/fujitsu/us
 lib/X11/xkb/symbols/gb
+lib/X11/xkb/symbols/gr
 lib/X11/xkb/symbols/group
 lib/X11/xkb/symbols/hp/us
 lib/X11/xkb/symbols/hu
+lib/X11/xkb/symbols/hu_US
+lib/X11/xkb/symbols/il
+lib/X11/xkb/symbols/il_phonetic
 lib/X11/xkb/symbols/inet
 lib/X11/xkb/symbols/is
 lib/X11/xkb/symbols/iso9995-3
@@ -307,25 +343,46 @@ lib/X11/xkb/symbols/it
 lib/X11/xkb/symbols/jp
 lib/X11/xkb/symbols/keypad
 lib/X11/xkb/symbols/lock
+lib/X11/xkb/symbols/lt
+lib/X11/xkb/symbols/lt_p
+lib/X11/xkb/symbols/lt_std
+lib/X11/xkb/symbols/macintosh/de
+lib/X11/xkb/symbols/macintosh/de_CH
+lib/X11/xkb/symbols/macintosh/dk
+lib/X11/xkb/symbols/macintosh/es
+lib/X11/xkb/symbols/macintosh/fi
+lib/X11/xkb/symbols/macintosh/fr
+lib/X11/xkb/symbols/macintosh/fr_CH
+lib/X11/xkb/symbols/macintosh/gb
+lib/X11/xkb/symbols/macintosh/it
+lib/X11/xkb/symbols/macintosh/nl
+lib/X11/xkb/symbols/macintosh/no
+lib/X11/xkb/symbols/macintosh/pt
+lib/X11/xkb/symbols/macintosh/se
 lib/X11/xkb/symbols/macintosh/us
+lib/X11/xkb/symbols/mk
 lib/X11/xkb/symbols/nec/jp
 lib/X11/xkb/symbols/no
 lib/X11/xkb/symbols/pc104
 lib/X11/xkb/symbols/pl
 lib/X11/xkb/symbols/pt
 lib/X11/xkb/symbols/ralt
+lib/X11/xkb/symbols/ro
 lib/X11/xkb/symbols/ru
 lib/X11/xkb/symbols/se
 lib/X11/xkb/symbols/sgi/jp
 lib/X11/xkb/symbols/si
 lib/X11/xkb/symbols/sony/us
+lib/X11/xkb/symbols/sr
 lib/X11/xkb/symbols/sun/se
 lib/X11/xkb/symbols/sun/us
 lib/X11/xkb/symbols/th
+lib/X11/xkb/symbols/tr
 lib/X11/xkb/symbols/ua
 lib/X11/xkb/symbols/us
 lib/X11/xkb/symbols/us_group3
 lib/X11/xkb/symbols/us_intl
+lib/X11/xkb/symbols/vn
 lib/X11/xkb/symbols/xfree68/amiga
 lib/X11/xkb/symbols/xfree68/ataritt
 lib/X11/xkb/types.dir
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 0bc42cf5417a..082d6ae1f6cf 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -22,25 +22,29 @@ configure () {
     grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
     echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
 
-    # setdefault values
-    if [ X$InstallXdmConfig = "X" ]; then
-	InstallXdmConfig=YES
+    # It's good for FreeBSD ports/packages system.
+    echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
+    echo "#define InstallXserverSetUID NO" >> $LOCALDEF
+
+    # User Config.
+    if [ X$HasSecureRPC != XDEFAULT -a X$HasSecureRPC != X ]; then
+	echo "#define HasSecureRPC $HasSecureRPC" >> $LOCALDEF
     fi
-    if [ X$InstallXinitConfig = "X" ]; then
-	InstallXinitConfig=YES
+    if [ X$HasPam != XDEFAULT -a X$HasPam != X ]; then
+	echo "#define HasPam $HasPam" >> $LOCALDEF
     fi
-    if [ X$InstallAppDefFiles = "X" ]; then
-	InstallAppDefFiles=YES
+    if [ X$InstallXdmConfig != XDEFAULT -a X$InstallXdmConfig != X ]; then
+	echo "#define InstallXdmConfig $InstallXdmConfig" >> $LOCALDEF
     fi
-    if [ X$BuildAoutLibraries = "X" ]; then
-	BuildAoutLibraries=NO
+    if [ X$InstallXinitConfig != XDEFAULT -a X$InstallXinitConfig != X ]; then
+	echo "#define InstallXinitConfig $InstallXinitConfig" >> $LOCALDEF
+    fi
+    if [ X$InstallAppDefFiles != XDEFAULT -a X$InstallAppDefFiles != X ]; then
+	echo "#define InstallAppDefFiles $InstallAppDefFiles" >> $LOCALDEF
+    fi
+    if [ ! -d /sys -a ! -d /usr/src/sys ]; then
+        echo "#define BuildXF86DRI NO" >> $LOCALDEF
     fi
-
-    echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
-
-    # I want to set this line.
-    # but the probrem is too deep. not yet done.
-    # echo "#define InstallXserverSetUID NO" >> $LOCALDEF
 
     # disable some configs: there are not used this ports
     for i in \
@@ -58,17 +62,14 @@ configure () {
 	LibHeaders \
         LibInstall \
 	ForceNormalLib \
-	ModuleInstall
+	ModInstall \
+	XTrueTypeInstallCConvHeaders
     do \
 	echo "#define $i NO" >> $LOCALDEF
     done
     echo "#define LibInstallBuild  YES" >> $LOCALDEF
     echo "#define FreeBSDBuildXlib NO" >> $LOCALDEF
     echo "#define FreeBSDBuildXbin YES" >> $LOCALDEF
-    echo "#define InstallXdmConfig $InstallXdmConfig" >> $LOCALDEF
-    echo "#define InstallXinitConfig $InstallXinitConfig" >> $LOCALDEF
-    echo "#define InstallAppDefFiles $InstallAppDefFiles" >> $LOCALDEF
-    echo "#define BuildAoutLibraries $BuildAoutLibraries" >> $LOCALDEF
 
     # Check Wraphelp.c
     WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
@@ -90,6 +91,9 @@ configure () {
 	grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
 	echo "#define HasXdmAuth NO" >> $DESTDEF
     else
+	if [ X$HasXdmAuth != XDEFAULT -a X$HasXdmAuth != X ]; then
+	    echo "#define HasXdmAuth $HasXdmAuth" >> $LOCALDEF
+        fi
 	cp -f $ORIGDEF $DESTDEF
     fi