Port of the latest XFree86 version (4.0). Not tested on alpha and pc98 (and

hence no corresponding PLISTs). Use at your own risk :-)
svn path=/head/; revision=26727
2024-12-24 04:33:24 +00:00 · 2000-03-11 00:20:34 +00:00 · 2000-03-11 00:20:34 +00:00 · 1ec0dc8225 · 2021-03-31 03:12:20 +00:00
commit 1ec0dc8225
parent 451e3f5acb
49 changed files with 6284 additions and 5371 deletions
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@ -1,5 +1,5 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3.6
+# Version required:     4.0
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
@ -7,25 +7,17 @@
 #

 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3.6
+PKGNAME= 	XFree86-4.0
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
-DISTFILES=	X336src-1.tgz X336src-2.tgz
-
-PATCH_SITES=	ftp://ftp.xfree.org/pub/XFree86/3.3.6/fixes/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/fixes/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/fixes/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/fixes/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/fixes/
-PATCHFILES= 	fix-01-r128	
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
+		ftp://xfree86.cdrom.com/pub/XFree86/4.0/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+DISTFILES=	X400src-1.tgz X400src-2.tgz

 MAINTAINER=	jmz@FreeBSD.org

-IS_INTERACTIVE=	yes	# configure script asks questions
 .if (${MACHINE} != "alpha")
 #NO_PACKAGE=	package available from XFree86
 .endif
@ -34,8 +26,19 @@ INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
 SCRIPTS_ENV=	OSVERSION=${OSVERSION}
+.ifdef DISTRIB
+DESTDIR=	${WRKDIR}/distrib
+MAKE_ENV+=	DESTDIR=${DESTDIR}
+NO_PKG_REGISTER=yes
+SCRIPTS_ENV+=	NO_INPUT=yes
+.endif
 # can't use USE_X_PREFIX here -- it will cause a circular dependency
 PREFIX=		${X11BASE}
+.if defined(DISTRIB) || defined(PACKAGE_BUILDING)
+IS_INTERACTIVE=	no
+.else
+IS_INTERACTIVE=	yes	# configure script asks questions
+.endif
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
 .if (${MACHINE} == "pc98")
 SCRIPTS_ENV+=	MACHINE=pc98
@ -57,7 +60,7 @@ 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=	X336src-1.tgz X336src-2.tgz
+EXTRACT_ONLY=	X400src-1.tgz X400src-2.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
@ -71,23 +74,60 @@ pre-fetch:
 .include <bsd.port.pre.mk>

 pre-install:
-	${MKDIR} ${X11BASE}
+	${MKDIR} ${PREFIX}

 post-install:
 .if ${PORTOBJFORMAT} == "aout"
-.for lib in PEX5 SM XIE Xi Xmu Xt oldX XThrStub
-	${LN} -sf lib${lib}.so.6.0 ${PREFIX}/lib/lib${lib}.so
+.for lib in psres dps dpstk Xfont GL
+	${LN} -sf lib${lib}.so.1.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
-.for lib in X11 Xaw Xtst
-	${LN} -sf lib${lib}.so.6.1 ${PREFIX}/lib/lib${lib}.so
+.for lib in Xpm
+	${LN} -sf lib${lib}.so.4.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in PEX5 SM XIE Xi Xmu Xt oldX xrx
+	${LN} -sf lib${lib}.so.6.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in X11 Xtst
+	${LN} -sf lib${lib}.so.6.1 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
 .for lib in Xp
-	${LN} -sf lib${lib}.so.6.2 ${PREFIX}/lib/lib${lib}.so
+	${LN} -sf lib${lib}.so.6.2 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
 .for lib in ICE Xext
-	${LN} -sf lib${lib}.so.6.3 ${PREFIX}/lib/lib${lib}.so
+	${LN} -sf lib${lib}.so.6.3 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in Xaw
+	${LN} -sf lib${lib}.so.7.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
 .endif
