Update XFree86 ports, including linux_dri, to 4.3.0. Set IGNORE= in dri-devel

for being outdated.  Thank you to all the testers and people who submitted
patches for this update.

Approved by:	portmgr

3 files changed, 43 insertions, 53 deletions

diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index 8641c6b9966f..70e7347af603 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	FontServer
-PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-servers x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz
-EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
+DISTFILES=	X430src-1.tgz \
+		X430src-2.tgz \
+		X430src-3.tgz
 
 MAINTAINER=	anholt@freebsd.org
-COMMENT=	XFree86-4 Font Server
+COMMENT=	XFree86-4 font server
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
@@ -28,9 +28,8 @@ SCRIPTS_ENV=		CC="${CC}" \
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
 MAN1=			Xserver.1 xfs.1
 XBUILD_DIRS=		programs/xfs
-XINCLUDE_DIRS=		lib/xtrans programs/Xserver 
+XINCLUDE_DIRS=		lib/xtrans programs/Xserver
 XINSTALL_MAN_DIRS=	programs/Xserver programs/xfs
 
-
 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-FontServer/distinfo b/x11-servers/XFree86-4-FontServer/distinfo
index 62b0b3a56cf9..95ac418ea9ad 100644
--- a/x11-servers/XFree86-4-FontServer/distinfo
+++ b/x11-servers/XFree86-4-FontServer/distinfo
@@ -1,2 +1,3 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
diff --git a/x11-servers/XFree86-4-FontServer/scripts/configure b/x11-servers/XFree86-4-FontServer/scripts/configure
index 70303f06cf69..d7ff8bbdbfec 100644
--- a/x11-servers/XFree86-4-FontServer/scripts/configure
+++ b/x11-servers/XFree86-4-FontServer/scripts/configure
@@ -1,14 +1,11 @@
 #!/bin/sh
 
 # This script does the following:
-# (1) cp current xf86site.def (it is created by the imake-4 port) 
+# (1) cp xf86site.def, installed by imake-4 port,
 #       to ${WRKDIR}/xc/config/cf.
-#     this means this port uses imake-4's config for defaults.
-# (2) Generate temporal config for compiling.
-#     Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-#     used locally for compiling this port, so these configs will be generated
-#     by this script. These configs will be stored to the `host.def' file,
-#     but this host.def will never be installed.
+#     this provides settings for the ports system.
+# (2) Create a host.def for this specific port, using 
+#     host.def as a base.
 
 ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
 DESTDEF=$WRKDIR/xc/config/cf/xf86site.def
@@ -16,25 +13,17 @@ ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
 LOCALDEF=$WRKDIR/.config
 HOSTDEF=$WRKDIR/xc/config/cf/host.def
 
-configure () {
-    # Use original host.def as initial config file
-    rm -f $LOCALDEF
-    grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
-    echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
+# Use original host.def as initial config file
+rm -f $LOCALDEF
+grep -v '#define.*ProjectRoot' $ORIGHOSTDEF	>> $LOCALDEF
+echo "#define ProjectRoot $PREFIX"		>> $LOCALDEF
 
-    if [ X$InstallFSConfig = "X" ]; then
-	InstallFSConfig=YES
-    fi
-
-    # It's good for FreeBSD ports/packages system.
-    echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
-
-    # I want to set this line.
-    # but the probrem is too deep. not yet done.
-    # echo "#define InstallXserverSetUID NO" >> $LOCALDEF
+# This is also defined in xf86site.def, but doesn't get
+# picked up for some reason.
+echo "#define NothingOutsideProjectRoot YES"	>> $LOCALDEF
 
-    # disable some configs: there are not used this ports
-    for i in BuildFonts \
+# disable some options
+for i in BuildFonts \
 	Build75DpiFonts \
 	Build100DpiFonts \
 	BuildSpeedoFonts \
@@ -49,27 +38,28 @@ configure () {
 	LibHeaders \
 	ForceNormalLib \
 	XTrueTypeInstallCConvHeaders
-    do \
-	echo "#define $i NO" >> $LOCALDEF
-    done
-    echo "#define BuildServer YES" >> $LOCALDEF
-    echo "#define BuildFontServer YES" >> $LOCALDEF
-    echo "#define BuildServersOnly YES" >> $LOCALDEF
-    echo "#define InstallFSConfig $InstallFSConfig" >> $LOCALDEF
-    echo "#define FreeBSDBuildXfs YES" >> $LOCALDEF
-    echo "#define UseInstalledPrograms YES" >> $LOCALDEF
-    echo "#define FreeBSDCC	${CC}" >> $LOCALDEF
-    echo "#define FreeBSDCXX	${CXX}" >> $LOCALDEF
-    echo "#define FreeBSDCFLAGS	${CFLAGS}" >> $LOCALDEF
+do \
+	echo "#define $i NO"			>> $LOCALDEF
+done
+
+echo "#define BuildServer YES"			>> $LOCALDEF
+echo "#define BuildFontServer YES"		>> $LOCALDEF
+echo "#define BuildServersOnly YES"		>> $LOCALDEF
+if [ X$InstallFSConfig = "X" ]; then
+	InstallFSConfig=YES
+fi
+echo "#define InstallFSConfig $InstallFSConfig" >> $LOCALDEF
+echo "#define FreeBSDBuildXfs YES"		>> $LOCALDEF
+echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
+echo "#define FreeBSDCC ${CC}"			>> $LOCALDEF
+echo "#define FreeBSDCXX ${CXX}"		>> $LOCALDEF
+echo "#define FreeBSDCFLAGS ${CFLAGS}"		>> $LOCALDEF
 
-    # Copy ORIGDEF to DESTDEF
-    rm -f $DESTDEF
-    cp -f $ORIGDEF $DESTDEF
+# Copy ORIGDEF to DESTDEF
+rm -f $DESTDEF
+cp -f $ORIGDEF $DESTDEF
 
-    # copy generated config to host.def
-    cp -f $LOCALDEF $HOSTDEF
-}
+# copy generated config to host.def
+cp -f $LOCALDEF $HOSTDEF
 
-cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf
-configure
 exit 0