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

10 files changed, 7 insertions, 16 deletions

diff --git a/sysutils/anacron/Makefile b/sysutils/anacron/Makefile
index 38daaa281788..6edb3417d8a9 100644
--- a/sysutils/anacron/Makefile
+++ b/sysutils/anacron/Makefile
@@ -20,7 +20,6 @@ MAN5=		anacrontab.5
 USE_GMAKE=	yes
 USE_RC_SUBR=	anacron.sh
 SUB_FILES=	pkg-message
-MAKE_ENV=	CC="${CC}"
 
 post-patch:
 .for f in Makefile anacron.8 anacrontab.5
diff --git a/sysutils/bacula-bat/Makefile b/sysutils/bacula-bat/Makefile
index f0ebff87db77..5277500c88a0 100644
--- a/sysutils/bacula-bat/Makefile
+++ b/sysutils/bacula-bat/Makefile
@@ -19,8 +19,6 @@ WITH_BAT=	yes
 MAN1=		bat.1
 
 MAKE_ARGS=	-E MAN1
-MAKE_ENV=	MAN1="${MAN1}"
-
 MAKE_ENV+=	MAKEOBJDIRPREFIX=/
 
 MASTERDIR=	${.CURDIR}/../../sysutils/bacula-server
diff --git a/sysutils/devcpu/Makefile b/sysutils/devcpu/Makefile
index 942bf309afe5..e95cdfbccf9c 100644
--- a/sysutils/devcpu/Makefile
+++ b/sysutils/devcpu/Makefile
@@ -27,7 +27,7 @@ NO_PACKAGE=	depends on kernel
 
 PLIST_SUB=	KMODDIR="${KMODDIR:C,^/,,}"
 KMODDIR=	/boot/modules
-MAKE_ENV+=	KMODDIR="${KMODDIR}"
+MAKE_ENV+=	KMODDIR="${KMODDIR}" BINDIR="${PREFIX}/bin"
 
 STAMPFILE=	${LOCALBASE}/share/${PORTNAME}/.do_not_delete
 
@@ -50,9 +50,6 @@ PLIST_SUB+=	EXTRACTOR=""
 PLIST_SUB+=	EXTRACTOR="@comment "
 .endif
 
-MAKE_ENV+=	KMODDIR="${KMODDIR}" \
-		BINDIR="${PREFIX}/bin"
-
 .if !exists(${SRC_BASE}/sys/Makefile)
 IGNORE=		requires kernel source to be installed
 .endif
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index f42efcb4a520..e2faba80ea57 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -51,7 +51,7 @@ BINMODE=	4511
 BINMODE=	2511
 .endif
 
-MAKE_ENV+=	CC="${CC}" LOCALEDIR=${PREFIX}/share/locale
+MAKE_ENV+=	LOCALEDIR=${PREFIX}/share/locale
 CFLAGS+=	-DSYSTEM_THEMES_DIR='\"${PREFIX}/share/gkrellm/themes\"' \
 		-DSYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm/plugins\"'
 
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 27e7621bab67..4f4ce7d4bd78 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -84,7 +84,7 @@ ALL_TARGET=	freebsd
 INSTALL_TARGET=	install_freebsd
 .endif
 
-MAKE_ENV+=	CC="${CC}" INSTALLROOT=${LOCALBASE} INSTALLDIR=${LOCALBASE}/bin \
+MAKE_ENV+=	INSTALLROOT=${LOCALBASE} INSTALLDIR=${LOCALBASE}/bin \
 		PKGCONFIGDIR=${LOCALBASE}/libdata/pkgconfig \
 		SINSTALLROOT=${PREFIX} SINSTALLDIR=${PREFIX}/sbin \
 		SPKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
diff --git a/sysutils/isomaster/Makefile b/sysutils/isomaster/Makefile
index 5ca912f7cebf..ad9ace8aa059 100644
--- a/sysutils/isomaster/Makefile
+++ b/sysutils/isomaster/Makefile
@@ -18,7 +18,7 @@ USE_GNOME=	gtk20 pkgconfig intlhack gnomehier
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 
-MAKE_ENV=	PREFIX=${PREFIX} DESKTOPPATH=${DESKTOPDIR}
+MAKE_ENV=	DESKTOPPATH=${DESKTOPDIR}
 MAKE_ARGS=	CFLAGS="${CFLAGS}"
 CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS:S/"//g} \
 		`pkg-config --cflags gtk+-2.0` \
diff --git a/sysutils/nbosd/Makefile b/sysutils/nbosd/Makefile
index 8a23b3eb6082..5105dbe0acb4 100644
--- a/sysutils/nbosd/Makefile
+++ b/sysutils/nbosd/Makefile
@@ -18,8 +18,6 @@ BUILD_DEPENDS=	xosd-config:${PORTSDIR}/misc/xosd
 PLIST_FILES=	bin/nbosd
 PORTDOCS=	*
 
-MAKE_ENV+=	PREFIX=${PREFIX}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nbosd ${PREFIX}/bin
 
diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile
index 95d3aecb6529..102155ad67ff 100644
--- a/sysutils/pfstat/Makefile
+++ b/sysutils/pfstat/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Utility to render graphical statistics for pf
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 MAKE_ARGS=	"LD_GD=gd"
-MAKE_ENV+=	CFLAGS="${CFLAGS}" CC="${CC}" __MAKE_CONF=/dev/null
+MAKE_ENV+=	__MAKE_CONF=/dev/null
 USE_ICONV=	yes
 
 MAN8=		pfstat.8 \
diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile
index 90148d1aa017..dc367f6f423e 100644
--- a/sysutils/pftop/Makefile
+++ b/sysutils/pftop/Makefile
@@ -41,7 +41,7 @@ MAKE_ARGS=	LOCALBASE="${PREFIX}" OSLEVEL=41
 CFLAGS+=	-DHAVE_ALTQ=1
 .endif
 
-MAKE_ENV+=	CC="${CC}" CFLAGS="${CFLAGS}" __MAKE_CONF=/dev/null
+MAKE_ENV+=	__MAKE_CONF=/dev/null
 
 PLIST_FILES=	sbin/pftop
 
diff --git a/sysutils/thefish/Makefile b/sysutils/thefish/Makefile
index 30a9d0907d1e..d1b70420301c 100644
--- a/sysutils/thefish/Makefile
+++ b/sysutils/thefish/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	mmendez@energyhq.be
 COMMENT=	Qt/Gtk+/ncurses rc.conf editor/management tool
 
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		LOCALBASE="${LOCALBASE}"
+MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 WANT_GNOME=	yes