From 3dae6bbb516fec9bfcdf48ddf7751b4bc567c22a Mon Sep 17 00:00:00 2001
From: anholt <anholt@FreeBSD.org>
Date: Thu, 17 Oct 2002 07:20:03 +0000
Subject: [1] Make the 4.2.1 ports all use the merged 4.2.1+mitshm patch. [2]
 Make the ports respect CFLAGS better.  Now CFLAGS (and CC/CXX) are set for
 the build during the configure stage.

PR:		[2] 40271, 43369
---
 x11-servers/XFree86-4-Server/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 2b6ea4554a28..f1a26e3fe5f7 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Server
 PORTVERSION=	4.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
@@ -39,7 +39,10 @@ SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
 			ExtendedInputDevices=${ExtendedInputDevices} \
 			BuildXF86DRI=${BuildXF86DRI} \
 			HasGlide3=${HasGlide3} \
-			HaveMatroxHal=${HaveMatroxHal}
+			HaveMatroxHal=${HaveMatroxHal} \
+			CC="${CC}" \
+			CXX="${CXX}" \
+			CFLAGS="${CFLAGS}"
 MAN1=			XFree86.1 \
 			Xserver.1 \
 			kbd_mode.1 \
-- 
cgit