math category: Remove $PTHREAD_LIBS

Note that math/PDL did not pass stage-QA before, so it was fixed.

approved by:	PTHREAD blanket

22 files changed, 55 insertions, 78 deletions

diff --git a/math/PDL/Makefile b/math/PDL/Makefile
index 914bdba77922..e2a2dd9fbd7a 100644
--- a/math/PDL/Makefile
+++ b/math/PDL/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	PDL
 PORTVERSION=	2.007
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHM
@@ -26,7 +26,7 @@ PORTSCOUT=	limit:^[0-9\.]*$$
 USES=		gmake perl5
 USE_PERL5=	configure
 MAKE_ENV=	PERL5LIB=${WRKSRC}/blib/lib
-PLIST_FILES=	bin/pdl bin/pdldoc bin/perldl bin/pptemplate \
+PLIST_FILES=	bin/pdl bin/pdl2 bin/pdldoc bin/perldl bin/pptemplate \
 		${SITE_ARCH_REL}/Inline/Pdlpp.pm \
 		${SITE_ARCH_REL}/Inline/MakePdlppInstallable.pm
 MAKE_JOBS_UNSAFE=	yes
@@ -71,7 +71,7 @@ SINK_RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm \
 post-patch:
 	@${GREP} -lR '#!/.*bin/perl' ${WRKSRC}/ | ${XARGS} ${SED} -e 's|#!/.*bin/perl|#!${PERL}|' -i ''
 	@${GREP} -lR 'x86_64' ${WRKSRC}/ | ${XARGS} ${SED} -e 's|x86_64|amd64|g' -i ''
-	@${REINPLACE_CMD} -e "/POSIX_THREADS_LIBS/ s|undef|'${PTHREAD_LIBS}'|" \
+	@${REINPLACE_CMD} -e "/POSIX_THREADS_LIBS/ s|undef|'-lpthread'|" \
 		${WRKSRC}/perldl.conf
 
 # autogen plist