+.ifndef DISTRIB
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+.endif
+
+.ifdef DISTRIB
+distrib: all install
+	@cd ../XFree86-contrib && \
+	    ${MAKE} NO_PKG_REGISTER=yes WRKDIR=${WRKDIR}/contrib-work \
+	    PREFIX=${X11BASE} PREFIX=${DESTDIR}/${PREFIX} all install
+	@${MKDIR} ${WRKDIR}/bindist
+	@${CP} ${WRKSRC}/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-ELF/* \
+	    ${WRKDIR}/bindist
+	@${SED} -e 's:TAR="gnu-tar":TAR="${TAR}":g' \
+	    -e 's/EXTRACTLOPTS="-t -v"/TARLOPTS="-t -v -z"/g' \
+	    -e 's/\(#\)\(      echo $$i >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(#\)\(      echo "------------" >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(#\)\(      $$TAR $$TARLOPTS -f $$i >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(#\)\(      echo "" >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(      $$EXTRACT $$EXTRACTLOPTS $$i >> $$LISTFILE\)/#\1/g' \
+	    < ${WRKSRC}/programs/Xserver/hw/xfree86/etc/bindist/build-bindist \
+	    > ${WRKDIR}/build-bindist
+	@${CHMOD} 0555 ${WRKDIR}/build-bindist
+	@${WRKDIR}/build-bindist X ${WRKDIR}/distrib ${WRKDIR}/bindist
+.else
+distrib:
+	@${ECHO_MSG} '>> The DISTRIB variable must be set when building ' \
+	    '"distrib".'
+	@exit 1
+.endif

 .include <bsd.port.post.mk>
--- a/x11-servers/XFree86-4-Server-snap/distinfo
+++ b/x11-servers/XFree86-4-Server-snap/distinfo
@ -1,4 +1,3 @@
-MD5 (xc/X336src-1.tgz) = bbfa360d10ce91ab37f24f197a31b485
-MD5 (xc/X336src-2.tgz) = 897daa223b5b67b8314ed8835cc17539
-MD5 (xc/fix-01-r128) = a62387e13b970c5a83e9a0822c30344f
+MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
+MD5 (xc/X400src-2.tgz) = ad5f7461adb6b2646f9a9c48ad93f6da
 MD5 (xc/Wraphelp.c) = IGNORE
--- a/x11-servers/XFree86-4-Server-snap/pkg-comment
+++ b/x11-servers/XFree86-4-Server-snap/pkg-comment
@ -1 +1 @@
-X11R6.3/XFree86 core distribution
+X11R6.4/XFree86 core distribution
--- a/x11-servers/XFree86-4-Server-snap/pkg-descr
+++ b/x11-servers/XFree86-4-Server-snap/pkg-descr
@ -1,9 +1,4 @@
 XFree86 is a added-value pack for X11R6 that supports several versions
-of Intel-based Unix and Unix-like operating systems.  XFree86-3.0 was
-part of the X11R6 core distribution.  This release of XFree86-3.3
-consists of many new features and performance improvements as well as
-many bug fixes.  The release is available as source patches against
-the X Consortium X11R6 code, as well as binary distributions for many
-architectures.
+of Intel-based Unix and Unix-like operating systems.  

 WWW: http://www.xfree86.org/
--- a/x11-servers/XFree86-4-Server-snap/pkg-plist
+++ b/x11-servers/XFree86-4-Server-snap/pkg-plist
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@ -1,7 +1,16 @@
 #!/bin/sh

+answset () {
+  if [ -n "$NO_INPUT" ]; then
+    echo "$2 [$1]"
+    answ=$1
+  else
+    answ=X
+  fi
+}
+
 yesno () {
-  answ=X;
+  answset YES "$1"
  while [ $answ = X ]; do
    echo -n "$1 [YES] "
    read answ
@ -16,7 +25,7 @@ yesno () {
  done
 }
 noyes() {
-  answ=X;
+  answset NO "$1"
  while [ $answ = X ]; do
    echo -n "$1 [NO] "
    read answ
@ -83,23 +92,23 @@ if [ X$tkversion != X ]; then
  *jp)
    echo "Using Japanized tk-$jptkLversion"
    if [ X"${MACHINE}" = X"pc98" ]; then
-	echo "#define HasJpTk			YES" >>$F
-	echo "#define JpTkLibDir		/usr/local/lib" >>$F
-	echo "#define JpTkIncDir		/usr/local/include/tk$tkLversion" >>$F
-	echo "#define JpTkLibName		tk$tkversion" >>$F
+	echo "#define HasJpTk		YES" >>$F
+	echo "#define JpTkLibDir	/usr/local/lib" >>$F
+	echo "#define JpTkIncDir	/usr/local/include/tk$tkLversion" >>$F
+	echo "#define JpTkLibName	tk$tkversion" >>$F
 	echo "#define HasJpTcl		YES" >>$F
-	echo "#define JpTclLibDir		/usr/local/lib" >>$F
-	echo "#define JpTclIncDir		/usr/local/include/tcl$tclLversion" >>$F
-	echo "#define JpTclLibName		tcl$tclversion" >>$F
+	echo "#define JpTclLibDir	/usr/local/lib" >>$F
+	echo "#define JpTclIncDir	/usr/local/include/tcl$tclLversion" >>$F
+	echo "#define JpTclLibName	tcl$tclversion" >>$F
    else
-	echo "#define HasTk			YES" >>$F
+	echo "#define HasTk		YES" >>$F
 	echo "#define TkLibDir		/usr/local/lib" >>$F
 	echo "#define TkIncDir		/usr/local/include/tk$tkLversion" >>$F
 	echo "#define TkLibName		tk$tkversion" >>$F
-	echo "#define HasTcl			YES" >>$F
+	echo "#define HasTcl		YES" >>$F
 	echo "#define TclLibDir		/usr/local/lib" >>$F
 	echo "#define TclIncDir		/usr/local/include/tcl$tclLversion" >>$F
-	echo "#define TclLibName		tcl$tclversion" >>$F
+	echo "#define TclLibName	tcl$tclversion" >>$F
    fi
    ;;
  *)
@ -108,7 +117,7 @@ if [ X$tkversion != X ]; then
    echo "#define TkLibDir		/usr/local/lib" >>$F
    echo "#define TkIncDir		/usr/local/include/tk$tkLversion" >>$F
    echo "#define TkLibName		tk$tkversion" >>$F
-    echo "#define HasTcl			YES" >>$F
+    echo "#define HasTcl		YES" >>$F
    echo "#define TclLibDir		/usr/local/lib" >>$F
    echo "#define TclIncDir		/usr/local/include/tcl$tclLversion" >>$F
    echo "#define TclLibName		tcl$tclversion" >>$F
@ -123,118 +132,16 @@ cat <<EOF
 EOF
 fi

-cat <<END
- Which servers do you wish to build, you can save a lot of disk space
- by only compiling the server you will be using.  It will also save you
- considerable compile time.
-END
-if [ X$tkversion != X ]; then
-  echo "*** If you want to use XF86Setup to set the INITIAL configuration,"
-  echo "*** then you must build the VGA server"
-fi
-# force the compilation of the EGC server for pc98.
-if [ X"${MACHINE}" = X"pc98" ]; then
-    echo "#define BuildPC98Servers	YES"  >>$F
-    echo "#undef XF98EGCServer"           >>$F
-    echo "#define XF98EGCServer     YES"  >>$F
-    servers="GA968 GANBWAP NEC480 NKVNEC WABS WABEP WSNA TGUI MGA SVGA NECS3 PWSKB PWLB"
-    selected=EGC
-    for i in $servers; do
-	yesno "Do you want to build the $i server?"
-	if [ $answ = YES ]; then selected="$selected $i"; fi
-	echo "#undef XF98${i}Server"           >>$F
-	echo "#define XF98${i}Server   $answ"  >>$F
-    done
-    echo "#undef XF86SVGAServer"           >>$F
-    echo "#define XF86SVGAServer     NO"  >>$F
-    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
-    for i in $servers; do
-	echo "#undef XF86${i}Server"           >>$F
-    echo "#define XF86${i}Server   NO"  >>$F
-    done
-elif [ X"${MACHINE}" = X"alpha" ]; then
-# force the compilation of the SVGA server.
-    echo "#undef XF86SVGAServer"           >>$F
-    echo "#define XF86SVGAServer     YES"  >>$F
-    servers="Mono S3 S3V Mach64 P9000 I128 GLINT TGA"
-    selected=SVGA
-    for i in $servers; do
-	yesno "Do you want to build the $i server?"
-	if [ $answ = YES ]; then selected="$selected $i"; fi
-	echo "#undef XF86${i}Server"           >>$F
-	echo "#define XF86${i}Server   $answ"  >>$F
-    done
-else
-# force the compilation of the SVGA server.
-    echo "#undef XF86SVGAServer"           >>$F
-    echo "#define XF86SVGAServer     YES"  >>$F
-    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
-    selected=SVGA
-    for i in $servers; do
-	yesno "Do you want to build the $i server?"
-	if [ $answ = YES ]; then selected="$selected $i"; fi
-	echo "#undef XF86${i}Server"           >>$F
-	echo "#define XF86${i}Server   $answ"  >>$F
-    done
-fi
-
-echo
-ok=0
-while [ $ok != 1 ]; do 
-  echo -n "default server to install. [none] "
-  read answ
-  if [ X$answ = X ]; then answ=none; ok=1; fi
-  if [ $answ != none ]; then
-    for i in $selected; do if [ $i = $answ ]; then
-      ok=1  
-      if [ X"${MACHINE}" = X"pc98" ]; then
-      echo "#define ServerToInstall		XF98_$answ" >>$F
-      else
-      echo "#define ServerToInstall		XF86_$answ" >>$F
-      fi
-      fi 
-    done
-  fi
-  if [ $ok = 0 ]; then echo you must choose a server among $selected; fi  
-done
-echo
-yesno "Do you want to build Xvfb?"
-echo "#define XVirtualFramebufferServer $answ" >>$F
-
-if [ X"${MACHINE}" != X"pc98" ]; then
-if [ X"${MACHINE}" = X"alpha" ]; then
 cat >> $F <<END
-#define XF86SvgaDrivers         nv mga s3v generic
-
-#define XF86MonoDrivers		hgc1280 sigma apollo hercules
+#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
+                                neomagic i740 tdfx \
+                                cirrus tseng trident chips apm \
+                                GlideDriver fbdev \
+                                ati r128 vga XF86ExtraCardDrivers
 END
-else
-cat >> $F <<END
-#define XF86SvgaDrivers         nv et4000 et3000 pvga1 gvga r128 ati sis tvga8900 \
-                                cirrus ncr77c22 compaq mga oak al2101 ali \
-                                cl64xx video7 ark mx realtek apm s3_savage s3v \
-                                s3_svga neo chips cyrix rendition p9x00 \
-				spc8110 i740 tdfx smi generic
-
-#define XF86Vga16Drivers	et4000 et3000 ncr77c22 ati sis tvga8900 oak \
-				cl64xx generic 
-
-#define XF86Vga2Drivers		et4000 et3000 pvga1 gvga ati sis tvga8900 \
-				cirrus ncr77c22 oak cl64xx generic
-
-#define XF86MonoDrivers		hgc1280 sigma apollo hercules
-
-#define XF86W32Drivers		et4000w32
-
-END
-fi
-fi
-

 cat <<END
-
-
- Do you want to install the default system config files, this will overwrite
+ Do you want to install the default system config files? This will overwrite
 and files that you may be currently using.  This would only be required
 on a first time build.
 END
@ -246,16 +153,19 @@ yesno "Install xinit config?"
 if [ $answ = YES ]; then
  echo "#define InstallXinitConfig $answ" >> $F
 fi
-yesno "Install xfs config?"
-if [ $answ = YES ]; then
-  echo "#define InstallFSConfig $answ" >> $F
-fi

 yesno "Do you want to include support for the FontServer?"
-echo "#undef BuildFontServer" >>$F
-echo "#define  BuildFontServer $answ" >>$F
-echo "#undef InstallFSConfig" >>$F
-echo "#define   InstallFSConfig $answ" >>$F
+if [ $answ = YES ]; then
+    echo "#define  BuildFontServer $answ" >>$F
+    yesno "Install xfs config?"
+    if [ $answ = YES ]; then
+      echo "#define InstallFSConfig $answ" >> $F
+    fi
+else
+    echo "#define  BuildFontServer $answ" >>$F
+    echo "#define InstallFSConfig $answ" >> $F
+fi
+

 cat <<'END'
 Do you want to Build Fonts (Usually you only want to build and install
@ -263,29 +173,55 @@ cat <<'END'
 fonts)
 END
 yesno "Build fonts?"
-if [ $answ = NO ]; then
-  echo "#define BuildFonts		NO" >> $F
+echo "#define BuildFonts		$answ" >> $F
+if [ $answ = YES ]; then
+  yesno "Build/install the 75dpi fonts?"
+  echo "#define Build75DpiFonts	$answ" >> $F
+  yesno "Build/install the 100dpi fonts?"
+  echo "#define Build100DpiFonts	$answ" >> $F
+  yesno "Build/install the Speedo fonts?"
+  echo "#define BuildSpeedoFonts	$answ" >> $F
+  yesno "Build/install the Type1 fonts?"
+  echo "#define BuildType1Fonts	$answ" >> $F
+  yesno "Build/install the CID fonts?"
+  echo "#define BuildCIDFonts	$answ" >> $F
+  yesno "Build/install the Cyrillic fonts?"
+  echo "#define BuildCyrillicFonts	$answ" >> $F
+  yesno "Build/install the Latin2 fonts?"
+  echo "#define BuildLatin2Fonts	$answ" >> $F
 fi
+
 yesno "Build the servers with Extended input devices?"
 if [ $answ = NO ]; then
  echo "#undef BuildXInputExt" >> $F
  echo "#define BuildXInputExt		NO" >> $F
 else
-  if [ X${MACHINE} != X"alpha" ]; then
-    echo "#define JoystickSupport		YES" >> $F
-  fi
+  echo "#define XInputDrivers dynapro elo2300 elographics magellan microtouch \
+        mutouch spaceorb wacom"  >> $F
+# XXX broken in 3.9.18
+#  if [ X${MACHINE} != X"alpha" ]; then
+#    echo "#define JoystickSupport		YES" >> $F
+#  fi
 fi

 yesno "Build PEX?"
 if [ $answ = NO ]; then
  echo "#define BuildPexExt		NO" >> $F
 fi
+yesno "Build Xinerama?"
+echo "#define BuildXinerama  $answ" >> $F
+
 yesno "Build XIE?"
 if [ $answ = NO ]; then
  echo "#define BuildXIE		NO" >> $F
 fi
 echo

+yesno "Install application defaults files?"
+if [ $answ = NO ]; then
+  echo "#define InstallAppDefFiles      NO" >> $F
+fi
+
 yesno "Build static libraries in addition to shared libraries?"
 if [ $answ = YES ]; then
  echo "#define ForceNormalLib		YES" >> $F
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@ -1,5 +1,5 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3.6
+# Version required:     4.0
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
@ -7,25 +7,17 @@
 #

 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3.6
+PKGNAME= 	XFree86-4.0
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
-DISTFILES=	X336src-1.tgz X336src-2.tgz
-
-PATCH_SITES=	ftp://ftp.xfree.org/pub/XFree86/3.3.6/fixes/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/fixes/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/fixes/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/fixes/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/fixes/
-PATCHFILES= 	fix-01-r128	
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
+		ftp://xfree86.cdrom.com/pub/XFree86/4.0/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+DISTFILES=	X400src-1.tgz X400src-2.tgz

 MAINTAINER=	jmz@FreeBSD.org

-IS_INTERACTIVE=	yes	# configure script asks questions
 .if (${MACHINE} != "alpha")
 #NO_PACKAGE=	package available from XFree86
 .endif
@ -34,8 +26,19 @@ INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
 SCRIPTS_ENV=	OSVERSION=${OSVERSION}
+.ifdef DISTRIB
+DESTDIR=	${WRKDIR}/distrib
+MAKE_ENV+=	DESTDIR=${DESTDIR}
+NO_PKG_REGISTER=yes
+SCRIPTS_ENV+=	NO_INPUT=yes
+.endif
 # can't use USE_X_PREFIX here -- it will cause a circular dependency
 PREFIX=		${X11BASE}
+.if defined(DISTRIB) || defined(PACKAGE_BUILDING)
+IS_INTERACTIVE=	no
+.else
+IS_INTERACTIVE=	yes	# configure script asks questions
+.endif
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
 .if (${MACHINE} == "pc98")
 SCRIPTS_ENV+=	MACHINE=pc98
@ -57,7 +60,7 @@ 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=	X336src-1.tgz X336src-2.tgz
+EXTRACT_ONLY=	X400src-1.tgz X400src-2.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
@ -71,23 +74,60 @@ pre-fetch:
 .include <bsd.port.pre.mk>

 pre-install:
-	${MKDIR} ${X11BASE}
+	${MKDIR} ${PREFIX}

 post-install:
 .if ${PORTOBJFORMAT} == "aout"
-.for lib in PEX5 SM XIE Xi Xmu Xt oldX XThrStub
-	${LN} -sf lib${lib}.so.6.0 ${PREFIX}/lib/lib${lib}.so
+.for lib in psres dps dpstk Xfont GL
+	${LN} -sf lib${lib}.so.1.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
-.for lib in X11 Xaw Xtst
-	${LN} -sf lib${lib}.so.6.1 ${PREFIX}/lib/lib${lib}.so
+.for lib in Xpm
+	${LN} -sf lib${lib}.so.4.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in PEX5 SM XIE Xi Xmu Xt oldX xrx
+	${LN} -sf lib${lib}.so.6.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in X11 Xtst
+	${LN} -sf lib${lib}.so.6.1 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
 .for lib in Xp
-	${LN} -sf lib${lib}.so.6.2 ${PREFIX}/lib/lib${lib}.so
+	${LN} -sf lib${lib}.so.6.2 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
 .for lib in ICE Xext
-	${LN} -sf lib${lib}.so.6.3 ${PREFIX}/lib/lib${lib}.so
+	${LN} -sf lib${lib}.so.6.3 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in Xaw
+	${LN} -sf lib${lib}.so.7.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
 .endif
+.ifndef DISTRIB
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+.endif
+
+.ifdef DISTRIB
+distrib: all install
+	@cd ../XFree86-contrib && \
+	    ${MAKE} NO_PKG_REGISTER=yes WRKDIR=${WRKDIR}/contrib-work \
+	    PREFIX=${X11BASE} PREFIX=${DESTDIR}/${PREFIX} all install
+	@${MKDIR} ${WRKDIR}/bindist
+	@${CP} ${WRKSRC}/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-ELF/* \
+	    ${WRKDIR}/bindist
+	@${SED} -e 's:TAR="gnu-tar":TAR="${TAR}":g' \
+	    -e 's/EXTRACTLOPTS="-t -v"/TARLOPTS="-t -v -z"/g' \
+	    -e 's/\(#\)\(      echo $$i >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(#\)\(      echo "------------" >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(#\)\(      $$TAR $$TARLOPTS -f $$i >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(#\)\(      echo "" >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(      $$EXTRACT $$EXTRACTLOPTS $$i >> $$LISTFILE\)/#\1/g' \
+	    < ${WRKSRC}/programs/Xserver/hw/xfree86/etc/bindist/build-bindist \
+	    > ${WRKDIR}/build-bindist
+	@${CHMOD} 0555 ${WRKDIR}/build-bindist
+	@${WRKDIR}/build-bindist X ${WRKDIR}/distrib ${WRKDIR}/bindist
+.else
+distrib:
+	@${ECHO_MSG} '>> The DISTRIB variable must be set when building ' \
+	    '"distrib".'
+	@exit 1
+.endif

 .include <bsd.port.post.mk>
--- a/x11-servers/XFree86-4-Server/distinfo
+++ b/x11-servers/XFree86-4-Server/distinfo
@ -1,4 +1,3 @@
-MD5 (xc/X336src-1.tgz) = bbfa360d10ce91ab37f24f197a31b485
-MD5 (xc/X336src-2.tgz) = 897daa223b5b67b8314ed8835cc17539
-MD5 (xc/fix-01-r128) = a62387e13b970c5a83e9a0822c30344f
+MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
+MD5 (xc/X400src-2.tgz) = ad5f7461adb6b2646f9a9c48ad93f6da
 MD5 (xc/Wraphelp.c) = IGNORE
--- a/x11-servers/XFree86-4-Server/pkg-comment
+++ b/x11-servers/XFree86-4-Server/pkg-comment
@ -1 +1 @@
-X11R6.3/XFree86 core distribution
+X11R6.4/XFree86 core distribution
--- a/x11-servers/XFree86-4-Server/pkg-descr
+++ b/x11-servers/XFree86-4-Server/pkg-descr
@ -1,9 +1,4 @@
 XFree86 is a added-value pack for X11R6 that supports several versions
-of Intel-based Unix and Unix-like operating systems.  XFree86-3.0 was
-part of the X11R6 core distribution.  This release of XFree86-3.3
-consists of many new features and performance improvements as well as
-many bug fixes.  The release is available as source patches against
-the X Consortium X11R6 code, as well as binary distributions for many
-architectures.
+of Intel-based Unix and Unix-like operating systems.  

 WWW: http://www.xfree86.org/
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@ -1,7 +1,16 @@
 #!/bin/sh

+answset () {
+  if [ -n "$NO_INPUT" ]; then
+    echo "$2 [$1]"
+    answ=$1
+  else
+    answ=X
+  fi
+}
+
 yesno () {
-  answ=X;
+  answset YES "$1"
  while [ $answ = X ]; do
    echo -n "$1 [YES] "
    read answ
@ -16,7 +25,7 @@ yesno () {
  done
 }
 noyes() {
-  answ=X;
+  answset NO "$1"
  while [ $answ = X ]; do
    echo -n "$1 [NO] "
    read answ
@ -83,23 +92,23 @@ if [ X$tkversion != X ]; then
  *jp)
    echo "Using Japanized tk-$jptkLversion"
    if [ X"${MACHINE}" = X"pc98" ]; then
-	echo "#define HasJpTk			YES" >>$F
-	echo "#define JpTkLibDir		/usr/local/lib" >>$F
-	echo "#define JpTkIncDir		/usr/local/include/tk$tkLversion" >>$F
-	echo "#define JpTkLibName		tk$tkversion" >>$F
+	echo "#define HasJpTk		YES" >>$F
+	echo "#define JpTkLibDir	/usr/local/lib" >>$F
+	echo "#define JpTkIncDir	/usr/local/include/tk$tkLversion" >>$F
+	echo "#define JpTkLibName	tk$tkversion" >>$F
 	echo "#define HasJpTcl		YES" >>$F
-	echo "#define JpTclLibDir		/usr/local/lib" >>$F
-	echo "#define JpTclIncDir		/usr/local/include/tcl$tclLversion" >>$F
-	echo "#define JpTclLibName		tcl$tclversion" >>$F
+	echo "#define JpTclLibDir	/usr/local/lib" >>$F
+	echo "#define JpTclIncDir	/usr/local/include/tcl$tclLversion" >>$F
+	echo "#define JpTclLibName	tcl$tclversion" >>$F
    else
-	echo "#define HasTk			YES" >>$F
+	echo "#define HasTk		YES" >>$F
 	echo "#define TkLibDir		/usr/local/lib" >>$F
 	echo "#define TkIncDir		/usr/local/include/tk$tkLversion" >>$F
 	echo "#define TkLibName		tk$tkversion" >>$F
-	echo "#define HasTcl			YES" >>$F
+	echo "#define HasTcl		YES" >>$F
 	echo "#define TclLibDir		/usr/local/lib" >>$F
 	echo "#define TclIncDir		/usr/local/include/tcl$tclLversion" >>$F
-	echo "#define TclLibName		tcl$tclversion" >>$F
+	echo "#define TclLibName	tcl$tclversion" >>$F
    fi
    ;;
  *)
@ -108,7 +117,7 @@ if [ X$tkversion != X ]; then
    echo "#define TkLibDir		/usr/local/lib" >>$F
    echo "#define TkIncDir		/usr/local/include/tk$tkLversion" >>$F
    echo "#define TkLibName		tk$tkversion" >>$F
-    echo "#define HasTcl			YES" >>$F
+    echo "#define HasTcl		YES" >>$F
    echo "#define TclLibDir		/usr/local/lib" >>$F
    echo "#define TclIncDir		/usr/local/include/tcl$tclLversion" >>$F
    echo "#define TclLibName		tcl$tclversion" >>$F
@ -123,118 +132,16 @@ cat <<EOF
 EOF
 fi

-cat <<END
- Which servers do you wish to build, you can save a lot of disk space
- by only compiling the server you will be using.  It will also save you
- considerable compile time.
-END
-if [ X$tkversion != X ]; then
-  echo "*** If you want to use XF86Setup to set the INITIAL configuration,"
-  echo "*** then you must build the VGA server"
-fi
-# force the compilation of the EGC server for pc98.
-if [ X"${MACHINE}" = X"pc98" ]; then
-    echo "#define BuildPC98Servers	YES"  >>$F
-    echo "#undef XF98EGCServer"           >>$F
-    echo "#define XF98EGCServer     YES"  >>$F
-    servers="GA968 GANBWAP NEC480 NKVNEC WABS WABEP WSNA TGUI MGA SVGA NECS3 PWSKB PWLB"
-    selected=EGC
-    for i in $servers; do
-	yesno "Do you want to build the $i server?"
-	if [ $answ = YES ]; then selected="$selected $i"; fi
-	echo "#undef XF98${i}Server"           >>$F
-	echo "#define XF98${i}Server   $answ"  >>$F
-    done
-    echo "#undef XF86SVGAServer"           >>$F
-    echo "#define XF86SVGAServer     NO"  >>$F
-    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
-    for i in $servers; do
-	echo "#undef XF86${i}Server"           >>$F
-    echo "#define XF86${i}Server   NO"  >>$F
-    done
-elif [ X"${MACHINE}" = X"alpha" ]; then
-# force the compilation of the SVGA server.
-    echo "#undef XF86SVGAServer"           >>$F
-    echo "#define XF86SVGAServer     YES"  >>$F
-    servers="Mono S3 S3V Mach64 P9000 I128 GLINT TGA"
-    selected=SVGA
-    for i in $servers; do
-	yesno "Do you want to build the $i server?"
-	if [ $answ = YES ]; then selected="$selected $i"; fi
-	echo "#undef XF86${i}Server"           >>$F
-	echo "#define XF86${i}Server   $answ"  >>$F
-    done
-else
-# force the compilation of the SVGA server.
-    echo "#undef XF86SVGAServer"           >>$F
-    echo "#define XF86SVGAServer     YES"  >>$F
-    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
-    selected=SVGA
-    for i in $servers; do
-	yesno "Do you want to build the $i server?"
-	if [ $answ = YES ]; then selected="$selected $i"; fi
-	echo "#undef XF86${i}Server"           >>$F
-	echo "#define XF86${i}Server   $answ"  >>$F
-    done
-fi
-
-echo
-ok=0
-while [ $ok != 1 ]; do 
-  echo -n "default server to install. [none] "
-  read answ
-  if [ X$answ = X ]; then answ=none; ok=1; fi
-  if [ $answ != none ]; then
-    for i in $selected; do if [ $i = $answ ]; then
-      ok=1  
-      if [ X"${MACHINE}" = X"pc98" ]; then
-      echo "#define ServerToInstall		XF98_$answ" >>$F
-      else
-      echo "#define ServerToInstall		XF86_$answ" >>$F
-      fi
-      fi 
-    done
-  fi
-  if [ $ok = 0 ]; then echo you must choose a server among $selected; fi  
-done
-echo
-yesno "Do you want to build Xvfb?"
-echo "#define XVirtualFramebufferServer $answ" >>$F
-
-if [ X"${MACHINE}" != X"pc98" ]; then
-if [ X"${MACHINE}" = X"alpha" ]; then
 cat >> $F <<END
-#define XF86SvgaDrivers         nv mga s3v generic
-
-#define XF86MonoDrivers		hgc1280 sigma apollo hercules
+#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
+                                neomagic i740 tdfx \
+                                cirrus tseng trident chips apm \
+                                GlideDriver fbdev \
+                                ati r128 vga XF86ExtraCardDrivers
 END
-else
-cat >> $F <<END
-#define XF86SvgaDrivers         nv et4000 et3000 pvga1 gvga r128 ati sis tvga8900 \
-                                cirrus ncr77c22 compaq mga oak al2101 ali \
-                                cl64xx video7 ark mx realtek apm s3_savage s3v \
-                                s3_svga neo chips cyrix rendition p9x00 \
-				spc8110 i740 tdfx smi generic
-
-#define XF86Vga16Drivers	et4000 et3000 ncr77c22 ati sis tvga8900 oak \
-				cl64xx generic 
-
-#define XF86Vga2Drivers		et4000 et3000 pvga1 gvga ati sis tvga8900 \
-				cirrus ncr77c22 oak cl64xx generic
-
-#define XF86MonoDrivers		hgc1280 sigma apollo hercules
-
-#define XF86W32Drivers		et4000w32
-
-END
-fi
-fi
-

 cat <<END
-
-
- Do you want to install the default system config files, this will overwrite
+ Do you want to install the default system config files? This will overwrite
 and files that you may be currently using.  This would only be required
 on a first time build.
 END
@ -246,16 +153,19 @@ yesno "Install xinit config?"
 if [ $answ = YES ]; then
  echo "#define InstallXinitConfig $answ" >> $F
 fi
-yesno "Install xfs config?"
-if [ $answ = YES ]; then
-  echo "#define InstallFSConfig $answ" >> $F
-fi

 yesno "Do you want to include support for the FontServer?"
-echo "#undef BuildFontServer" >>$F
-echo "#define  BuildFontServer $answ" >>$F
-echo "#undef InstallFSConfig" >>$F
-echo "#define   InstallFSConfig $answ" >>$F
+if [ $answ = YES ]; then
+    echo "#define  BuildFontServer $answ" >>$F
+    yesno "Install xfs config?"
+    if [ $answ = YES ]; then
+      echo "#define InstallFSConfig $answ" >> $F
+    fi
+else
+    echo "#define  BuildFontServer $answ" >>$F
+    echo "#define InstallFSConfig $answ" >> $F
+fi
+

 cat <<'END'
 Do you want to Build Fonts (Usually you only want to build and install
@ -263,29 +173,55 @@ cat <<'END'
 fonts)
 END
 yesno "Build fonts?"
-if [ $answ = NO ]; then
-  echo "#define BuildFonts		NO" >> $F
+echo "#define BuildFonts		$answ" >> $F
+if [ $answ = YES ]; then
+  yesno "Build/install the 75dpi fonts?"
+  echo "#define Build75DpiFonts	$answ" >> $F
+  yesno "Build/install the 100dpi fonts?"
+  echo "#define Build100DpiFonts	$answ" >> $F
+  yesno "Build/install the Speedo fonts?"
+  echo "#define BuildSpeedoFonts	$answ" >> $F
+  yesno "Build/install the Type1 fonts?"
+  echo "#define BuildType1Fonts	$answ" >> $F
+  yesno "Build/install the CID fonts?"
+  echo "#define BuildCIDFonts	$answ" >> $F
+  yesno "Build/install the Cyrillic fonts?"
+  echo "#define BuildCyrillicFonts	$answ" >> $F
+  yesno "Build/install the Latin2 fonts?"
+  echo "#define BuildLatin2Fonts	$answ" >> $F
 fi
+
 yesno "Build the servers with Extended input devices?"
 if [ $answ = NO ]; then
  echo "#undef BuildXInputExt" >> $F
  echo "#define BuildXInputExt		NO" >> $F
 else
-  if [ X${MACHINE} != X"alpha" ]; then
-    echo "#define JoystickSupport		YES" >> $F
-  fi
+  echo "#define XInputDrivers dynapro elo2300 elographics magellan microtouch \
+        mutouch spaceorb wacom"  >> $F
+# XXX broken in 3.9.18
+#  if [ X${MACHINE} != X"alpha" ]; then
+#    echo "#define JoystickSupport		YES" >> $F
+#  fi
 fi

 yesno "Build PEX?"
 if [ $answ = NO ]; then
  echo "#define BuildPexExt		NO" >> $F
 fi
+yesno "Build Xinerama?"
+echo "#define BuildXinerama  $answ" >> $F
+
 yesno "Build XIE?"
 if [ $answ = NO ]; then
  echo "#define BuildXIE		NO" >> $F
 fi
 echo

+yesno "Install application defaults files?"
+if [ $answ = NO ]; then
+  echo "#define InstallAppDefFiles      NO" >> $F
+fi
+
 yesno "Build static libraries in addition to shared libraries?"
 if [ $answ = YES ]; then
  echo "#define ForceNormalLib		YES" >> $F
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@ -1,5 +1,5 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3.6
+# Version required:     4.0
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
@ -7,25 +7,17 @@
 #

 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3.6
+PKGNAME= 	XFree86-4.0
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
-DISTFILES=	X336src-1.tgz X336src-2.tgz
-
-PATCH_SITES=	ftp://ftp.xfree.org/pub/XFree86/3.3.6/fixes/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/fixes/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/fixes/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/fixes/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/fixes/
-PATCHFILES= 	fix-01-r128	
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
+		ftp://xfree86.cdrom.com/pub/XFree86/4.0/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+DISTFILES=	X400src-1.tgz X400src-2.tgz

 MAINTAINER=	jmz@FreeBSD.org

-IS_INTERACTIVE=	yes	# configure script asks questions
 .if (${MACHINE} != "alpha")
 #NO_PACKAGE=	package available from XFree86
 .endif
@ -34,8 +26,19 @@ INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
 SCRIPTS_ENV=	OSVERSION=${OSVERSION}
+.ifdef DISTRIB
+DESTDIR=	${WRKDIR}/distrib
+MAKE_ENV+=	DESTDIR=${DESTDIR}
+NO_PKG_REGISTER=yes
+SCRIPTS_ENV+=	NO_INPUT=yes
+.endif
 # can't use USE_X_PREFIX here -- it will cause a circular dependency
 PREFIX=		${X11BASE}
+.if defined(DISTRIB) || defined(PACKAGE_BUILDING)
+IS_INTERACTIVE=	no
+.else
+IS_INTERACTIVE=	yes	# configure script asks questions
+.endif
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
 .if (${MACHINE} == "pc98")
 SCRIPTS_ENV+=	MACHINE=pc98
@ -57,7 +60,7 @@ 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=	X336src-1.tgz X336src-2.tgz
+EXTRACT_ONLY=	X400src-1.tgz X400src-2.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
@ -71,23 +74,60 @@ pre-fetch:
 .include <bsd.port.pre.mk>

 pre-install:
-	${MKDIR} ${X11BASE}
+	${MKDIR} ${PREFIX}

 post-install:
 .if ${PORTOBJFORMAT} == "aout"
-.for lib in PEX5 SM XIE Xi Xmu Xt oldX XThrStub
-	${LN} -sf lib${lib}.so.6.0 ${PREFIX}/lib/lib${lib}.so
+.for lib in psres dps dpstk Xfont GL
+	${LN} -sf lib${lib}.so.1.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
-.for lib in X11 Xaw Xtst
-	${LN} -sf lib${lib}.so.6.1 ${PREFIX}/lib/lib${lib}.so
+.for lib in Xpm
+	${LN} -sf lib${lib}.so.4.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in PEX5 SM XIE Xi Xmu Xt oldX xrx
+	${LN} -sf lib${lib}.so.6.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in X11 Xtst
+	${LN} -sf lib${lib}.so.6.1 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
 .for lib in Xp
-	${LN} -sf lib${lib}.so.6.2 ${PREFIX}/lib/lib${lib}.so
+	${LN} -sf lib${lib}.so.6.2 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
 .for lib in ICE Xext
-	${LN} -sf lib${lib}.so.6.3 ${PREFIX}/lib/lib${lib}.so
+	${LN} -sf lib${lib}.so.6.3 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in Xaw
+	${LN} -sf lib${lib}.so.7.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
 .endif
+.ifndef DISTRIB
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+.endif
+
+.ifdef DISTRIB
+distrib: all install
+	@cd ../XFree86-contrib && \
+	    ${MAKE} NO_PKG_REGISTER=yes WRKDIR=${WRKDIR}/contrib-work \
+	    PREFIX=${X11BASE} PREFIX=${DESTDIR}/${PREFIX} all install
+	@${MKDIR} ${WRKDIR}/bindist
+	@${CP} ${WRKSRC}/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-ELF/* \
+	    ${WRKDIR}/bindist
+	@${SED} -e 's:TAR="gnu-tar":TAR="${TAR}":g' \
+	    -e 's/EXTRACTLOPTS="-t -v"/TARLOPTS="-t -v -z"/g' \
+	    -e 's/\(#\)\(      echo $$i >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(#\)\(      echo "------------" >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(#\)\(      $$TAR $$TARLOPTS -f $$i >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(#\)\(      echo "" >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(      $$EXTRACT $$EXTRACTLOPTS $$i >> $$LISTFILE\)/#\1/g' \
+	    < ${WRKSRC}/programs/Xserver/hw/xfree86/etc/bindist/build-bindist \
+	    > ${WRKDIR}/build-bindist
+	@${CHMOD} 0555 ${WRKDIR}/build-bindist
+	@${WRKDIR}/build-bindist X ${WRKDIR}/distrib ${WRKDIR}/bindist
+.else
+distrib:
+	@${ECHO_MSG} '>> The DISTRIB variable must be set when building ' \
+	    '"distrib".'
+	@exit 1
+.endif

 .include <bsd.port.post.mk>
--- a/x11/XFree86-4-clients/distinfo
+++ b/x11/XFree86-4-clients/distinfo
@ -1,4 +1,3 @@
-MD5 (xc/X336src-1.tgz) = bbfa360d10ce91ab37f24f197a31b485
-MD5 (xc/X336src-2.tgz) = 897daa223b5b67b8314ed8835cc17539
-MD5 (xc/fix-01-r128) = a62387e13b970c5a83e9a0822c30344f
+MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
+MD5 (xc/X400src-2.tgz) = ad5f7461adb6b2646f9a9c48ad93f6da
 MD5 (xc/Wraphelp.c) = IGNORE
--- a/x11/XFree86-4-clients/pkg-comment
+++ b/x11/XFree86-4-clients/pkg-comment
@ -1 +1 @@
-X11R6.3/XFree86 core distribution
+X11R6.4/XFree86 core distribution
--- a/x11/XFree86-4-clients/pkg-descr
+++ b/x11/XFree86-4-clients/pkg-descr
@ -1,9 +1,4 @@
 XFree86 is a added-value pack for X11R6 that supports several versions
-of Intel-based Unix and Unix-like operating systems.  XFree86-3.0 was
-part of the X11R6 core distribution.  This release of XFree86-3.3
-consists of many new features and performance improvements as well as
-many bug fixes.  The release is available as source patches against
-the X Consortium X11R6 code, as well as binary distributions for many
-architectures.
+of Intel-based Unix and Unix-like operating systems.  

 WWW: http://www.xfree86.org/
--- a/x11/XFree86-4-clients/pkg-plist
+++ b/x11/XFree86-4-clients/pkg-plist
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@ -1,7 +1,16 @@
 #!/bin/sh

+answset () {
+  if [ -n "$NO_INPUT" ]; then
+    echo "$2 [$1]"
+    answ=$1
+  else
+    answ=X
+  fi
+}
+
 yesno () {
-  answ=X;
+  answset YES "$1"
  while [ $answ = X ]; do
    echo -n "$1 [YES] "
    read answ
@ -16,7 +25,7 @@ yesno () {
  done
 }
 noyes() {
-  answ=X;
+  answset NO "$1"
  while [ $answ = X ]; do
    echo -n "$1 [NO] "
    read answ
@ -83,23 +92,23 @@ if [ X$tkversion != X ]; then
  *jp)
    echo "Using Japanized tk-$jptkLversion"
    if [ X"${MACHINE}" = X"pc98" ]; then
-	echo "#define HasJpTk			YES" >>$F
-	echo "#define JpTkLibDir		/usr/local/lib" >>$F
-	echo "#define JpTkIncDir		/usr/local/include/tk$tkLversion" >>$F
-	echo "#define JpTkLibName		tk$tkversion" >>$F
+	echo "#define HasJpTk		YES" >>$F
+	echo "#define JpTkLibDir	/usr/local/lib" >>$F
+	echo "#define JpTkIncDir	/usr/local/include/tk$tkLversion" >>$F
+	echo "#define JpTkLibName	tk$tkversion" >>$F
 	echo "#define HasJpTcl		YES" >>$F
-	echo "#define JpTclLibDir		/usr/local/lib" >>$F
-	echo "#define JpTclIncDir		/usr/local/include/tcl$tclLversion" >>$F
-	echo "#define JpTclLibName		tcl$tclversion" >>$F
+	echo "#define JpTclLibDir	/usr/local/lib" >>$F
+	echo "#define JpTclIncDir	/usr/local/include/tcl$tclLversion" >>$F
+	echo "#define JpTclLibName	tcl$tclversion" >>$F
    else
-	echo "#define HasTk			YES" >>$F
+	echo "#define HasTk		YES" >>$F
 	echo "#define TkLibDir		/usr/local/lib" >>$F
 	echo "#define TkIncDir		/usr/local/include/tk$tkLversion" >>$F
 	echo "#define TkLibName		tk$tkversion" >>$F
-	echo "#define HasTcl			YES" >>$F
+	echo "#define HasTcl		YES" >>$F
 	echo "#define TclLibDir		/usr/local/lib" >>$F
 	echo "#define TclIncDir		/usr/local/include/tcl$tclLversion" >>$F
-	echo "#define TclLibName		tcl$tclversion" >>$F
+	echo "#define TclLibName	tcl$tclversion" >>$F
    fi
    ;;
  *)
@ -108,7 +117,7 @@ if [ X$tkversion != X ]; then
    echo "#define TkLibDir		/usr/local/lib" >>$F
    echo "#define TkIncDir		/usr/local/include/tk$tkLversion" >>$F
    echo "#define TkLibName		tk$tkversion" >>$F
-    echo "#define HasTcl			YES" >>$F
+    echo "#define HasTcl		YES" >>$F
    echo "#define TclLibDir		/usr/local/lib" >>$F
    echo "#define TclIncDir		/usr/local/include/tcl$tclLversion" >>$F
    echo "#define TclLibName		tcl$tclversion" >>$F
@ -123,118 +132,16 @@ cat <<EOF
 EOF
 fi

-cat <<END
- Which servers do you wish to build, you can save a lot of disk space
- by only compiling the server you will be using.  It will also save you
- considerable compile time.
-END
-if [ X$tkversion != X ]; then
-  echo "*** If you want to use XF86Setup to set the INITIAL configuration,"
-  echo "*** then you must build the VGA server"
-fi
-# force the compilation of the EGC server for pc98.
-if [ X"${MACHINE}" = X"pc98" ]; then
-    echo "#define BuildPC98Servers	YES"  >>$F
-    echo "#undef XF98EGCServer"           >>$F
-    echo "#define XF98EGCServer     YES"  >>$F
-    servers="GA968 GANBWAP NEC480 NKVNEC WABS WABEP WSNA TGUI MGA SVGA NECS3 PWSKB PWLB"
-    selected=EGC
-    for i in $servers; do
-	yesno "Do you want to build the $i server?"
-	if [ $answ = YES ]; then selected="$selected $i"; fi
-	echo "#undef XF98${i}Server"           >>$F
-	echo "#define XF98${i}Server   $answ"  >>$F
-    done
-    echo "#undef XF86SVGAServer"           >>$F
-    echo "#define XF86SVGAServer     NO"  >>$F
-    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
-    for i in $servers; do
-	echo "#undef XF86${i}Server"           >>$F
-    echo "#define XF86${i}Server   NO"  >>$F
-    done
-elif [ X"${MACHINE}" = X"alpha" ]; then
-# force the compilation of the SVGA server.
-    echo "#undef XF86SVGAServer"           >>$F
-    echo "#define XF86SVGAServer     YES"  >>$F
-    servers="Mono S3 S3V Mach64 P9000 I128 GLINT TGA"
-    selected=SVGA
-    for i in $servers; do
-	yesno "Do you want to build the $i server?"
-	if [ $answ = YES ]; then selected="$selected $i"; fi
-	echo "#undef XF86${i}Server"           >>$F
-	echo "#define XF86${i}Server   $answ"  >>$F
-    done
-else
-# force the compilation of the SVGA server.
-    echo "#undef XF86SVGAServer"           >>$F
-    echo "#define XF86SVGAServer     YES"  >>$F
-    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
-    selected=SVGA
-    for i in $servers; do
-	yesno "Do you want to build the $i server?"
-	if [ $answ = YES ]; then selected="$selected $i"; fi
-	echo "#undef XF86${i}Server"           >>$F
-	echo "#define XF86${i}Server   $answ"  >>$F
-    done
-fi
-
-echo
-ok=0
-while [ $ok != 1 ]; do 
-  echo -n "default server to install. [none] "
-  read answ
-  if [ X$answ = X ]; then answ=none; ok=1; fi
-  if [ $answ != none ]; then
-    for i in $selected; do if [ $i = $answ ]; then
-      ok=1  
-      if [ X"${MACHINE}" = X"pc98" ]; then
-      echo "#define ServerToInstall		XF98_$answ" >>$F
-      else
-      echo "#define ServerToInstall		XF86_$answ" >>$F
-      fi
-      fi 
-    done
-  fi
-  if [ $ok = 0 ]; then echo you must choose a server among $selected; fi  
-done
-echo
-yesno "Do you want to build Xvfb?"
-echo "#define XVirtualFramebufferServer $answ" >>$F
-
-if [ X"${MACHINE}" != X"pc98" ]; then
-if [ X"${MACHINE}" = X"alpha" ]; then
 cat >> $F <<END
-#define XF86SvgaDrivers         nv mga s3v generic
-
-#define XF86MonoDrivers		hgc1280 sigma apollo hercules
+#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
+                                neomagic i740 tdfx \
+                                cirrus tseng trident chips apm \
+                                GlideDriver fbdev \
+                                ati r128 vga XF86ExtraCardDrivers
 END
-else
-cat >> $F <<END
-#define XF86SvgaDrivers         nv et4000 et3000 pvga1 gvga r128 ati sis tvga8900 \
-                                cirrus ncr77c22 compaq mga oak al2101 ali \
-                                cl64xx video7 ark mx realtek apm s3_savage s3v \
-                                s3_svga neo chips cyrix rendition p9x00 \
-				spc8110 i740 tdfx smi generic
-
-#define XF86Vga16Drivers	et4000 et3000 ncr77c22 ati sis tvga8900 oak \
-				cl64xx generic 
-
-#define XF86Vga2Drivers		et4000 et3000 pvga1 gvga ati sis tvga8900 \
-				cirrus ncr77c22 oak cl64xx generic
-
-#define XF86MonoDrivers		hgc1280 sigma apollo hercules
-
-#define XF86W32Drivers		et4000w32
-
-END
-fi
-fi
-

 cat <<END
-
-
- Do you want to install the default system config files, this will overwrite
+ Do you want to install the default system config files? This will overwrite
 and files that you may be currently using.  This would only be required
 on a first time build.
 END
@ -246,16 +153,19 @@ yesno "Install xinit config?"
 if [ $answ = YES ]; then
  echo "#define InstallXinitConfig $answ" >> $F
 fi
-yesno "Install xfs config?"
-if [ $answ = YES ]; then
-  echo "#define InstallFSConfig $answ" >> $F
-fi

 yesno "Do you want to include support for the FontServer?"
-echo "#undef BuildFontServer" >>$F
-echo "#define  BuildFontServer $answ" >>$F
-echo "#undef InstallFSConfig" >>$F
-echo "#define   InstallFSConfig $answ" >>$F
+if [ $answ = YES ]; then
+    echo "#define  BuildFontServer $answ" >>$F
+    yesno "Install xfs config?"
+    if [ $answ = YES ]; then
+      echo "#define InstallFSConfig $answ" >> $F
+    fi
+else
+    echo "#define  BuildFontServer $answ" >>$F
+    echo "#define InstallFSConfig $answ" >> $F
+fi
+

 cat <<'END'
 Do you want to Build Fonts (Usually you only want to build and install
@ -263,29 +173,55 @@ cat <<'END'
 fonts)
 END
 yesno "Build fonts?"
-if [ $answ = NO ]; then
-  echo "#define BuildFonts		NO" >> $F
+echo "#define BuildFonts		$answ" >> $F
+if [ $answ = YES ]; then
+  yesno "Build/install the 75dpi fonts?"
+  echo "#define Build75DpiFonts	$answ" >> $F
+  yesno "Build/install the 100dpi fonts?"
+  echo "#define Build100DpiFonts	$answ" >> $F
+  yesno "Build/install the Speedo fonts?"
+  echo "#define BuildSpeedoFonts	$answ" >> $F
+  yesno "Build/install the Type1 fonts?"
+  echo "#define BuildType1Fonts	$answ" >> $F
+  yesno "Build/install the CID fonts?"
+  echo "#define BuildCIDFonts	$answ" >> $F
+  yesno "Build/install the Cyrillic fonts?"
+  echo "#define BuildCyrillicFonts	$answ" >> $F
+  yesno "Build/install the Latin2 fonts?"
+  echo "#define BuildLatin2Fonts	$answ" >> $F
 fi
+
 yesno "Build the servers with Extended input devices?"
 if [ $answ = NO ]; then
  echo "#undef BuildXInputExt" >> $F
  echo "#define BuildXInputExt		NO" >> $F
 else
-  if [ X${MACHINE} != X"alpha" ]; then
-    echo "#define JoystickSupport		YES" >> $F
-  fi
+  echo "#define XInputDrivers dynapro elo2300 elographics magellan microtouch \
+        mutouch spaceorb wacom"  >> $F
+# XXX broken in 3.9.18
+#  if [ X${MACHINE} != X"alpha" ]; then
+#    echo "#define JoystickSupport		YES" >> $F
+#  fi
 fi

 yesno "Build PEX?"
 if [ $answ = NO ]; then
  echo "#define BuildPexExt		NO" >> $F
 fi
+yesno "Build Xinerama?"
+echo "#define BuildXinerama  $answ" >> $F
+
 yesno "Build XIE?"
 if [ $answ = NO ]; then
  echo "#define BuildXIE		NO" >> $F
 fi
 echo

+yesno "Install application defaults files?"
+if [ $answ = NO ]; then
+  echo "#define InstallAppDefFiles      NO" >> $F
+fi
+
 yesno "Build static libraries in addition to shared libraries?"
 if [ $answ = YES ]; then
  echo "#define ForceNormalLib		YES" >> $F
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@ -1,5 +1,5 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3.6
+# Version required:     4.0
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
@ -7,25 +7,17 @@
 #

 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3.6
+PKGNAME= 	XFree86-4.0
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
-DISTFILES=	X336src-1.tgz X336src-2.tgz
-
-PATCH_SITES=	ftp://ftp.xfree.org/pub/XFree86/3.3.6/fixes/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/fixes/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/fixes/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/fixes/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/fixes/
-PATCHFILES= 	fix-01-r128	
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
+		ftp://xfree86.cdrom.com/pub/XFree86/4.0/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+DISTFILES=	X400src-1.tgz X400src-2.tgz

 MAINTAINER=	jmz@FreeBSD.org

-IS_INTERACTIVE=	yes	# configure script asks questions
 .if (${MACHINE} != "alpha")
 #NO_PACKAGE=	package available from XFree86
 .endif
@ -34,8 +26,19 @@ INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
 SCRIPTS_ENV=	OSVERSION=${OSVERSION}
+.ifdef DISTRIB
+DESTDIR=	${WRKDIR}/distrib
+MAKE_ENV+=	DESTDIR=${DESTDIR}
+NO_PKG_REGISTER=yes
+SCRIPTS_ENV+=	NO_INPUT=yes
+.endif
 # can't use USE_X_PREFIX here -- it will cause a circular dependency
 PREFIX=		${X11BASE}
+.if defined(DISTRIB) || defined(PACKAGE_BUILDING)
+IS_INTERACTIVE=	no
+.else
+IS_INTERACTIVE=	yes	# configure script asks questions
+.endif
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
 .if (${MACHINE} == "pc98")
 SCRIPTS_ENV+=	MACHINE=pc98
@ -57,7 +60,7 @@ 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=	X336src-1.tgz X336src-2.tgz
+EXTRACT_ONLY=	X400src-1.tgz X400src-2.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
@ -71,23 +74,60 @@ pre-fetch:
 .include <bsd.port.pre.mk>

 pre-install:
-	${MKDIR} ${X11BASE}
+	${MKDIR} ${PREFIX}

 post-install:
 .if ${PORTOBJFORMAT} == "aout"
-.for lib in PEX5 SM XIE Xi Xmu Xt oldX XThrStub
-	${LN} -sf lib${lib}.so.6.0 ${PREFIX}/lib/lib${lib}.so
+.for lib in psres dps dpstk Xfont GL
+	${LN} -sf lib${lib}.so.1.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
-.for lib in X11 Xaw Xtst
-	${LN} -sf lib${lib}.so.6.1 ${PREFIX}/lib/lib${lib}.so
+.for lib in Xpm
+	${LN} -sf lib${lib}.so.4.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in PEX5 SM XIE Xi Xmu Xt oldX xrx
+	${LN} -sf lib${lib}.so.6.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in X11 Xtst
+	${LN} -sf lib${lib}.so.6.1 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
 .for lib in Xp
-	${LN} -sf lib${lib}.so.6.2 ${PREFIX}/lib/lib${lib}.so
+	${LN} -sf lib${lib}.so.6.2 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
 .for lib in ICE Xext
-	${LN} -sf lib${lib}.so.6.3 ${PREFIX}/lib/lib${lib}.so
+	${LN} -sf lib${lib}.so.6.3 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in Xaw
+	${LN} -sf lib${lib}.so.7.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
 .endif
+.ifndef DISTRIB
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+.endif
+
+.ifdef DISTRIB
+distrib: all install
+	@cd ../XFree86-contrib && \
+	    ${MAKE} NO_PKG_REGISTER=yes WRKDIR=${WRKDIR}/contrib-work \
+	    PREFIX=${X11BASE} PREFIX=${DESTDIR}/${PREFIX} all install
+	@${MKDIR} ${WRKDIR}/bindist
+	@${CP} ${WRKSRC}/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-ELF/* \
+	    ${WRKDIR}/bindist
+	@${SED} -e 's:TAR="gnu-tar":TAR="${TAR}":g' \
+	    -e 's/EXTRACTLOPTS="-t -v"/TARLOPTS="-t -v -z"/g' \
+	    -e 's/\(#\)\(      echo $$i >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(#\)\(      echo "------------" >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(#\)\(      $$TAR $$TARLOPTS -f $$i >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(#\)\(      echo "" >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(      $$EXTRACT $$EXTRACTLOPTS $$i >> $$LISTFILE\)/#\1/g' \
+	    < ${WRKSRC}/programs/Xserver/hw/xfree86/etc/bindist/build-bindist \
+	    > ${WRKDIR}/build-bindist
+	@${CHMOD} 0555 ${WRKDIR}/build-bindist
+	@${WRKDIR}/build-bindist X ${WRKDIR}/distrib ${WRKDIR}/bindist
+.else
+distrib:
+	@${ECHO_MSG} '>> The DISTRIB variable must be set when building ' \
+	    '"distrib".'
+	@exit 1
+.endif

 .include <bsd.port.post.mk>
--- a/x11/XFree86-4-libraries/distinfo
+++ b/x11/XFree86-4-libraries/distinfo
@ -1,4 +1,3 @@
-MD5 (xc/X336src-1.tgz) = bbfa360d10ce91ab37f24f197a31b485
-MD5 (xc/X336src-2.tgz) = 897daa223b5b67b8314ed8835cc17539
-MD5 (xc/fix-01-r128) = a62387e13b970c5a83e9a0822c30344f
+MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
+MD5 (xc/X400src-2.tgz) = ad5f7461adb6b2646f9a9c48ad93f6da
 MD5 (xc/Wraphelp.c) = IGNORE
--- a/x11/XFree86-4-libraries/files/patch-1
+++ b/x11/XFree86-4-libraries/files/patch-1
@ -0,0 +1,16 @@
+--- programs/Xserver/hw/xfree86/input/joystick/Imakefile~	Fri Oct  8 01:24:05 1999
+++ programs/Xserver/hw/xfree86/input/joystick/Imakefile	Fri Oct  8 14:17:12 1999
+@@ -12,11 +12,11 @@
+ 			-I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC)
+ 
+ #ifdef LinuxArchitecture
+-	ARCH_JSTK = ../os-support/linux/lnx_jstk.o
+ARCH_JSTK = ../os-support/linux/lnx_jstk.o
+ #endif
+ 
+ #if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture)
+-	ARCH_JSTK = ../os-support/bsd/bsd_jstk.o
+ARCH_JSTK = ../os-support/bsd/bsd_jstk.o
+ #endif
+ 
+ #if MakeHasPosixVariableSubstitutions
--- a/x11/XFree86-4-libraries/files/patch-2
+++ b/x11/XFree86-4-libraries/files/patch-2
@ -0,0 +1,10 @@
+--- programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c~	Sun Aug  2 08:43:34 1998
+++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c	Mon Oct 11 02:27:32 1999
+@@ -97,7 +97,6 @@
+     *centerY = js.y;
+     xf86Msg(X_PROBED, "Joystick: CenterY set to %d\n", *centerY);
+     }
+-  }
+ 
+   return status;
+ }
--- a/x11/XFree86-4-libraries/files/patch-5
+++ b/x11/XFree86-4-libraries/files/patch-5
@ -1,11 +1,12 @@
--- programs/Xserver/os/access.c.orig	Thu Dec 24 13:43:25 1998
-+++ programs/Xserver/os/access.c	Wed Dec 23 15:32:23 1998
-@@ -634,7 +634,7 @@
- #endif
-     ifc.ifc_len = sizeof (buf);
-     ifc.ifc_buf = buf;
-    if (ifioctl (fd, (int) SIOCGIFCONF, (pointer) &ifc) < 0)
-+    if (ifioctl (fd, SIOCGIFCONF, (pointer) &ifc) < 0)
-         Error ("Getting interface configuration (4)");
+--- nls/Imakefile.old	Tue Feb 15 18:25:36 2000
+++ nls/Imakefile	Tue Feb 15 18:25:39 2000
+@@ -9,6 +9,9 @@
 
- #ifdef ISC
+         SUBDIRS = XLC_LOCALE Compose
+         DEFINES = -DR63_COMPAT
+#if defined(FreeBSDArchitecture)
+STD_CPP_DEFINES+= -DINCLUDE_ru_SU
+#endif
+ 
+ MakeSubdirs($(SUBDIRS))
+ DependSubdirs($(SUBDIRS))
--- a/x11/XFree86-4-libraries/files/patch-6
+++ b/x11/XFree86-4-libraries/files/patch-6
@ -1,11 +1,12 @@
--- programs/xdm/Imakefile.orig	Sun Aug  1 15:28:12 1999
-+++ programs/xdm/Imakefile	Sun Aug  1 15:33:53 1999
-@@ -20,7 +20,7 @@
-  */
- #ifndef SharedLibXdmGreet
- #define SharedLibXdmGreet						\
-    ((defined(AlphaArchitecture) &&					\
-+    ((defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) &&	\
-       (!defined(NetBSDArchitecture) ||					\
-        (defined(NetBSDArchitecture) && HasSharedLibraries))) ||		\
-      SystemV4)
+--- programs/xdm/sessreg.c.old	Tue Feb 15 18:26:57 2000
+++ programs/xdm/sessreg.c	Tue Feb 15 18:26:59 2000
+@@ -76,7 +76,9 @@
+ 
+ #ifdef CSRG_BASED
+ /* *BSD doesn't like a ':0' type entry in utmp */
+#ifndef __FreeBSD__
+ #define NO_UTMP
+#endif
+ #endif
+ 
+ #ifndef WTMP_FILE
--- a/x11/XFree86-4-libraries/files/patch-8
+++ b/x11/XFree86-4-libraries/files/patch-8
@ -1,13 +1,12 @@
--- nls/Imakefile.orig	Sun Jan 23 02:22:04 2000
-+++ nls/Imakefile	Sun Jan 23 02:38:08 2000
-@@ -8,7 +8,9 @@
- #define PassCDebugFlags
- 
-         SUBDIRS = XLC_LOCALE Compose
-
-+#if defined(FreeBSDArchitecture)
-+STD_CPP_DEFINES+= -DINCLUDE_ru_SU
-+#endif
- MakeSubdirs($(SUBDIRS))
- DependSubdirs($(SUBDIRS))
- 
+--- programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl.old	Tue Feb 15 19:36:32 2000
+++ programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl	Tue Feb 15 19:36:37 2000
+@@ -590,6 +590,9 @@
+ 	if { $mseRes <= 0 } {
+ 		set mseRes 100
+ 	}
+	if { $mseRes > 200 } {
+               set mseRes 200
+        }
+ 	$w.mouse.resolution.$mseRes invoke
+ 	set mseButtons      $initbtn
+ 	if { $mseButtons < 3 } {
--- a/x11/XFree86-4-libraries/files/patch-9
+++ b/x11/XFree86-4-libraries/files/patch-9
@ -1,12 +1,11 @@
--- programs/xdm/sessreg.c~	Sun Jan 16 18:33:06 2000
-+++ programs/xdm/sessreg.c	Sun Jan 23 03:31:15 2000
-@@ -79,7 +79,9 @@
+--- programs/Xserver/hw/xfree86/os-support/xf86_libc.h.old	Tue Feb 15 21:31:06 2000
+++ programs/Xserver/hw/xfree86/os-support/xf86_libc.h	Tue Feb 15 21:32:27 2000
+@@ -19,7 +19,7 @@
 
- #ifdef CSRG_BASED
- /* *BSD doesn't like a ':0' type entry in utmp */
-+#ifndef __FreeBSD__
- #define NO_UTMP
-+#endif
- #endif
+ #ifndef	XF86_LIBC_H
+ #define XF86_LIBC_H 1
+-
+#include <sys/types.h>
+ #include "Xfuncs.h"
 
- #ifndef WTMP_FILE
+ /*
--- a/x11/XFree86-4-libraries/files/patch-c
+++ b/x11/XFree86-4-libraries/files/patch-c
@ -1,12 +1,20 @@
--- programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl.orig	Mon Jan 17 00:34:06 2000
-+++ programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl	Wed Jan 19 02:51:43 2000
-@@ -586,6 +586,9 @@
- 	set mseRes          $initres
- 	if { $mseRes <= 0 } {
- 		set mseRes 100
-+	}
-+	if { $mseRes > 200 } {
-+		set mseRes 200
- 	}
- 	$w.mouse.resolution.$mseRes invoke
- 	set mseButtons      $initbtn
+--- config/cf/Imake.tmpl~	Tue Feb 22 02:42:26 2000
+++ config/cf/Imake.tmpl	Tue Feb 22 03:11:21 2000
+@@ -1282,7 +1282,7 @@
+        CXXOPTIONS = CplusplusOptions
+       CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) 
+        CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
+-         CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
+         CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
+ #endif
+          COMPRESS = CompressCmd
+           GZIPCMD = GzipCmd
+@@ -1469,7 +1469,7 @@
+  */
+       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
+        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES)
+-           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
+           CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
+         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
+          LDPRELIB = LdPreLib
+         LDPOSTLIB = LdPostLib
--- a/x11/XFree86-4-libraries/files/patch-d
+++ b/x11/XFree86-4-libraries/files/patch-d
@ -1,10 +1,19 @@
--- programs/Xserver/hw/xfree86/xf86Version.h.orig	Sat Jan  8 19:24:57 2000
-+++ programs/Xserver/hw/xfree86/xf86Version.h	Wed Feb  9 16:44:53 2000
-@@ -19,6 +19,6 @@
- 			XF86_VERSION_BETA,			\
- 			XF86_VERSION_ALPHA)
+--- config/cf/FreeBSD.cf~	Tue Feb 22 02:42:26 2000
+++ config/cf/FreeBSD.cf	Tue Feb 22 03:15:08 2000
+@@ -336,14 +336,14 @@
+ /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
+ #ifndef DefaultGcc2i386Opt
+ #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
+-#define DefaultGcc2i386Opt -O2
+#define DefaultGcc2i386Opt
+ #endif
+ #endif
 
