40 files changed, 27 insertions, 53 deletions

diff --git a/databases/clip/Makefile b/databases/clip/Makefile
index 87760afb0bd1..d9bb6b9685cc 100644
--- a/databases/clip/Makefile
+++ b/databases/clip/Makefile
@@ -114,7 +114,6 @@ MAKE_ENV=		HOME="${WRKDIR}" \
 			PGINCDIR="${LOCALBASE}/include" \
 			OPT_CLIPLIBS="${OPT_CLIPLIBS}" \
 			PTHREAD_LIBS="${PTHREAD_LIBS}" \
-			LOCALBASE="${LOCALBASE}" \
 			WITH_IODBC="${WITH_IODBC}" \
 			CLIP_CONFIGURE_FLAGS="-l"
 
diff --git a/databases/fastdb/Makefile b/databases/fastdb/Makefile
index 14331e28806c..8505abcc340e 100644
--- a/databases/fastdb/Makefile
+++ b/databases/fastdb/Makefile
@@ -18,8 +18,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GMAKE=	yes
 MAKE_ENV=	OSTYPE="${OPSYS}" \
-		PREFIX="${PREFIX}" \
-		CXX="${CXX}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 MAKEFILE=	makefile
diff --git a/databases/firebird-server/Makefile b/databases/firebird-server/Makefile
index f8ffe5bbd874..bf7c869a7dc5 100644
--- a/databases/firebird-server/Makefile
+++ b/databases/firebird-server/Makefile
@@ -80,7 +80,7 @@ PORTDOCS=	*
 .endif
 .endif
 
-MAKE_ENV+=	CC=${CC} CXX=${CXX} FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}"
+MAKE_ENV+=	FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}"
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/firebird2-server/Makefile b/databases/firebird2-server/Makefile
index 1efee944fb35..4ddaf7f72228 100644
--- a/databases/firebird2-server/Makefile
+++ b/databases/firebird2-server/Makefile
@@ -89,7 +89,7 @@ FB_DOCS_DIRS=	sql.extensions license upgrade
 .endif
 .endif
 
-MAKE_ENV+=	CC=${CC} CXX=${CXX} FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}"
+MAKE_ENV+=	FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}"
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/extern/icu
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index 1efee944fb35..4ddaf7f72228 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -89,7 +89,7 @@ FB_DOCS_DIRS=	sql.extensions license upgrade
 .endif
 .endif
 
-MAKE_ENV+=	CC=${CC} CXX=${CXX} FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}"
+MAKE_ENV+=	FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}"
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/extern/icu
diff --git a/databases/py-MySQL/Makefile b/databases/py-MySQL/Makefile
index a37243adfb55..7283ccb40a14 100644
--- a/databases/py-MySQL/Makefile
+++ b/databases/py-MySQL/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 PLIST_FILES=	lib/%%PYTHON_VERSION%%/site-packages/MySQLmodule.so
 USE_PYTHON=	-2.4
-CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
-MAKE_ENV=	${CONFIGURE_ENV}
+MAKE_ENV=	PYTHON="${PYTHON_CMD}"
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/py-PySQLite10/Makefile b/databases/py-PySQLite10/Makefile
index b29bdb9d7011..fa8301b989ea 100644
--- a/databases/py-PySQLite10/Makefile
+++ b/databases/py-PySQLite10/Makefile
@@ -26,7 +26,6 @@ WRKSRC=		${WRKDIR}/pysqlite
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_PKGNAME=	pysqlite
-MAKE_ENV=	LOCALBASE="${LOCALBASE}"
 
 PORTDOCS=	*
 
diff --git a/databases/py-PySQLite11/Makefile b/databases/py-PySQLite11/Makefile
index 5ef8052f89d9..3fb7e723bd14 100644
--- a/databases/py-PySQLite11/Makefile
+++ b/databases/py-PySQLite11/Makefile
@@ -24,7 +24,6 @@ NO_LATEST_LINK=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	pysqlite
-MAKE_ENV=	LOCALBASE="${LOCALBASE}"
 
 PORTDOCS=	*
 
diff --git a/deskutils/abacus/Makefile b/deskutils/abacus/Makefile
index eb06393592a0..cb374b3d4244 100644
--- a/deskutils/abacus/Makefile
+++ b/deskutils/abacus/Makefile
@@ -23,10 +23,11 @@ LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
 
 USE_GMAKE=	yes
 USE_XORG=	x11
-MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -Wno-deprecated" LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 CFLAGS+=	-I$(LOCALBASE)/include \
 		-I$(LOCALBASE)/include/tcl8.2 \
 		-I$(LOCALBASE)/include/tk8.2
+CXXFLAGS+=	-Wno-deprecated
 LDFLAGS+=	-L$(LOCALBASE)/lib
 ALL_TARGET=	dep tcl_interf/nxlc
 
diff --git a/deskutils/checkrdf/Makefile b/deskutils/checkrdf/Makefile
index bdcebb10556c..6aa80269aa72 100644
--- a/deskutils/checkrdf/Makefile
+++ b/deskutils/checkrdf/Makefile
@@ -18,7 +18,6 @@ COMMENT=	A tool for RDF site summaries based news-check
 BUILD_DEPENDS=	Xtract:${PORTSDIR}/textproc/hs-haxml
 
 USE_BZIP2=	yes
-MAKE_ENV=	PREFIX=${PREFIX}
 
 MAN1=		checkrdf.1
 MANCOMPRESSED=	yes
diff --git a/deskutils/xfce4-notification-daemon/Makefile b/deskutils/xfce4-notification-daemon/Makefile
index 80f0de543a49..753f1205e9eb 100644
--- a/deskutils/xfce4-notification-daemon/Makefile
+++ b/deskutils/xfce4-notification-daemon/Makefile
@@ -33,8 +33,6 @@ CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/xfce4 \
 			--libexecdir=${PREFIX}/libexec/xfce4 \
 			--with-dbus-services=${PREFIX}/share/dbus-1/services
 
-MAKE_ENV+=	CFLAGS="${CFLAGS}"
-
 CONFLICTS=	notification-daemon-[0-9]*
 
 OPTIONS=	GRADIENT "Show a gradient look in the default theme"  off \
diff --git a/devel/boost/Makefile b/devel/boost/Makefile
index 1e55536c7872..10a0bfcbb445 100644
--- a/devel/boost/Makefile
+++ b/devel/boost/Makefile
@@ -19,8 +19,6 @@ USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/g}
 
-MAKE_ENV+=	CXX=${CXX} CC=${CC}
-
 .if defined(WITH_PYTHON) || defined (WITH_PYSTE)
 USE_PYTHON=	2.4+
 
diff --git a/devel/distorm/Makefile b/devel/distorm/Makefile
index 5c23733f3dff..0a1fad00b52b 100644
--- a/devel/distorm/Makefile
+++ b/devel/distorm/Makefile
@@ -18,7 +18,6 @@ COMMENT=	Fast x86 and x86-64 disassembler library
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 
-MAKE_ENV+=	CC=${CC}
 WRKSRC=		${WRKDIR}/distorm/build/linux
 ALL_TARGET=	clib
 PLIST_FILES=	bin/disasm lib/libdistorm64.a lib/libdistorm64.so
diff --git a/devel/dsss/Makefile b/devel/dsss/Makefile
index 03cde3b44661..c94313bfdf65 100644
--- a/devel/dsss/Makefile
+++ b/devel/dsss/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	gdc:${PORTSDIR}/lang/gdc
 USE_BZIP2=	yes
 MAKEFILE=	Makefile.gdc.posix
 
-MAKE_ENV=	CXX="${CXX}" NATIVECXX="${CXX}"
+MAKE_ENV=	NATIVECXX="${CXX}"
 
 PORTDOCS=	*
 
diff --git a/devel/ifd-test/Makefile b/devel/ifd-test/Makefile
index a6c194f40d83..4d90807bb446 100644
--- a/devel/ifd-test/Makefile
+++ b/devel/ifd-test/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE=	yes
 
 NOMAN=
 PLIST_FILES=	sbin/ifdtest
-MAKE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		LIBS="-L${PREFIX}/lib -lpcsclite ${PTHREAD_LIBS}"
+CFLAGS+=	${PTHREAD_CFLAGS}
+MAKE_ENV=	LIBS="-L${PREFIX}/lib -lpcsclite ${PTHREAD_LIBS}"
 
 post-patch:
 	${REINPLACE_CMD} -e "s,LPSTR,LPTSTR,g; s,LPCSTR,LPCTSTR,g" \
diff --git a/devel/leaktracer/Makefile b/devel/leaktracer/Makefile
index 23222389cf52..bd42522bbe4c 100644
--- a/devel/leaktracer/Makefile
+++ b/devel/leaktracer/Makefile
@@ -18,8 +18,7 @@ COMMENT=	Trace and analyze memory leaks in C++ programs
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 USE_PERL5_RUN=	yes
-MAKE_ENV=	CXX="${CXX}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 PLIST_FILES=	bin/LeakCheck bin/leak-analyze lib/LeakTracer.so
 PORTDOCS=	README README.html
