9 files changed, 19 insertions, 19 deletions

diff --git a/Mk/bsd.cmake.mk b/Mk/bsd.cmake.mk
index 3bfad7cc03bd..eeb895b6e1ec 100644
--- a/Mk/bsd.cmake.mk
+++ b/Mk/bsd.cmake.mk
@@ -60,6 +60,9 @@ CMAKE_ARGS+=	-DCMAKE_C_COMPILER:STRING="${CC}" \
 				-DCMAKE_CXX_FLAGS_RELEASE:STRING="${CXXFLAGS}" \
 				-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \
 				-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \
+				-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
+				-DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}" \
+				-DCMAKE_MODULE_LINKER_FLAGS="${LDFLAGS}" \
 				-DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES
 
 #
@@ -88,10 +91,10 @@ PLIST_SUB+=	CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:L}"
 .if defined(CMAKE_USE_PTHREAD)
 CFLAGS+=		${PTHREAD_CFLAGS}
 CXXFLAGS+=		${PTHREAD_CFLAGS}
+LDFLAGS+=		${PTHREAD_LIBS}
 
 CMAKE_ARGS+=	-DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}" \
-				-DCMAKE_USE_PTHREADS:BOOL=ON \
-				-DCMAKE_EXE_LINKER_FLAGS:STRING="${PTHREAD_LIBS}"
+				-DCMAKE_USE_PTHREADS:BOOL=ON
 .endif
 
 #
diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk
index 0048739b5e35..f68b1aa548a6 100644
--- a/Mk/bsd.database.mk
+++ b/Mk/bsd.database.mk
@@ -225,7 +225,6 @@ IGNORE=		cannot install: unknown PostgreSQL version: ${PGSQL_VER}
 .endif # Check for correct version
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .endif # USE_PGSQL
 
 
diff --git a/Mk/bsd.efl.mk b/Mk/bsd.efl.mk
index 9ecb6cd9425b..140764563a36 100644
--- a/Mk/bsd.efl.mk
+++ b/Mk/bsd.efl.mk
@@ -520,9 +520,9 @@ LIB_DEPENDS+=	${_${LIB}_SLIB}.${_${LIB}_VERSION}:${PORTSDIR}/${_${LIB}_CATEGORY}
 #
 # Initialize configure enviropment
 #
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 
 PLIST_SUB+=	E17_ARCH=freebsd${OSREL}-${ARCH}
 
