16 files changed, 12 insertions, 27 deletions

diff --git a/audio/audacious-dumb/Makefile b/audio/audacious-dumb/Makefile
index ac6420cbb40d..c77cd43103ad 100644
--- a/audio/audacious-dumb/Makefile
+++ b/audio/audacious-dumb/Makefile
@@ -22,6 +22,4 @@ BUILD_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious \
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
-MAKE_ENV+=	CC="${CC}" LOCALBASE="${LOCALBASE}"
-
 .include <bsd.port.mk>
diff --git a/audio/dumb/Makefile b/audio/dumb/Makefile
index dfab9fe86a51..6ad8459ef2b4 100644
--- a/audio/dumb/Makefile
+++ b/audio/dumb/Makefile
@@ -31,8 +31,6 @@ MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS=
 CFLAGS+=	-fPIC
 .endif
 
-MAKE_ENV+=	CC="${CC}"
-
 pre-configure:
 	@${CP} ${FILESDIR}/config.txt ${WRKSRC}/make
 	@${REINPLACE_CMD} -e "s,@LOCALBASE@,${LOCALBASE}," ${WRKSRC}/make/config.txt
diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index 4efa48785a8b..22bc40b0e90a 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -20,7 +20,7 @@ CONFLICTS=	speak-1.[0-9]
 
 MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" CXX="${CXX}"
+		LDFLAGS="${LDFLAGS}"
 
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
diff --git a/audio/festival+OGI/Makefile b/audio/festival+OGI/Makefile
index a626e07cff56..d24c8fa50c8c 100644
--- a/audio/festival+OGI/Makefile
+++ b/audio/festival+OGI/Makefile
@@ -41,9 +41,7 @@ MAKE_ENV+=	PKG_EST_HOME=${SPEECHTOOLS} \
 		PKG_LOCALBASE=${LOCALBASE} \
 		PKG_PREFIX=${PREFIX} \
 		GCC27_CC="${CC}" \
-		GCC27_CXX="${CXX}" \
-		CC="${CC}" \
-		CXX="${CXX}"
+		GCC27_CXX="${CXX}"
 MAN1=		festival.1 festival_client.1
 USE_GCC=	2.95
 USE_GMAKE=	yes
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 00d0fe76b575..eda28733fd08 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -32,9 +32,7 @@ MAKE_ENV+=	GCC="${CC}" \
 		GXX="${CXX}" \
 		EST_HOME=${SPEECHTOOLS} \
 		EGCS_CC="${CC}" \
-		EGCS_CXX="${CXX}" \
-		CC="${CC}" \
-		CXX="${CXX}"
+		EGCS_CXX="${CXX}"
 MAN1=		festival.1 festival_client.1
 WRKSRC=		${WRKDIR}
 
diff --git a/audio/gkrellmvolume2/Makefile b/audio/gkrellmvolume2/Makefile
index 0c69a97c18af..100df1033b0f 100644
--- a/audio/gkrellmvolume2/Makefile
+++ b/audio/gkrellmvolume2/Makefile
@@ -34,6 +34,6 @@ USE_GMAKE=	yes
 
 MAKE_ENV+=	PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins \
 		LOCALEDIR=${PREFIX}/share/locale \
-		enable_nls=1 CC="${CC}"
+		enable_nls=1
 
 .include <bsd.port.mk>
diff --git a/audio/hawkvoice/Makefile b/audio/hawkvoice/Makefile
index 6963e30f8ff1..dab21d034813 100644
--- a/audio/hawkvoice/Makefile
+++ b/audio/hawkvoice/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}" \
 		MAKE="${GMAKE}"
 
 WRKSRC=	${WRKDIR}/HawkVoiceDI/src
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 63c3953e0630..f1f55bbdcf50 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -24,7 +24,6 @@ USE_GNOME=	gnometarget lthack
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
-MAKE_ENV=	SHELL=/bin/sh
 USE_LDCONFIG=	yes
 
 MAN1=		libmikmod-config.1