@@ -84,7 +84,8 @@ post-install:
 	  ${FIND} *.1 | ${SED} "s,^,man/man1/,;s/1$$/1.gz/" >> ${TMPPLIST})
 	@(${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/PDL* -type f | \
 		${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST} ; \
-	  ${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/PDL -type f | \
-		${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST})
+	  ${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/PDL -type f \
+	  	-name "[A-Z]*" | ${SED} "s,^${STAGEDIR}${PREFIX}/,," \
+	  	>> ${TMPPLIST})
 
 .include <bsd.port.mk>
diff --git a/math/R/Makefile b/math/R/Makefile
index 2e8f369a067a..1b1b93a6212f 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -316,9 +316,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/src/nmath/standalone/Makefile.in \
 		${WRKSRC}/src/unix/Makefile.in
-	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \
-		${WRKSRC}/configure \
-		${WRKSRC}/src/scripts/javareconf.in
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" \
 		${WRKSRC}/configure \
 		${WRKSRC}/src/library/profile/Rprofile.unix \
diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index 75537a89409e..a4dfb0ea4eed 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -86,9 +86,8 @@ PLIST_SUB+=	${opt}="@comment "
 .endfor
 
 EXTRA_FLAGS?=	-Wl,-rpath=${_GCC_RUNTIME}
-SHARED_FLAGS=	${PTHREAD_CFLAGS} ${PICFLAG} -DPIC
+SHARED_FLAGS=	${PICFLAG} -DPIC
 SHARED_LAPACK_WRKSRC=	WRKSRC_SHARED
-STATIC_FLAGS=	${PTHREAD_CFLAGS}
 STATIC_LAPACK_WRKSRC=	WRKSRC
 
 post-patch:
@@ -109,8 +108,7 @@ post-patch:
 	@${REINPLACE_CMD} -e "\|OS=ALL|{N; s|'gcc'|'${CC}'|; \
 		s|'gfortran'|'${FC}'|; s|-mavx|-msse3|;s|'| ${EXTRA_FLAGS}'|4;}" \
 		${WRKSRC}/CONFIG/src/atlcomp.txt
-	@${REINPLACE_CMD} -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|" \
-		-e "s|%%CC%%|${CC}|" \
+	@${REINPLACE_CMD} -e "s|%%CC%%|${CC}|" \
 		${WRKSRC}/CONFIG/src/SpewMakeInc.c
 	@${REINPLACE_CMD} -E -e \
 	"\|(#define ATL_MaxMalloc[[:blank:]]+)([[:digit:]]+)|s||\1${ATLAS_MAXMALLOC}|" \
@@ -188,7 +186,7 @@ do-build:
 
 L1=	${FC} $${F77FLAGS} ${SHARED_FLAGS} ${LDFLAGS} -shared -Wl,-x \
 	-Wl,--whole-archive -Wl,-soname,
-L2=	-Wl,--no-whole-archive -Wl,--as-needed ${PTHREAD_LIBS}
+L2=	-Wl,--no-whole-archive -Wl,--as-needed -lpthread
 
 post-build:
 .for opt in shared static
diff --git a/math/atlas/files/patch-CONFIG+src+SpewMakeInc.c b/math/atlas/files/patch-CONFIG+src+SpewMakeInc.c
index 6f41c19512da..a8cc6e3c0ac9 100644
--- a/math/atlas/files/patch-CONFIG+src+SpewMakeInc.c
+++ b/math/atlas/files/patch-CONFIG+src+SpewMakeInc.c
@@ -1,6 +1,6 @@
---- CONFIG/src/SpewMakeInc.c.orig	2011-05-14 13:33:24.000000000 -0400
-+++ CONFIG/src/SpewMakeInc.c	2011-09-06 06:06:00.000000000 -0400
-@@ -399,7 +399,8 @@
+--- CONFIG/src/SpewMakeInc.c.orig	2011-05-14 17:33:24 UTC
++++ CONFIG/src/SpewMakeInc.c
+@@ -399,7 +399,8 @@ main(int nargs, char **args)
              &mhz, &ptrbits, &ncpu, comps, &gccflags, &outfile, &srcdir,
              &blddir, &USEDEFL1, &USEARCHDEF, &nof77, &f2cdefs, &cdefs, &pmake,
              &flapack, &smaflags, &dmaflags, &f77lib, &l2size, &targ);
@@ -10,7 +10,7 @@
     if (!outfile)
        fpout = stdout;
     else
-@@ -482,7 +483,7 @@
+@@ -482,7 +483,7 @@ main(int nargs, char **args)
     fprintf(fpout, "#  -------------------------------------------------\n");
     fprintf(fpout, "#  Name indicating the platform to configure BLAS to\n");
     fprintf(fpout, "#  -------------------------------------------------\n");
@@ -19,7 +19,7 @@
     fprintf(fpout, "%d", ptrbits);
     if (ISAX)
        fprintf(fpout, "%s", ISAXNAM[ISAX]);
-@@ -649,7 +650,7 @@
+@@ -649,7 +650,7 @@ main(int nargs, char **args)
            comps[i][j-2] == 'c' && comps[i][j-1] == 'c')
           break;
     }
@@ -28,7 +28,7 @@
     fprintf(fpout, "   GOODGCC = %s", goodgcc);
     if (gccflags)
        fprintf(fpout, " %s", gccflags);
-@@ -661,7 +662,7 @@
+@@ -661,7 +662,7 @@ main(int nargs, char **args)
         fprintf(fpout, " %s", sp);
     fprintf(fpout, "\n");
  
