8 files changed, 4 insertions, 9 deletions

diff --git a/security/bro/Makefile b/security/bro/Makefile
index 297edfc893cc..c8fb5dde9f20 100644
--- a/security/bro/Makefile
+++ b/security/bro/Makefile
@@ -25,7 +25,6 @@ WRKSRC=		${WRKDIR}/bro-${PORTVERSION}.1
 USE_BISON=	build
 USE_LDCONFIG=	${PREFIX}/share
 GNU_CONFIGURE=	yes
-MAKE_ENV+=	CC="${CC}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--libdir=${PREFIX}/share
 USE_PERL5=	yes
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index acc7d8932207..cf639513bd21 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -48,7 +48,6 @@ EXTRACONFIGURE+=	enable-camellia
 .endif
 
 MAKE_ARGS+=		WHOLE_ARCHIVE_FLAG=--whole-archive
-MAKE_ENV+=		MANPREFIX=${MANPREFIX}
 NOPRECIOUSMAKEVARS=	Too many _MLINKS for fetch
 NOPRECIOUSSOFTMAKEVARS=	Too many _MLINKS for fetch
 USE_PERL5_BUILD=	yes
diff --git a/security/pft/Makefile b/security/pft/Makefile
index 52a7cdffa4fa..2bf0a1a4f6b1 100644
--- a/security/pft/Makefile
+++ b/security/pft/Makefile
@@ -18,7 +18,6 @@ COMMENT=	Printer Job Language library and tool
 NO_WRKSUBDIR=	yes
 ALL_TARGET=	libPJL.a
 USE_GMAKE=	yes
-MAKE_ENV=	CXX="${CXX}"
 
 PLIST_FILES=	bin/pft lib/libPJL.a
 
diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index 28afa6d34027..9075a5f3aa97 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/src
 
 MAKEFILE=	makefile
 ALL_TARGET=	freebsd-${MACHINE_ARCH}
-MAKE_ENV=	PREFIX="${PREFIX}" OS_CFLAGS="${CFLAGS}"
+MAKE_ENV=	OS_CFLAGS="${CFLAGS}"
 PGPLIB=		${PREFIX}/share/pgp
 MAN1=		pgp.1 pgp2.1
 ONLY_FOR_ARCHS=	i386 alpha
diff --git a/security/poly1305aes/Makefile b/security/poly1305aes/Makefile
index 317c6e79fb20..17a378d5082f 100644
--- a/security/poly1305aes/Makefile
+++ b/security/poly1305aes/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://cr.yp.to/mac/
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	The poly1305 message authentication reference implementation using AES
 
-MAKE_ENV+=	CC="${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${STRIP}"
+CC+=		${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${STRIP}
 ALL_TARGET=	default
 
 REPLACE_HDRS=	aes.h cpucycles.h poly1305aes.h
diff --git a/security/tlswrap/Makefile b/security/tlswrap/Makefile
index 1abf475653d9..2673975f507d 100644
--- a/security/tlswrap/Makefile
+++ b/security/tlswrap/Makefile
@@ -15,7 +15,6 @@ DISTNAME=	${PORTNAME}-1.04
 MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	An FTP proxy that wraps data and control with TLS/SSL
 
-MAKE_ENV+=	CC="${CC}"
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 
diff --git a/security/tthsum/Makefile b/security/tthsum/Makefile
index 57b5f08f4c8a..c80e70f5a13e 100644
--- a/security/tthsum/Makefile
+++ b/security/tthsum/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A command-line utility for generating and checking TTH message digests
 
 USE_GMAKE=	yes
 
-MAKE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 
 PORTDOCS=	Changelog.txt
 PLIST_FILES=	bin/tthsum
diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile
index 994d401c44ba..68f94fb21430 100644
--- a/security/vpnc/Makefile
+++ b/security/vpnc/Makefile
@@ -30,8 +30,7 @@ OPTIONS+=	DECRYPT       "cisco-decypt password decrypt utility"      on
 OPTIONS+=	SSL           "OpenSSL certificate support (hybrid only)"  off
 OPTIONS+=	CISCOVERSION  "Mask linux presentation string"             off
 
-MAKE_ENV+=	LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" CC="${CC}" \
-		BINS="${EXTRABUILDS}"
+MAKE_ENV+=	LDFLAGS="${LDFLAGS}" BINS="${EXTRABUILDS}"
 
 .include <bsd.port.pre.mk>