- Remove duplicates from MAKE_ENV after inclusion of CC and CXX in default MAKE_ENV

20 files changed, 17 insertions, 40 deletions

diff --git a/net/3proxy/Makefile b/net/3proxy/Makefile
index 4fe5d940ba11..aef3e4f5a779 100644
--- a/net/3proxy/Makefile
+++ b/net/3proxy/Makefile
@@ -18,8 +18,7 @@ COMMENT=	Proxy servers set (support HTTP(S), FTP, SOCKS, POP3, TCP & UDP)
 NO_WRKSUBDIR=	yes
 USE_RC_SUBR=	3proxy.sh
 MAKEFILE=	Makefile.unix
-MAKE_ENV=	CC="${CC}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 
 MAN3=	3proxy.conf.3
diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile
index 90b970aa3ecb..7bdc0a76dda0 100644
--- a/net/DarwinStreamingServer/Makefile
+++ b/net/DarwinStreamingServer/Makefile
@@ -35,9 +35,7 @@ SUB_LIST+=	PERL=${PERL}
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-MAKE_ENV+=	CC="${CC}"				\
-		CXX="${CXX}"				\
-		MAKE="${MAKE}"				\
+MAKE_ENV+=	MAKE="${MAKE}"				\
 		DATADIR="${DATADIR}"			\
 		PTHREAD_LIBS="${PTHREAD_LIBS}"		\
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
diff --git a/net/Sockets-devel/Makefile b/net/Sockets-devel/Makefile
index 78f5f59a2bcc..b18af4f5ec70 100644
--- a/net/Sockets-devel/Makefile
+++ b/net/Sockets-devel/Makefile
@@ -17,7 +17,6 @@ COMMENT=	A C++ wrapper for BSD-style sockets
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 WITH_OPENSSL_BASE=	yes
-MAKE_ENV=	CXX="${CXX}"
 
 post-patch:
 # PREFIX safeness
diff --git a/net/Sockets/Makefile b/net/Sockets/Makefile
index ea0c3b7cf330..42a5169521a1 100644
--- a/net/Sockets/Makefile
+++ b/net/Sockets/Makefile
@@ -16,7 +16,6 @@ COMMENT=	A C++ wrapper for BSD-style sockets
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 WITH_OPENSSL_BASE=	yes
-MAKE_ENV=	CXX="${CXX}"
 
 post-patch:
 # PREFIX safeness
diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile
index b4eef0d36f93..2af86ae95d39 100644
--- a/net/asterisk-bristuff/Makefile
+++ b/net/asterisk-bristuff/Makefile
@@ -41,8 +41,7 @@ MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		MKDIR="${MKDIR}" \
 		PWLIBDIR=${LOCALBASE}/share/pwlib \
 		OPENH323DIR=${LOCALBASE}/share/openh323 \
-		OSVERSION=${OSVERSION} \
-		CXX="${CXX}"
+		OSVERSION=${OSVERSION}
 MAN8=		asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
 
 .include <bsd.port.pre.mk>
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 82e3cac1e173..86938e6d0a46 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -38,8 +38,7 @@ MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PWLIBDIR=${LOCALBASE}/share/pwlib \
 		OPENH323DIR=${LOCALBASE}/share/openh323 \
 		OSVERSION=${OSVERSION} \
-		NOISY_BUILD=YES \
-		CXX="${CXX}"
+		NOISY_BUILD=YES
 MAN8=		asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
 
 OPTIONS=	OGGVORBIS	"Enable Ogg Vorbis support" on \
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index 82e3cac1e173..86938e6d0a46 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -38,8 +38,7 @@ MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PWLIBDIR=${LOCALBASE}/share/pwlib \
 		OPENH323DIR=${LOCALBASE}/share/openh323 \
 		OSVERSION=${OSVERSION} \
-		NOISY_BUILD=YES \
-		CXX="${CXX}"
+		NOISY_BUILD=YES
 MAN8=		asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
 
 OPTIONS=	OGGVORBIS	"Enable Ogg Vorbis support" on \
diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile
index 12ad38f4ee95..0e0d9b24b74d 100644
--- a/net/asterisk12/Makefile
+++ b/net/asterisk12/Makefile
@@ -42,8 +42,7 @@ MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		MKDIR="${MKDIR}" \
 		PWLIBDIR=${LOCALBASE}/share/pwlib \
 		OPENH323DIR=${LOCALBASE}/share/openh323 \
-		OSVERSION=${OSVERSION} \
-		CXX="${CXX}"
+		OSVERSION=${OSVERSION}
 PLIST_SUB=	BRISTUFF="@comment "
 MAN8=		asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
 WITHOUT_FAX=	yes # Doesn't build with spandsp-0.0.3.
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index 82e3cac1e173..86938e6d0a46 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -38,8 +38,7 @@ MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PWLIBDIR=${LOCALBASE}/share/pwlib \
 		OPENH323DIR=${LOCALBASE}/share/openh323 \
 		OSVERSION=${OSVERSION} \
-		NOISY_BUILD=YES \
-		CXX="${CXX}"
+		NOISY_BUILD=YES
 MAN8=		asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
 
 OPTIONS=	OGGVORBIS	"Enable Ogg Vorbis support" on \
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 82e3cac1e173..86938e6d0a46 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -38,8 +38,7 @@ MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PWLIBDIR=${LOCALBASE}/share/pwlib \
 		OPENH323DIR=${LOCALBASE}/share/openh323 \
 		OSVERSION=${OSVERSION} \
-		NOISY_BUILD=YES \
-		CXX="${CXX}"
+		NOISY_BUILD=YES
 MAN8=		asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
 
 OPTIONS=	OGGVORBIS	"Enable Ogg Vorbis support" on \
diff --git a/net/ccxstream/Makefile b/net/ccxstream/Makefile
index 18352063085c..46d4526db8d3 100644
--- a/net/ccxstream/Makefile
+++ b/net/ccxstream/Makefile
@@ -19,7 +19,6 @@ OPTIONS=		SO_KEEPALIVE "Build with SO_KEEPALIVE" ON \
 			TCP_NODELAY "Build with TCP_NODELAY" OFF
 
 USE_GMAKE=		yes
-MAKE_ENV=		CC="${CC}"
 USE_RC_SUBR=		ccxstream
 
 PLIST_FILES=		\
diff --git a/net/hawknl-devel/Makefile b/net/hawknl-devel/Makefile
index beb26187bb3e..7423c5610a40 100644
--- a/net/hawknl-devel/Makefile
+++ b/net/hawknl-devel/Makefile
@@ -26,8 +26,7 @@ USE_LDCONFIG=	yes
 
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CPPFLAGS=	-I${LOCALBASE}/include
-MAKE_ENV=	CC="${CC}" CFLAGS="${CFLAGS} ${OPTFLAGS}" \
-		LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
+MAKE_ENV=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
 
 WRKSRC=	${WRKDIR}/HawkNL1.70
 
diff --git a/net/hawknl/Makefile b/net/hawknl/Makefile
index c61376e3cfbe..39716c46198f 100644
--- a/net/hawknl/Makefile
+++ b/net/hawknl/Makefile
@@ -22,8 +22,7 @@ USE_LDCONFIG=	yes
 
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CPPFLAGS=	-I${LOCALBASE}/include
-MAKE_ENV=	CC="${CC}" CFLAGS="${CFLAGS} ${OPTFLAGS}" \
-		LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
+MAKE_ENV=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
 
 WRKSRC=	${WRKDIR}/${PORTNAME}${PORTVERSION}
 
diff --git a/net/ipfw-graph/Makefile b/net/ipfw-graph/Makefile
index 7f24a14e413c..6e95a17f828a 100644
--- a/net/ipfw-graph/Makefile
+++ b/net/ipfw-graph/Makefile
@@ -15,7 +15,6 @@ MAINTAINER=	edwin@mavetju.org
 COMMENT=	Graphical overview of traffic going through your IPFW rules
 
 USE_GNOME=	gtk12