diff --git a/Mk/bsd.gnustep.mk b/Mk/bsd.gnustep.mk
index 90b16115018e..415bddec7a8e 100644
--- a/Mk/bsd.gnustep.mk
+++ b/Mk/bsd.gnustep.mk
@@ -452,6 +452,7 @@ do-configure:
 	@(cd ${CONFIGURE_WRKSRC}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
 	    if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
 		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
 		INSTALL_DATA="${INSTALL} -c" \
 		INSTALL_PROGRAM="${INSTALL} -c" \
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk
index 44535e213fdc..5eb1cdeb9124 100644
--- a/Mk/bsd.kde.mk
+++ b/Mk/bsd.kde.mk
@@ -92,8 +92,9 @@ QTCPPFLAGS+=		-D_GETOPT_H		# added to work around broken getopt.h #inc
 .if !defined (QT_NONSTANDARD)
 CONFIGURE_ARGS+=--with-extra-libs="${LOCALBASE}/lib" \
 				--with-extra-includes="${LOCALBASE}/include"
-CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
+CONFIGURE_ENV+=	MOC="${MOC}" LIBS="${QTCFGLIBS}" \
 				QTDIR="${QT_CVS_PREFIX}" KDEDIR="${KDE_CVS_PREFIX}"
+CPPFLAGS+=		${QTCPPFLAGS}
 .endif
 
 .elif ${USE_QT_VER} == 3
@@ -123,8 +124,9 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
 				--with-qt-libraries=${QT_PREFIX}/lib \
 				--with-extra-libs=${LOCALBASE}/lib \
 				--with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
+CONFIGURE_ENV+=	MOC="${MOC}" LIBS="${QTCFGLIBS}" \
 				QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
+CPPFLAGS+=		${QTCPPFLAGS}
 .endif # !defined(QT_NONSTANDARD)
 
 .else
diff --git a/Mk/bsd.ncurses.mk b/Mk/bsd.ncurses.mk
index 4e8388193516..8eb30a7d5f2f 100644
--- a/Mk/bsd.ncurses.mk
+++ b/Mk/bsd.ncurses.mk
@@ -91,8 +91,6 @@ NCURSES_LDFLAGS+=	-rpath=${NCURSESRPATH}
 .if defined(LDFLAGS)
 LDFLAGS+=${NCURSES_LDFLAGS}
 .else
-LDFLAGS=${NCURSES_LDFLAGS}
+LDFLAGS+=${NCURSES_LDFLAGS}
 .endif
 
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
-MAKE_ENV+=		LDFLAGS="${LDFLAGS}"
diff --git a/Mk/bsd.openssl.mk b/Mk/bsd.openssl.mk
index 0bc1503a0f95..44123d148b6e 100644
--- a/Mk/bsd.openssl.mk
+++ b/Mk/bsd.openssl.mk
@@ -2,7 +2,7 @@
 # Date created:		31 May 2002
 # Whom:			dinoex
 #
-# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.45 2010-01-12 15:46:24 dinoex Exp $
+# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.openssl.mk,v 1.46 2011-09-23 22:20:46 amdmi3 Exp $
 #
 # Use of 'USE_OPENSSL=yes' includes this Makefile after bsd.ports.pre.mk
 #
@@ -135,14 +135,8 @@ CFLAGS+=		-Wl,-rpath,${OPENSSLRPATH}
 .endif
 OPENSSL_LDFLAGS+=	-rpath=${OPENSSLRPATH}
 
-.if defined(LDFLAGS)
 LDFLAGS+=${OPENSSL_LDFLAGS}
-.else
-LDFLAGS=${OPENSSL_LDFLAGS}
-.endif
 
-CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
-MAKE_ENV+=		LDFLAGS="${LDFLAGS}"
 MAKE_ENV+=		OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \
 			OPENSSLBASE=${OPENSSLBASE} OPENSSLDIR=${OPENSSLDIR}
 
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 435cec57693a..773d1610d148 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -2200,6 +2200,7 @@ MAKE_ENV+=		PREFIX=${PREFIX} \
 			MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" \
 			CC="${CC}" CFLAGS="${CFLAGS}" \
 			CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \
+			LDFLAGS="${LDFLAGS}" \
 			CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
 			MANPREFIX="${MANPREFIX}"
 
@@ -3689,6 +3690,7 @@ do-configure:
 	    ${SET_LATE_CONFIGURE_ARGS} \
 		if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
 	    CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+	    LDFLAGS="${LDFLAGS}" \
 	    INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
 	    INSTALL_DATA="${INSTALL_DATA}" \
 	    INSTALL_LIB="${INSTALL_LIB}" \
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk
index ecb58b5acb89..63711d604a59 100644
--- a/Mk/bsd.qt.mk
+++ b/Mk/bsd.qt.mk
@@ -25,8 +25,9 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
 		--with-qt-libraries=${QT_LIBDIR} \
 		--with-extra-libs=${LOCALBASE}/lib \
 		--with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+=	MOC="${MOC}" UIC="${UIC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
+CONFIGURE_ENV+=	MOC="${MOC}" UIC="${UIC}" LIBS="${QTCFGLIBS}" \
 		QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" QTDIR="${QT_PREFIX}"
+CPPFLAGS+=	${QTCPPFLAGS}
 MAKE_ENV+=	QMAKESPEC="${QMAKESPEC}"
 .endif # !defined(QT_NONSTANDARD)