-#define XF86_DATE	"January 8 1999"
-+#define XF86_DATE	"January 8 2000"
+ #ifdef i386Architecture
+ # define OptimizedCDebugFlags DefaultGcc2i386Opt
+ #else
+-# define OptimizedCDebugFlags -O
+# define OptimizedCDebugFlags
+ #endif
 
- /* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */
+ #ifndef PreIncDir
--- a/x11/XFree86-4-libraries/files/patch-f
+++ b/x11/XFree86-4-libraries/files/patch-f
@ -1,11 +0,0 @@
--- nls/locale.alias.orig	Thu Feb 17 16:04:55 2000
-+++ nls/locale.alias	Thu Feb 17 16:04:29 2000
-@@ -27,6 +27,7 @@
- cs_CS.ISO8859-2					cs_CZ.ISO8859-2
- cs_CZ						cs_CZ.ISO8859-2
- cs_CZ.iso88592					cs_CZ.ISO8859-2
-+cs_CZ.ISO_8859-2				cs_CZ.ISO8859-2
- cz						cz_CZ.ISO8859-2
- cz_CZ						cz_CZ.ISO8859-2
- da						da_DK.ISO8859-1
-
--- a/x11/XFree86-4-libraries/pkg-comment
+++ b/x11/XFree86-4-libraries/pkg-comment
@ -1 +1 @@
-X11R6.3/XFree86 core distribution
+X11R6.4/XFree86 core distribution
--- a/x11/XFree86-4-libraries/pkg-descr
+++ b/x11/XFree86-4-libraries/pkg-descr
@ -1,9 +1,4 @@
 XFree86 is a added-value pack for X11R6 that supports several versions
