6 files changed, 9 insertions, 57 deletions

diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index 70e7347af603..b22db14e9ff6 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	FontServer
 PORTVERSION=	4.3.0
+PORTREVISION=	1
 CATEGORIES=	x11-servers x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
@@ -18,14 +19,6 @@ DISTFILES=	X430src-1.tgz \
 MAINTAINER=	anholt@freebsd.org
 COMMENT=	XFree86-4 font server
 
-XFREE86_VERSION=	4
-USE_IMAKE=		YES
-DIST_SUBDIR=		xc
-WRKSRC=			${WRKDIR}/xc
-SCRIPTS_ENV=		CC="${CC}" \
-			CXX="${CXX}" \
-			CFLAGS="${CFLAGS}"
-PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
 MAN1=			Xserver.1 xfs.1
 XBUILD_DIRS=		programs/xfs
 XINCLUDE_DIRS=		lib/xtrans programs/Xserver
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index ff2a9be2e59f..0f091c248606 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	NestServer
 PORTVERSION=	4.3.0
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
@@ -24,15 +25,6 @@ EXTRACT_ONLY=	X430src-1.tgz \
 MAINTAINER=	anholt@freebsd.org
 COMMENT=	XFree86-4 nested X server
 
-XFREE86_VERSION=	4
-USE_IMAKE=		YES
-DIST_SUBDIR=		xc
-WRKSRC=			${WRKDIR}/xc
-SCRIPTS_ENV=		CC="${CC}" \
-			CXX="${CXX}" \
-			CFLAGS="${CFLAGS}"
-PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
-MANCOMPRESSED=		yes
 MAN1=			Xnest.1 Xserver.1
 XBUILD_DIRS=		lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver
 XINCLUDE_DIRS=		lib/xkbfile lib/xtrans
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index fc122b60e622..3bd32d5fd388 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -24,14 +24,6 @@ EXTRACT_ONLY=	X430src-1.tgz \
 MAINTAINER=	anholt@freebsd.org
 COMMENT=	XFree86-4 print server
 
-XFREE86_VERSION=	4
-USE_IMAKE=		YES
-DIST_SUBDIR=		xc
-WRKSRC=			${WRKDIR}/xc
-SCRIPTS_ENV=		CC="${CC}" \
-			CXX="${CXX}" \
-			CFLAGS="${CFLAGS}"
-PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
 XBUILD_DIRS=		lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver
 XINCLUDE_DIRS=		lib/xkbfile lib/xtrans
 XINSTALL_DIRS=		programs/Xserver
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 81aafd038c59..b9183e954c58 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Server
 PORTVERSION=	4.3.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
@@ -25,12 +25,6 @@ EXTRACT_ONLY=	X430src-1.tgz \
 MAINTAINER=	anholt@freebsd.org
 COMMENT=	XFree86-4 X server and related programs
 
-XFREE86_VERSION=	4
-USE_IMAKE=		YES
-INSTALLS_SHLIB=		YES
-DIST_SUBDIR=		xc
-WRKSRC=			${WRKDIR}/xc
-PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
 .for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h patch-radeondri \
 	patch-r128_driver.c patch-mga_driver.c patch-xkbInit.c patch-radeon_dri.c \
 	patch-mga_dri.c patch-nv_driver.c patch-nv_setup.c patch-int10-generic.c \
@@ -39,10 +33,7 @@ EXTRA_PATCHES+=		${FILESDIR}/${pf}
 .endfor
 SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
 			BuildXF86DRI=${BuildXF86DRI} \
-			WITH_DEBUG="${WITH_DEBUG}" \
-			CC="${CC}" \
-			CXX="${CXX}" \
-			CFLAGS="${CFLAGS}"
+			WITH_DEBUG="${WITH_DEBUG}"
 MAN1=			XFree86.1 \
 			Xserver.1 \
 			gtf.1 \
@@ -101,6 +92,7 @@ XINCLUDE_DIRS=		lib/xkbfile lib/xtrans
 XINSTALL_DIRS=		lib/font programs/Xserver
 XINSTALL_MAN_DIRS=	programs/Xserver
 
+.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386 ||  ${ARCH} == alpha
@@ -166,5 +158,4 @@ post-install::
 	${LN} -sf Xwrapper-4 ${PREFIX}/bin/X; \
 	fi;
 
-.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.post.mk>
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 81aafd038c59..b9183e954c58 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Server
 PORTVERSION=	4.3.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
@@ -25,12 +25,6 @@ EXTRACT_ONLY=	X430src-1.tgz \
 MAINTAINER=	anholt@freebsd.org
 COMMENT=	XFree86-4 X server and related programs
 
-XFREE86_VERSION=	4
-USE_IMAKE=		YES
-INSTALLS_SHLIB=		YES
-DIST_SUBDIR=		xc
-WRKSRC=			${WRKDIR}/xc
-PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
 .for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h patch-radeondri \
 	patch-r128_driver.c patch-mga_driver.c patch-xkbInit.c patch-radeon_dri.c \
 	patch-mga_dri.c patch-nv_driver.c patch-nv_setup.c patch-int10-generic.c \
@@ -39,10 +33,7 @@ EXTRA_PATCHES+=		${FILESDIR}/${pf}
 .endfor
 SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
 			BuildXF86DRI=${BuildXF86DRI} \
-			WITH_DEBUG="${WITH_DEBUG}" \
-			CC="${CC}" \
-			CXX="${CXX}" \
-			CFLAGS="${CFLAGS}"
+			WITH_DEBUG="${WITH_DEBUG}"
 MAN1=			XFree86.1 \
 			Xserver.1 \
 			gtf.1 \
@@ -101,6 +92,7 @@ XINCLUDE_DIRS=		lib/xkbfile lib/xtrans
 XINSTALL_DIRS=		lib/font programs/Xserver
 XINSTALL_MAN_DIRS=	programs/Xserver
 
+.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386 ||  ${ARCH} == alpha
@@ -166,5 +158,4 @@ post-install::
 	${LN} -sf Xwrapper-4 ${PREFIX}/bin/X; \
 	fi;
 
-.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.post.mk>
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index 8a1ec165acb3..0810fe46ed18 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	VirtualFramebufferServer
 PORTVERSION=	4.3.0
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
@@ -28,14 +29,6 @@ RUN_DEPENDS=	${FONT}:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps
 
 FONT=	${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz
 
-XFREE86_VERSION=	4
-USE_IMAKE=		YES
-DIST_SUBDIR=		xc
-WRKSRC=			${WRKDIR}/xc
-SCRIPTS_ENV=		CC="${CC}" \
-			CXX="${CXX}" \
-			CFLAGS="${CFLAGS}"
-PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
 MAN1=			Xserver.1 Xvfb.1
 XBUILD_DIRS=		lib/font lib/lbxutil/ lib/Xdmcp lib/Xau programs/Xserver
 XINCLUDE_DIRS=		lib/xkbfile lib/xtrans