@@ -37,7 +37,7 @@
     if (MachIsX86(mach))
     {
        if (ptrbits == 32)
-@@ -679,7 +680,7 @@
+@@ -679,7 +680,7 @@ main(int nargs, char **args)
     fprintf(fpout, "   FCLINKFLAGS = $(FLINKFLAGS)");
     if (strstr(comps[F77_], "ifort") && !OSIsWin(OS))
        fprintf(fpout, " -nofor_main");
@@ -46,7 +46,7 @@
     fprintf(fpout, "   ARFLAGS  = r\n");
  /*
   * JF Mertens says that even x86 OS X still need ranlib for safety
-@@ -702,14 +703,14 @@
+@@ -702,8 +703,8 @@ main(int nargs, char **args)
     fprintf(fpout, "#  ------------------------------------\n");
     fprintf(fpout, "#  Reference and system libraries\n");
     fprintf(fpout, "#  ------------------------------------\n");
@@ -57,10 +57,3 @@
     fprintf(fpout, "   FLAPACKlib = ");
     if (flapack) fprintf(fpout, "%s", flapack);
     fprintf(fpout, "\n");
-    fprintf(fpout, "   SLAPACKlib = \n");
-    if (THREADS)
--      fprintf(fpout, "   LIBS = -lpthread");
-+      fprintf(fpout, "   LIBS = %%PTHREAD_LIBS%%");
-    else
-       fprintf(fpout, "   LIBS =");
-    if (!OSIsWin(OS))
diff --git a/math/fityk/Makefile b/math/fityk/Makefile
index d1c653f4c77d..451b81c605cf 100644
--- a/math/fityk/Makefile
+++ b/math/fityk/Makefile
@@ -37,9 +37,9 @@ PORTDOCS=	*
 
 CFLAGS+=	-D_GNU_SOURCE
 CPPFLAGS+=	-I${WRKDIR}/${XYLIB_DISTNAME} \
-		-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+		-I${LOCALBASE}/include
 LDFLAGS+=	-L${WRKDIR}/${XYLIB_DISTNAME}/xylib/.libs \
-		-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+		-lpthread -L${LOCALBASE}/lib
 
 XYLIB_DISTNAME=	xylib-1.1
 
diff --git a/math/graphthing/Makefile b/math/graphthing/Makefile
index 41e1add1d7b6..f46ae8107b2f 100644
--- a/math/graphthing/Makefile
+++ b/math/graphthing/Makefile
@@ -22,9 +22,7 @@ GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
 
 PLIST_FILES=	bin/graphthing bin/gt
-
-CPPFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/math/lapacke/Makefile b/math/lapacke/Makefile
index 7eed3522f7a8..9a304ca7ed03 100644
--- a/math/lapacke/Makefile
+++ b/math/lapacke/Makefile
@@ -53,14 +53,12 @@ LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas \
 BLAS=		-lblas
 LAPACK=		-llapack
 .elif ${WITH_BLAS} == "gotoblas"
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread
 LIB_DEPENDS+=	libgoto2p.so:${PORTSDIR}/math/gotoblas
 BLAS=		-lgoto2p
 LAPACK=		-lgoto2p
 .elif ${WITH_BLAS} == "atlas"
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread
 LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
 BLAS=		-lptf77blas
 LAPACK=		-lalapack -lptcblas
diff --git a/math/levmar/Makefile b/math/levmar/Makefile
index 9225ba403f87..a62d3c04343a 100644
--- a/math/levmar/Makefile
+++ b/math/levmar/Makefile
@@ -35,14 +35,12 @@ LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas \
 BLAS=		-lblas
 LAPACK=		-llapack
 .elif ${WITH_BLAS} == "gotoblas"
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 LIB_DEPENDS+=	libgoto2p.so:${PORTSDIR}/math/gotoblas
 BLAS=		-lgoto2p
 LAPACK=		-lgoto2p
 .elif ${WITH_BLAS} == "atlas"
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
 BLAS=		-lptf77blas
 LAPACK=		-lalapack -lptcblas
diff --git a/math/libflame/Makefile b/math/libflame/Makefile
index 0e8393056d9c..89aab0e8ffe3 100644
--- a/math/libflame/Makefile
+++ b/math/libflame/Makefile
@@ -174,8 +174,6 @@ CFLAGS+=		${OPENMP_CFLAGS}
 LDFLAGS+=		${OPENMP_CFLAGS}
 CONFIGURE_ARGS+=	--enable-multithreading=openmp
 .elif ${PORT_OPTIONS:MTHREADS}
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		${PTHREAD_CFLAGS}
 CONFIGURE_ARGS+=	--enable-multithreading=pthreads
 .else
 CONFIGURE_ARGS+=	--enable-multithreading=no
@@ -243,7 +241,6 @@ post-patch:
 	-e 's@(#!)(/bin/bash)@\1${LOCALBASE}\2@'
 	@${FIND} ${WRKSRC} -type f \( -name 'makefile' -o -name 'config.mk.in' \) | \
 	${XARGS} ${REINPLACE_CMD} \
-	-e 's@-lpthread@${PTHREAD_LIBS}@g' \
 	-e 's@-fPIC@${PICFLAG}@g'
 	@${REINPLACE_CMD} \
 	-e '\@MK_INCL_DIR_INST_W_ARCH_VERS[[:blank:]]*:=@ \
diff --git a/math/libocas/Makefile b/math/libocas/Makefile
index 34c7370a33f6..0ef4038d2a0e 100644
--- a/math/libocas/Makefile
+++ b/math/libocas/Makefile
@@ -16,7 +16,7 @@ USES=		gmake zip
 USE_LDCONFIG=	yes
 
 ALL_TARGET=	clean libocas.so.1 svmocas msvmocas linclassif
-CLIBS=		-lm ${PTHREAD_LIBS}
+CLIBS=		-lm -lpthread
 MAKE_ENV=	CLIBS="${CLIBS}" MEXDETECTED=no
 
 PLIST_FILES=	bin/linclassif bin/msvmocas bin/svmocas lib/libocas.so \
@@ -30,7 +30,7 @@ PICFLAG=	-fPIC
 PICFLAG=	-fpic
 .endif
 
-CFLAGS+=	${PICFLAG} ${PTHREAD_CFLAGS}
+CFLAGS+=	${PICFLAG}
 
 post-patch:
 	@${REINPLACE_CMD} \
diff --git a/math/libproj4/Makefile b/math/libproj4/Makefile
index c6f8280b2032..0a916b4b9935 100644
--- a/math/libproj4/Makefile
+++ b/math/libproj4/Makefile
@@ -34,9 +34,6 @@ LIB_DEPENDS+=	libmissing.so:${PORTSDIR}/math/libmissing
 LDFLAGS+=	-lmissing
 .endif
 
-pre-configure:
-	${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/${MAKEFILE}
-
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/math/mumps/Makefile b/math/mumps/Makefile
index b61e523ca2a3..c0aebf377785 100644
--- a/math/mumps/Makefile
+++ b/math/mumps/Makefile
@@ -106,7 +106,6 @@ pre-build:
 	s+@FCFLAGS@+${FCFLAGS}+g; \
 	s+@GCCLIBDIR@+${GCCLIBDIR}+g; \
 	s+@FORTRANLIBS@+${FORTRANLIBS}+g; \
-	s+@PTHREAD_LIBS@+${PTHREAD_LIBS}+g; \
 	s+@BLAS_LIBS@+${BLAS_LIBS}+ ; \
 	s+@LOCALBASE@+${LOCALBASE}+g;' \
 		${WRKSRC}/Makefile.inc
diff --git a/math/mumps/files/patch-Make.inc+Makefile.inc.generic b/math/mumps/files/patch-Make.inc+Makefile.inc.generic
index 60a3228312b2..c46cc3a1b0a7 100644
--- a/math/mumps/files/patch-Make.inc+Makefile.inc.generic
+++ b/math/mumps/files/patch-Make.inc+Makefile.inc.generic
@@ -68,7 +68,7 @@
  
  # DEFINE YOUR PTHREAD LIBRARY
 -LIBOTHERS = -lpthread
-+LIBOTHERS = @PTHREAD_LIBS@ @GCCLIBDIR@ @FORTRANLIBS@
++LIBOTHERS = -lpthread @GCCLIBDIR@ @FORTRANLIBS@
  
  # FORTRAN/C COMPATIBILITY:
  #  Use:
diff --git a/math/mumps/files/patch-Make.inc+Makefile.inc.generic.SEQ b/math/mumps/files/patch-Make.inc+Makefile.inc.generic.SEQ
index af2c7f83e878..0d2b5c84ff0c 100644
--- a/math/mumps/files/patch-Make.inc+Makefile.inc.generic.SEQ
+++ b/math/mumps/files/patch-Make.inc+Makefile.inc.generic.SEQ
@@ -56,7 +56,7 @@
  
  # DEFINE HERE YOUR PTHREAD LIBRARY
 -LIBOTHERS = -lpthread
-+LIBOTHERS = @PTHREAD_LIBS@ @GCCLIBDIR@  @FORTRANLIBS@
++LIBOTHERS = -lpthread @GCCLIBDIR@  @FORTRANLIBS@
  
  # FORTRAN/C COMPATIBILITY:
  #  Use:
diff --git a/math/sage/Makefile b/math/sage/Makefile
index 36d0e9b0f431..91f1b3e5dba4 100644
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@@ -54,7 +54,7 @@ LATEST_LINK=	sage-math	# Conflicts with graphics/sage.
 MAKE_ARGS+=	ARCH="${AR}"
 
 post-patch:
-	${REINPLACE_CMD} 's/$$MAKE $$gettext/$$MAKE PTHREAD_LIBS=${PTHREAD_LIBS} $$gettext/' ${WRKSRC}/build/pkgs/git/spkg-install
+	${REINPLACE_CMD} 's/$$MAKE $$gettext/$$MAKE PTHREAD_LIBS=-lpthread $$gettext/' ${WRKSRC}/build/pkgs/git/spkg-install
 
 # Create wrapper for invocation of make.
 	@${MKDIR} ${WRKSRC}/local/bin
diff --git a/math/sdpara/Makefile b/math/sdpara/Makefile
index c09bfd9643f6..f24f195f8a01 100644
--- a/math/sdpara/Makefile
+++ b/math/sdpara/Makefile
@@ -64,7 +64,6 @@ post-patch:
 				s|%%BLAS%%|${BLAS}|g ; \
 				s|%%LAPACK%%|${LAPACK}|g ; \
 				s|%%SCALAPACK%%|${SCALAPACK}|g ; \
-				s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g ; \
 				s|%%FORTRAN_LIBS%%|${GCCLIBDIR} ${FORTRAN_LIBS}|g '  ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|%%MPICC%%|${LOCALBASE}/bin/mpicc|g ; \
 				s|%%MPICXX%%|${LOCALBASE}/bin/mpicxx|g ; \
diff --git a/math/sdpara/files/patch-Makefile b/math/sdpara/files/patch-Makefile
index 36bfe61ec64f..4b96fe097d7f 100644
--- a/math/sdpara/files/patch-Makefile
+++ b/math/sdpara/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2009-01-09 02:26:29.000000000 +0000
+--- Makefile.orig	2009-01-09 02:26:29 UTC
 +++ Makefile
-@@ -4,20 +4,20 @@
+@@ -4,19 +4,19 @@
  # you edit here along your environment
  ############################################################
  
@@ -17,7 +17,6 @@
 -SCALAPACK_LIBS  = /usr/local/scalapack/lib/libscalapack.a /usr/local/BLACS/LIB/blacs_MPI-LINUX-0.a /usr/local/BLACS/LIB/blacsCinit_MPI-LINUX-0.a /usr/local/BLACS/LIB/blacs_MPI-LINUX-0.a
 -
 -FORTRAN_LIBS = -lgfortran
--PTHERAD_LIBS = -lpthread
 +CC       = %%MPICC%%
 +CXX      = %%MPICXX%%
 +F77      = %%MPIF77%%
@@ -31,11 +30,10 @@
 +SCALAPACK_LIBS  = %%SCALAPACK%%
 +  
 +FORTRAN_LIBS = %%FORTRAN_LIBS%%
-+PTHERAD_LIBS = %%PTHREAD_LIBS%%
+ PTHERAD_LIBS = -lpthread
  
  # F77_FUNC 
- DEF_F77_FUNC = -DF77_FUNC\(name,NAME\)=name\ \#\#\ _ 
-@@ -82,10 +82,10 @@ cleanall: clean mumps-clean
+@@ -82,10 +82,10 @@ cleanall: clean mumps-clean 
  force: cleanall all
  
  mumps:
diff --git a/math/spooles/Makefile b/math/spooles/Makefile
index d82c502705e7..95f628a6b49b 100644
--- a/math/spooles/Makefile
+++ b/math/spooles/Makefile
@@ -60,8 +60,12 @@ do-extract:
 
 post-patch:
 	${MKDIR} ${WRKSRC}_SHARED ; ${CP} -r ${WRKSRC}/* ${WRKSRC}_SHARED
-	@${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+g;' -e 's+%%CFLAGS%%+${PTHREAD_CFLAGS} ${CFLAGS}+g;' -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' -e 's+%%CC%%+${CC}+g;' ${WRKSRC}/Make.inc
-	@${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+g;' -e 's+%%CFLAGS%%+${CFLAGS} ${PTHREAD_CFLAGS} ${PICFLAG}+g;' -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' -e 's+%%CC%%+${CC}+g;' ${WRKSRC}_SHARED/Make.inc
+	@${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+g;' \
+		-e 's+%%CFLAGS%%+${CFLAGS}+g;' \
+		-e 's+%%CC%%+${CC}+g;' ${WRKSRC}/Make.inc
+	@${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+g;' \
+		-e 's+%%CFLAGS%%+${CFLAGS} ${PICFLAG}+g;' \
+		-e 's+%%CC%%+${CC}+g;' ${WRKSRC}_SHARED/Make.inc
 
 do-build:
 .if defined(WITH_MPI)
diff --git a/math/spooles/files/patch-Make.inc b/math/spooles/files/patch-Make.inc
index 142e44598f05..8bece8f33248 100644
--- a/math/spooles/files/patch-Make.inc
+++ b/math/spooles/files/patch-Make.inc
@@ -42,7 +42,7 @@
  # THREAD_LIBS =
 -# THREAD_LIBS = -D_REENTRANT=199506L -lpthread
 -  THREAD_LIBS = -D_POSIX_C_SOURCE=199506L -lpthread
-+THREAD_LIBS = -D_REENTRANT=199506L %%PTHREAD_LIBS%%
++THREAD_LIBS = -D_REENTRANT=199506L -lpthread
 +# THREAD_LIBS = -D_POSIX_C_SOURCE=199506L -lpthread
  # THREAD_LIBS = -lpthread
  #
diff --git a/math/suitesparse/Makefile b/math/suitesparse/Makefile
index 052fe0e9fdd9..95ceaa05cf1f 100644
--- a/math/suitesparse/Makefile
+++ b/math/suitesparse/Makefile
@@ -40,7 +40,6 @@ RESTRICTED=	GPL and METIS licenses are contradictory
 
 CONFLICTS=	umfpack-*
 
-CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
diff --git a/math/superlu_mt/Makefile b/math/superlu_mt/Makefile
index e08fb6f6b295..6c7fb4419749 100644
--- a/math/superlu_mt/Makefile
+++ b/math/superlu_mt/Makefile
@@ -73,9 +73,7 @@ post-patch:
 			s+%%CFLAGS%%+${CFLAGS}+; \
 			s+%%FFLAGS%%+${FFLAGS}+; \
 			s+%%LDFLAGS%%+${LDFLAGS}+; \
-			s+%%FPIC%%++; \
-	  s+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+ ; \
-	  s+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+ ' \
+			s+%%FPIC%%++ ' \
 		${WRKSRC}/make.inc
 
 	@${REINPLACE_CMD} -e 's+%%BLAS%%+-L${LOCALBASE}/lib ${BLAS}+ ; \
@@ -84,9 +82,7 @@ post-patch:
 			s+%%CFLAGS%%+${CFLAGS} ${FPIC}+; \
 			s+%%FFLAGS%%+${FFLAGS} ${FPIC}+; \
 			s+%%LDFLAGS%%+${LDFLAGS}+; \
-			s+%%FPIC%%+${FPIC}+; \
-	  s+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+ ; \
-	  s+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+ ' \
+			s+%%FPIC%%+${FPIC}+ ' \
 		${WRKSRC_SHARED}/make.inc
 
 do-build:
diff --git a/math/superlu_mt/files/patch-make.inc b/math/superlu_mt/files/patch-make.inc
index 1c57231ce747..23c7237fc353 100644
--- a/math/superlu_mt/files/patch-make.inc
+++ b/math/superlu_mt/files/patch-make.inc
@@ -1,5 +1,5 @@
---- make.inc	Fri Jan 18 05:53:51 2008
-+++ make.inc	Thu Jul  3 12:47:55 2008
+--- make.inc.orig	2008-02-22 22:45:36 UTC
++++ make.inc
 @@ -16,13 +16,13 @@
  #
  #  The machine (platform) identifier to append to the library names
@@ -17,7 +17,7 @@
  
  # 
  # If you don't have ESSL, you can use the following blaslib instead:
-@@ -30,10 +30,10 @@
+@@ -30,7 +30,7 @@ SUPERLULIB   = libsuperlu_mt$(PLAT).a
  # which may be slower than ESSL
  #
  BLASDEF	  = -DUSE_VENDOR_BLAS
@@ -25,12 +25,17 @@
 +BLASLIB   = %%BLAS%%
  #BLASLIB   = ../lib/libblas$(PLAT).a
  MATHLIB	  = -lm 
--MPLIB	  = -lpthread
-+MPLIB	  = %%PTHREAD_LIBS%%
- 
+ MPLIB	  = -lpthread
+@@ -38,7 +38,7 @@ MPLIB	  = -lpthread
  #  The archiver and the flag(s) to use when building archive (library)
  #  If your system has no ranlib, set RANLIB = echo.
-@@ -46,16 +46,17 @@
+ #
+-ARCH         = ar
++ARCMD        = ar
+ ARCHFLAGS    = cr
+ RANLIB       = ranlib
+ 
+@@ -46,16 +46,17 @@ RANLIB       = ranlib
  PREDEFS      	= -D_PTHREAD
  #
  
@@ -41,7 +46,7 @@
 -LOADER       = xlc_r
 -LOADOPTS     = -bmaxdata:0x80000000
 +CC           = %%CC%%
-+CFLAGS       = $(PREDEFS) %%CPPFLAGS%% %%CFLAGS%% %%PTHREAD_CFLAGS%%
++CFLAGS       = $(PREDEFS) %%CPPFLAGS%% %%CFLAGS%%
 +FORTRAN      = %%FC%%
 +FFLAGS       = %%FFLAGS%%
 +LOADER       = %%CC%%