diff --git a/audio/libmodplug/Makefile b/audio/libmodplug/Makefile
index d0fc0dd4a972..92c582f807b4 100644
--- a/audio/libmodplug/Makefile
+++ b/audio/libmodplug/Makefile
@@ -19,8 +19,6 @@ USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 
-MAKE_ENV+=	CXX="${CXX}"
-
 post-patch:
 	@${REINPLACE_CMD} -e '/^CXXFLAGS=/d' \
 		${WRKSRC}/configure
diff --git a/audio/pocketsphinx/Makefile b/audio/pocketsphinx/Makefile
index 635dd8446632..a73994f9619a 100644
--- a/audio/pocketsphinx/Makefile
+++ b/audio/pocketsphinx/Makefile
@@ -24,8 +24,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbas
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAKE_ENV=	MKDIR="${MKDIR}" \
-		OSVERSION=${OSVERSION} \
-		CXX="${CXX}"
+		OSVERSION=${OSVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.in
diff --git a/audio/py-xmms/Makefile b/audio/py-xmms/Makefile
index 71e00f93fe30..3529bcc6d04f 100644
--- a/audio/py-xmms/Makefile
+++ b/audio/py-xmms/Makefile
@@ -25,6 +25,6 @@ PYDISTUTILS_PKGNAME=	pyxmms
 USE_BZIP2=	yes
 USE_GNOME=	glib12
 XMMS_CONFIG?=	${LOCALBASE}/bin/xmms-config
-MAKE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}" XMMS_CONFIG="${XMMS_CONFIG}"
+MAKE_ENV=	XMMS_CONFIG="${XMMS_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/audio/quelcom/Makefile b/audio/quelcom/Makefile
index 806d8de32ce5..b3ac58cb7af0 100644
--- a/audio/quelcom/Makefile
+++ b/audio/quelcom/Makefile
@@ -18,7 +18,7 @@ USE_GCC=	3.3
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 MAKEFILE=	makefile
-MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 CXXFLAGS+=	-I../lib -I${LOCALBASE}/include ${CPPFLAGS} \
diff --git a/audio/sphinx3/Makefile b/audio/sphinx3/Makefile
index ff42b39f30ce..0071c4f3f370 100644
--- a/audio/sphinx3/Makefile
+++ b/audio/sphinx3/Makefile
@@ -24,8 +24,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbas
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAKE_ENV=	MKDIR="${MKDIR}" \
-		OSVERSION=${OSVERSION} \
-		CXX="${CXX}"
+		OSVERSION=${OSVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.in
diff --git a/audio/sphinxbase/Makefile b/audio/sphinxbase/Makefile
index 52e571c02346..0cb09061b8ef 100644
--- a/audio/sphinxbase/Makefile
+++ b/audio/sphinxbase/Makefile
@@ -23,8 +23,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAKE_ENV=	MKDIR="${MKDIR}" \
-		OSVERSION=${OSVERSION} \
-		CXX="${CXX}"
+		OSVERSION=${OSVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.am
diff --git a/audio/xmms-sndstretch/Makefile b/audio/xmms-sndstretch/Makefile
index f218c49a91aa..f9bf409df805 100644
--- a/audio/xmms-sndstretch/Makefile
+++ b/audio/xmms-sndstretch/Makefile
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/sndstretch_xmms
 
 USE_GNOME=	gtk12
 USE_GMAKE=	yes
-MAKE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" PTHREAD_LIBS=${PTHREAD_LIBS}
+MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
 
 post-extract:
 	(cd ${WRKSRC}; ${MAKE} clean)
diff --git a/audio/xmmsctrl/Makefile b/audio/xmmsctrl/Makefile
index 56ff3c9649bf..643b0211462c 100644
--- a/audio/xmmsctrl/Makefile
+++ b/audio/xmmsctrl/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
 USE_GMAKE=	yes
-MAKE_ENV=	CC="${CC}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 PORTDOCS=	Changelog README