9 files changed, 23 insertions, 22 deletions

diff --git a/science/cgnslib/Makefile b/science/cgnslib/Makefile
index 1c48532d9853..0d320f2d45ae 100644
--- a/science/cgnslib/Makefile
+++ b/science/cgnslib/Makefile
@@ -18,7 +18,6 @@ LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		cmake
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	HDF5 SZIP TESTS TOOLS
diff --git a/science/cgnslib/files/patch-src_make.defs.in b/science/cgnslib/files/patch-src_make.defs.in
index 692de9bd8f28..727faf7d2989 100644
--- a/science/cgnslib/files/patch-src_make.defs.in
+++ b/science/cgnslib/files/patch-src_make.defs.in
@@ -5,7 +5,7 @@
  CEOUT   = @CEOUT@
  LDFLAGS = @LDFLAGS@
 -CLIBS   = @LIBS@
-+CLIBS   = @LIBS@ $(PTHREAD_LIBS)
++CLIBS   = @LIBS@ -lpthread
  
  #------------------------------------------------------------------------
  # SPACE  - used to force a space in the compiler executable output flag
@@ -14,7 +14,7 @@
  FFLAGS = @FFLAGS@ @SYSFFLAGS@
  FEOUT  = @FEOUT@
 -FLIBS  = @FLIBS@
-+FLIBS  = @FLIBS@ $(PTHREAD_LIBS)
++FLIBS  = @FLIBS@ -lpthread
  
  #------------------------------------------------------------------------
  # strip command for executables - set to true if not used
diff --git a/science/ecs/Makefile b/science/ecs/Makefile
index f52a5131f15d..50729af34563 100644
--- a/science/ecs/Makefile
+++ b/science/ecs/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--with-bft=${LOCALBASE}		\
 		--with-med=${LOCALBASE}		\
 		--with-metis=${LOCALBASE}	\
 		--with-metis-include=${LOCALBASE}/include/metis
-CONFIGURE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ENV=	PTHREAD_LIBS=-lpthread
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index c2811d0978d6..44cbc52251e4 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -34,8 +34,8 @@ CMAKE_ARGS=	-DREADLINEDIR:STRING="/usr"		\
 		-DNCURSESDIR:STRING="/usr"		\
 		-DMPICH:BOOL=NO				\
 		-DMAGICK:BOOL=NO
-CPPFLAGS+=	${CFLAGS} -fno-inline ${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
+CPPFLAGS+=	${CFLAGS} -fno-inline
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 SLAVEDIRS=	science/py-gnudatalanguage
 
diff --git a/science/h5utils/Makefile b/science/h5utils/Makefile
index f78030542326..48fd155afb60 100644
--- a/science/h5utils/Makefile
+++ b/science/h5utils/Makefile
@@ -15,8 +15,7 @@ LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 GNU_CONFIGURE=	YES
-CFLAGS +=	-L${LOCALBASE}/lib -I${LOCALBASE}/include \
-		${PTHREAD_LIBS}
+CFLAGS +=	-L${LOCALBASE}/lib -I${LOCALBASE}/include -lpthread
 
 BUILD_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk
 LIB_DEPENDS+=	libhdf5.so:${PORTSDIR}/science/hdf5 \
diff --git a/science/mpb/Makefile b/science/mpb/Makefile
index 272cc8832c97..67d254677ee5 100644
--- a/science/mpb/Makefile
+++ b/science/mpb/Makefile
@@ -43,7 +43,7 @@ CONFIGURE_ARGS+=	--with-lapack=-llapack
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lhdf5 |-lhdf5 ${PTHREAD_LIBS} |g' \
+	@${REINPLACE_CMD} -e 's|-lhdf5 |-lhdf5 -lpthread |g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} \
 		-e '/INSTALL/s/$$(prefix)/$$(DESTDIR)$$(prefix)/' \
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile
index 3d12dc856d43..c3f30815200d 100644
--- a/science/mpqc/Makefile
+++ b/science/mpqc/Makefile
@@ -75,7 +75,7 @@ CONFIGURE_ARGS+=--with-libs="-lsvml"
 
 .if ${PORT_OPTIONS:MMPICH}
 CONFIGURE_ARGS+=--enable-always-use-mpi
-CONFIGURE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	PTHREAD_LIBS=-lpthread
 .endif
 
 .if ${PORT_OPTIONS:MOPTIFLAGS}