-of Intel-based Unix and Unix-like operating systems.  XFree86-3.0 was
-part of the X11R6 core distribution.  This release of XFree86-3.3
-consists of many new features and performance improvements as well as
-many bug fixes.  The release is available as source patches against
-the X Consortium X11R6 code, as well as binary distributions for many
-architectures.
+of Intel-based Unix and Unix-like operating systems.  

 WWW: http://www.xfree86.org/
--- a/x11/XFree86-4-libraries/pkg-plist
+++ b/x11/XFree86-4-libraries/pkg-plist
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@ -1,7 +1,16 @@
 #!/bin/sh

+answset () {
+  if [ -n "$NO_INPUT" ]; then
+    echo "$2 [$1]"
+    answ=$1
+  else
+    answ=X
+  fi
+}
+
 yesno () {
-  answ=X;
+  answset YES "$1"
  while [ $answ = X ]; do
    echo -n "$1 [YES] "
    read answ
@ -16,7 +25,7 @@ yesno () {
  done
 }
 noyes() {
-  answ=X;
+  answset NO "$1"
  while [ $answ = X ]; do
    echo -n "$1 [NO] "
    read answ
@ -83,23 +92,23 @@ if [ X$tkversion != X ]; then
  *jp)
    echo "Using Japanized tk-$jptkLversion"
    if [ X"${MACHINE}" = X"pc98" ]; then
-	echo "#define HasJpTk			YES" >>$F
-	echo "#define JpTkLibDir		/usr/local/lib" >>$F
-	echo "#define JpTkIncDir		/usr/local/include/tk$tkLversion" >>$F
-	echo "#define JpTkLibName		tk$tkversion" >>$F
+	echo "#define HasJpTk		YES" >>$F
+	echo "#define JpTkLibDir	/usr/local/lib" >>$F
+	echo "#define JpTkIncDir	/usr/local/include/tk$tkLversion" >>$F
+	echo "#define JpTkLibName	tk$tkversion" >>$F
 	echo "#define HasJpTcl		YES" >>$F
-	echo "#define JpTclLibDir		/usr/local/lib" >>$F
-	echo "#define JpTclIncDir		/usr/local/include/tcl$tclLversion" >>$F
-	echo "#define JpTclLibName		tcl$tclversion" >>$F
+	echo "#define JpTclLibDir	/usr/local/lib" >>$F
+	echo "#define JpTclIncDir	/usr/local/include/tcl$tclLversion" >>$F
+	echo "#define JpTclLibName	tcl$tclversion" >>$F
    else
-	echo "#define HasTk			YES" >>$F
+	echo "#define HasTk		YES" >>$F
 	echo "#define TkLibDir		/usr/local/lib" >>$F
 	echo "#define TkIncDir		/usr/local/include/tk$tkLversion" >>$F
 	echo "#define TkLibName		tk$tkversion" >>$F
-	echo "#define HasTcl			YES" >>$F
+	echo "#define HasTcl		YES" >>$F
 	echo "#define TclLibDir		/usr/local/lib" >>$F
 	echo "#define TclIncDir		/usr/local/include/tcl$tclLversion" >>$F
-	echo "#define TclLibName		tcl$tclversion" >>$F
+	echo "#define TclLibName	tcl$tclversion" >>$F
    fi
    ;;
  *)