diff --git a/devel/libdsp/Makefile b/devel/libdsp/Makefile
index 74b31e224f66..96fcf3561d81 100644
--- a/devel/libdsp/Makefile
+++ b/devel/libdsp/Makefile
@@ -21,8 +21,7 @@ WRKSRC=		${WRKDIR}/libdsp-src/${PORTNAME:S/dsp/DSP/}-${PORTVERSION}
 
 USE_AUTOTOOLS=	libtool:15:env
 USE_GMAKE=	yes
-MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" MKDIR="${MKDIR}" \
-		INLINE_VER="${INLINE_VER}"
+MAKE_ENV=	MKDIR="${MKDIR}" INLINE_VER="${INLINE_VER}"
 MAKEFILE=	Makefile.FreeBSD
 USE_LDCONFIG=	yes
 
diff --git a/devel/libmba/Makefile b/devel/libmba/Makefile
index 59631c6d52cc..dec240e70781 100644
--- a/devel/libmba/Makefile
+++ b/devel/libmba/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A collection of C modules potentially useful to any project
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_GMAKE=	yes
-MAKE_ENV=	prefix="${PREFIX}" CC="${CC}" \
+MAKE_ENV=	prefix="${PREFIX}" \
 		MINVERSION="${SHLIB_MAJOR}" \
 		RPM_OPT_FLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libowfat/Makefile b/devel/libowfat/Makefile
index c50f6e6cf45b..33c9fcff6a58 100644
--- a/devel/libowfat/Makefile
+++ b/devel/libowfat/Makefile
@@ -22,7 +22,7 @@ OPTIONS=	LIBOWFAT_OPTIMIZED_CFLAGS "Use optimized CFLAGS" on
 
 .include <bsd.port.pre.mk>
 
