From 6ef550dcec6232dd7ee48be413889d61365bc6cd Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@FreeBSD.org>
Date: Sun, 14 Jul 2002 20:26:33 +0000
Subject: Take over maintainership of XFree86-4 ports.  Add patches to fix
 libGLU on -current, fix the DRI with Wine, update the config files for the X
 ports, and fix many of them to allow continuing of the X build after
 interruption (it used to clean and rebuild).

Approved by:	will, des (mentor)
---
 x11-servers/XFree86-4-Server-snap/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'x11-servers/XFree86-4-Server-snap/Makefile')

diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 05e15c9e7ffe..981748848552 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.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE} \
 		ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
@@ -19,7 +19,7 @@ DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
 EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
 IGNOREFILES=	Wraphelp.c
 
-MAINTAINER=	taguchi@tohoku.iij.ad.jp
+MAINTAINER=	anholt@freebsd.org
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
@@ -37,8 +37,7 @@ SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
 			BuildXF86DRI=${BuildXF86DRI} \
 			HasGlide3=${HasGlide3} \
 			HaveMatroxHal=${HaveMatroxHal}
-MAKE_ENV=		MAN_INSTALL_TARGET=FreeBSDPortsInstall.man WORLDOPTS=
-MAKE_ARGS=		WORLDOPTS=
+MAKE_ENV=		MAN_INSTALL_TARGET=FreeBSDPortsInstall.man
 ALL_TARGET=		FreeBSDPortsBuild
 INSTALL_TARGET=		FreeBSDPortsInstall  FreeBSDPortsInstall.man
 MAN1=			XFree86.1 \
@@ -65,6 +64,7 @@ MAN4=			mga.4 \
 			tdfx.4 \
 			glint.4 \
 			s3virge.4 \
+			r128.4 \
 			rendition.4 \
 			savage.4 \
 			nv.4 \
@@ -114,7 +114,6 @@ PLIST_SUB+=	ALPHA_NA="@comment "
 .else
 PLIST_SUB+=	ALPHA_NA=""
 MAN1+=		scanpci.1
-MAN4+=		vmware.4
 .endif
 
 .if ${ARCH} == i386
@@ -129,11 +128,11 @@ MAN4+=		apm.4 \
 		i740.4 \
 		i810.4 \
 		neomagic.4 \
-		r128.4 \
 		sis.4 \
 		trident.4 \
 		tseng.4 \
-		vesa.4
+		vesa.4 \
+		vmware.4
 .else
 PLIST_SUB+=	I386:="@comment "
 .endif
@@ -198,6 +197,7 @@ PLIST_SUB+=		MATROX="@comment "
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
+	@cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure
 
 post-build:
 	@${RM} -f ${PKGMESSAGE}
-- 
cgit v1.2.3