Make XFree86-4 miniports use imake-4's HasXdmAuth setting (default is YES).

Clean up Wraphelp.c inclusion in the ports that need it.
Add USE_PERL5 to imake-4.

Approved by:	des

18 files changed, 93 insertions, 270 deletions

diff --git a/devel/imake-4/Makefile b/devel/imake-4/Makefile
index 760641627265..ff68bc6c4182 100644
--- a/devel/imake-4/Makefile
+++ b/devel/imake-4/Makefile
@@ -14,13 +14,13 @@ MASTER_SITES=	${MASTER_SITE_XFREE} \
 		ftp://ftp.internat.FreeBSD.org/pub/FreeBSD/X11-Crypto/:wrap \
 		ftp://ftp3.za.FreeBSD.org/pub/FreeBSD/X11-Crypto/:wrap
 MASTER_SITE_SUBDIR=	${PORTVERSION}
+DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz
 EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
-IGNOREFILES=	Wraphelp.c
 
-MAINTAINER=	taguchi@tohoku.iij.ad.jp
+MAINTAINER=	anholt@freebsd.org
 
 PREFIX?=	${X11BASE}
+USE_PERL5=	YES
 
 .include <bsd.port.pre.mk>
 
@@ -74,11 +74,11 @@ SCRIPTS_ENV+=	OSVERSION=${OSVERSION} \
 INSTALL_TARGET=	install install.man
 # ---
 # User Config:
-# All variables are same as Imake config macros.
+# All variables are the same as Imake config macros.
 # For more details, see ${WRKDIR}/xc/config/cf/README.
-# Followings will write to ${PFEFIX}/lib/X11/config/xf86site.def,
+# Following will write to ${PREFIX}/lib/X11/config/xf86site.def,
 # and all of XFree86-4-* ports will use them as default value.
-# Offcause, you can override them (at your own risk ;-).
+# Of course, you can override them (at your own risk ;-).
 # Read scripts/configure for more details.
 # ---
 HasSecureRPC?=		YES
diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index 119d217f81a5..3c2b77d3f155 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -8,10 +8,15 @@
 PORTNAME=	FontServer
 PORTVERSION=	4.2.0
 CATEGORIES=	x11-servers x11-fonts
-MASTER_SITES=	${MASTER_SITE_XFREE}
+MASTER_SITES=	${MASTER_SITE_XFREE} \
+		ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
+		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap \
+		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz
+DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
+EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
+IGNOREFILES=	Wraphelp.c
 
 MAINTAINER=	anholt@freebsd.org
 
@@ -25,6 +30,9 @@ ALL_TARGET=		FreeBSDPortsBuild
 INSTALL_TARGET=		FreeBSDPortsInstall installXserver.man
 MAN1=			Xserver.1 xfs.1
 
+post-extract:
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp/
+
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 	@cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure
diff --git a/x11-servers/XFree86-4-FontServer/distinfo b/x11-servers/XFree86-4-FontServer/distinfo
index df48626099b2..4766fc3aff79 100644
--- a/x11-servers/XFree86-4-FontServer/distinfo
+++ b/x11-servers/XFree86-4-FontServer/distinfo
@@ -1 +1,2 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11-servers/XFree86-4-FontServer/scripts/configure b/x11-servers/XFree86-4-FontServer/scripts/configure
index a6a53f321679..3eabe6a46cd4 100644
--- a/x11-servers/XFree86-4-FontServer/scripts/configure
+++ b/x11-servers/XFree86-4-FontServer/scripts/configure
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-# This scripts work as following:
-# (1) cp current xf86site.def (it may be created by imake-4 ports) 
+# This script does the following:
+# (1) cp current xf86site.def (it is created by the imake-4 port) 
 #       to ${WRKDIR}/xc/config/cf.
-#     this means this ports use imake-4's config defaultly.
+#     this means this port uses imake-4's config for defaults.
 # (2) Generate temporal config for compiling.
 #     Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-#     used for compiling this ports localy. so these configs will be generated