-MAKE_ENV+=	INSTALL="${INSTALL}" CC="${CC}"
+MAKE_ENV+=	INSTALL="${INSTALL}"
 
 .if defined(WITH_LIBOWFAT_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O2 -fomit-frame-pointer
diff --git a/devel/libvolume_id/Makefile b/devel/libvolume_id/Makefile
index 06487905df37..f3fcd4644c2f 100644
--- a/devel/libvolume_id/Makefile
+++ b/devel/libvolume_id/Makefile
@@ -17,7 +17,7 @@ USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 MAKE_ENV=	E=${ECHO_MSG} RANLIB=${RANLIB} AR=${AR} Q=@ \
-		CC=${CC} prefix=${PREFIX}
+		prefix=${PREFIX}
 
 PLIST_FILES=	include/libvolume_id.h \
 		lib/libvolume_id.a \
diff --git a/devel/luabind/Makefile b/devel/luabind/Makefile
index e15e9d69003d..cb8bff0014db 100644
--- a/devel/luabind/Makefile
+++ b/devel/luabind/Makefile
@@ -20,8 +20,7 @@ USE_ZIP=	yes
 USE_LUA=	5.0
 USE_GMAKE=	yes
 
-MAKE_ENV=	CXX="${CXX}" LUA_INCDIR="${LUA_INCDIR}" \
-		BOOST_ROOT="${LOCALBASE}/include"
+MAKE_ENV=	BOOST_ROOT="${LOCALBASE}/include"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/devel/mpatrol/Makefile b/devel/mpatrol/Makefile
index e1ed6d2d6944..d123e994910f 100644
--- a/devel/mpatrol/Makefile
+++ b/devel/mpatrol/Makefile
@@ -22,8 +22,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_LDCONFIG=	yes
 
 USE_GMAKE=	yes
-MAKE_ENV=	LOCALBASE="${LOCALBASE}" CXX="${CXX}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 MAN1=		hexwords.1 mleak.1 mpatrol.1 mprof.1 \
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index cd7bb1b093a8..19db147f75e8 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -25,7 +25,7 @@ USE_LDCONFIG=	yes
 SOVERSION=	51
 TCL_VERSION?=	tcl8.3
 TCL_NODOT=	${TCL_VERSION:S/.//}
-MAKE_ENV+=	CC=${CC} PCFLAGS="${CFLAGS}" TCLVERSION="${TCL_VERSION}"
+MAKE_ENV+=	PCFLAGS="${CFLAGS}" TCLVERSION="${TCL_VERSION}"
 PLIST_SUB+=	SOVERSION=${SOVERSION} \
 		EXAMPLESDIR="${EXAMPLESDIR:S,${PREFIX}/,,}"
 
diff --git a/devel/picprog/Makefile b/devel/picprog/Makefile
index 5cf77a9ea0b6..705bda450f33 100644
--- a/devel/picprog/Makefile
+++ b/devel/picprog/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Serial port pic16c84 programmer
 
 USE_GMAKE=	yes
 
-MAKE_ENV=	CXX="${CXX}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 PLIST_FILES=	bin/picprog
 MAN1=		picprog.1
diff --git a/devel/pikdev/Makefile b/devel/pikdev/Makefile
index b726cc7770d2..94daeca75cad 100644
--- a/devel/pikdev/Makefile
+++ b/devel/pikdev/Makefile
@@ -30,7 +30,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
 CONFIGURE_ARGS+=	--with-pic=yes
-MAKE_ENV=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
+MAKE_ENV=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
 SUB_FILES=	pkg-message
 
 OPTIONS=	DEBUG	"Enable debug information"	off \
diff --git a/devel/premake/Makefile b/devel/premake/Makefile
index 7f03b6a26c13..95fe1269566c 100644
--- a/devel/premake/Makefile
+++ b/devel/premake/Makefile
@@ -19,7 +19,6 @@ WRKSRC=		${WRKDIR}/Premake-${PORTVERSION}
 USE_DOS2UNIX=	yes
 USE_ZIP=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
 
 PLIST_FILES=	bin/premake
 
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index aebb23a900da..e97d54798fea 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -32,14 +32,14 @@ USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
+CFLAGS=		-O1
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -O1 -I${WRKSRC}/include -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CFLAGS="${CFLAGS} -O1"
+		CFLAGS="${CFLAGS}"
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS} -O1 -I${WRKSRC}/include -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-		STDCCFLAGS+="-I${LOCALBASE}" \
-		CFLAGS="${CFLAGS} -O1"
+		STDCCFLAGS+="-I${LOCALBASE}"
 
 .if ${OSVERSION} >= 700042
 CONFIGURE_ENV+=	ATOMICITY_H="<ext/atomicity.h>"
diff --git a/devel/py-distorm/Makefile b/devel/py-distorm/Makefile
index caefb3541cd5..df09952788af 100644
--- a/devel/py-distorm/Makefile
+++ b/devel/py-distorm/Makefile
@@ -21,7 +21,6 @@ COMMENT=	Fast x86 and x86-64 disassembler library with Python interface
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 
-MAKE_ENV+=	CC=${CC}
 WRKSRC=		${WRKDIR}/distorm/build/linux
 ALL_TARGET=	py
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/distorm.so \
diff --git a/devel/sdl_sge/Makefile b/devel/sdl_sge/Makefile
index 18a8e8167a23..383b1d0551c8 100644
--- a/devel/sdl_sge/Makefile
+++ b/devel/sdl_sge/Makefile
@@ -18,7 +18,6 @@ COMMENT=	A graphic library for the Simple DirectMedia Layer (SDL)
 
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-MAKE_ENV=	CC="${CC}" CXX="${CXX}"
 
 OPTIONS=	SDL_IMAGE "Enable support for SDL_IMAGE" On \
 		FREETYPE "Enable FreeType support" On \
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index ef6f1466c3aa..ceeddc8bd16e 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -24,7 +24,6 @@ USE_GMAKE=	yes
 COMPILER?=	gcc
 MAKEFILE=	${COMPILER}.mak
 ALL_TARGET=	install
-MAKE_ENV+=	CC=${CC} CXX=${CXX}
 MAKE_ARGS+=	INSTALLDIR=${PREFIX} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} 		\
 		PTHREAD_LIBS=${PTHREAD_LIBS}
 PLIST_SUB+=	COMPILER=${COMPILER} VER=${PORTVERSION} V2=${PORTVERSION:R}	\
diff --git a/devel/tcltls/Makefile b/devel/tcltls/Makefile
index 174700f7e4eb..f5b1efae7b85 100644
--- a/devel/tcltls/Makefile
+++ b/devel/tcltls/Makefile
@@ -26,8 +26,6 @@ PLIST_SUB+=	TCL_VER=${TCL_VER} DISTNAME="${DISTNAME}"
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV=	TCL_VER=${TCL_VER} MKDIR="${MKDIR}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
-		OPENSSLINC="${OPENSSLINC}" OPENSSLLIB="${OPENSSLLIB}" \
-		OPENSSLDIR="${OPENSSLDIR}" CFLAGS="${CFLAGS}" \
 		SHLIB_NAME=libtls.so.1 \
 		PORTVERSION="${PORTVERSION}" SED="${SED}"
 REINPLACE_ARGS=	-i ""
