11 files changed, 25 insertions, 28 deletions

diff --git a/security/bsmtrace/Makefile b/security/bsmtrace/Makefile
index c844a166699b..adfa8e25e519 100644
--- a/security/bsmtrace/Makefile
+++ b/security/bsmtrace/Makefile
@@ -21,8 +21,9 @@ OPTIONS_DEFINE=	PCRE EXAMPLES
 
 .if ${PORT_OPTIONS:MPCRE}
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
-MAKE_ENV+=	PCRE=1 LIBS="-lpcre -L${LOCALBASE}/lib"
+MAKE_ENV+=	PCRE=1 
 CFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib -lpcre
 .endif
 
 pre-build:
diff --git a/security/libgnomesu/Makefile b/security/libgnomesu/Makefile
index 997c97558d62..55e4abd1887d 100644
--- a/security/libgnomesu/Makefile
+++ b/security/libgnomesu/Makefile
@@ -15,8 +15,8 @@ USES=		pathfix gmake pkgconfig libtool
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix libgnomeui
 CONFIGURE_ARGS+=--disable-install-pam
-CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 SUB_FILES=	pkg-message
 
diff --git a/security/libgringotts/Makefile b/security/libgringotts/Makefile
index d0ffbf9cb249..5427b9118c89 100644
--- a/security/libgringotts/Makefile
+++ b/security/libgringotts/Makefile
@@ -15,8 +15,8 @@ LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/libmcrypt \
 
 USES=		tar:bzip2 libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-pkg-config-files=${PREFIX}/libdata/pkgconfig
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
diff --git a/security/libpwquality/Makefile b/security/libpwquality/Makefile
index 022de165ffa6..ee7f9367b539 100644
--- a/security/libpwquality/Makefile
+++ b/security/libpwquality/Makefile
@@ -18,9 +18,7 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS+=--disable-pam
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-# configure needs to be fixed
-CONFIGURE_ENV+=	LIBS="-lintl"
+LIBS+=		-L${LOCALBASE}/lib -lintl
 
 OPTIONS_DEFINE=	PYTHON
 OPTIONS_DEFAULT=PYTHON
diff --git a/security/openscep/Makefile b/security/openscep/Makefile
index ff07d2108b14..32dc078d7968 100644
--- a/security/openscep/Makefile
+++ b/security/openscep/Makefile
@@ -25,7 +25,7 @@ NO_STAGE=	yes
 PLIST_DIRSTRY=	www/cgi-bin
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-html-install-dir="${PREFIX}/www/openscep" \
 		--with-cgi-install-dir="${PREFIX}/www/cgi-bin/openscep" \
 		--with-openscep-dir="${PREFIX}/etc/openscep" \
diff --git a/security/p11-kit/Makefile b/security/p11-kit/Makefile
index 71e10564f9c8..c855cec67886 100644
--- a/security/p11-kit/Makefile
+++ b/security/p11-kit/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS=	libtasn1.so:${PORTSDIR}/security/libtasn1 \
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls --enable-debug=no \
-		--with-trust-paths=${LOCALBASE}/share/certs/ca-root-nss.crt
-CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
+		--with-trust-paths=${LOCALBASE}/share/certs/ca-root-nss.crt \
+		ac_cv_func_pthread_mutexattr_init=no
 MAKE_ENV=	exampledir=${STAGEDIR}${EXAMPLESDIR}
 
 USES=		gmake libtool:keepla pathfix pkgconfig
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index 10003f37d5f5..3ae49f0e8051 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -23,13 +23,12 @@ USES=		pkgconfig gettext iconv gmake
 USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-
 USE_RC_SUBR=	prelude-manager
-CONFIGURE_ARGS=		--with-html-dir=${PREFIX}/share/doc \
-			--localstatedir=/var
-CONFIGURE_ENV=	LIBS="${LIBS} -L${LOCALBASE}/lib"
 
-CFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
+		--localstatedir=/var
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 USERS?=		prelude
 GROUPS?=	prelude