diff --git a/science/ncs/Makefile b/science/ncs/Makefile
index 590b8938c114..6769c6b32254 100644
--- a/science/ncs/Makefile
+++ b/science/ncs/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ENV=	MPI_LIBS="${MPI_LIBS}" \
 		PYEXE="${PYTHON_CMD}"
 CONFIGURE_ARGS=	--with-blas-libs="${BLASLIB} ${LAPACKLIB}"
 MAKE_ENV=	NOM_ARCH=${OPSYS} CS_MPI_PATH=${MPI_HOME}/bin	\
-		PTHREAD_LIBS=${PTHREAD_LIBS} TERM=${TERM}	\
+		PTHREAD_LIBS=-lpthread TERM=${TERM}	\
 		MPI_HOME=${MPI_HOME} MPI_LIBS="${MPI_LIBS}"
 USE_LDCONFIG=	yes
 
@@ -88,7 +88,7 @@ MPI_LIBS=	-lmpi -lorte -lopal
 MPI_HOME=	${LOCALBASE}
 BUILD_DEPENDS+=	${MPI_HOME}/bin/mpicc:${PORTSDIR}/net/mpich2
 RUN_DEPENDS+=	${MPI_HOME}/bin/mpirun:${PORTSDIR}/net/mpich2
-MPI_LIBS=	-lmpich -lmpl ${PTHREAD_LIBS}
+MPI_LIBS=	-lmpich -lmpl -lpthread
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/science/vmd/Makefile b/science/vmd/Makefile
index 102407ccef72..8024bf887c95 100644
--- a/science/vmd/Makefile
+++ b/science/vmd/Makefile
@@ -65,17 +65,20 @@ do-extract:
 	${TAR} -xzf ${DISTDIR}/${STRIDE_DIST} -C ${WRKSRC}/lib/stride
 
 post-patch:
-	${REINPLACE_CMD} "s/-lpthread/${PTHREAD_LIBS}/" ${WRKSRC}/configure
-	${REINPLACE_CMD} "s/-ltk8.5/-ltk85/" ${WRKSRC}/configure
-	${REINPLACE_CMD} "s/-ltcl8.5/-ltcl85/" ${WRKSRC}/configure
-	${REINPLACE_CMD} "s%\$$python_dir/lib_\$$config_arch%${PREFIX}%" ${WRKSRC}/configure
-	${REINPLACE_CMD} "s/python2.5/${PYTHON_VERSION}/" ${WRKSRC}/configure
-	${REINPLACE_CMD} "s/.SILENT:/#.SILENT:/" ${WRKDIR}/plugins/Makefile
+	${REINPLACE_CMD} \
+		-e "s|-ltk8.5|-ltk85|" \
+		-e "s|-ltcl8.5|-ltcl85|" \
+		-e "s%\$$python_dir/lib_\$$config_arch%${PREFIX}%" \
+		-e "s|python2.5|${PYTHON_VERSION}|" \
+		-e "s|%%PREFIX%%|${PREFIX}|g" \
+		-e "s|/usr/local|${LOCALBASE}|g"  \
+		${WRKSRC}/configure
+	${REINPLACE_CMD} "s/\"gcc\"/\"${CC}\"/;s/\"g++\"/\"${CXX}\"/" \
+		${WRKSRC}/configure
+	${REINPLACE_CMD} -e "s/.SILENT:/#.SILENT:/" ${WRKDIR}/plugins/Makefile
 	${REINPLACE_CMD} "s/.SILENT:/#.SILENT:/" ${WRKDIR}/plugins/*/Makefile
-	${REINPLACE_CMD} "s%log2f(\([^ ,]*\))%logf(\1)/(float)M_LN2%g" ${WRKSRC}/src/Orbital.C
-	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
-		-e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure
-	${REINPLACE_CMD} "s/\"gcc\"/\"${CC}\"/;s/\"g++\"/\"${CXX}\"/" ${WRKSRC}/configure
+	${REINPLACE_CMD} "s%log2f(\([^ ,]*\))%logf(\1)/(float)M_LN2%g" \
+		${WRKSRC}/src/Orbital.C
 	${REINPLACE_CMD} -E "s/(SHLD[[:space:]]*=[[:space:]]*)gcc/\1${CC}/" \
 		${WRKDIR}/plugins/Make-arch
 	${REINPLACE_CMD} -E "s/(CC[[:space:]]*=[[:space:]]*)(gcc|cc)/\1${CC}/" \