-MAKE_ENV+=	MANPREFIX="${MANPREFIX}"
 
 MAN8=		ipfw-al.8 ipfw-graph.8
 
diff --git a/net/ldap2dns/Makefile b/net/ldap2dns/Makefile
index ef788a11e188..02ff86246f19 100644
--- a/net/ldap2dns/Makefile
+++ b/net/ldap2dns/Makefile
@@ -20,7 +20,7 @@ USE_GMAKE=	yes
 USE_OPENLDAP=	yes
 USE_PERL5=	yes
 
-MAKE_ENV=	PREFIX=${PREFIX} INC=-I${PREFIX}/include LIB=-L${PREFIX}/lib
+MAKE_ENV=	INC=-I${PREFIX}/include LIB=-L${PREFIX}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/ldap2dns.c
diff --git a/net/mars_nwe/Makefile b/net/mars_nwe/Makefile
index bc34460da40a..a6fd2b3cfb9c 100644
--- a/net/mars_nwe/Makefile
+++ b/net/mars_nwe/Makefile
@@ -19,7 +19,6 @@ MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Netware server emulator for Un*x systems
 
 WRKSRC=		${WRKDIR}/mars_nwe
-MAKE_ENV=	CC="${CC}"
 
 PLIST=	${WRKDIR}/PLIST.DYN
 
diff --git a/net/openser/Makefile b/net/openser/Makefile
index f84144aca9aa..abf1463d89c5 100644
--- a/net/openser/Makefile
+++ b/net/openser/Makefile
@@ -20,8 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-tls
 
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
-MAKE_ENV=	CC="${CC}" \
-		CC_EXTRA_OPTS="${CFLAGS}" \
+MAKE_ENV=	CC_EXTRA_OPTS="${CFLAGS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index eb92e2ebef15..d391cb04a5fc 100644
--- a/net/tapidbus/Makefile
+++ b/net/tapidbus/Makefile
@@ -26,7 +26,7 @@ USE_LDCONFIG=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-MAKE_ENV+=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\-O2||' ${WRKSRC}/configure
diff --git a/net/wistumbler2/Makefile b/net/wistumbler2/Makefile
index c2477852c8be..e5424bf69773 100644
--- a/net/wistumbler2/Makefile
+++ b/net/wistumbler2/Makefile
@@ -15,7 +15,6 @@ DISTNAME=	wistumbler${PORTVERSION}-pre7
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network Stumbler for WaveLAN/IEEE Wireless
 
-MAKE_ENV=	PREFIX=${LOCALBASE} USE_GTK=1
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 USE_GNOME=	gtk20
@@ -25,17 +24,13 @@ MAN1=		wistumbler2.1
 PLIST_FILES=	bin/wistumbler2
 
 .if defined(NO_X)
-MAKE_ENV=	PREFIX=${LOCALBASE} USE_GTK=0
+MAKE_ENV=	USE_GTK=0
+.else
+MAKE_ENV=	USE_GTK=1
 .endif
 
 .include <bsd.port.pre.mk>
 
-# this port needs the file /sys/dev/owi/if_ieee80211.h, but there
-# was not a FreeBSD version bump specifically for that.  Use the
-# nearest one.
-.if ${OSVERSION} < 501107
-IGNORE=		requires newer kernel sources
-.endif
 .if ${OSVERSION} > 700045
 IGNORE=		is not supported on FreeBSD 7.X and later
 .endif
diff --git a/net/yate-devel/Makefile b/net/yate-devel/Makefile
index 3436ae099687..8e46f3ed12d2 100644
--- a/net/yate-devel/Makefile
+++ b/net/yate-devel/Makefile
@@ -31,8 +31,7 @@ CONFIGURE_ARGS=	--without-fdsize \
 		--mandir=${LOCALBASE}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-MAKE_ENV=	CXX="${CXX}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PWLIBDIR=${LOCALBASE}/share/pwlib \
 		OPENH323DIR=${LOCALBASE}/share/openh323