diff --git a/devel/tokamak/Makefile b/devel/tokamak/Makefile
index b47235756005..9a5db6b40bd9 100644
--- a/devel/tokamak/Makefile
+++ b/devel/tokamak/Makefile
@@ -19,7 +19,6 @@ USE_ZIP=	yes
 USE_GMAKE=	yes
 USE_DOS2UNIX=	*
 
-MAKE_ENV=	CC=${CC} CXX=${CXX}
 MAKEFILE=	tokamak.make
 ALL_TARGET=
 
diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile
index 80e8e0c04e87..86628fb9ade1 100644
--- a/dns/powerdns-recursor/Makefile
+++ b/dns/powerdns-recursor/Makefile
@@ -28,8 +28,6 @@ OPTIONS=	SETUID	"Run as pdns_recursor user" on \
 CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAKE_ENV+=	CXX="${CXX}" CC="${CC}"
-
 MAN8=		rec_control.8 pdns_recursor.8
 SUB_FILES=	pkg-message
 
diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 9b32d35b3859..296d7a8ba02b 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -25,7 +25,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 MAKEFILE=	makefile
-MAKE_ENV=	CC="${CC}" CXX="${CXX}"
 
 SUB_FILES=	pkg-message
 
diff --git a/emulators/mupen64-base/Makefile b/emulators/mupen64-base/Makefile
index fb779e108dfd..84ca0bb925e7 100644
--- a/emulators/mupen64-base/Makefile
+++ b/emulators/mupen64-base/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 ONLY_FOR_ARCHS=	i386
 
-MAKE_ENV+=	CXX="${CXX}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 MUPEN64VERSION=	0.5
 FIXFILES?=	r4300/r4300.c memory/dma.c r4300/recomp.c r4300/x86/assemble.c
diff --git a/emulators/mupen64plus-base/Makefile b/emulators/mupen64plus-base/Makefile
index 4b28fd8a3eb6..4c269a65a719 100644
--- a/emulators/mupen64plus-base/Makefile
+++ b/emulators/mupen64plus-base/Makefile
@@ -23,7 +23,7 @@ USE_SDL?=	#
 USE_GMAKE=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 
-MAKE_ENV+=	CXX="${CXX}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
 
 FIXFILES?=	r4300/r4300.c r4300/recomp.c memory/dma.c r4300/x86/assemble.c \
diff --git a/emulators/mupen64plus-core/Makefile b/emulators/mupen64plus-core/Makefile
index 4b28fd8a3eb6..4c269a65a719 100644
--- a/emulators/mupen64plus-core/Makefile
+++ b/emulators/mupen64plus-core/Makefile
@@ -23,7 +23,7 @@ USE_SDL?=	#
 USE_GMAKE=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 
-MAKE_ENV+=	CXX="${CXX}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
 
 FIXFILES?=	r4300/r4300.c r4300/recomp.c memory/dma.c r4300/x86/assemble.c \
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index b884c690f544..da497ceb3f47 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -26,7 +26,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 PATCH_STRIP=	-lp1
-MAKE_ENV+=	BSD_MAKE="${MAKE}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV+=	BSD_MAKE="${MAKE}" LDFLAGS="${LDFLAGS}"
 MAN1=		qemu.1 qemu-img.1
 ONLY_FOR_ARCHS=	amd64 i386
 CONFLICTS=	qemu-[0-9]*
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 260d519d345b..9a9a35992272 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -25,7 +25,7 @@ USE_PERL5=	yes
 USE_GCC=	3.4
 PATCH_STRIP=	-lp1
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --cc=${CC}
-MAKE_ENV+=	BSD_MAKE="${MAKE}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV+=	BSD_MAKE="${MAKE}" LDFLAGS="${LDFLAGS}"
 MAN1=		qemu.1 qemu-img.1
 ONLY_FOR_ARCHS=	amd64 i386
 CONFLICTS=	qemu-devel-[0-9]*
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index 10980f0bd070..e2b2b09c383f 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -27,7 +27,6 @@ USE_GMAKE=	yes
 USE_SDL=	sdl
 USE_GNOME=	gnomehier
 MAKEFILE=	makefile
-MAKE_ENV=	PREFIX=${PREFIX}
 
 ONLY_FOR_ARCHS=	i386