@ -108,7 +117,7 @@ if [ X$tkversion != X ]; then
    echo "#define TkLibDir		/usr/local/lib" >>$F
    echo "#define TkIncDir		/usr/local/include/tk$tkLversion" >>$F
    echo "#define TkLibName		tk$tkversion" >>$F
-    echo "#define HasTcl			YES" >>$F
+    echo "#define HasTcl		YES" >>$F
    echo "#define TclLibDir		/usr/local/lib" >>$F
    echo "#define TclIncDir		/usr/local/include/tcl$tclLversion" >>$F
    echo "#define TclLibName		tcl$tclversion" >>$F
@ -123,118 +132,16 @@ cat <<EOF
 EOF
 fi

-cat <<END
- Which servers do you wish to build, you can save a lot of disk space
- by only compiling the server you will be using.  It will also save you
- considerable compile time.
-END
-if [ X$tkversion != X ]; then
-  echo "*** If you want to use XF86Setup to set the INITIAL configuration,"
-  echo "*** then you must build the VGA server"
-fi
-# force the compilation of the EGC server for pc98.
-if [ X"${MACHINE}" = X"pc98" ]; then
-    echo "#define BuildPC98Servers	YES"  >>$F
-    echo "#undef XF98EGCServer"           >>$F
-    echo "#define XF98EGCServer     YES"  >>$F
-    servers="GA968 GANBWAP NEC480 NKVNEC WABS WABEP WSNA TGUI MGA SVGA NECS3 PWSKB PWLB"
-    selected=EGC
-    for i in $servers; do
-	yesno "Do you want to build the $i server?"
-	if [ $answ = YES ]; then selected="$selected $i"; fi
-	echo "#undef XF98${i}Server"           >>$F
-	echo "#define XF98${i}Server   $answ"  >>$F
-    done
-    echo "#undef XF86SVGAServer"           >>$F
-    echo "#define XF86SVGAServer     NO"  >>$F
-    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
-    for i in $servers; do
-	echo "#undef XF86${i}Server"           >>$F
-    echo "#define XF86${i}Server   NO"  >>$F
-    done
-elif [ X"${MACHINE}" = X"alpha" ]; then
-# force the compilation of the SVGA server.
-    echo "#undef XF86SVGAServer"           >>$F
-    echo "#define XF86SVGAServer     YES"  >>$F
-    servers="Mono S3 S3V Mach64 P9000 I128 GLINT TGA"
-    selected=SVGA
-    for i in $servers; do
-	yesno "Do you want to build the $i server?"
-	if [ $answ = YES ]; then selected="$selected $i"; fi
-	echo "#undef XF86${i}Server"           >>$F
-	echo "#define XF86${i}Server   $answ"  >>$F
-    done
-else
-# force the compilation of the SVGA server.
-    echo "#undef XF86SVGAServer"           >>$F
-    echo "#define XF86SVGAServer     YES"  >>$F
-    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
-    selected=SVGA
-    for i in $servers; do
-	yesno "Do you want to build the $i server?"
-	if [ $answ = YES ]; then selected="$selected $i"; fi
-	echo "#undef XF86${i}Server"           >>$F
-	echo "#define XF86${i}Server   $answ"  >>$F
-    done
-fi
-
-echo
-ok=0
-while [ $ok != 1 ]; do 
-  echo -n "default server to install. [none] "
-  read answ
-  if [ X$answ = X ]; then answ=none; ok=1; fi
-  if [ $answ != none ]; then
-    for i in $selected; do if [ $i = $answ ]; then
-      ok=1  
-      if [ X"${MACHINE}" = X"pc98" ]; then
-      echo "#define ServerToInstall		XF98_$answ" >>$F
-      else
-      echo "#define ServerToInstall		XF86_$answ" >>$F
-      fi
-      fi 
-    done
-  fi
-  if [ $ok = 0 ]; then echo you must choose a server among $selected; fi  
-done
-echo
-yesno "Do you want to build Xvfb?"
-echo "#define XVirtualFramebufferServer $answ" >>$F
-
-if [ X"${MACHINE}" != X"pc98" ]; then
-if [ X"${MACHINE}" = X"alpha" ]; then
 cat >> $F <<END