diff --git a/security/sectok/Makefile b/security/sectok/Makefile
index 2354d3165c77..2d464d19b29e 100644
--- a/security/sectok/Makefile
+++ b/security/sectok/Makefile
@@ -15,17 +15,18 @@ LIB_DEPENDS=	libsectok.so:${PORTSDIR}/security/libsectok
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		'/^INCLUDES=/s|$$| $${CPPFLAGS}| ; \
-		 /^LIBS=/s|$$| $${LDFLAGS}| ; \
-		 s|^CC=|CC?=| ; \
-		 s|^CFLAGS=|CFLAGS?=|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} \
+		-e '/^INCLUDES=/s|$$| ${CPPFLAGS}|' \
+		-e '/^LIBS=/s|=|=${LDFLAGS} |' \
+		-e '/^LIBS=/s|$$| ${LIBS}|' \
+		${WRKSRC}/Makefile
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index 437f4b9d03e5..a04e680e891b 100644
--- a/security/steghide/Makefile
+++ b/security/steghide/Makefile
@@ -20,8 +20,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		gettext perl5 gmake libtool
 USE_AUTOTOOLS=	libtoolize
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl -lmcrypt"
-CPPFLAGS+=	${CFLAGS} -I${LOCALBASE}/include -fpermissive
+CPPFLAGS+=	-I${LOCALBASE}/include -fpermissive
+LIBS+=		-L${LOCALBASE}/lib -lintl -lmcrypt
 
 post-patch:
 	${REINPLACE_CMD} -e 's,SHELL) libtool,SHELL) ${LIBTOOL} --tag=CXX,' \
diff --git a/security/vlog/Makefile b/security/vlog/Makefile
index e71f08508a6c..bc08dd752b15 100644
--- a/security/vlog/Makefile
+++ b/security/vlog/Makefile
@@ -17,15 +17,13 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		perl5
 USE_PERL5=	build
-MAKE_ENV=	LIBS="-lcurses -pthread"
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LIBS="${LDFLAGS} -lcurses -pthread"
 ALL_TARGET=	it
 
 PLIST_FILES=	bin/vlog man/man1/vlog.1.gz
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		'/^CC/s|\([[:space:]]\)=|\1?=| ; \
-		 /strip/s|^|#|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} '/strip/d' ${WRKSRC}/Makefile
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} vlog \
diff --git a/security/xca/Makefile b/security/xca/Makefile
index 035b828cb97c..a960fce800c0 100644
--- a/security/xca/Makefile
+++ b/security/xca/Makefile
@@ -27,8 +27,8 @@ LD_CXX_LIB=	-lc++
 post-patch:
 	@echo "CPPFLAGS=-I. -I.. -I${WRKSRC}/ui -I${QT_INCDIR} -I${QT_INCDIR}/Qt -I${LOCALBASE}/include" > ${WRKSRC}/Local.mak
 	@echo "CFLAGS= ${CFLAGS} -Wall -ggdb" >> ${WRKSRC}/Local.mak
-	@echo "LDFLAGS= ${LDFLAGS} -L${QT_LIBDIR} -L${LOCALBASE}/lib" >> ${WRKSRC}/Local.mak
-	@echo "LIBS=-lQtCore -lQtGui ${PTHREAD_LIBS} -lcrypto -lltdl ${LD_CXX_LIB}" >> ${WRKSRC}/Local.mak
+	@echo "LDFLAGS= ${LDFLAGS}" >> ${WRKSRC}/Local.mak
+	@echo "LIBS= ${LIBS} -L${QT_LIBDIR} -L${LOCALBASE}/lib -lQtCore -lQtGui ${PTHREAD_LIBS} -lcrypto -lltdl ${LD_CXX_LIB}" >> ${WRKSRC}/Local.mak
 	@echo "MOC=${MOC}" >> ${WRKSRC}/Local.mak
 	@echo "UIC=${QT_PREFIX}/bin/uic-qt4" >> ${WRKSRC}/Local.mak
 	@echo "RCC=${LOCALBASE}/bin/rcc"  >> ${WRKSRC}/Local.mak