From 787bdff2f7807fff2445effc384d07553c51c896 Mon Sep 17 00:00:00 2001
From: tg <tg@FreeBSD.org>
Date: Wed, 18 Sep 2002 11:19:32 +0000
Subject: Don't use MAKE_ARGS to proliferate CFLAGS as setting CFLAGS in
 /etc/make.conf will gladly overwrite the value in MAKE_ARGS. Patch Makedefs
 (in the Icon source) instead.

PR:		38322
---
 lang/icon/Makefile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'lang/icon')

diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index 029587f7f0a1..b25b2ac2f3e0 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -17,13 +17,11 @@ MAINTAINER=	ports@FreeBSD.org
 ONLY_FOR_ARCHS=	alpha i386
 
 .ifdef WITHOUT_X11
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 CONFIG_CMD=	Configure
 PLIST_SUB=	WITHOUT_X11="@comment "
 .else
 USE_XLIB=	yes
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include" \
-		XLIBS="-L${X11BASE}/lib -lX11"
+CFLAGS+=	-I${X11BASE}/include
 CONFIG_CMD=	X-Configure
 PLIST_SUB=	WITHOUT_X11=
 .endif
@@ -36,9 +34,10 @@ ARCH_NAME=	${ARCH:S/i386/intel/}_${OPSYS:L}
 ICONDIR=	${PREFIX}/lib/${PORTNAME}
 
 pre-patch:
-	@${REINPLACE_CMD} -e 's|^CC|#CC|g ; \
-		 s|^CFLAGS|#CFLAGS|g ; \
-		 s|^XLIBS|#XLIBS|g' ${WRKSRC}/config/unix/${ARCH_NAME}/Makedefs
+	@${REINPLACE_CMD} -e "s|^CC.*|CC=${CC}|g ; \
+		 s|^CFLAGS.*|CFLAGS=${CFLAGS}|g ; \
+		 s|^XLIBS.*|XLIBS=-L${X11BASE}/lib -lX11|g" \
+		${WRKSRC}/config/unix/${ARCH_NAME}/Makedefs
 	@${REINPLACE_CMD} -e 's|/opt/icon|${ICONDIR}|g' ${WRKSRC}/ipl/BuildBin
 
 do-configure:
-- 
cgit