-#define XF86SvgaDrivers         nv mga s3v generic
-
-#define XF86MonoDrivers		hgc1280 sigma apollo hercules
+#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
+                                neomagic i740 tdfx \
+                                cirrus tseng trident chips apm \
+                                GlideDriver fbdev \
+                                ati r128 vga XF86ExtraCardDrivers
 END
-else
-cat >> $F <<END
-#define XF86SvgaDrivers         nv et4000 et3000 pvga1 gvga r128 ati sis tvga8900 \
-                                cirrus ncr77c22 compaq mga oak al2101 ali \
-                                cl64xx video7 ark mx realtek apm s3_savage s3v \
-                                s3_svga neo chips cyrix rendition p9x00 \
-				spc8110 i740 tdfx smi generic
-
-#define XF86Vga16Drivers	et4000 et3000 ncr77c22 ati sis tvga8900 oak \
-				cl64xx generic 
-
-#define XF86Vga2Drivers		et4000 et3000 pvga1 gvga ati sis tvga8900 \
-				cirrus ncr77c22 oak cl64xx generic
-
-#define XF86MonoDrivers		hgc1280 sigma apollo hercules
-
-#define XF86W32Drivers		et4000w32
-
-END
-fi
-fi
-

 cat <<END
-
-
- Do you want to install the default system config files, this will overwrite
+ Do you want to install the default system config files? This will overwrite
 and files that you may be currently using.  This would only be required
 on a first time build.
 END
@ -246,16 +153,19 @@ yesno "Install xinit config?"
 if [ $answ = YES ]; then
  echo "#define InstallXinitConfig $answ" >> $F
 fi
-yesno "Install xfs config?"
-if [ $answ = YES ]; then
-  echo "#define InstallFSConfig $answ" >> $F
-fi

 yesno "Do you want to include support for the FontServer?"
-echo "#undef BuildFontServer" >>$F
-echo "#define  BuildFontServer $answ" >>$F
-echo "#undef InstallFSConfig" >>$F
-echo "#define   InstallFSConfig $answ" >>$F
+if [ $answ = YES ]; then
+    echo "#define  BuildFontServer $answ" >>$F
+    yesno "Install xfs config?"
+    if [ $answ = YES ]; then
+      echo "#define InstallFSConfig $answ" >> $F
+    fi
+else
+    echo "#define  BuildFontServer $answ" >>$F
+    echo "#define InstallFSConfig $answ" >> $F
+fi
+

 cat <<'END'
 Do you want to Build Fonts (Usually you only want to build and install
@ -263,29 +173,55 @@ cat <<'END'
 fonts)
 END
 yesno "Build fonts?"
-if [ $answ = NO ]; then
-  echo "#define BuildFonts		NO" >> $F
+echo "#define BuildFonts		$answ" >> $F
+if [ $answ = YES ]; then
+  yesno "Build/install the 75dpi fonts?"
+  echo "#define Build75DpiFonts	$answ" >> $F
+  yesno "Build/install the 100dpi fonts?"
+  echo "#define Build100DpiFonts	$answ" >> $F
+  yesno "Build/install the Speedo fonts?"
+  echo "#define BuildSpeedoFonts	$answ" >> $F
+  yesno "Build/install the Type1 fonts?"
+  echo "#define BuildType1Fonts	$answ" >> $F
+  yesno "Build/install the CID fonts?"
+  echo "#define BuildCIDFonts	$answ" >> $F
+  yesno "Build/install the Cyrillic fonts?"
+  echo "#define BuildCyrillicFonts	$answ" >> $F
+  yesno "Build/install the Latin2 fonts?"
+  echo "#define BuildLatin2Fonts	$answ" >> $F
 fi
+
 yesno "Build the servers with Extended input devices?"
 if [ $answ = NO ]; then
  echo "#undef BuildXInputExt" >> $F
  echo "#define BuildXInputExt		NO" >> $F
 else
-  if [ X${MACHINE} != X"alpha" ]; then
-    echo "#define JoystickSupport		YES" >> $F
-  fi
+  echo "#define XInputDrivers dynapro elo2300 elographics magellan microtouch \
+        mutouch spaceorb wacom"  >> $F
+# XXX broken in 3.9.18
+#  if [ X${MACHINE} != X"alpha" ]; then
+#    echo "#define JoystickSupport		YES" >> $F
+#  fi
 fi

 yesno "Build PEX?"
 if [ $answ = NO ]; then
  echo "#define BuildPexExt		NO" >> $F
 fi
+yesno "Build Xinerama?"
+echo "#define BuildXinerama  $answ" >> $F
+
 yesno "Build XIE?"
 if [ $answ = NO ]; then
  echo "#define BuildXIE		NO" >> $F
 fi
 echo

+yesno "Install application defaults files?"
+if [ $answ = NO ]; then
+  echo "#define InstallAppDefFiles      NO" >> $F
+fi
+
 yesno "Build static libraries in addition to shared libraries?"
 if [ $answ = YES ]; then
  echo "#define ForceNormalLib		YES" >> $F
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@ -1,5 +1,5 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3.6
+# Version required:     4.0
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
@ -7,25 +7,17 @@
 #

 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3.6
