14 files changed, 82 insertions, 51 deletions

diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index b718cf624a1b..f786a05b3c65 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -8,12 +8,10 @@
 PORTNAME=	FontServer
 PORTVERSION=	4.2.0
 CATEGORIES=	x11-servers x11-fonts
-MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
-		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
-			anholt/:local
+MASTER_SITES=	${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR=	${PORTVERSION}/
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz:x Wraphelp.gz:local
+DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz
 EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
 
 MAINTAINER=	anholt@freebsd.org
@@ -23,17 +21,11 @@ USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
-MAKE_ENV=		MAN_INSTALL_TARGET=FreeBSDPortsInstall.man
-ALL_TARGET=		FreeBSDPortsBuild
-INSTALL_TARGET=		FreeBSDPortsInstall installXserver.man
 MAN1=			Xserver.1 xfs.1
+XBUILD_DIRS=		programs/xfs
+XINCLUDE_DIRS=		lib/xtrans programs/Xserver 
+XINSTALL_MAN_DIRS=	programs/Xserver programs/xfs
 
-post-extract:
-	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
-		${WRKSRC}/lib/Xdmcp/Wraphelp.c
-
-do-configure:
-	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
-	@cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure
 
+.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-FontServer/scripts/configure b/x11-servers/XFree86-4-FontServer/scripts/configure
index 3eabe6a46cd4..38581aaadf57 100644
--- a/x11-servers/XFree86-4-FontServer/scripts/configure
+++ b/x11-servers/XFree86-4-FontServer/scripts/configure
@@ -57,6 +57,7 @@ configure () {
     echo "#define BuildServersOnly YES" >> $LOCALDEF
     echo "#define InstallFSConfig $InstallFSConfig" >> $LOCALDEF
     echo "#define FreeBSDBuildXfs YES" >> $LOCALDEF
+    echo "#define UseInstalledPrograms YES" >> $LOCALDEF
 
     # Copy ORIGDEF to DESTDEF
     rm -f $DESTDEF
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index d158fba086b6..f7a348973303 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -23,18 +23,16 @@ USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
-MAKE_ENV=		MAN_INSTALL_TARGET=installXnest.man
-ALL_TARGET=		FreeBSDPortsBuild
-INSTALL_TARGET=		installXnest installXserver.man
 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
+XINSTALL_DIRS=		programs/Xserver
+XINSTALL_MAN_DIRS=	${XINSTALL_DIRS}
 
 post-extract:
 	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
 		${WRKSRC}/lib/Xdmcp/Wraphelp.c
 
-do-configure:
-	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
-	@cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure
-
+.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-NestServer/scripts/configure b/x11-servers/XFree86-4-NestServer/scripts/configure
index a7ac5359f3be..a05984bb5a3a 100644
--- a/x11-servers/XFree86-4-NestServer/scripts/configure
+++ b/x11-servers/XFree86-4-NestServer/scripts/configure
@@ -48,6 +48,7 @@ configure () {
     echo "#define BuildServer YES" >> $LOCALDEF
     echo "#define XnestServer YES" >> $LOCALDEF
     echo "#define BuildServersOnly YES" >> $LOCALDEF
+    echo "#define UseInstalledPrograms YES" >> $LOCALDEF
 
     # Copy ORIGDEF to DESTDEF
     rm -f $DESTDEF
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index 445b8d052554..1553f3e63944 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -23,16 +23,16 @@ USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
-MAKE_ENV=		MAN_INSTALL_TARGET=NOOP
-ALL_TARGET=		FreeBSDPortsBuild
-INSTALL_TARGET=		installXprt
+XBUILD_DIRS=		lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver
+XINCLUDE_DIRS=		lib/xkbfile lib/xtrans
+XINSTALL_DIRS=		programs/Xserver
 
 post-extract:
 	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
 		${WRKSRC}/lib/Xdmcp/Wraphelp.c
 
-do-configure:
-	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
-	@cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure
+do-install:
+	$(INSTALL_PROGRAM) ${WRKSRC}/programs/Xserver/Xprt ${PREFIX}/bin/Xprt
 
+.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-PrintServer/scripts/configure b/x11-servers/XFree86-4-PrintServer/scripts/configure
index a6aba9c72614..3855d175046b 100644
--- a/x11-servers/XFree86-4-PrintServer/scripts/configure
+++ b/x11-servers/XFree86-4-PrintServer/scripts/configure
@@ -48,6 +48,7 @@ configure () {
     echo "#define BuildServer YES" >> $LOCALDEF
     echo "#define XprtServer YES" >> $LOCALDEF
     echo "#define BuildServersOnly YES" >> $LOCALDEF
+    echo "#define UseInstalledPrograms YES" >> $LOCALDEF
 
     # Copy ORIGDEF to DESTDEF
     rm -f $DESTDEF
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index db54468fa6ce..10eb5a67b5e2 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Server
 PORTVERSION=	4.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \
@@ -41,9 +42,6 @@ SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
 			BuildXF86DRI=${BuildXF86DRI} \
 			HasGlide3=${HasGlide3} \
 			HaveMatroxHal=${HaveMatroxHal}
-MAKE_ENV=		MAN_INSTALL_TARGET=FreeBSDPortsInstall.man
-ALL_TARGET=		FreeBSDPortsBuild
-INSTALL_TARGET=		FreeBSDPortsInstall  FreeBSDPortsInstall.man
 MAN1=			XFree86.1 \
 			Xserver.1 \
 			kbd_mode.1 \
@@ -78,6 +76,10 @@ MAN4=			mga.4 \
 			mouse.4
 MAN5=			XF86Config.5
 PKGMESSAGE=		${WRKDIR}/.pkg-message
+XBUILD_DIRS=		lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver
+XINCLUDE_DIRS=		lib/xkbfile lib/xtrans
+XINSTALL_DIRS=		lib/font programs/Xserver
+XINSTALL_MAN_DIRS=	programs/Xserver
 
 .include <bsd.port.pre.mk>
 
@@ -97,7 +99,8 @@ BuildXF86DRI=		YES
 PLIST_SUB+=		DRI=""
 DISTFILES+=		freebsd-glide3headers.tar.gz:local
 HasGlide3=		YES
-
+XBUILD_DIRS+=		lib/XThrStub lib/X11 lib/GL
+XINSTALL_DIRS+=		lib/GL/mesa/src/drv
 post-extract::
 	@(cd ${WRKSRC}/lib/GL/mesa/src/drv/tdfx/ ; \
 		tar xfpz ${DISTDIR}/${DIST_SUBDIR}/freebsd-glide3headers.tar.gz)
@@ -204,10 +207,6 @@ pre-patch::
 	-@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \
 		| ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 --batch
 
-do-configure:
-	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
-	@cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure
-
 post-build:
 	@${RM} -f ${PKGMESSAGE}
 	@${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE}
@@ -216,4 +215,5 @@ post-install::
 	@${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE}
 	strip ${PREFIX}/bin/XFree86
 
+.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.post.mk>
diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist
index a52cea5e9f79..1baaee262b6e 100644
--- a/x11-servers/XFree86-4-Server-snap/pkg-plist
+++ b/x11-servers/XFree86-4-Server-snap/pkg-plist
@@ -6,6 +6,23 @@ bin/pcitweak
 %%ALPHA_NA%%bin/scanpci
 bin/xf86cfg
 bin/xf86config
+include/X11/bitmaps/card.xbm
+include/X11/bitmaps/down.xbm
+include/X11/bitmaps/keyboard.xbm
+include/X11/bitmaps/left.xbm
+include/X11/bitmaps/monitor.xbm
+include/X11/bitmaps/mouse.xbm
+include/X11/bitmaps/narrower.xbm
+include/X11/bitmaps/right.xbm
+include/X11/bitmaps/shorter.xbm
+include/X11/bitmaps/taller.xbm
+include/X11/bitmaps/up.xbm
+include/X11/bitmaps/wider.xbm
+include/X11/pixmaps/card.xpm
+include/X11/pixmaps/computer.xpm
+include/X11/pixmaps/keyboard.xpm
+include/X11/pixmaps/monitor.xpm
+include/X11/pixmaps/mouse.xpm
 lib/X11/app-defaults/XF86Cfg
 lib/X11/Cards
 lib/X11/Options
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 362a07d9e67b..19fdf2092e4d 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -79,6 +79,8 @@ configure () {
     echo "#define XF86Server YES" >> $LOCALDEF
     echo "#define BuildServersOnly YES" >> $LOCALDEF
     echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF
+    echo "#define UseInstalledPrograms YES" >> $LOCALDEF
+    echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
     
     # More of the i386 drivers could probably move to XF86CardDrivers.
     # Is fbdev driver useful to us?
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index db54468fa6ce..10eb5a67b5e2 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Server
 PORTVERSION=	4.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \
@@ -41,9 +42,6 @@ SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
 			BuildXF86DRI=${BuildXF86DRI} \
 			HasGlide3=${HasGlide3} \
 			HaveMatroxHal=${HaveMatroxHal}
-MAKE_ENV=		MAN_INSTALL_TARGET=FreeBSDPortsInstall.man
-ALL_TARGET=		FreeBSDPortsBuild
-INSTALL_TARGET=		FreeBSDPortsInstall  FreeBSDPortsInstall.man
 MAN1=			XFree86.1 \
 			Xserver.1 \
 			kbd_mode.1 \
@@ -78,6 +76,10 @@ MAN4=			mga.4 \
 			mouse.4
 MAN5=			XF86Config.5
 PKGMESSAGE=		${WRKDIR}/.pkg-message
+XBUILD_DIRS=		lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver
+XINCLUDE_DIRS=		lib/xkbfile lib/xtrans
+XINSTALL_DIRS=		lib/font programs/Xserver
+XINSTALL_MAN_DIRS=	programs/Xserver
 
 .include <bsd.port.pre.mk>
 
@@ -97,7 +99,8 @@ BuildXF86DRI=		YES
 PLIST_SUB+=		DRI=""
 DISTFILES+=		freebsd-glide3headers.tar.gz:local
 HasGlide3=		YES
-
+XBUILD_DIRS+=		lib/XThrStub lib/X11 lib/GL
+XINSTALL_DIRS+=		lib/GL/mesa/src/drv
 post-extract::
 	@(cd ${WRKSRC}/lib/GL/mesa/src/drv/tdfx/ ; \
 		tar xfpz ${DISTDIR}/${DIST_SUBDIR}/freebsd-glide3headers.tar.gz)
@@ -204,10 +207,6 @@ pre-patch::
 	-@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \
 		| ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 --batch
 
-do-configure:
-	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
-	@cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure
-
 post-build:
 	@${RM} -f ${PKGMESSAGE}
 	@${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE}
@@ -216,4 +215,5 @@ post-install::
 	@${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE}
 	strip ${PREFIX}/bin/XFree86
 
+.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.post.mk>
diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist
index a52cea5e9f79..1baaee262b6e 100644
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
@@ -6,6 +6,23 @@ bin/pcitweak
 %%ALPHA_NA%%bin/scanpci
 bin/xf86cfg
 bin/xf86config
+include/X11/bitmaps/card.xbm
+include/X11/bitmaps/down.xbm
+include/X11/bitmaps/keyboard.xbm
+include/X11/bitmaps/left.xbm
+include/X11/bitmaps/monitor.xbm
+include/X11/bitmaps/mouse.xbm
+include/X11/bitmaps/narrower.xbm
+include/X11/bitmaps/right.xbm
+include/X11/bitmaps/shorter.xbm
+include/X11/bitmaps/taller.xbm
+include/X11/bitmaps/up.xbm
+include/X11/bitmaps/wider.xbm
+include/X11/pixmaps/card.xpm
+include/X11/pixmaps/computer.xpm
+include/X11/pixmaps/keyboard.xpm
+include/X11/pixmaps/monitor.xpm
+include/X11/pixmaps/mouse.xpm
 lib/X11/app-defaults/XF86Cfg
 lib/X11/Cards
 lib/X11/Options
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index 362a07d9e67b..19fdf2092e4d 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -79,6 +79,8 @@ configure () {
     echo "#define XF86Server YES" >> $LOCALDEF
     echo "#define BuildServersOnly YES" >> $LOCALDEF
     echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF
+    echo "#define UseInstalledPrograms YES" >> $LOCALDEF
+    echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
     
     # More of the i386 drivers could probably move to XF86CardDrivers.
     # Is fbdev driver useful to us?
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index 4f3a5c314ab8..ec41d619b12f 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -28,17 +28,15 @@ USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
-ALL_TARGET=		FreeBSDPortsBuild
-INSTALL_TARGET=		installXvfb installXserver.man
-MAKE_ENV=		MAN_INSTALL_TARGET=installXvfb.man
 MAN1=			Xserver.1 Xvfb.1
+XBUILD_DIRS=		lib/font lib/lbxutil/ lib/Xdmcp lib/Xau programs/Xserver
+XINCLUDE_DIRS=		lib/xkbfile lib/xtrans
+XINSTALL_DIRS=		programs/Xserver
+XINSTALL_MAN_DIRS=	${XINSTALL_DIRS}
 
 post-extract:
 	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
 		${WRKSRC}/lib/Xdmcp/Wraphelp.c
 
-do-configure:
-	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
-	@cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure
-
+.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure
index 95477973f61f..efba0bbf0d11 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure
@@ -48,6 +48,8 @@ configure () {
     echo "#define BuildServer YES" >> $LOCALDEF
     echo "#define XVirtualFramebufferServer YES" >> $LOCALDEF
     echo "#define BuildServersOnly YES" >> $LOCALDEF
+    echo "#define UseInstalledPrograms YES" >> $LOCALDEF
+    echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
 
     # Copy ORIGDEF to DESTDEF
     rm -f $DESTDEF