From a0f7fe90a025ffba298357bc66e1bfc3b77e6dd3 Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@FreeBSD.org>
Date: Fri, 24 Jan 2003 04:14:16 +0000
Subject: [1] Fix missing symbols in i810 driver [2] Fix xdm on Alpha by using
 NetBSD's version of Wraphelp.c [3] Report buttons 7 and when using sysmouse
 protocol [4] Fix missing symbols in r128 driver. [5] Reset /usr/X11R6/bin/X
 to Xwrapper-4 after install if Xwrapper-4 exists.

PR:		[1] i386/44203
		[2] ports/43664
		[3] ports/43232
---
 x11-servers/XFree86-4-Server-snap/Makefile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 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 551c7035aba6..d8bb093d2c22 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.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	4.2.0/:x \
 			anholt/:local
 PKGNAMEPREFIX=	XFree86-
 DISTFILES=	X420src-1.tgz:x \
-		Wraphelp.gz:local
+		Wraphelp2.gz:local
 EXTRACT_ONLY=	X420src-1.tgz
 
 PATCH_SITES=		${MASTER_SITE_LOCAL}
@@ -31,7 +31,8 @@ DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
 .for pf in patch-text-mode.c patch-xf86Configure.c patch-xf86config.c \
-	patch-mga_driver.c patch-alp_xaam.c
+	patch-i810_driver.c patch-mga_driver.c patch-r128_driver.c \
+	patch-alp_xaam.c
 EXTRA_PATCHES+=		${.CURDIR}/files/${pf}
 .endfor
 SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
@@ -188,7 +189,7 @@ PLIST_SUB+=		MATROX="@comment "
 .endif
 
 post-extract::
-	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
+	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \
 		${WRKSRC}/lib/Xdmcp/Wraphelp.c
 
 post-build:
@@ -198,6 +199,10 @@ post-build:
 post-install::
 	@${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE}
 	strip ${PREFIX}/bin/XFree86
+	@if [ -f ${PREFIX}/bin/Xwrapper-4 ] ; then \
+	ln -sf Xwrapper-4 ${PREFIX}/bin/X; \
+	fi;
+	
 
 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.post.mk>
-- 
cgit v1.2.3