+PKGNAME= 	XFree86-4.0
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
-DISTFILES=	X336src-1.tgz X336src-2.tgz
-
-PATCH_SITES=	ftp://ftp.xfree.org/pub/XFree86/3.3.6/fixes/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/fixes/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/fixes/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/fixes/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/fixes/
-PATCHFILES= 	fix-01-r128	
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
+		ftp://xfree86.cdrom.com/pub/XFree86/4.0/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+DISTFILES=	X400src-1.tgz X400src-2.tgz

 MAINTAINER=	jmz@FreeBSD.org

-IS_INTERACTIVE=	yes	# configure script asks questions
 .if (${MACHINE} != "alpha")
 #NO_PACKAGE=	package available from XFree86
 .endif
@ -34,8 +26,19 @@ INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
 SCRIPTS_ENV=	OSVERSION=${OSVERSION}
+.ifdef DISTRIB
+DESTDIR=	${WRKDIR}/distrib
+MAKE_ENV+=	DESTDIR=${DESTDIR}
+NO_PKG_REGISTER=yes
+SCRIPTS_ENV+=	NO_INPUT=yes
+.endif
 # can't use USE_X_PREFIX here -- it will cause a circular dependency
 PREFIX=		${X11BASE}
+.if defined(DISTRIB) || defined(PACKAGE_BUILDING)
+IS_INTERACTIVE=	no
+.else
+IS_INTERACTIVE=	yes	# configure script asks questions
+.endif
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
 .if (${MACHINE} == "pc98")
 SCRIPTS_ENV+=	MACHINE=pc98
@ -57,7 +60,7 @@ 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=	X336src-1.tgz X336src-2.tgz
+EXTRACT_ONLY=	X400src-1.tgz X400src-2.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
@ -71,23 +74,60 @@ pre-fetch:
 .include <bsd.port.pre.mk>

 pre-install:
-	${MKDIR} ${X11BASE}
+	${MKDIR} ${PREFIX}

 post-install:
 .if ${PORTOBJFORMAT} == "aout"
-.for lib in PEX5 SM XIE Xi Xmu Xt oldX XThrStub
-	${LN} -sf lib${lib}.so.6.0 ${PREFIX}/lib/lib${lib}.so
+.for lib in psres dps dpstk Xfont GL
+	${LN} -sf lib${lib}.so.1.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
-.for lib in X11 Xaw Xtst
-	${LN} -sf lib${lib}.so.6.1 ${PREFIX}/lib/lib${lib}.so
+.for lib in Xpm
+	${LN} -sf lib${lib}.so.4.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in PEX5 SM XIE Xi Xmu Xt oldX xrx
+	${LN} -sf lib${lib}.so.6.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in X11 Xtst
+	${LN} -sf lib${lib}.so.6.1 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
 .for lib in Xp
-	${LN} -sf lib${lib}.so.6.2 ${PREFIX}/lib/lib${lib}.so
+	${LN} -sf lib${lib}.so.6.2 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
 .for lib in ICE Xext
-	${LN} -sf lib${lib}.so.6.3 ${PREFIX}/lib/lib${lib}.so
+	${LN} -sf lib${lib}.so.6.3 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
+.endfor
+.for lib in Xaw
+	${LN} -sf lib${lib}.so.7.0 ${DESTDIR}/${PREFIX}/lib/lib${lib}.so
 .endfor
 .endif
+.ifndef DISTRIB
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+.endif
+
+.ifdef DISTRIB
+distrib: all install
+	@cd ../XFree86-contrib && \
+	    ${MAKE} NO_PKG_REGISTER=yes WRKDIR=${WRKDIR}/contrib-work \
+	    PREFIX=${X11BASE} PREFIX=${DESTDIR}/${PREFIX} all install
+	@${MKDIR} ${WRKDIR}/bindist
+	@${CP} ${WRKSRC}/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-ELF/* \
+	    ${WRKDIR}/bindist
+	@${SED} -e 's:TAR="gnu-tar":TAR="${TAR}":g' \
+	    -e 's/EXTRACTLOPTS="-t -v"/TARLOPTS="-t -v -z"/g' \
+	    -e 's/\(#\)\(      echo $$i >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(#\)\(      echo "------------" >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(#\)\(      $$TAR $$TARLOPTS -f $$i >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(#\)\(      echo "" >> $$LISTFILE\)/\2/g' \
+	    -e 's/\(      $$EXTRACT $$EXTRACTLOPTS $$i >> $$LISTFILE\)/#\1/g' \
+	    < ${WRKSRC}/programs/Xserver/hw/xfree86/etc/bindist/build-bindist \
+	    > ${WRKDIR}/build-bindist
+	@${CHMOD} 0555 ${WRKDIR}/build-bindist
+	@${WRKDIR}/build-bindist X ${WRKDIR}/distrib ${WRKDIR}/bindist
+.else
+distrib:
+	@${ECHO_MSG} '>> The DISTRIB variable must be set when building ' \
+	    '"distrib".'
+	@exit 1
+.endif

 .include <bsd.port.post.mk>
--- a/x11/XFree86-4/distinfo
+++ b/x11/XFree86-4/distinfo
@ -1,4 +1,3 @@
-MD5 (xc/X336src-1.tgz) = bbfa360d10ce91ab37f24f197a31b485
-MD5 (xc/X336src-2.tgz) = 897daa223b5b67b8314ed8835cc17539
-MD5 (xc/fix-01-r128) = a62387e13b970c5a83e9a0822c30344f
+MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
+MD5 (xc/X400src-2.tgz) = ad5f7461adb6b2646f9a9c48ad93f6da
 MD5 (xc/Wraphelp.c) = IGNORE
--- a/x11/XFree86-4/files/patch-1
+++ b/x11/XFree86-4/files/patch-1
@ -0,0 +1,16 @@
+--- programs/Xserver/hw/xfree86/input/joystick/Imakefile~	Fri Oct  8 01:24:05 1999
+++ programs/Xserver/hw/xfree86/input/joystick/Imakefile	Fri Oct  8 14:17:12 1999
+@@ -12,11 +12,11 @@
+ 			-I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC)
+ 
+ #ifdef LinuxArchitecture
+-	ARCH_JSTK = ../os-support/linux/lnx_jstk.o
+ARCH_JSTK = ../os-support/linux/lnx_jstk.o
+ #endif
+ 
+ #if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture)
+-	ARCH_JSTK = ../os-support/bsd/bsd_jstk.o
+ARCH_JSTK = ../os-support/bsd/bsd_jstk.o
+ #endif
+ 
+ #if MakeHasPosixVariableSubstitutions
--- a/x11/XFree86-4/files/patch-2
+++ b/x11/XFree86-4/files/patch-2
@ -0,0 +1,10 @@
+--- programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c~	Sun Aug  2 08:43:34 1998
+++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c	Mon Oct 11 02:27:32 1999
+@@ -97,7 +97,6 @@
+     *centerY = js.y;
+     xf86Msg(X_PROBED, "Joystick: CenterY set to %d\n", *centerY);
+     }
+-  }
+ 
+   return status;
+ }
--- a/x11/XFree86-4/files/patch-5
+++ b/x11/XFree86-4/files/patch-5
@ -1,11 +1,12 @@
--- programs/Xserver/os/access.c.orig	Thu Dec 24 13:43:25 1998
-+++ programs/Xserver/os/access.c	Wed Dec 23 15:32:23 1998
-@@ -634,7 +634,7 @@
- #endif
-     ifc.ifc_len = sizeof (buf);
-     ifc.ifc_buf = buf;
-    if (ifioctl (fd, (int) SIOCGIFCONF, (pointer) &ifc) < 0)
-+    if (ifioctl (fd, SIOCGIFCONF, (pointer) &ifc) < 0)
-         Error ("Getting interface configuration (4)");
+--- nls/Imakefile.old	Tue Feb 15 18:25:36 2000
+++ nls/Imakefile	Tue Feb 15 18:25:39 2000
+@@ -9,6 +9,9 @@
 
- #ifdef ISC
+         SUBDIRS = XLC_LOCALE Compose
+         DEFINES = -DR63_COMPAT
+#if defined(FreeBSDArchitecture)
+STD_CPP_DEFINES+= -DINCLUDE_ru_SU
+#endif
+ 
+ MakeSubdirs($(SUBDIRS))
+ DependSubdirs($(SUBDIRS))
--- a/x11/XFree86-4/files/patch-6
+++ b/x11/XFree86-4/files/patch-6
@ -1,11 +1,12 @@
--- programs/xdm/Imakefile.orig	Sun Aug  1 15:28:12 1999
-+++ programs/xdm/Imakefile	Sun Aug  1 15:33:53 1999
-@@ -20,7 +20,7 @@
-  */
- #ifndef SharedLibXdmGreet
- #define SharedLibXdmGreet						\
-    ((defined(AlphaArchitecture) &&					\
-+    ((defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) &&	\
-       (!defined(NetBSDArchitecture) ||					\
-        (defined(NetBSDArchitecture) && HasSharedLibraries))) ||		\
-      SystemV4)
+--- programs/xdm/sessreg.c.old	Tue Feb 15 18:26:57 2000
+++ programs/xdm/sessreg.c	Tue Feb 15 18:26:59 2000
+@@ -76,7 +76,9 @@
+ 
+ #ifdef CSRG_BASED
+ /* *BSD doesn't like a ':0' type entry in utmp */
+#ifndef __FreeBSD__
+ #define NO_UTMP
+#endif
+ #endif
+ 
+ #ifndef WTMP_FILE
--- a/x11/XFree86-4/files/patch-8
+++ b/x11/XFree86-4/files/patch-8
@ -1,13 +1,12 @@
--- nls/Imakefile.orig	Sun Jan 23 02:22:04 2000
-+++ nls/Imakefile	Sun Jan 23 02:38:08 2000
-@@ -8,7 +8,9 @@
- #define PassCDebugFlags
- 
-         SUBDIRS = XLC_LOCALE Compose
-
-+#if defined(FreeBSDArchitecture)
-+STD_CPP_DEFINES+= -DINCLUDE_ru_SU
-+#endif
- MakeSubdirs($(SUBDIRS))
- DependSubdirs($(SUBDIRS))
- 
+--- programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl.old	Tue Feb 15 19:36:32 2000
+++ programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl	Tue Feb 15 19:36:37 2000
+@@ -590,6 +590,9 @@
+ 	if { $mseRes <= 0 } {
+ 		set mseRes 100
+ 	}
+	if { $mseRes > 200 } {
+               set mseRes 200
+        }
+ 	$w.mouse.resolution.$mseRes invoke
+ 	set mseButtons      $initbtn
+ 	if { $mseButtons < 3 } {
--- a/x11/XFree86-4/files/patch-9
+++ b/x11/XFree86-4/files/patch-9
@ -1,12 +1,11 @@
--- programs/xdm/sessreg.c~	Sun Jan 16 18:33:06 2000
-+++ programs/xdm/sessreg.c	Sun Jan 23 03:31:15 2000
-@@ -79,7 +79,9 @@
+--- programs/Xserver/hw/xfree86/os-support/xf86_libc.h.old	Tue Feb 15 21:31:06 2000
+++ programs/Xserver/hw/xfree86/os-support/xf86_libc.h	Tue Feb 15 21:32:27 2000
+@@ -19,7 +19,7 @@
 
- #ifdef CSRG_BASED
- /* *BSD doesn't like a ':0' type entry in utmp */
-+#ifndef __FreeBSD__
- #define NO_UTMP
-+#endif
- #endif
+ #ifndef	XF86_LIBC_H
+ #define XF86_LIBC_H 1
+-
+#include <sys/types.h>
+ #include "Xfuncs.h"
 
- #ifndef WTMP_FILE
+ /*
--- a/x11/XFree86-4/files/patch-c
+++ b/x11/XFree86-4/files/patch-c
@ -1,12 +1,20 @@
--- programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl.orig	Mon Jan 17 00:34:06 2000
-+++ programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl	Wed Jan 19 02:51:43 2000
-@@ -586,6 +586,9 @@
- 	set mseRes          $initres
- 	if { $mseRes <= 0 } {
- 		set mseRes 100
-+	}
-+	if { $mseRes > 200 } {
-+		set mseRes 200
- 	}
- 	$w.mouse.resolution.$mseRes invoke
- 	set mseButtons      $initbtn
+--- config/cf/Imake.tmpl~	Tue Feb 22 02:42:26 2000
+++ config/cf/Imake.tmpl	Tue Feb 22 03:11:21 2000
+@@ -1282,7 +1282,7 @@
+        CXXOPTIONS = CplusplusOptions
+       CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) 
+        CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
+-         CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
+         CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
+ #endif
+          COMPRESS = CompressCmd
+           GZIPCMD = GzipCmd
+@@ -1469,7 +1469,7 @@
+  */
+       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
+        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES)
+-           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
+           CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
+         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
+          LDPRELIB = LdPreLib
+         LDPOSTLIB = LdPostLib
--- a/x11/XFree86-4/files/patch-d
+++ b/x11/XFree86-4/files/patch-d
@ -1,10 +1,19 @@
--- programs/Xserver/hw/xfree86/xf86Version.h.orig	Sat Jan  8 19:24:57 2000
-+++ programs/Xserver/hw/xfree86/xf86Version.h	Wed Feb  9 16:44:53 2000
-@@ -19,6 +19,6 @@
- 			XF86_VERSION_BETA,			\
- 			XF86_VERSION_ALPHA)
+--- config/cf/FreeBSD.cf~	Tue Feb 22 02:42:26 2000
+++ config/cf/FreeBSD.cf	Tue Feb 22 03:15:08 2000
+@@ -336,14 +336,14 @@
+ /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
+ #ifndef DefaultGcc2i386Opt
+ #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
+-#define DefaultGcc2i386Opt -O2
+#define DefaultGcc2i386Opt
+ #endif
+ #endif
 