-#     this scripts. these configs will be stored to `host.def' file.
-#     but this host.def will never install. use local only.
+#     used locally for compiling this port, so these configs will be generated
+#     by this script. These configs will be stored to the `host.def' file,
+#     but this host.def will never be installed.
 
 ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
 DESTDEF=$WRKDIR/xc/config/cf/xf86site.def
@@ -58,6 +58,8 @@ configure () {
     echo "#define InstallFSConfig $InstallFSConfig" >> $LOCALDEF
     echo "#define FreeBSDBuildXfs YES" >> $LOCALDEF
 
+    # Copy ORIGDEF to DESTDEF
+    rm -f $DESTDEF
     cp -f $ORIGDEF $DESTDEF
 
     # copy generated config to host.def
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index 8b116a74298f..44961e635d8d 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -25,14 +25,14 @@ USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
-SCRIPTS_ENV=		HasXdmAuth=${HasXdmAuth}
 MAKE_ENV=		MAN_INSTALL_TARGET=installXnest.man
 ALL_TARGET=		FreeBSDPortsBuild
 INSTALL_TARGET=		installXnest installXserver.man
 MANCOMPRESSED=		yes
 MAN1=			Xnest.1 Xserver.1
 
-HasXdmAuth?=		YES
+post-extract:
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp/
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-NestServer/scripts/configure b/x11-servers/XFree86-4-NestServer/scripts/configure
index 4f644af47812..a7ac5359f3be 100644
--- a/x11-servers/XFree86-4-NestServer/scripts/configure
+++ b/x11-servers/XFree86-4-NestServer/scripts/configure
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-# This scripts work as following:
-# (1) cp current xf86site.def (it may be created by imake-4 ports) 
+# This script does the following:
+# (1) cp current xf86site.def (it is created by the imake-4 port) 
 #       to ${WRKDIR}/xc/config/cf.
-#     this means this ports use imake-4's config defaultly.
+#     this means this port uses imake-4's config for defaults.
 # (2) Generate temporal config for compiling.
 #     Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-#     used for compiling this ports localy. so these configs will be generated
-#     this scripts. these configs will be stored to `host.def' file.
-#     but this host.def will never install. use local only.
+#     used locally for compiling this port, so these configs will be generated
+#     by this script. These configs will be stored to the `host.def' file,
+#     but this host.def will never be installed.
 
 ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
 DESTDEF=$WRKDIR/xc/config/cf/xf86site.def
@@ -49,36 +49,9 @@ configure () {
     echo "#define XnestServer YES" >> $LOCALDEF
     echo "#define BuildServersOnly YES" >> $LOCALDEF
 
-    # Check Wraphelp.c
-    if [ $HasXdmAuth = DEFAULT ]; then
-	HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
-    fi
-
-    cpwh=NO
-    if [ $HasXdmAuth = YES ]; then
-	WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
-	if [ -f $WH ] ; then
-	    cpwh=SOURCE
-	elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
-	    cpwh=$DISTDIR/xc/Wraphelp.c
-	else
-	    echo "==> You must fetch USA-legal Wraphelp.c manually"
-	    echo "==> and put it to ${DISTDIR}/xc/."
-	    exit 1
-	fi
-	if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
-	    tr -d '\r' < $cpwh > $WH
-	fi
-    fi
-
     # Copy ORIGDEF to DESTDEF
     rm -f $DESTDEF
-    grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
-    if [ $cpwh = NO ] ; then
-	echo "#define HasXdmAuth NO" >> $DESTDEF
-    else
-	echo "#define HasXdmAuth YES" >> $DESTDEF
-    fi
+    cp -f $ORIGDEF $DESTDEF
 
     # copy generated config to host.def
     cp -f $LOCALDEF $HOSTDEF
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index 8ce0dab4ea68..d1ea78b0885f 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -25,12 +25,12 @@ USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
-SCRIPTS_ENV=		HasXdmAuth=${HasXdmAuth}
 MAKE_ENV=		MAN_INSTALL_TARGET=NOOP
 ALL_TARGET=		FreeBSDPortsBuild
 INSTALL_TARGET=		installXprt
 
-HasXdmAuth?=		YES
+post-extract:
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp/
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-PrintServer/scripts/configure b/x11-servers/XFree86-4-PrintServer/scripts/configure
index 6fa4795d48f2..a6aba9c72614 100644
--- a/x11-servers/XFree86-4-PrintServer/scripts/configure
+++ b/x11-servers/XFree86-4-PrintServer/scripts/configure
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-# This scripts work as following:
-# (1) cp current xf86site.def (it may be created by imake-4 ports) 
+# This script does the following:
+# (1) cp current xf86site.def (it is created by the imake-4 port) 
 #       to ${WRKDIR}/xc/config/cf.
-#     this means this ports use imake-4's config defaultly.
+#     this means this port uses imake-4's config for defaults.
 # (2) Generate temporal config for compiling.
 #     Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-#     used for compiling this ports localy. so these configs will be generated
-#     this scripts. these configs will be stored to `host.def' file.
-#     but this host.def will never install. use local only.
+#     used locally for compiling this port, so these configs will be generated
+#     by this script. These configs will be stored to the `host.def' file,
+#     but this host.def will never be installed.
 
 ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
 DESTDEF=$WRKDIR/xc/config/cf/xf86site.def
@@ -49,36 +49,9 @@ configure () {
     echo "#define XprtServer YES" >> $LOCALDEF
     echo "#define BuildServersOnly YES" >> $LOCALDEF
 
-    # Check Wraphelp.c
-    if [ $HasXdmAuth = DEFAULT ]; then
-	HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
-    fi
-
-    cpwh=NO
-    if [ $HasXdmAuth = YES ]; then
-	WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
-	if [ -f $WH ] ; then
-	    cpwh=SOURCE
-	elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
-	    cpwh=$DISTDIR/xc/Wraphelp.c
-	else
-	    echo "==> You must fetch USA-legal Wraphelp.c manually"
-	    echo "==> and put it to ${DISTDIR}/xc/."
-	    exit 1
-	fi
-	if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
-	    tr -d '\r' < $cpwh > $WH
-	fi
-    fi
-
     # Copy ORIGDEF to DESTDEF
     rm -f $DESTDEF
-    grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
-    if [ $cpwh = NO ] ; then
-	echo "#define HasXdmAuth NO" >> $DESTDEF
-    else
-	echo "#define HasXdmAuth YES" >> $DESTDEF
-    fi
+    cp -f $ORIGDEF $DESTDEF
 
     # copy generated config to host.def
     cp -f $LOCALDEF $HOSTDEF
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 981748848552..b05e4cd47132 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -30,7 +30,6 @@ PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
 EXTRA_PATCHES+=		${.CURDIR}/files/${pf}
 .endfor
 SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
-			HasXdmAuth=${HasXdmAuth} \
 			HasSecureRPC=${HasSecureRPC} \
 			HasPam=${HasPam} \
 			ExtendedInputDevices=${ExtendedInputDevices} \
@@ -81,11 +80,9 @@ PKGMESSAGE=		${WRKDIR}/.pkg-message
 # ---
 # 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)
 # ExtendedInputDevices	YES	support extended input devices
-HasXdmAuth?=		YES
 HasSecureRPC?=		DEFAULT
 HasPam?=		DEFAULT
 ExtendedInputDevices?=	DEFAULT
@@ -97,7 +94,7 @@ MASTER_SITES+=		http://gladstone.uoregon.edu/~eanholt/dri/:glide
 DISTFILES+=		freebsd-glide3headers.tar.gz:glide
 HasGlide3=		YES
 
-post-extract:
+post-extract::
 	@(cd ${WRKSRC}/lib/GL/mesa/src/drv/tdfx/ ; \
 		tar xfpz ${DISTDIR}/${DIST_SUBDIR}/freebsd-glide3headers.tar.gz)
 .else
@@ -195,6 +192,9 @@ HaveMatroxHal=		NO
 PLIST_SUB+=		MATROX="@comment "
 .endif
 
+post-extract::
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp/
+
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 	@cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index b7f67d6c4d8b..362a07d9e67b 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-# This scripts work as following:
-# (1) cp current xf86site.def (it may be created by imake-4 ports) 
+# This script does the following:
+# (1) cp current xf86site.def (it is created by the imake-4 port) 
 #       to ${WRKDIR}/xc/config/cf.
-#     this means this ports use imake-4's config defaultly.
+#     this means this port uses imake-4's config for defaults.
 # (2) Generate temporal config for compiling.
 #     Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-#     used for compiling this ports localy. so these configs will be generated
-#     this scripts. these configs will be stored to `host.def' file.
-#     but this host.def will never install. use local only.
+#     used locally for compiling this port, so these configs will be generated
+#     by this script. These configs will be stored to the `host.def' file,
+#     but this host.def will never be installed.
 
 ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
 DESTDEF=$WRKDIR/xc/config/cf/xf86site.def
@@ -104,36 +104,9 @@ END
     echo "#define BuildThreadStubLibrary YES" >> $LOCALDEF
     echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF
 
-    # Check Wraphelp.c
-    if [ $HasXdmAuth = DEFAULT ]; then
-	HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
-    fi
-
-    cpwh=NO
-    if [ $HasXdmAuth = YES ]; then
-	WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
-	if [ -f $WH ] ; then
-	    cpwh=SOURCE
-	elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
-	    cpwh=$DISTDIR/xc/Wraphelp.c
-	else
-	    echo "==> You must fetch USA-legal Wraphelp.c manually"
-	    echo "==> and put it to ${DISTDIR}/xc/."
-	    exit 1
-	fi
-	if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
-	    tr -d '\r' < $cpwh > $WH
-	fi
-    fi
-
     # Copy ORIGDEF to DESTDEF
     rm -f $DESTDEF
-    grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
-    if [ $cpwh = NO ] ; then
-	echo "#define HasXdmAuth NO" >> $DESTDEF
-    else
-	echo "#define HasXdmAuth YES" >> $DESTDEF
-    fi
+    cp -f $ORIGDEF $DESTDEF
 
     # copy generated config to host.def
     cp -f $LOCALDEF $HOSTDEF
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 981748848552..b05e4cd47132 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -30,7 +30,6 @@ PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
 EXTRA_PATCHES+=		${.CURDIR}/files/${pf}
 .endfor
 SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
-			HasXdmAuth=${HasXdmAuth} \
 			HasSecureRPC=${HasSecureRPC} \
 			HasPam=${HasPam} \
 			ExtendedInputDevices=${ExtendedInputDevices} \
@@ -81,11 +80,9 @@ PKGMESSAGE=		${WRKDIR}/.pkg-message
 # ---
 # 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)
 # ExtendedInputDevices	YES	support extended input devices
-HasXdmAuth?=		YES
 HasSecureRPC?=		DEFAULT
 HasPam?=		DEFAULT
 ExtendedInputDevices?=	DEFAULT
@@ -97,7 +94,7 @@ MASTER_SITES+=		http://gladstone.uoregon.edu/~eanholt/dri/:glide
 DISTFILES+=		freebsd-glide3headers.tar.gz:glide
 HasGlide3=		YES
 
-post-extract:
+post-extract::
 	@(cd ${WRKSRC}/lib/GL/mesa/src/drv/tdfx/ ; \
 		tar xfpz ${DISTDIR}/${DIST_SUBDIR}/freebsd-glide3headers.tar.gz)
 .else
@@ -195,6 +192,9 @@ HaveMatroxHal=		NO
 PLIST_SUB+=		MATROX="@comment "
 .endif
 
+post-extract::
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp/
+
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 	@cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index b7f67d6c4d8b..362a07d9e67b 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-# This scripts work as following:
-# (1) cp current xf86site.def (it may be created by imake-4 ports) 
+# This script does the following:
+# (1) cp current xf86site.def (it is created by the imake-4 port) 
 #       to ${WRKDIR}/xc/config/cf.
-#     this means this ports use imake-4's config defaultly.
+#     this means this port uses imake-4's config for defaults.
 # (2) Generate temporal config for compiling.
 #     Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-#     used for compiling this ports localy. so these configs will be generated
-#     this scripts. these configs will be stored to `host.def' file.
-#     but this host.def will never install. use local only.
+#     used locally for compiling this port, so these configs will be generated
+#     by this script. These configs will be stored to the `host.def' file,
+#     but this host.def will never be installed.
 
 ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
 DESTDEF=$WRKDIR/xc/config/cf/xf86site.def
@@ -104,36 +104,9 @@ END
     echo "#define BuildThreadStubLibrary YES" >> $LOCALDEF
     echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF
 
-    # Check Wraphelp.c
-    if [ $HasXdmAuth = DEFAULT ]; then
-	HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
-    fi
-
-    cpwh=NO
-    if [ $HasXdmAuth = YES ]; then
-	WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
-	if [ -f $WH ] ; then
-	    cpwh=SOURCE
-	elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
-	    cpwh=$DISTDIR/xc/Wraphelp.c
-	else
-	    echo "==> You must fetch USA-legal Wraphelp.c manually"
-	    echo "==> and put it to ${DISTDIR}/xc/."
-	    exit 1
-	fi
-	if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
-	    tr -d '\r' < $cpwh > $WH
-	fi
-    fi
-
     # Copy ORIGDEF to DESTDEF
     rm -f $DESTDEF
-    grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
-    if [ $cpwh = NO ] ; then
-	echo "#define HasXdmAuth NO" >> $DESTDEF
-    else
-	echo "#define HasXdmAuth YES" >> $DESTDEF
-    fi
+    cp -f $ORIGDEF $DESTDEF
 
     # copy generated config to host.def
     cp -f $LOCALDEF $HOSTDEF
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index e5bf29b32052..d15f70c87e5c 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -30,13 +30,13 @@ USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
-SCRIPTS_ENV=		HasXdmAuth=${HasXdmAuth}
 ALL_TARGET=		FreeBSDPortsBuild
 INSTALL_TARGET=		installXvfb installXserver.man
 MAKE_ENV=		MAN_INSTALL_TARGET=installXvfb.man
 MAN1=			Xserver.1 Xvfb.1
 
-HasXdmAuth?=		YES
+post-extract:
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp/
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure
index 917a76ead3ff..95477973f61f 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-# This scripts work as following:
-# (1) cp current xf86site.def (it may be created by imake-4 ports) 
+# This script does the following:
+# (1) cp current xf86site.def (it is created by the imake-4 port) 
 #       to ${WRKDIR}/xc/config/cf.
-#     this means this ports use imake-4's config defaultly.
+#     this means this port uses imake-4's config for defaults.
 # (2) Generate temporal config for compiling.
 #     Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-#     used for compiling this ports localy. so these configs will be generated
-#     this scripts. these configs will be stored to `host.def' file.
-#     but this host.def will never install. use local only.
+#     used locally for compiling this port, so these configs will be generated
+#     by this script. These configs will be stored to the `host.def' file,
+#     but this host.def will never be installed.
 
 ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
 DESTDEF=$WRKDIR/xc/config/cf/xf86site.def
@@ -49,36 +49,9 @@ configure () {
     echo "#define XVirtualFramebufferServer YES" >> $LOCALDEF
     echo "#define BuildServersOnly YES" >> $LOCALDEF
 
-    # Check Wraphelp.c
-    if [ $HasXdmAuth = DEFAULT ]; then
-	HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
-    fi
-
-    cpwh=NO
-    if [ $HasXdmAuth = YES ]; then
-	WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
-	if [ -f $WH ] ; then
-	    cpwh=SOURCE
-	elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
-	    cpwh=$DISTDIR/xc/Wraphelp.c
-	else
-	    echo "==> You must fetch USA-legal Wraphelp.c manually"
-	    echo "==> and put it to ${DISTDIR}/xc/."
-	    exit 1
-	fi
-	if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
-	    tr -d '\r' < $cpwh > $WH
-	fi
-    fi
-
     # Copy ORIGDEF to DESTDEF
     rm -f $DESTDEF
-    grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
-    if [ $cpwh = NO ] ; then
-	echo "#define HasXdmAuth NO" >> $DESTDEF
-    else
-	echo "#define HasXdmAuth YES" >> $DESTDEF
-    fi
+    cp -f $ORIGDEF $DESTDEF
 
     # copy generated config to host.def
     cp -f $LOCALDEF $HOSTDEF
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 07f8c7d1a11a..4329a85616ac 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -30,7 +30,6 @@ PATCHDIR=		${.CURDIR}/../XFree86-4-libraries/files
 SCRIPTS_ENV=		InstallXdmConfig=${InstallXdmConfig} \
 			InstallXinitConfig=${InstallXinitConfig} \
 			InstallAppDefFiles=${InstallAppDefFiles} \
-			HasXdmAuth=${HasXdmAuth} \
 			HasSecureRPC=${HasSecureRPC} \
 			HasPam=${HasPam}
 MAKE_ENV=		PKGNAMEPREFIX=${PKGNAMEPREFIX} \
@@ -43,7 +42,6 @@ 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.
@@ -55,7 +53,6 @@ INSTALL_TARGET=		FreeBSDPortsInstall FreeBSDPortsInstall.man
 InstallXdmConfig?=	DEFAULT
 InstallXinitConfig?=	DEFAULT
 InstallAppDefFiles?=	DEFAULT
-HasXdmAuth?=		YES
 HasSecureRPC?=		DEFAULT
 HasPam?=		DEFAULT
 
@@ -64,6 +61,7 @@ post-extract:
 	 ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 	   ${DISTDIR}/${DIST_SUBDIR}/X${PORTVERSION:S/.//g}src-2.tgz \
 	    | ${TAR} -xf - xc/fonts/util )
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp/
 
 post-patch:
 	cd ${WRKSRC}/nls; \
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index b1db6e5c4e7c..c562846bc8bb 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-# This scripts work as following:
-# (1) cp current xf86site.def (it may be created by imake-4 ports) 
+# This script does the following:
+# (1) cp current xf86site.def (it is created by the imake-4 port) 
 #       to ${WRKDIR}/xc/config/cf.
-#     this means this ports use imake-4's config defaultly.
+#     this means this port uses imake-4's config for defaults.
 # (2) Generate temporal config for compiling.
 #     Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-#     used for compiling this ports localy. so these configs will be generated
-#     this scripts. these configs will be stored to `host.def' file.
-#     but this host.def will never install. use local only.
+#     used locally for compiling this port, so these configs will be generated
+#     by this script. These configs will be stored to the `host.def' file,
+#     but this host.def will never be installed.
 
 ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
 DESTDEF=$WRKDIR/xc/config/cf/xf86site.def
@@ -71,36 +71,9 @@ configure () {
     echo "#define FreeBSDBuildXlib NO" >> $LOCALDEF
     echo "#define FreeBSDBuildXbin YES" >> $LOCALDEF
 
-    # Check Wraphelp.c
-    if [ $HasXdmAuth = DEFAULT ]; then
-	HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
-    fi
-
-    cpwh=NO
-    if [ $HasXdmAuth = YES ]; then
-	WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
-	if [ -f $WH ] ; then
-	    cpwh=SOURCE
-	elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
-	    cpwh=$DISTDIR/xc/Wraphelp.c
-	else
-	    echo "==> You must fetch USA-legal Wraphelp.c manually"
-	    echo "==> and put it to ${DISTDIR}/xc/."
-	    exit 1
-	fi
-	if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
-	    tr -d '\r' < $cpwh > $WH
-	fi
-    fi
-
     # Copy ORIGDEF to DESTDEF
     rm -f $DESTDEF
-    grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
-    if [ $cpwh = NO ] ; then
-	echo "#define HasXdmAuth NO" >> $DESTDEF
-    else
-	echo "#define HasXdmAuth YES" >> $DESTDEF
-    fi
+    cp -f $ORIGDEF $DESTDEF
 
     # copy generated config to host.def
     cp -f $LOCALDEF $HOSTDEF
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index b74044242e1e..838d911e67f6 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -39,8 +39,7 @@ MTREE_FILE=		/etc/mtree/BSD.x11-4.dist
 INSTALLS_SHLIB=		yes
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
-SCRIPTS_ENV=		HasXdmAuth=${HasXdmAuth} \
-			HasSecureRPC=${HasSecureRPC} \
+SCRIPTS_ENV=		HasSecureRPC=${HasSecureRPC} \
 			BuildPexExt=${BuildPexExt} \
 			BuildXinerama=${BuildXinerama} \
 			BuildXIE=${BuildXIE} \
@@ -59,7 +58,6 @@ MAN3=		Xaw.3 Xft.3
 # ---
 # Name          Default		Meaning
 # ----------------------------------------------------------------------------
-# HasXdmAuth	YES		support XDM-AUTHORIZATION-1.
 # HasSecureRPC	YES		build with SecureRPC (require FreeBSD-3 or later)
 # BuildPexExt	YES		build PEX extension
 # BuildXinerama	YES		build Xinerama extension
@@ -70,7 +68,6 @@ MAN3=		Xaw.3 Xft.3
 # ----------------------------------------------------------------------------
 # DEFAULT means ports will use values which set by ${PORTSDIR}/devel/imake-4
 #
-HasXdmAuth?=		YES
 HasSecureRPC?=		DEFAULT
 BuildPexExt?=		DEFAULT
 BuildXinerama?=		DEFAULT
@@ -89,6 +86,9 @@ PLIST_SUB+=	OSMESA:="@comment "
 PLIST_SUB+=	OSMESA:=""
 .endif
 
+post-extract:
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp/
+
 post-patch:
 	cd ${WRKSRC}/nls; \
 	for i in Compose XI18N_OBJS XLC_LOCALE; do \
diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index eb98efd99287..22dd71a0b148 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-# This scripts work as following:
-# (1) cp current xf86site.def (it may be created by imake-4 ports) 
+# This script does the following:
+# (1) cp current xf86site.def (it is created by the imake-4 port) 
 #       to ${WRKDIR}/xc/config/cf.
-#     this means this ports use imake-4's config defaultly.
+#     this means this port uses imake-4's config for defaults.
 # (2) Generate temporal config for compiling.
 #     Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-#     used for compiling this ports localy. so these configs will be generated
-#     this scripts. these configs will be add to `host.def' file.
-#     but this host.def will never install. use local only.
+#     used locally for compiling this port, so these configs will be generated
+#     by this script. These configs will be stored to the `host.def' file,
+#     but this host.def will never be installed.
 
 ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
 DESTDEF=$WRKDIR/xc/config/cf/xf86site.def
@@ -73,33 +73,9 @@ configure () {
     echo "#define FreeBSDBuildXlib  YES" >> $LOCALDEF
     echo "#define FreeBSDBuildXbin   NO" >> $LOCALDEF
 
-    HasXdmAuth=YES
-
-    cpwh=NO
-    if [ $HasXdmAuth = YES ]; then
-    	WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
-    	if [ -f $WH ] ; then
-	    cpwh=SOURCE
-    	elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
-	    cpwh=$DISTDIR/xc/Wraphelp.c
-    	else
-	    echo "==> You must fetch USA-legal Wraphelp.c manually"
-	    echo "==> and put it to ${DISTDIR}/xc/."
-	    exit 1
-	fi
-    	if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
-	    tr -d '\r' < $cpwh > $WH
-    	fi
-    fi
-
     # Copy ORIGDEF to DESTDEF
     rm -f $DESTDEF
-    grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
-    if [ $cpwh = NO ] ; then
-	echo "#define HasXdmAuth NO" >> $DESTDEF
-    else
-	echo "#define HasXdmAuth YES" >> $DESTDEF
-    fi
+    cp -f $ORIGDEF $DESTDEF
 
     # copy generated config to host.def
     cp -f $LOCALDEF $HOSTDEF