-#define XF86_DATE	"January 8 1999"
-+#define XF86_DATE	"January 8 2000"
+ #ifdef i386Architecture
+ # define OptimizedCDebugFlags DefaultGcc2i386Opt
+ #else
+-# define OptimizedCDebugFlags -O
+# define OptimizedCDebugFlags
+ #endif
 
- /* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */
+ #ifndef PreIncDir
--- a/x11/XFree86-4/files/patch-f
+++ b/x11/XFree86-4/files/patch-f
@ -1,11 +0,0 @@
--- nls/locale.alias.orig	Thu Feb 17 16:04:55 2000
-+++ nls/locale.alias	Thu Feb 17 16:04:29 2000
-@@ -27,6 +27,7 @@
- cs_CS.ISO8859-2					cs_CZ.ISO8859-2
- cs_CZ						cs_CZ.ISO8859-2
- cs_CZ.iso88592					cs_CZ.ISO8859-2
-+cs_CZ.ISO_8859-2				cs_CZ.ISO8859-2
- cz						cz_CZ.ISO8859-2
- cz_CZ						cz_CZ.ISO8859-2
- da						da_DK.ISO8859-1
-
--- a/x11/XFree86-4/pkg-comment
+++ b/x11/XFree86-4/pkg-comment
@ -1 +1 @@
-X11R6.3/XFree86 core distribution
+X11R6.4/XFree86 core distribution
--- a/x11/XFree86-4/pkg-descr
+++ b/x11/XFree86-4/pkg-descr
@ -1,9 +1,4 @@
 XFree86 is a added-value pack for X11R6 that supports several versions
-of Intel-based Unix and Unix-like operating systems.  XFree86-3.0 was
-part of the X11R6 core distribution.  This release of XFree86-3.3
-consists of many new features and performance improvements as well as
-many bug fixes.  The release is available as source patches against
-the X Consortium X11R6 code, as well as binary distributions for many
-architectures.
+of Intel-based Unix and Unix-like operating systems.  

 WWW: http://www.xfree86.org/
--- a/x11/XFree86-4/pkg-plist
+++ b/x11/XFree86-4/pkg-plist
--- a/x11/XFree86-4/pkg-plist.alpha
+++ b/x11/XFree86-4/pkg-plist.alpha
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@ -1,7 +1,16 @@
 #!/bin/sh

+answset () {
+  if [ -n "$NO_INPUT" ]; then
+    echo "$2 [$1]"
+    answ=$1
+  else
+    answ=X
+  fi
+}
+
 yesno () {
-  answ=X;
+  answset YES "$1"
  while [ $answ = X ]; do
    echo -n "$1 [YES] "
    read answ
@ -16,7 +25,7 @@ yesno () {
  done
 }
 noyes() {
-  answ=X;
+  answset NO "$1"
  while [ $answ = X ]; do
    echo -n "$1 [NO] "
    read answ
@ -83,23 +92,23 @@ if [ X$tkversion != X ]; then
  *jp)
    echo "Using Japanized tk-$jptkLversion"
    if [ X"${MACHINE}" = X"pc98" ]; then
-	echo "#define HasJpTk			YES" >>$F
-	echo "#define JpTkLibDir		/usr/local/lib" >>$F
-	echo "#define JpTkIncDir		/usr/local/include/tk$tkLversion" >>$F
-	echo "#define JpTkLibName		tk$tkversion" >>$F
+	echo "#define HasJpTk		YES" >>$F
+	echo "#define JpTkLibDir	/usr/local/lib" >>$F
+	echo "#define JpTkIncDir	/usr/local/include/tk$tkLversion" >>$F
+	echo "#define JpTkLibName	tk$tkversion" >>$F
 	echo "#define HasJpTcl		YES" >>$F
-	echo "#define JpTclLibDir		/usr/local/lib" >>$F
-	echo "#define JpTclIncDir		/usr/local/include/tcl$tclLversion" >>$F
-	echo "#define JpTclLibName		tcl$tclversion" >>$F
+	echo "#define JpTclLibDir	/usr/local/lib" >>$F
+	echo "#define JpTclIncDir	/usr/local/include/tcl$tclLversion" >>$F
+	echo "#define JpTclLibName	tcl$tclversion" >>$F
    else
-	echo "#define HasTk			YES" >>$F
+	echo "#define HasTk		YES" >>$F
 	echo "#define TkLibDir		/usr/local/lib" >>$F
 	echo "#define TkIncDir		/usr/local/include/tk$tkLversion" >>$F
 	echo "#define TkLibName		tk$tkversion" >>$F
-	echo "#define HasTcl			YES" >>$F
+	echo "#define HasTcl		YES" >>$F
 	echo "#define TclLibDir		/usr/local/lib" >>$F
 	echo "#define TclIncDir		/usr/local/include/tcl$tclLversion" >>$F
-	echo "#define TclLibName		tcl$tclversion" >>$F
+	echo "#define TclLibName	tcl$tclversion" >>$F
    fi
    ;;
  *)
@ -108,7 +117,7 @@ if [ X$tkversion != X ]; then
    echo "#define TkLibDir		/usr/local/lib" >>$F
    echo "#define TkIncDir		/usr/local/include/tk$tkLversion" >>$F
    echo "#define TkLibName		tk$tkversion" >>$F
-    echo "#define HasTcl			YES" >>$F
+    echo "#define HasTcl		YES" >>$F
    echo "#define TclLibDir		/usr/local/lib" >>$F
    echo "#define TclIncDir		/usr/local/include/tcl$tclLversion" >>$F
    echo "#define TclLibName		tcl$tclversion" >>$F
@ -123,118 +132,16 @@ cat <<EOF
 EOF
 fi

-cat <<END
- Which servers do you wish to build, you can save a lot of disk space
- by only compiling the server you will be using.  It will also save you
- considerable compile time.
-END
-if [ X$tkversion != X ]; then
-  echo "*** If you want to use XF86Setup to set the INITIAL configuration,"
-  echo "*** then you must build the VGA server"
-fi
-# force the compilation of the EGC server for pc98.
-if [ X"${MACHINE}" = X"pc98" ]; then
-    echo "#define BuildPC98Servers	YES"  >>$F
-    echo "#undef XF98EGCServer"           >>$F
-    echo "#define XF98EGCServer     YES"  >>$F
-    servers="GA968 GANBWAP NEC480 NKVNEC WABS WABEP WSNA TGUI MGA SVGA NECS3 PWSKB PWLB"
-    selected=EGC
-    for i in $servers; do
-	yesno "Do you want to build the $i server?"
-	if [ $answ = YES ]; then selected="$selected $i"; fi
-	echo "#undef XF98${i}Server"           >>$F
-	echo "#define XF98${i}Server   $answ"  >>$F
-    done
-    echo "#undef XF86SVGAServer"           >>$F
-    echo "#define XF86SVGAServer     NO"  >>$F
-    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
-    for i in $servers; do
-	echo "#undef XF86${i}Server"           >>$F
-    echo "#define XF86${i}Server   NO"  >>$F
-    done
-elif [ X"${MACHINE}" = X"alpha" ]; then
-# force the compilation of the SVGA server.
-    echo "#undef XF86SVGAServer"           >>$F
-    echo "#define XF86SVGAServer     YES"  >>$F
-    servers="Mono S3 S3V Mach64 P9000 I128 GLINT TGA"
-    selected=SVGA
-    for i in $servers; do
-	yesno "Do you want to build the $i server?"
-	if [ $answ = YES ]; then selected="$selected $i"; fi
-	echo "#undef XF86${i}Server"           >>$F
-	echo "#define XF86${i}Server   $answ"  >>$F
-    done
-else
-# force the compilation of the SVGA server.
-    echo "#undef XF86SVGAServer"           >>$F
-    echo "#define XF86SVGAServer     YES"  >>$F
-    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
-    selected=SVGA
-    for i in $servers; do
-	yesno "Do you want to build the $i server?"
-	if [ $answ = YES ]; then selected="$selected $i"; fi
-	echo "#undef XF86${i}Server"           >>$F
-	echo "#define XF86${i}Server   $answ"  >>$F
-    done
-fi
-
-echo
-ok=0
-while [ $ok != 1 ]; do 
-  echo -n "default server to install. [none] "
-  read answ
-  if [ X$answ = X ]; then answ=none; ok=1; fi
-  if [ $answ != none ]; then
-    for i in $selected; do if [ $i = $answ ]; then
-      ok=1  
-      if [ X"${MACHINE}" = X"pc98" ]; then
-      echo "#define ServerToInstall		XF98_$answ" >>$F
-      else
-      echo "#define ServerToInstall		XF86_$answ" >>$F
-      fi
-      fi 
-    done
-  fi
-  if [ $ok = 0 ]; then echo you must choose a server among $selected; fi  
-done
-echo
-yesno "Do you want to build Xvfb?"
-echo "#define XVirtualFramebufferServer $answ" >>$F
-
-if [ X"${MACHINE}" != X"pc98" ]; then
-if [ X"${MACHINE}" = X"alpha" ]; then
 cat >> $F <<END
-#define XF86SvgaDrivers         nv mga s3v generic
-
-#define XF86MonoDrivers		hgc1280 sigma apollo hercules
+#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
+                                neomagic i740 tdfx \
+                                cirrus tseng trident chips apm \
+                                GlideDriver fbdev \
+                                ati r128 vga XF86ExtraCardDrivers
 END
-else
-cat >> $F <<END
-#define XF86SvgaDrivers         nv et4000 et3000 pvga1 gvga r128 ati sis tvga8900 \
-                                cirrus ncr77c22 compaq mga oak al2101 ali \
-                                cl64xx video7 ark mx realtek apm s3_savage s3v \
-                                s3_svga neo chips cyrix rendition p9x00 \
-				spc8110 i740 tdfx smi generic
-
-#define XF86Vga16Drivers	et4000 et3000 ncr77c22 ati sis tvga8900 oak \
-				cl64xx generic 
-
-#define XF86Vga2Drivers		et4000 et3000 pvga1 gvga ati sis tvga8900 \
-				cirrus ncr77c22 oak cl64xx generic
-
-#define XF86MonoDrivers		hgc1280 sigma apollo hercules
-
-#define XF86W32Drivers		et4000w32
-
-END
-fi
-fi
-

 cat <<END
-
-
- Do you want to install the default system config files, this will overwrite
+ Do you want to install the default system config files? This will overwrite
 and files that you may be currently using.  This would only be required
 on a first time build.
 END
@ -246,16 +153,19 @@ yesno "Install xinit config?"
 if [ $answ = YES ]; then
  echo "#define InstallXinitConfig $answ" >> $F
 fi
-yesno "Install xfs config?"
-if [ $answ = YES ]; then
-  echo "#define InstallFSConfig $answ" >> $F
-fi

 yesno "Do you want to include support for the FontServer?"
-echo "#undef BuildFontServer" >>$F
-echo "#define  BuildFontServer $answ" >>$F
-echo "#undef InstallFSConfig" >>$F
-echo "#define   InstallFSConfig $answ" >>$F
+if [ $answ = YES ]; then
+    echo "#define  BuildFontServer $answ" >>$F
+    yesno "Install xfs config?"
+    if [ $answ = YES ]; then
+      echo "#define InstallFSConfig $answ" >> $F
+    fi
+else
+    echo "#define  BuildFontServer $answ" >>$F
+    echo "#define InstallFSConfig $answ" >> $F
+fi
+

 cat <<'END'
 Do you want to Build Fonts (Usually you only want to build and install
@ -263,29 +173,55 @@ cat <<'END'
 fonts)
 END
 yesno "Build fonts?"
-if [ $answ = NO ]; then
-  echo "#define BuildFonts		NO" >> $F
+echo "#define BuildFonts		$answ" >> $F
+if [ $answ = YES ]; then
+  yesno "Build/install the 75dpi fonts?"
+  echo "#define Build75DpiFonts	$answ" >> $F
+  yesno "Build/install the 100dpi fonts?"
+  echo "#define Build100DpiFonts	$answ" >> $F
+  yesno "Build/install the Speedo fonts?"
+  echo "#define BuildSpeedoFonts	$answ" >> $F
+  yesno "Build/install the Type1 fonts?"
+  echo "#define BuildType1Fonts	$answ" >> $F
+  yesno "Build/install the CID fonts?"
+  echo "#define BuildCIDFonts	$answ" >> $F
+  yesno "Build/install the Cyrillic fonts?"
+  echo "#define BuildCyrillicFonts	$answ" >> $F
+  yesno "Build/install the Latin2 fonts?"
+  echo "#define BuildLatin2Fonts	$answ" >> $F
 fi
+
 yesno "Build the servers with Extended input devices?"
 if [ $answ = NO ]; then
  echo "#undef BuildXInputExt" >> $F
  echo "#define BuildXInputExt		NO" >> $F
 else
-  if [ X${MACHINE} != X"alpha" ]; then
-    echo "#define JoystickSupport		YES" >> $F
-  fi
+  echo "#define XInputDrivers dynapro elo2300 elographics magellan microtouch \
+        mutouch spaceorb wacom"  >> $F
+# XXX broken in 3.9.18
+#  if [ X${MACHINE} != X"alpha" ]; then
+#    echo "#define JoystickSupport		YES" >> $F
+#  fi
 fi

 yesno "Build PEX?"
 if [ $answ = NO ]; then
  echo "#define BuildPexExt		NO" >> $F
 fi
+yesno "Build Xinerama?"
+echo "#define BuildXinerama  $answ" >> $F
+
 yesno "Build XIE?"
 if [ $answ = NO ]; then
  echo "#define BuildXIE		NO" >> $F
 fi
 echo

+yesno "Install application defaults files?"
+if [ $answ = NO ]; then
+  echo "#define InstallAppDefFiles      NO" >> $F
+fi
+
 yesno "Build static libraries in addition to shared libraries?"
 if [ $answ = YES ]; then
  echo "#define ForceNormalLib		YES" >> $F