Index: head/math/PDL/Makefile
===================================================================
--- head/math/PDL/Makefile	(revision 382198)
+++ head/math/PDL/Makefile	(revision 382199)
@@ -1,90 +1,91 @@
 # Created by: Anton Berezin <tobez@plab.ku.dk>
 # $FreeBSD$
 
 PORTNAME=	PDL
 PORTVERSION=	2.007
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHM
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl Data Language
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	p5-Astro-FITS-Header>=0:${PORTSDIR}/astro/p5-Astro-FITS-Header \
 		p5-Convert-UU>=0:${PORTSDIR}/converters/p5-Convert-UU \
 		p5-File-Map>=0.47:${PORTSDIR}/devel/p5-File-Map \
 		p5-Inline>=0.43:${PORTSDIR}/devel/p5-Inline \
 		p5-Module-Compile>=0.23:${PORTSDIR}/devel/p5-Module-Compile
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 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
 
 OPTIONS_DEFINE=	PGPLOT PLPLOT OPENGL GD FFTW GSL HDF PROJ F77 READLINE SINK
 OPTIONS_DEFAULT=PGPLOT FFTW F77
 
 # graphics/p5-OpenGL require manual building
 .if empty(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	OPENGL
 .endif
 
 PGPLOT_DESC=	Enable PDL::Graphics::PGPLOT
 PLPLOT_DESC=	Enable PDL::Graphics::PLplot
 OPENGL_DESC=	Enable PDL::Graphics::TriD and OpenGL
 GD_DESC=	Enable PDL::IO::GD
 FFTW_DESC=	Enable PDL::FFTW
 GSL_DESC=	Enable PDL::GSL interface
 HDF_DESC=	Enable PDL::IO::HDF interface
 PROJ_DESC=	Enable PDL::GIS::Proj interface
 F77_DESC=	Enable PDL::Minuit and PDL::Slatec
 READLINE_DESC=	Use GNU readline
 SINK_DESC=	Include PDL kitchen sink
 
 PGPLOT_BUILD_DEPENDS=	p5-PGPLOT>=0:${PORTSDIR}/graphics/p5-PGPLOT
 PLPLOT_LIB_DEPENDS=	libplplotd.so:${PORTSDIR}/math/plplot
 OPENGL_BUILD_DEPENDS=	p5-OpenGL>=0.65:${PORTSDIR}/graphics/p5-OpenGL
 OPENGL_RUN_DEPENDS:=	${OPENGL_BUILD_DEPENDS}
 OPENGL_USE=		gl=yes
 GD_LIB_DEPENDS=		libgd.so:${PORTSDIR}/graphics/gd
 F77_BUILD_DEPENDS=	p5-ExtUtils-F77>=0:${PORTSDIR}/lang/p5-ExtUtils-F77
 FFTW_LIB_DEPENDS=	libfftw.so:${PORTSDIR}/math/fftw
 GSL_LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
 HDF_LIB_DEPENDS=	libdf.so:${PORTSDIR}/science/hdf
 PROJ_LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj
 READLINE_RUN_DEPENDS=	p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu
 READLINE_RUN_DEPENDS_OFF=	p5-ReadLine-Perl>=0:${PORTSDIR}/devel/p5-ReadLine-Perl
 SINK_RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm \
 			mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode \
 			saoimage:${PORTSDIR}/astro/saoimage
 
 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
 post-install:
 	@(cd ${WRKSRC}; ${PERL} -Iblib/lib -Iblib/arch Doc/scantree.pl)
 	@(cd ${WRKSRC}/blib/man3 ; \
 	  ${FIND} *.3 | ${SED} "s,^,${MAN3PREFIX:S,^${PREFIX}/,,}/man/man3/,;s/3$$/3.gz/" \
 		>> ${TMPPLIST} ; \
 	  cd ${WRKSRC}/blib/man1 ; \
 	  ${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>
Index: head/math/R/Makefile
===================================================================
--- head/math/R/Makefile	(revision 382198)
+++ head/math/R/Makefile	(revision 382199)
@@ -1,401 +1,398 @@
 # Created by: Maurice Castro <maurice@serc.rmit.edu.au>
 # $FreeBSD$
 
 PORTNAME?=	R
 PORTVERSION=	3.0.2
 PORTREVISION=	3
 CATEGORIES=	math lang
 MASTER_SITES=	http://cran.r-project.org/%SUBDIR%/ \
 		ftp://cran.r-project.org/pub/R/%SUBDIR%/ \
 		http://cran.at.r-project.org/%SUBDIR%/ \
 		http://cran.au.r-project.org/%SUBDIR%/ \
 		http://cran.br.r-project.org/%SUBDIR%/ \
 		http://cran.ch.r-project.org/%SUBDIR%/ \
 		http://cran.es.r-project.org/%SUBDIR%/ \
 		http://cran.dk.r-project.org/%SUBDIR%/ \
 		http://cran.uk.r-project.org/%SUBDIR%/ \
 		http://cran.us.r-project.org/%SUBDIR%/ \
 		ftp://ftp.u-aizu.ac.jp/pub/lang/R/CRAN/%SUBDIR%/ \
 		http://lib.stat.cmu.edu/R/CRAN/%SUBDIR%/ \
 		http://cran.stat.ucla.edu/%SUBDIR%/ \
 		http://probability.ca/cran/%SUBDIR%/
 MASTER_SITE_SUBDIR=	src/base/R-${PORTVERSION:C|\..*||}
 DISTNAME=	R-${PORTVERSION}
 
 PATCH_SITES=		${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	bf
 PATCHFILES=		R-patched-20131112-r64207.diff.bz2
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT?=	A language for statistical computing and graphics
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=		${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
 
 CONFIGURE_ENV=		LIBR_LDFLAGS="${LDFLAGS}" OBJC="${CC}" \
 			SED="${LOCALBASE}/bin/gsed" \
 			ac_cv_have_decl_powl=yes ac_cv_have_decl_log1pl=yes
 
 OPTIONS_DEFINE=		MISSING DOCS
 
 MISSING_DESC=		use libmissing rather than libquadmath
 
 .if defined(LIBRMATH_SLAVEPORT)
 BUILD_WRKSRC=		${WRKSRC}/src/nmath/standalone
 CONFIGURE_ARGS=		--disable-nls --with-ICU=no --with-cairo=no \
 			--with-jpeglib=no --with-libpng=no --with-libtiff=no \
 			--with-readline=no --with-tcltk=no --with-x=no \
 			--without-libintl-prefix
 CONFIGURE_ENV+=		ac_cv_header_iconv_h=no
 PLIST_SUB=		RMATH_SOVERSION="${RMATH_SOVERSION}"
 USE_LDCONFIG=		yes
 .else # LIBRMATH_SLAVEPORT
 ALL_TARGET=		all
 INSTALL_TARGET=		install
 CONFIGURE_ARGS=		--enable-memory-profiling rdocdir=${DOCSDIR} \
 			--with-system-bzlib --with-system-zlib
 CONFIGURE_ENV+=		FCFLAGS="${FFLAGS}" \
 			R_LD_LIBRARY_PATH="${R_LD_LIBRARY_PATH}" TAR="${TAR}"
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE+=	ATLAS ICU PCRE_PORT THREADS
 
 ATLAS_DESC=		Use ATLAS instead of BLAS/LAPACK
 ICU_DESC=		Use ICU for collation in multibyte locales
 PCRE_PORT_DESC=		Use devel/pcre instead of the bundled PCRE
 
 OPTIONS_DEFAULT+=	ICU PCRE_PORT THREADS
 .if !defined(LIBR_SLAVEPORT)
 RUN_DEPENDS+=		${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
 USE_LDCONFIG=		${PREFIX}/lib/R/lib
 #now only used to build the R.1 manpage:
 USES+=			makeinfo perl5
 USE_PERL5=		build
 
 OPTIONS_DEFINE+=	GHOSTSCRIPT INFO_MANUALS JPEG LETTER_PAPER LIBR \
 			PANGOCAIRO PDF_MANUALS PNG TCLTK TIFF X11
 
 GHOSTSCRIPT_DESC=	[dev2]bitmap() graphics devices
 INFO_MANUALS_DESC=	GNU info manuals
 JPEG_DESC=		jpeg() graphics device
 LETTER_PAPER_DESC=	US Letter paper
 LIBR_DESC=		R shared library and a dynamically-linked R
 PANGOCAIRO_DESC=	cairo and pango graphics support
 PDF_MANUALS_DESC=	PDF manuals (requires TeX)
 PNG_DESC=		png() graphics device
 TCLTK_DESC=		tcltk package
 X11_DESC=		X11() graphics device
 
 OPTIONS_DEFAULT+=	GHOSTSCRIPT INFO_MANUALS JPEG LIBR PANGOCAIRO PNG \
 			TCLTK TIFF X11
 
 OPTIONS_DEFAULT_armv6+=		MISSING
 OPTIONS_DEFAULT_powerpc+=	MISSING
 OPTIONS_DEFAULT_powerpc64+=	MISSING
 
 .endif # !LIBR_SLAVEPORT
 PLIST_SUB=		R_SOVERSION="${R_SOVERSION}" \
 			RBLAS_SOVERSION="${RBLAS_SOVERSION}" \
 			RLAPACK_SOVERSION="${RLAPACK_SOVERSION}"
 R_LD_LIBRARY_PATH=	${_GCC_RUNTIME}:${LOCALBASE}/lib
 USES+=			iconv
 .endif # LIBRMATH_SLAVEPORT
 GNU_CONFIGURE=		yes
 MAKE_JOBS_UNSAFE=	yes
 R_SOVERSION=		1
 RBLAS_SOVERSION=	2
 RLAPACK_SOVERSION=	4
 RMATH_SOVERSION=	0
 USES+=			fortran
 USE_GCC=		yes
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "sparc64" || ${ARCH} == "powerpc64"
 PICFLAG?=		-fPIC
 .else
 PICFLAG?=		-fpic
 .endif
 .for flag in LD CXXLD
 CONFIGURE_ENV +=	SHLIB_${flag}FLAGS="${PICFLAG}"
 .endfor
 
 .if ${OSVERSION} > 1000052 && \
 (${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64 || ${ARCH} == pc98 || ${ARCH} == sparc64)
 .for _f in coshl erfcl erfl lgammal powl sinhl tanhl tgammal
 CFLAGS+=	-fno-builtin-${_f}
 LDFLAGS+=	-fno-builtin-${_f}
 .endfor
 .endif
 
 .if ${PORT_OPTIONS:MMISSING}
 .for _f in acos asin atan cos cosh exp log pow sin sinh tan tanh
 CONFIGURE_ENV+=		ac_cv_have_decl_c${_f}=yes
 .endfor
 LIB_DEPENDS+=		libmissing.so:${PORTSDIR}/math/libmissing
 LIBM=			-L${LOCALBASE}/lib -lmissing -lm
 LIBMH=			"missing_math.h"
 .if defined(LIBRMATH_SLAVEPORT)
 CPPFLAGS+=		-I${LOCALBASE}/include
 .endif
 .else
 LIBM=			-lquadmath -lm
 LIBMH=			<quadmath.h>
 .endif
 
 .if !defined(LIBRMATH_SLAVEPORT)
 .if ${PORT_OPTIONS:MATLAS}
 LIB_DEPENDS+=		libatlas.so:${PORTSDIR}/math/atlas
 BLAS?=			${LIBM} -lf77blas
 LAPACK?=		${LIBM} -lalapack -lcblas
 .else
 BLAS?=			no
 LAPACK?=		no
 .endif
 CONFIGURE_ARGS+=	--with-blas="${BLAS}" --with-lapack="${LAPACK}"
 .if ${BLAS} == "no" || ${LAPACK} == "no"
 PLIST_SUB+=		LAPACK=""
 .else
 PLIST_SUB+=		LAPACK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MICU}
 LIB_DEPENDS+=		libicui18n.so:${PORTSDIR}/devel/icu
 CONFIGURE_ARGS+=	--with-ICU
 .else
 CONFIGURE_ARGS+=	--without-ICU
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=			gettext
 PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPCRE_PORT}
 LIB_DEPENDS+=		libpcre.so:${PORTSDIR}/devel/pcre
 CONFIGURE_ARGS+=	--with-system-pcre
 .else
 CONFIGURE_ARGS+=	--without-system-pcre
 .endif
 
 .if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=	--enable-threads=posix
 .else
 CONFIGURE_ARGS+=	--disable-threads
 .endif
 
 .if defined(LIBR_SLAVEPORT)
 
 CONFIGURE_ARGS+=	--disable-BLAS-shlib --without-pic --without-x
 USES+=			readline
 
 .else # LIBR_SLAVEPORT
 
 .if ${PORT_OPTIONS:MGHOSTSCRIPT}
 USE_GHOSTSCRIPT_RUN=	yes
 .endif
 
 .if ${PORT_OPTIONS:MJPEG}
 LIB_DEPENDS+=		libjpeg.so:${PORTSDIR}/graphics/jpeg
 CONFIGURE_ARGS+=	--with-jpeglib
 .else
 CONFIGURE_ARGS+=	--without-jpeglib
 .endif
 
 .if ${PORT_OPTIONS:MLETTER_PAPER}
 CONFIGURE_ENV +=	R_PAPERSIZE=letter
 .endif
 
 .if ${PORT_OPTIONS:MLIBR}
 CONFIGURE_ARGS+=	--enable-R-shlib
 PLIST_SUB+=		LIBR=""
 .else
 PLIST_SUB+=		LIBR="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPANGOCAIRO}
 USES+=			pkgconfig
 USE_GNOME+=		pango
 PLIST_SUB+=		PANGOCAIRO=""
 .else
 CONFIGURE_ARGS+=	--without-cairo
 PLIST_SUB+=		PANGOCAIRO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
 LIB_DEPENDS+=		libpng.so:${PORTSDIR}/graphics/png
 CONFIGURE_ARGS+=	--with-libpng
 .else
 CONFIGURE_ARGS+=	--without-libpng
 .endif
 
 .if ${PORT_OPTIONS:MTCLTK}
 USES+=			tk:84+
 CONFIGURE_ARGS+=	--with-tcltk \
 			--with-tcl-config=${TCL_LIBDIR}/tclConfig.sh \
 			--with-tk-config=${TK_LIBDIR}/tkConfig.sh
 PLIST_SUB+=		TCLTK=""
 .else
 CONFIGURE_ARGS+=	--without-tcltk
 PLIST_SUB+=		TCLTK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTIFF}
 LIB_DEPENDS+=		libtiff.so:${PORTSDIR}/graphics/tiff
 CONFIGURE_ARGS+=	--with-libtiff
 .else
 CONFIGURE_ARGS+=	--without-libtiff
 .endif
 
 .if ${PORT_OPTIONS:MX11}
 CONFIGURE_ARGS+=	--with-x
 USE_XORG=		x11 xmu xt
 PLIST_SUB+=		X11=""
 .else
 CONFIGURE_ARGS+=	--without-x
 PLIST_SUB+=		X11="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MINFO_MANUALS} && ${PORT_OPTIONS:MDOCS}
 ALL_TARGET+=	info
 INFO=		R-FAQ R-admin R-data R-exts R-intro R-lang
 .endif
 
 .if ${PORT_OPTIONS:MPDF_MANUALS} && ${PORT_OPTIONS:MDOCS}
 USE_TEX=		texlive dvipsk kpathsea pdftex
 BUILD_DEPENDS +=	texi2dvi:${PORTSDIR}/print/texinfo
 ALL_TARGET+=		pdf
 CONFIGURE_ENV +=	INSTALL_INFO="${LOCALBASE}/bin/install-info" \
 			MAKEINFO="${LOCALBASE}/bin/makeinfo"
 INSTALL_TARGET+=	install-pdf
 PLIST_SUB+=		PDF_MANUAL=""
 .else
 .for _b in KPSEWHICH MAKEINDEX PDFLATEX PDFTEX TEX TEXI2DVI
 CONFIGURE_ENV+=		ac_cv_path_${_b}=""
 .endfor
 PLIST_SUB+=		PDF_MANUAL="@comment "
 .endif
 .endif # LIBR_SLAVEPORT
 .endif # !LIBRMATH_SLAVEPORT
 
 post-patch:
 	@${REINPLACE_CMD} -e '\|LIBS=|s|-lrt ||' \
 		-e '\|-lm[". ]|s|-lm|${LIBM}|' \
 		${WRKSRC}/configure
 .if !${PORT_OPTIONS:MMISSING}
 .if ${OSVERSION} < 1000016
 	@${REINPLACE_CMD} -e 's/# define EXP expl/# define EXP(x) (long double)expq((__float128)(x))/' \
 		${WRKSRC}/src/nmath/pnchisq.c
 .endif
 .if ${OSVERSION} < 1000034
 	@${REINPLACE_CMD} -Ee 's/(log)(1p)?l\(/(long double)\1\2q((__float128)/' \
 		${WRKSRC}/src/nmath/dnbeta.c \
 		${WRKSRC}/src/nmath/pnbeta.c
 .endif
 	@${REINPLACE_CMD} -Ee 's/powl\((.*)(long double)/(long double)powq((__float128)\1__float128/' \
 		${WRKSRC}/src/main/format.c
 .else
 .if ${OSVERSION} > 1000052 && \
 (${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64 || ${ARCH} == pc98 || ${ARCH} == sparc64)
 	@${REINPLACE_CMD} -e '\|^FLIBS="$$ac_cv_f77_libs"|s|"|&${LIBM} |' \
 		${WRKSRC}/configure
 .endif
 	@${REINPLACE_CMD} -e \
 	'\|#[[:blank:]]*include[[:blank:]]*<complex.h>|{x;s|^.*$$|#include "missing_complex.h"|;H;x;}' \
 		${WRKSRC}/src/main/complex.c
 .endif
 	@${REINPLACE_CMD} -e \
 	'\|#[[:blank:]]*include[[:blank:]]*<math.h>|{x;s|^.*$$|#include ${LIBMH}|;H;x;}' \
 		${WRKSRC}/src/nmath/nmath.h \
 		${WRKSRC}/src/include/Rmath.h0.in
 	@${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 \
 		${WRKSRC}/src/scripts/javareconf.in
 .if !defined(LIBRMATH_SLAVEPORT)
 .if !${PORT_OPTIONS:MNLS}
 	@(cd ${WRKSRC}/src/library/Recommended; \
 	for tarfile in *.tgz *.tar.gz ; do \
 	${TAR} -czf temptgz --exclude='*/po/*' @$$tarfile ; \
 	${MV} temptgz $$tarfile ; \
 	done)
 	@${REINPLACE_CMD} -e '/ls -d $$(srcdir)\/inst/d' \
 		${WRKSRC}/src/library/translations/Makefile.in
 .endif
 
 .if !${PORT_OPTIONS:MMISSING}
 pre-configure:
 	@if [ ! -f ${_GCC_RUNTIME}/libquadmath.a ] ; then \
 	${PRINTF} "\n\n\n%s\n\n\n" "libquadmath is not available for your\
 	compiler and architecture: please enable the MISSING option." ; \
 	exit 1 ; fi
 .endif
 
 .if defined(LIBR_SLAVEPORT)
 do-build:
 .for d in include extra
 	@(cd ${WRKSRC}/src/${d}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
 	${MAKE_ARGS} R)
 .endfor
 	@(cd ${WRKSRC}/src/main; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
 	${MAKE_ARGS} Makefile Makedeps libR.a)
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/R/lib
 	@${INSTALL_LIB} ${WRKSRC}/src/main/libR.a ${STAGEDIR}${PREFIX}/lib/R/lib
 
 .else # LIBR_SLAVEPORT
 
 pre-configure-script:
 	@${FIND} ${WRKSRC} \( -name '*.orig' -o -name '*.bak' \) -delete
 
 check regression-test test: build
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} LANGUAGE=en \
 	LC_COLLATE=C LC_TIME=C ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} \
 	check)
 
 check-all: build
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} LANGUAGE=en \
 	LC_COLLATE=C LC_TIME=C ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} \
 	check-all)
 
 post-install:
 .for L in R Rblas Rlapack
 	@(cd ${STAGEDIR}${PREFIX}/lib/R/lib; if [ -f lib${L}.so ] ; then \
 	${LN} -sf lib${L}.so lib${L}.so.${${L:tu}_SOVERSION} ; fi)
 .endfor
 .if ${PORT_OPTIONS:MINFO_MANUALS} && ${PORT_OPTIONS:MDOCS}
 	@(cd ${WRKSRC}/doc/manual; \
 	for infofile in ${INFO}; do \
 		${INSTALL_DATA} $${infofile}.info* ${STAGEDIR}${PREFIX}/${INFO_PATH}/; \
 	done)
 .endif
 
 .endif # LIBR_SLAVEPORT
 .else # !LIBRMATH_SLAVEPORT
 do-install:
 	@${INSTALL_DATA} ${WRKSRC}/src/include/Rmath.h ${STAGEDIR}${PREFIX}/include
 	@${INSTALL_DATA} ${BUILD_WRKSRC}/libRmath.a ${STAGEDIR}${PREFIX}/lib
 	@${INSTALL_LIB} ${BUILD_WRKSRC}/libRmath.so \
 	${STAGEDIR}${PREFIX}/lib/libRmath.so.${RMATH_SOVERSION}
 	@(cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf libRmath.so.${RMATH_SOVERSION} libRmath.so)
 
 check regression-test test: build
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} LANGUAGE=en \
 	LC_COLLATE=C LC_TIME=C ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} test; \
 	${SETENV} LD_LIBRARY_PATH="${BUILD_WRKSRC}" ${BUILD_WRKSRC}/test)
 
 .endif # !LIBRMATH_SLAVEPORT
 
 .include <bsd.port.mk>
Index: head/math/atlas/Makefile
===================================================================
--- head/math/atlas/Makefile	(revision 382198)
+++ head/math/atlas/Makefile	(revision 382199)
@@ -1,266 +1,264 @@
 # Created by: Nakata Maho <maho@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	atlas
 PORTVERSION=	3.8.4
 PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/math-${PORTNAME}/Stable/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automatically Tuned Linear Algebra Software (ATLAS)
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/math/lapack:checksum
 
 USES=		fortran tar:bzip2
 USE_GCC=	yes
 
 CONFLICTS=	atlas-devel-[0-9]* cblas-[0-9]*
 MANUAL_PACKAGE_BUILD=	Optimizes for the local machine.
 
 OPTIONS_DEFINE=		DOCS DATA ARCHDEF TSC WALL_TIMER
 OPTIONS_DEFAULT=	DATA SHARED
 OPTIONS_MULTI=		BUILDTYPE
 OPTIONS_MULTI_BUILDTYPE=SHARED STATIC
 ARCHDEF_DESC=		Use a specified architectural default
 DATA_DESC=		Install tuning data and logs from the build
 SHARED_DESC=		Build static PIC archives and shared libraries
 STATIC_DESC=		Build static (non-PIC) archives
 TSC_DESC=		If WALL_TIMER is enabled, use the TSC
 WALL_TIMER_DESC=	Use less robust timing with higher resolution
 
 PORTSCOUT=	limitw:1,even
 WRKSRC=		${WRKDIR}/ATLAS
 
 .include <bsd.port.options.mk>
 
 #Increase ATLAS_MAXMALLOC if the atlas threaded libraries perform poorly on large problems:
 # http://math-atlas.sourceforge.net/errata.html#MaxMalloc
 ATLAS_MAXMALLOC?=	67108864
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 .else
 PICFLAG?=	-fpic
 .endif
 
 .if !empty(ARCH:M*64*)
 POINTER?=	64
 .else
 POINTER?=	32
 .endif
 
 .if defined(MAINTAINER_MODE)
 LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
 .endif
 
 .if ${PORT_OPTIONS:MDATA}
 PORTDATA=	*
 .endif
 PORTDOCS=	*
 
 .if ${PORT_OPTIONS:MARCHDEF}
 .  if defined(ARCHDEF)
 .    if ${ARCHDEF} == "NONE"
 ARCHDEFFLAG=	-Si archdef 0
 .    endif
 .  else
 IGNORE=		you have set WITH_ARCHDEF, but have not defined ARCHDEF
 .  endif
 .endif
 
 .if ${PORT_OPTIONS:MSHARED}
 USE_LDCONFIG=	yes
 .endif
 
 .for opt in SHARED STATIC
 .  if ${PORT_OPTIONS:M${opt}}
 PLIST_SUB+=	${opt}=""
 .  else
 PLIST_SUB+=	${opt}="@comment "
 .  endif
 .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:
 	@cd ${WRKSRC}/CONFIG/ARCHS ; for t in *.tgz ; do \
 		${MV} $${t} $${t}.bak ; \
 		${TAR} -s '/gcc/${CC}/' -xf $${t}.bak ; \
 		${TAR} -czf $${t} $${t%.tgz} ; \
 		${RM} -r $${t%.tgz} $${t}.bak ; \
 		done
 	@${REINPLACE_CMD} -e 's|$$(ARCH)|$$(ATLAS_ARCH)|g' \
 		${WRKSRC}/Make.top \
 		${WRKSRC}/makes/Make.bin \
 		${WRKSRC}/makes/Make.lib \
 		${WRKSRC}/makes/Make.sysinfo \
 		${WRKSRC}/CONFIG/src/Makefile \
 		${WRKSRC}/CONFIG/ARCHS/Makefile
 	@${REINPLACE_CMD} -e "s|gcc|${CC}|" ${WRKSRC}/CONFIG/ARCHS/Makefile
 	@${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}|" \
 		${WRKSRC}/include/atlas_lvl3.h
 	@${CAT} ${FILESDIR}/tuning-message
 
 do-configure:
 	@if [ ${PORT_OPTIONS:MWALL_TIMER} ] ; then \
 		TIMEFLAG= ; \
 		if [ \( ${ARCH} = "i386" -o ${ARCH} = "amd64" \) -a ${PORT_OPTIONS:MTSC} ] ; then \
 			freq=`${SYSCTL} -ni machdep.tsc_freq` ; \
 			if [ "x$${freq}" != "x" ] ; then \
 				if [ $${freq} -gt 1000000 ] ; then \
 					MHZ=$$(($${freq}/1000000)) ; \
 					TIMEFLAG="-D c -DPentiumCPS=$${MHZ}" ; \
 				fi ; \
 			fi ; \
 		fi ; \
 		if [ "x$${TIMEFLAG}" = "x" ] ; then \
 			TIMEFLAG="-D c -DWALL" ; \
 		fi ; \
 	fi ; \
 	${ECHO_CMD} "TIMEFLAG = $${TIMEFLAG}" \
 		> ${WRKSRC}/saved_flags ; \
 	${ECHO_CMD} "Dummy configuration of ATLAS to obtain compiler flags:" ; \
 	${MKDIR} ${WRKSRC}/static ; cd ${WRKSRC}/static ; \
 		../configure --cc="${CC}" --cflags="${CFLAGS}" \
 		--prefix="${PREFIX}" -v 2 $${TIMEFLAG} ${ARCHDEFFLAG} \
 		-Ss f77lib " " -Ss pmake "${MAKE} ${_MAKE_JOBS}" \
 		-Fa alg "${STATIC_FLAGS} " -b ${POINTER}
 	@${SED} -ne "\|F77FLAGS =|p" ${WRKSRC}/static/Make.inc \
 		>> ${WRKSRC}/saved_flags
 
 post-configure:
 	@${RM} -r ${WRKSRC}/static
 
 do-build:
 .for opt in shared static
 .  if ${PORT_OPTIONS:M${opt:tu}}
 	@${ECHO_CMD} "Building the LAPACK archives with ${opt} ATLAS flags:"
 	F77FLAGS="`${MAKE} -f ${WRKSRC}/saved_flags -V F77FLAGS` ${EXTRA_FFLAGS}" ; \
 	LW=`${MAKE} -C ${PORTSDIR}/math/lapack -V ${${opt:tu}_LAPACK_WRKSRC}` ; \
 	${MAKE} -C ${PORTSDIR}/math/lapack WITH=${opt:tu} clean patch ; \
 	cd $${LW} ; ${SETENV} ${MAKE_ENV:NFFLAGS=*} EXTRAFLAGS="${${opt:tu}_FLAGS}" \
 		FFLAGS="-pipe $${F77FLAGS}" ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} \
 		ARCH="${AR}" lapacklib ; \
 	TIMEFLAG=`${MAKE} -f ${WRKSRC}/saved_flags -V TIMEFLAG` ; \
 	${MKDIR} ${WRKSRC}/${opt} ; cd ${WRKSRC}/${opt} ; \
 	${MV} $${LW}/liblapack.a liblapack_${opt}.a ; \
 	${MAKE} -C ${PORTSDIR}/math/lapack clean ; \
 	${ECHO_CMD} "Configuring ${opt} ATLAS:" ; \
 		../configure --cc="${CC}" --cflags="${CFLAGS}" \
 		--with-netlib-lapack="${WRKSRC}/${opt}/liblapack_${opt}.a" \
 		--prefix="${PREFIX}" -v 2 $${TIMEFLAG} ${ARCHDEFFLAG} \
 		-Ss f77lib " " -Ss pmake "${MAKE} ${_MAKE_JOBS}" \
 		-Fa alg "${${opt:tu}_FLAGS} " -b ${POINTER} ; \
 	if [ "x${WITH_ARCHDEF}" != "x" ] ; then \
 		if [ "x${ARCHDEF}" != "xNONE" ] ; then \
 			if [ -f ${ARCHDEF} ] ; then \
 				${CP} -f ${ARCHDEF} ${WRKSRC}/CONFIG/ARCHS/ ; \
 			elif [ ! -f ${WRKSRC}/CONFIG/ARCHS/${ARCHDEF} ] ; then \
 				${ECHO_CMD} \
 				"==> ${PKGNAME} : ARCHDEF \"${ARCHDEF}\" does not exist" ; \
 				exit 1 ; \
 			fi ; \
 			${REINPLACE_CMD} -E -e \
 			"\|[[:blank:]]*ARCH =|s|=.*|= ${ARCHDEF:T:S/.tgz$//}|" \
 			${WRKSRC}/${opt}/Make.inc ; \
 		fi ; \
 	fi ; \
 	${ECHO_CMD} "Building ${opt} ATLAS:" ; cd ${WRKSRC}/${opt} ; \
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all
 .  endif
 .endfor
 
 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
 .  if ${PORT_OPTIONS:M${opt:tu}}
 	@${ECHO_CMD} "Timing ${opt} ATLAS:"
 	(cd ${WRKSRC}/${opt} ; ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} time ; \
 		cd ARCHS ; ${SETENV} ${MAKE_ENV} \
 			${MAKE_CMD} ${MAKE_ARGS} ArchNew tarfile)
 .  endif
 .endfor
 .if ${PORT_OPTIONS:MSHARED}
 	@${ECHO_CMD} "Building ATLAS shared libraries:"
 	@F77FLAGS="`${MAKE} -f ${WRKSRC}/saved_flags -V F77FLAGS` ${EXTRA_FFLAGS}" ; \
 	cd ${WRKSRC}/shared/lib ; \
 	${L1}libatlas.so.2 -o libatlas.so.2 libatlas.a ${L2} ; \
 	${L1}libf77blas.so.2 -o libf77blas.so.2 libf77blas.a ${L2} libatlas.so.2 ; \
 	${L1}libptf77blas.so.2 -o libptf77blas.so.2 libptf77blas.a ${L2} libatlas.so.2 ; \
 	${L1}libcblas.so.2 -o libcblas.so.2 libcblas.a ${L2} libatlas.so.2 ; \
 	${L1}libptcblas.so.2 -o libptcblas.so.2 libptcblas.a ${L2} libatlas.so.2 ; \
 	${L1}libalapack.so.2 -o libalapack.so.2 liblapack.a ${L2} libatlas.so.2
 .endif
 
 .if defined(MAINTAINER_MODE)
 STATIC_BLAS=	${LOCALBASE}/lib/libblas.a
 SHARED_BLAS=	-L${LOCALBASE}/lib -lblas
 
 check regression-test test: build
 .  for opt in shared static
 .    if ${PORT_OPTIONS:M${opt:tu}}
 	@${ECHO_CMD} "Testing ${opt} ATLAS:"
 	@cd ${WRKSRC}/${opt} ; ${SETENV} ${MAKE_ENV} BLAS="${${opt:tu}_BLAS}" \
 	${MAKE_CMD} ${MAKE_ARGS} check ptcheck error_report
 .    endif
 .  endfor
 .endif
 
 do-install:
 .for i in libatlas libcblas libf77blas liblapack libptcblas libptf77blas
 .  if ${PORT_OPTIONS:MSTATIC}
 	${INSTALL_DATA} ${WRKSRC}/static/lib/${i}.a \
 		${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}.a
 .  endif
 .  if ${PORT_OPTIONS:MSHARED}
 	${INSTALL_DATA} ${WRKSRC}/shared/lib/${i}.a \
 		${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}_pic.a
 	${INSTALL_LIB} ${WRKSRC}/shared/lib/${i:S|lapack|alapack|}.so.2 \
 		${STAGEDIR}${PREFIX}/lib
 	${LN} -sf ${i:S|lapack|alapack|}.so.2 \
 		${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}.so
 .  endif
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/cblas.h ${WRKSRC}/include/clapack.h \
 		${STAGEDIR}${PREFIX}/include
 .for opt in shared static
 .  if ${PORT_OPTIONS:M${opt:tu}}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/atlas/${opt}
 	${INSTALL_DATA} ${WRKSRC}/${opt}/include/* \
 		${STAGEDIR}${PREFIX}/include/atlas/${opt}
 .    if ${PORT_OPTIONS:MDATA}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${opt}
 	(cd ${WRKSRC}/${opt}/bin; \
 		${COPYTREE_SHARE} INSTALL_LOG ${STAGEDIR}${DATADIR}/${opt})
 	(cd ${WRKSRC}/${opt}/ARCHS; \
 		${COPYTREE_SHARE} "*" ${STAGEDIR}${DATADIR}/${opt} \
 		"! -name Makefile -and ! -name *.tgz")
 .    endif
 .  endif
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: head/math/atlas/files/patch-CONFIG+src+SpewMakeInc.c
===================================================================
--- head/math/atlas/files/patch-CONFIG+src+SpewMakeInc.c	(revision 382198)
+++ head/math/atlas/files/patch-CONFIG+src+SpewMakeInc.c	(revision 382199)
@@ -1,66 +1,59 @@
---- 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);
 -   if (ncpu > 1) THREADS = 1;
 + /*   if (ncpu > 1) THREADS = 1; */
 +    THREADS = 1;
     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");
 -   fprintf(fpout, "   ARCH = %s", machnam[mach]);
 +   fprintf(fpout, "   ATLAS_ARCH = %s", machnam[mach]);
     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;
     }
 -   goodgcc = (j < NCOMP) ? comps[j] : "gcc";
 +   goodgcc = (j < NCOMP) ? comps[j] : "%%CC%%";
     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");
  
 -   fprintf(fpout, "   LDFLAGS =");
 +   fprintf(fpout, "   LDFLAGS = %%LDFLAGS%% ");
     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");
 -   fprintf(fpout, "\n   ARCHIVER = ar\n");
 +   fprintf(fpout, "\n   ARCHIVER = $(AR)\n");
     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");
 -   fprintf(fpout, "   BLASlib = \n");
 -   fprintf(fpout, "   FBLASlib = \n");
 +   fprintf(fpout, "   BLASlib = $(BLAS)\n");
 +   fprintf(fpout, "   FBLASlib = $(BLAS)\n");
     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))
Index: head/math/fityk/Makefile
===================================================================
--- head/math/fityk/Makefile	(revision 382198)
+++ head/math/fityk/Makefile	(revision 382199)
@@ -1,74 +1,74 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	fityk
 PORTVERSION=	0.9.8
 PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	GHC SF/xylib:xylib
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT \
 		${XYLIB_DISTNAME}${EXTRACT_SUFX}:xylib
 
 MAINTAINER=	sperber@FreeBSD.org
 COMMENT=	Free peak fitting software
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/spirit/include/classic_core.hpp:${PORTSDIR}/devel/boost-libs \
 		gnuplot:${PORTSDIR}/math/gnuplot
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
 USES=		desktop-file-utils gmake libtool shared-mime-info tar:bzip2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 LDFLAGS+=	-lbz2 -lz
 USE_GITHUB=	yes
 GH_ACCOUNT=	wojdyr
 USE_GNOME=	gtk20
 USE_WX=		3.0
 WX_CONF_ARGS=	absolute
 WX_UNICODE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-doc --disable-xyconvert
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 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
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e '/HELP_DEF/s|pkgdatadir|docdir|g' \
 		${WRKSRC}/src/wxgui/Makefile.in
 	@${REINPLACE_CMD} -e '/XYLIB_USE_TR1_MEMORY/s| 1| 0|g' \
 		${WRKDIR}/${XYLIB_DISTNAME}/xylib/cache.h
 
 pre-configure:
 	@cd ${WRKDIR}/${XYLIB_DISTNAME} \
 		&& ${SH} ./configure --disable-shared \
 			CC="${CC}" CFLAGS="${CFLAGS} -fPIC" \
 			CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -fPIC" \
 			CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
 pre-build:
 	@cd ${WRKDIR}/${XYLIB_DISTNAME} \
 		&& ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
 			${ALL_TARGET}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/fityk.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_PROGRAM} ${WRKDIR}/${XYLIB_DISTNAME}/xyconv ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKDIR}/${XYLIB_DISTNAME}/xyconv.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/math/graphthing/Makefile
===================================================================
--- head/math/graphthing/Makefile	(revision 382198)
+++ head/math/graphthing/Makefile	(revision 382199)
@@ -1,37 +1,35 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	graphthing
 PORTVERSION=	1.3.2
 PORTREVISION=	10
 CATEGORIES=	math
 MASTER_SITES=	http://graph.seul.org/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool that allows you to create, manipulate, and study graphs
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GNOME=	gtk20
 USES=		bison gmake tar:bzip2
 USE_WX=		2.8
 WX_UNICODE=	yes
 WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
 
 PLIST_FILES=	bin/graphthing bin/gt
-
-CPPFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|@@CXX@|@CXX@|' ${WRKSRC}/src/GNUmakefile.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/graphthing ${STAGEDIR}${PREFIX}/bin
 	${LN} -sf graphthing ${STAGEDIR}${PREFIX}/bin/gt
 
 .include <bsd.port.mk>
Index: head/math/lapacke/Makefile
===================================================================
--- head/math/lapacke/Makefile	(revision 382198)
+++ head/math/lapacke/Makefile	(revision 382199)
@@ -1,140 +1,138 @@
 # Created by: Eijiro Shibusawa <ej-sib@ice.uec.ac.jp>
 # $FreeBSD$
 
 PORTNAME=	lapacke
 PORTVERSION=	3.4.2
 PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	NL
 MASTER_SITE_SUBDIR=	lapack
 DISTNAME=	lapack-${PORTVERSION}
 DIST_SUBDIR=	lapack
 
 MAINTAINER=	phd_kimberlite@yahoo.co.jp
 COMMENT=	Standard C language APIs for LAPACK
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_LDCONFIG=	yes
 USES=		fortran tar:tgz uidfix
 
 OPTIONS_DEFINE=	PROFILE XLAPACKE DOCS
 PROFILE_DESC=	Build a profiling library
 XLAPACKE_DESC=	Install interfaces to XLAPACK
 
 .include <bsd.port.options.mk>
 
 LAPACKE_SVERSION=	1
 LAPACKE_LIBNAME=	lapacke
 LAPACKE_LIBNAME_TMG=	lapacke_tmg
 MAKE_ENV+=		"SHLIB_MAJOR=${LAPACKE_SVERSION}" \
 			"LAPACKE_LIBNAME=${LAPACKE_LIBNAME}" \
 			"LAPACKE_LIBNAME_TMG=${LAPACKE_LIBNAME_TMG}"
 .if ${PORT_OPTIONS:MXLAPACKE}
 XLAPACKE_LIBNAME=	xlapacke
 MAKE_ENV+=		"XLAPACKE_LIBNAME=${XLAPACKE_LIBNAME}"
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 WRKSRC_LEGACY=	${WRKDIR}/lapacke
 
 .if exists(${LOCALBASE}/lib/libgoto2p.so)
 WITH_BLAS?=	gotoblas
 .elif exists(${LOCALBASE}/lib/libatlas.so)
 WITH_BLAS?=	atlas
 .else
 WITH_BLAS?=	reference
 .endif
 
 .if ${WITH_BLAS} == "reference"
 LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas \
 		liblapack.so:${PORTSDIR}/math/lapack
 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
 .endif
 .if ${PORT_OPTIONS:MXLAPACKE}
 LIB_DEPENDS+=		libxlapack.so:${PORTSDIR}/math/xlapack
 .endif
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	README
 .endif
 PLIST_FILES=	include/lapacke.h \
 		include/lapacke_utils.h \
 		lib/lib${LAPACKE_LIBNAME}.a \
 		lib/lib${LAPACKE_LIBNAME_TMG}.a \
 		lib/lib${LAPACKE_LIBNAME}.so \
 		lib/lib${LAPACKE_LIBNAME_TMG}.so \
 		lib/lib${LAPACKE_LIBNAME}.so.${LAPACKE_SVERSION} \
 		lib/lib${LAPACKE_LIBNAME_TMG}.so.${LAPACKE_SVERSION}
 .if ${PORT_OPTIONS:MXLAPACKE}
 PLIST_FILES+=	lib/lib${XLAPACKE_LIBNAME}.a \
 		lib/lib${XLAPACKE_LIBNAME}.so \
 		lib/lib${XLAPACKE_LIBNAME}.so.${LAPACKE_SVERSION}
 .endif
 
 .if ${PORT_OPTIONS:MPROFILE}
 .if defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE)
 IGNORE=		you have defined WITH_PROFILE, but have also defined\
 WITHOUT_PROFILE, NOPROFILE, or NO_PROFILE
 .elif !exists(/usr/lib/libc_p.a)
 IGNORE=		you have chosen WITH_PROFILE, but have not installed the\
 base system profiling libraries
 .endif
 PLIST_FILES+=	lib/lib${LAPACKE_LIBNAME}_p.a \
 		lib/lib${LAPACKE_LIBNAME_TMG}_p.a
 .if ${PORT_OPTIONS:MXLAPACKE}
 PLIST_FILES+=	lib/lib${XLAPACKE_LIBNAME}_p.a
 .endif
 .else
 MAKE_ENV+=	NO_PROFILE=
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile*" -type f |\
 		${XARGS} ${REINPLACE_CMD} -e 's;$$(ARCH);$$(ARCH_);g'
 	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile
 	@${CP} ${WRKSRC}/include//lapacke_mangling_with_flags.h ${WRKSRC}/include//lapacke_mangling.h
 	@${MKDIR} ${WRKSRC}/lib
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/lib/Makefile
 	@${MKDIR} ${WRKSRC}/libtmg
 	@${CP} ${FILESDIR}/Makefile.libtmg ${WRKSRC}/libtmg/Makefile
 
 	@${REINPLACE_CMD} -e 's;%%XLAPACKE%%;;g' \
 			-e 's;%%__XLAPACKE%%;\#;g' \
 			${WRKSRC}/lib/Makefile
 
 .if ${PORT_OPTIONS:MXLAPACKE}
 	@${MKDIR} ${WRKSRC}/libx
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/libx/Makefile
 	@${REINPLACE_CMD} -e 's;%%__XLAPACKE%%;;g' \
 			${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's;LAPACKE_LIBNAME;XLAPACKE_LIBNAME;g' \
 			-e 's;%%XLAPACKE%%;\#;g' \
 			-e 's;%%__XLAPACKE%%;;g' \
 			${WRKSRC}/libx/Makefile
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
Index: head/math/levmar/Makefile
===================================================================
--- head/math/levmar/Makefile	(revision 382198)
+++ head/math/levmar/Makefile	(revision 382199)
@@ -1,93 +1,91 @@
 # Created by: Eijiro Shibusawa <ej-sib@ice.uec.ac.jp>
 # $FreeBSD$
 
 PORTNAME=	levmar
 PORTVERSION=	2.6
 PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	http://users.ics.forth.gr/~lourakis/levmar/
 
 MAINTAINER=	phd_kimberlite@yahoo.co.jp
 COMMENT=	GPL-licensed library implementing the Levenberg-Marquardt algorithm
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_LDCONFIG=	yes
 USES=		fortran tar:tgz uidfix
 
 OPTIONS_DEFINE=	DOCS EXAMPLES PROFILE
 PROFILE_DESC=	Build a profiling library
 
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libgoto2p.so)
 WITH_BLAS?=	gotoblas
 .elif exists(${LOCALBASE}/lib/libatlas.so)
 WITH_BLAS?=	atlas
 .else
 WITH_BLAS?=	reference
 .endif
 
 .if ${WITH_BLAS} == "reference"
 LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas \
 		liblapack.so:${PORTSDIR}/math/lapack
 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
 .endif
 
 PORTDOCS=	README.txt
 PORTEXAMPLES=	lmdemo.c Makefile.demo
 PLIST_FILES=	include/levmar.h \
 	lib/liblevmar.a \
 	lib/liblevmar.so \
 	lib/liblevmar.so.2
 
 .if ${PORT_OPTIONS:MPROFILE}
 .if defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE)
 IGNORE=		you have defined WITH_PROFILE, but have also defined\
 WITHOUT_PROFILE, NOPROFILE, or NO_PROFILE
 .elif !exists(/usr/lib/libc_p.a)
 IGNORE=		you have chosen WITH_PROFILE, but have not installed the\
 base system profiling libraries
 .endif
 PLIST_FILES+=	lib/liblevmar_p.a
 .else
 MAKE_ENV+=	NO_PROFILE=
 .endif
 
 post-extract:
 	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/Makefile
 	@${CP} ${FILESDIR}/Makefile.demo ${WRKSRC}/
 	@${REINPLACE_CMD} -e 's+%%CC%%+${CC}+g' \
 		-e 's+%%CFLAGS%%+${CFLAGS} -I${LOCALBASE}/include+g' \
 		-e 's+%%LDFLAGS%%+${LDFLAGS}+g' \
 		-e 's+%%BLAS%%+${BLAS}+g' \
 		-e 's+%%LAPACK%%+${LAPACK}+g' \
 			${WRKSRC}/Makefile.demo
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR})
 
 test check: install
 	@( cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.demo \
 	${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} )
 	${WRKSRC}/lmdemo
 
 .include <bsd.port.post.mk>
Index: head/math/libflame/Makefile
===================================================================
--- head/math/libflame/Makefile	(revision 382198)
+++ head/math/libflame/Makefile	(revision 382199)
@@ -1,340 +1,337 @@
 # Created by: bf@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	libflame
 DISTVERSION=	r7421
 PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	http://www.cs.utexas.edu/users/%SUBDIR%/:1,2 LOCAL/bf:3
 MASTER_SITE_SUBDIR=	flame/snapshots/:1 field/docs/:2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:3 libflame.pdf:3
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	FLAME dense linear algebra library
 
 LICENSE=	LGPL21
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 GNU_CONFIGURE=	yes
 USE_CSTD=	c99
 USES=		gmake
 
 CONFIGURE_ARGS=		--enable-dynamic-build --enable-static-build
 
 OPTIONS_DEFINE=	BLAS3_CNTL BUILTIN_BLAS CBLAS EXTERNAL_LAPACK GOTOBLAS \
 		LAPACK2FLAME LAPACK_SUBPROBLEMS OPENMP SHARED STATIC \
 		SUPERMATRIX THREADS DOCS EXAMPLES
 OPTIONS_DEFAULT=	BLAS3_CNTL LAPACK2FLAME SHARED SUPERMATRIX THREADS
 BLAS3_CNTL_DESC=	Set Level-3 BLAS variant and blocksize
 BUILTIN_BLAS_DESC=	Build the (suboptimal) internal BLAS
 CBLAS_DESC=		Build an interface to an external C BLAS
 EXTERNAL_LAPACK_DESC=	Build an interface to an external LAPACK
 GOTOBLAS_DESC=		Build a full GotoBLAS interface
 LAPACK2FLAME_DESC=	Build a LAPACK compatibility layer
 LAPACK_SUBPROBLEMS_DESC=	Use an external LAPACK for subproblems
 OPENMP_DESC=		Use multithreading via OpenMP
 SHARED_DESC=		Build a shared library and PIC archive
 STATIC_DESC=		Build a non-PIC archive
 SUPERMATRIX_DESC=	Task scheduling and parallel execution
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBLAS3_CNTL}
 CONFIGURE_ARGS+=	--enable-blas3-front-end-cntl-trees
 .else
 CONFIGURE_ARGS+=	--disable-blas3-front-end-cntl-trees
 .endif
 
 .if ${PORT_OPTIONS:MBUILTIN_BLAS}
 IGNORE=		: BUILTIN_BLAS is an experimental option, for testing purposes only
 .if ${PORT_OPTIONS:MCBLAS} || ${PORT_OPTIONS:MGOTOBLAS}
 IGNORE=		: BUILTIN_BLAS is incompatible with CBLAS and GOTOBLAS
 .endif
 CONFIGURE_ARGS+=	--enable-builtin-blas
 .else
 CONFIGURE_ARGS+=	--disable-builtin-blas
 .endif
 
 .if ${PORT_OPTIONS:MCBLAS}
 IGNORE=		: CBLAS yields an incomplete library, and is for testing purposes only
 .if ${PORT_OPTIONS:MGOTOBLAS}
 IGNORE=		: CBLAS is incompatible with GOTOBLAS
 .endif
 CONFIGURE_ARGS+=	--enable-cblas-interfaces
 .else
 CONFIGURE_ARGS+=	--disable-cblas-interfaces
 .endif
 
 .if ${PORT_OPTIONS:MEXTERNAL_LAPACK}
 CONFIGURE_ARGS+=	--enable-external-lapack-interfaces
 .else
 CONFIGURE_ARGS+=	--disable-external-lapack-interfaces
 .endif
 
 .if ${PORT_OPTIONS:MGOTOBLAS}
 CONFIGURE_ARGS+=	--enable-goto-interfaces
 WITH_BLAS=	gotoblas
 .else
 CONFIGURE_ARGS+=	--disable-goto-interfaces
 .for b in M K N
 .if defined(${b}_BLOCKSIZE)
 CONFIGURE_ARGS+=	--enable-default-${b:tl}-blocksize=${${b}_BLOCKSIZE}
 .endif
 .endfor
 .endif
 
 .if ${PORT_OPTIONS:MLAPACK2FLAME}
 .if ${PORT_OPTIONS:MLAPACK_SUBPROBLEMS}
 IGNORE=		: LAPACK2FLAME is incompatible with LAPACK_SUBPROBLEMS
 .endif
 CONFIGURE_ARGS+=	--enable-lapack2flame
 .else
 CONFIGURE_ARGS+=	--disable-lapack2flame
 .endif
 
 .if ${PORT_OPTIONS:MLAPACK_SUBPROBLEMS}
 .if ! ${PORT_OPTIONS:MEXTERNAL_LAPACK}
 IGNORE=		: LAPACK_SUBPROBLEMS requires EXTERNAL_LAPACK
 .endif
 CONFIGURE_ARGS+=	--enable-external-lapack-for-subproblems
 .else
 CONFIGURE_ARGS+=	--disable-external-lapack-for-subproblems
 .endif
 
 .if ${PORT_OPTIONS:MEXTERNAL_LAPACK} || ! ${PORT_OPTIONS:MBUILTIN_BLAS}
 .if ${PORT_OPTIONS:MCBLAS}
 .if exists(${LOCALBASE}/lib/libatlas.so)
 WITH_BLAS?=	atlas_c
 .else
 WITH_BLAS?=	reference_c
 .endif
 .if !(${WITH_BLAS} == "atlas_c" || ${WITH_BLAS} == "reference_c")
 IGNORE=	: CBLAS is incompatible with WITH_BLAS = ${WITH_BLAS}
 .endif
 .elif exists(${LOCALBASE}/lib/libgoto2.so)
 WITH_BLAS?=	gotoblas
 .elif exists(${LOCALBASE}/lib/libatlas.so)
 WITH_BLAS?=	atlas
 .else
 WITH_BLAS?=	reference
 .endif  #WITH_CBLAS
 .endif #WITH_EXTERNAL_LAPACK or WITH_BUILTIN_BLAS
 
 .if ! ${PORT_OPTIONS:MBUILTIN_BLAS}
 .if ${WITH_BLAS} == atlas
 RUN_DEPENDS +=	${LOCALBASE}/lib/libatlas.so:${PORTSDIR}/math/atlas
 BLAS=		-lptf77blas
 .elif ${WITH_BLAS} == atlas_c
 RUN_DEPENDS +=	${LOCALBASE}/lib/libatlas.so:${PORTSDIR}/math/atlas
 BLAS=		-lptcblas
 .elif ${WITH_BLAS} == gotoblas
 RUN_DEPENDS +=	${LOCALBASE}/lib/libgoto2p.so:${PORTSDIR}/math/gotoblas
 BLAS=			-lgoto2p
 .elif ${WITH_BLAS} == reference
 RUN_DEPENDS +=	${LOCALBASE}/lib/libblas.so:${PORTSDIR}/math/blas
 BLAS=		-lblas
 .elif ${WITH_BLAS} == reference_c
 RUN_DEPENDS +=	${LOCALBASE}/lib/libgslcblas.so:${PORTSDIR}/math/gsl
 BLAS=		-lgslcblas
 .endif #WITH_BLAS
 .endif #WITH_BUILTIN_BLAS
 
 .if ${PORT_OPTIONS:MEXTERNAL_LAPACK}
 .if !empty(WITH_BLAS:Matlas*)
 .if ${PORT_OPTIONS:MBUILTIN_BLAS}
 RUN_DEPENDS +=	${LOCALBASE}/lib/libatlas.so:${PORTSDIR}/math/atlas
 .endif
 LAPACK=		-lalapack -lptcblas -lptf77blas
 .elif ${WITH_BLAS} == gotoblas
 .if ${PORT_OPTIONS:MBUILTIN_BLAS}
 RUN_DEPENDS +=	${LOCALBASE}/lib/libgoto2p.so:${PORTSDIR}/math/gotoblas
 .endif
 LAPACK=		-lgoto2p
 .elif !empty(WITH_BLAS:Mreference*)
 RUN_DEPENDS +=	${LOCALBASE}/lib/liblapack.so:${PORTSDIR}/math/lapack
 LAPACK=		-llapack
 .if ${PORT_OPTIONS:MBUILTIN_BLAS} || ${PORT_OPTIONS:MCBLAS}
 RUN_DEPENDS +=	${LOCALBASE}/lib/libblas.so:${PORTSDIR}/math/blas
 LAPACK+=	-lblas
 .endif
 .endif #WITH_BLAS
 .endif #WITH_EXTERNAL_LAPACK
 
 .if ${PORT_OPTIONS:MOPENMP}
 .if ${PORT_OPTIONS:MTHREADS}
 IGNORE=		OPENMP is incompatible with THREADS
 .endif
 .if !empty(CC:M*clang*)
 IGNORE=		clang does not support OPENMP, use THREADS instead
 .endif
 OPENMP_CFLAGS ?=	-fopenmp
 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
 .endif
 
 .if ${PORT_OPTIONS:MSHARED}
 USE_LDCONFIG=	yes
 .endif
 
 .for o in SHARED STATIC
 .if ${PORT_OPTIONS:M${o}}
 PLIST_SUB+=	${o}=""
 .else
 PLIST_SUB+=	${o}="@comment "
 .endif
 .endfor
 
 .if ${PORT_OPTIONS:MSUPERMATRIX}
 CONFIGURE_ARGS+=	--enable-supermatrix
 .else
 CONFIGURE_ARGS+=	--disable-supermatrix
 .endif
 
 .if !(defined(USE_GCC) || !empty(CC:M*gcc4*))
 CONFIGURE_ARGS+=	--disable-autodetect-f77-ldflags \
 			--disable-autodetect-f77-name-mangling
 .endif
 
 .if !empty(MACHINE_CPU:Msse3)
 CFLAGS+=		-msse3
 LDFLAGS+=		-msse3
 CONFIGURE_ARGS+=	--enable-vector-intrinsics=sse
 .else
 CONFIGURE_ARGS+=	--enable-vector-intrinsics=none
 .endif
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 .else
 PICFLAG?=	-fpic
 .endif
 CFLAGS+=	${PICFLAG}
 LDFLAGS+=	${PICFLAG} -Wl,-x
 
 .if defined(MEMORY_ALIGNMENT)
 CONFIGURE_ARGS+=	--enable-memory-alignment=${MEMORY_ALIGNMENT}
 .if defined(LDIM_ALIGNMENT)
 CONFIGURE_ARGS+=	--enable-ldim-alignment
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	libflame.pdf
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 PORTEXAMPLES=	*
 .endif
 
 SHLIB_MAJOR?=	0
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f \( -name '*.sh' -o -name '*.sh.in' \) | \
 	${XARGS} ${REINPLACE_CMD} -E \
 	-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:]]*:=@ \
 	s@-$$(ARCH_VERS)@/libflame@' \
 	-e '\@MK_FLAMEC_...S_INST_W_ARCH_VERS[[:blank:]]*:=@ \
 	{N; s@-$$(ARCH_VERS)@@; s@\.so@&.${SHLIB_MAJOR}@2;}' \
 	-e '\@^$$(MK_INCL_DIR_INST):@,\@^endif@d' \
 	-e '\@^$$(INSTALL_PREFIX)/lib/%\.a:@,\@^endif@d' \
 	-e 's@^\($$(INSTALL_PREFIX)/lib/%\)\(-$$(ARCH_VERS)\)\(\.a:\)@\1\3@' \
 	-e '\@^$$(INSTALL_PREFIX)/lib/%.*\.so:@ \
 	s@\(-$$(ARCH_VERS)\)\(\.so\)@\2.${SHLIB_MAJOR}@' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's@gcc)@cc|gcc*)@g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} \
 	-e '\@FLA_LIB_PATH[[:blank:]]*:=@ \
 	s@$$(INSTALL_PREFIX)/lib@../lib/$$(HOST)@' \
 	-e '\@FLA_INC_PATH[[:blank:]]*:=@ \
 	s@$$(INSTALL_PREFIX)@${WRKDIR}@' \
 	-e '\@HOST[[:blank:]]*:=@ \
 	s@sh $$(BUILD_DIRPATH)/ac-utils/config.guess@cat ../config.sys_type@' \
 		${WRKSRC}/test/Makefile
 
 pre-configure:
 	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -o -name '*.fbsd10bak' \
 	-o -name '*.orig' \) -delete
 
 post-configure:
 .if ${PORT_OPTIONS:MSTATIC}
 	@${CP} -af ${WRKSRC} ${WRKSRC}_STATIC
 	@${REINPLACE_CMD} -e 's@${PICFLAG}@@' \
 	-e '\@FLA_ENABLE_DYNAMIC_BUILD[[:blank:]]*:=@s@yes@no@' \
 		${WRKSRC}_STATIC/config/*/config.mk
 .endif
 .if ${PORT_OPTIONS:MSHARED}
 	@${REINPLACE_CMD} \
 	-e '\@MK_FLAMEC_LIBS_INST.*[[:blank:]]*:=@ \
 	{N; s@$$(INSTALL_PREFIX)/lib/%@&_pic@;}' \
 	-e '\@^$$(INSTALL_PREFIX)/lib/%\.a:@s@%@&_pic@1' \
 		${WRKSRC}/Makefile
 .endif
 
 do-build:
 .for o in SHARED STATIC
 .if ${PORT_OPTIONS:M${o}}
 	@${PRINTF} "\n\n\n===> Building ${o:tl} library:\n\n\n\n"
 	@cd ${WRKSRC}${o:S|^|_|:M*STATIC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 	${_MAKE_JOBS} ${MAKE_ARGS} libs
 .endif
 .endfor
 
 do-install:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \
 	${MAKE_ARGS} install-headers
 .if ${PORT_OPTIONS:MSHARED}
 	@cd ${WRKSRC}/lib; ${STRIP_CMD} */libflame.so */libflame.a
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \
 	${MAKE_ARGS} install-libs install-lib-symlinks
 .endif
 .if ${PORT_OPTIONS:MSTATIC}
 	@cd ${WRKSRC}_STATIC/lib; ${STRIP_CMD} */libflame.a
 	@cd ${WRKSRC}_STATIC; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \
 	${MAKE_ARGS} install-libs
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKSRC}/examples; ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .if defined(MAINTAINER_MODE)
 BUILD_DEPENDS +=	${RUN_DEPENDS}
 CONFIGURE_ARGS+=	--enable-verbose-make-output
 
 check regression-test test: build
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \
 	${MAKE_ARGS} MK_INCL_DIR_INST_W_ARCH_VERS="${WRKDIR}/include" \
 	install-headers
 .for o in SHARED STATIC
 .if ${PORT_OPTIONS:M${o}}
 	@${PRINTF} "\n\n\n===> Testing ${o:tl} library:\n\n\n\n"
 	@cd ${WRKSRC}${o:S|^|_|:M*STATIC}/test;  ${SETENV} ${MAKE_ENV} \
 	${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} \
 	LIBBLAS="-L${LOCALBASE}/lib ${BLAS} -lm" \
 	LIBLAPACK="-L${LOCALBASE}/lib ${LAPACK}" test_libflame ; \
 	./test_libflame.x
 .endif
 .endfor
 
 .endif #MAINTAINER_MODE
 .include <bsd.port.mk>
Index: head/math/libocas/Makefile
===================================================================
--- head/math/libocas/Makefile	(revision 382198)
+++ head/math/libocas/Makefile	(revision 382199)
@@ -1,59 +1,59 @@
 # Created by: b.f. <bf@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libocas
 PORTVERSION=	0.96
 CATEGORIES=	math
 MASTER_SITES=	http://cmp.felk.cvut.cz/~xfrancv/ocas/ LOCAL/bf
 DISTNAME=	${PORTNAME}_v${PORTVERSION:S/.//}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Efficient training of SVM classifiers
 
 LICENSE=	GPLv3
 
 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 \
 		lib/libocas.so.1
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == sparc64
 PICFLAG=	-fPIC
 .else
 PICFLAG=	-fpic
 .endif
 
-CFLAGS+=	${PICFLAG} ${PTHREAD_CFLAGS}
+CFLAGS+=	${PICFLAG}
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e '\|:=|d' \
 		-e 's|libocas\.so|&.1|' \
 		-e '\|$$(CC) $$(CFLAGS) -o|{s|$$(CFLAGS)|& ${LDFLAGS}|;}' \
 		${WRKSRC}/Makefile
 
 do-install:
 .for p in linclassif msvmocas svmocas
 	@${INSTALL_PROGRAM} ${WRKSRC}/${p} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	@${INSTALL_LIB} ${WRKSRC}/libocas.so.1 ${STAGEDIR}${PREFIX}/lib
 	@${LN} -sf libocas.so.1 ${STAGEDIR}${PREFIX}/lib/libocas.so
 
 check regression-test test: build
 	${WRKSRC}/msvmocas -c 10 -v 1 ${WRKSRC}/data/example4_train.light \
 		${WRKSRC}/data/msvmocas.model
 	${WRKSRC}/linclassif -e -v 1 -o ${WRKSRC}/data/example4_test.pred \
 		${WRKSRC}/data/example4_test.light ${WRKSRC}/data/msvmocas.model
 	${WRKSRC}/svmocas -c 10 -b 1 -v 1 ${WRKSRC}/data/riply_trn.light \
 		${WRKSRC}/data/svmocas.model
 	${WRKSRC}/linclassif -e -v 1 -o ${WRKSRC}/data/riply_tst.pred \
 		${WRKSRC}/data/riply_tst.light ${WRKSRC}/data/svmocas.model
 
 .include <bsd.port.post.mk>
Index: head/math/libproj4/Makefile
===================================================================
--- head/math/libproj4/Makefile	(revision 382198)
+++ head/math/libproj4/Makefile	(revision 382199)
@@ -1,46 +1,43 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	libproj4
 DISTVERSION=	3_20081120
 CATEGORIES=	math geography
 MASTER_SITES=	http://home.comcast.net/~gevenden56/proj/
 DISTFILES=	${PORTNAME}.${DISTVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	C language procedures related to cartographic processes
 
 LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
 
 USES=		gmake tar:bzip2
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 ALL_TARGET=	libproj4 lproj
 MAKE_JOBS_UNSAFE=yes
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	manual.pdf
 EXTRACT_ONLY=	${PORTNAME}.${DISTVERSION}${EXTRACT_SUFX}
 .endif
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000034
 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}
 	${INSTALL_DATA} ${_DISTDIR}/manual.pdf ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
Index: head/math/mumps/Makefile
===================================================================
--- head/math/mumps/Makefile	(revision 382198)
+++ head/math/mumps/Makefile	(revision 382199)
@@ -1,166 +1,165 @@
 # Created by: Pedro Giffuni
 # $FreeBSD$
 
 PORTNAME=	mumps
 PORTVERSION=	4.10.0
 PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	http://mumps.enseeiht.fr/		\
 		http://graal.ens-lyon.fr/MUMPS/		\
 		http://www.enseeiht.fr/apo/MUMPS/	\
 		http://www.enseeiht.fr/irit/apo/MUMPS/
 DISTNAME=	MUMPS_${PORTVERSION}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	MUltifrontal Massively Parallel sparse direct Solver
 
 LICENSE=	Public_Domain
 LICENSE_NAME=	"Public Domain"
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 #-----------------------------------------------------------------------
 
 # WARNING: Non-serviceable parts inside, can break other ports
 # You may define these options/knobs:
 #
 # FFLAGS: Fortran compiler flags for gfortran
 # WITH_OPTIMIZED_FLAGS:Try to use agressive (non-CPU) FFLAGS
 # BLAS_LIBS: specify other version of BLAS
 # WITH_ATLAS: Use ATLAS instead of the regular BLAS
 # WITH_METIS: Add METIS ordering
 # WITH_MPI: Use mpich for the parallel version
 #-----------------------------------------------------------------------
 
 SLAVEDIRS=	math/mumps-mpich
 
 USES=		fortran
 
 MAKE_JOBS_UNSAFE=yes
 
 FORTRANLIBS=	-lgfortran
 GCCLIBDIR=	${LDFLAGS}
 
 .if defined(WITH_OPTIMIZED_FLAGS)
 FFLAGS+=	-O3 -ffast-math
 .endif
 
 .ifdef WITH_METIS
 BUILD_DEPENDS+=	${LOCALBASE}/bin/oemetis:${PORTSDIR}/math/metis4
 MAKE_ENV+=	ORDERINGSF=-Dmetis
 .endif
 
 PLIST_SUB+=	MUMPSVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS)
 WITH_ATLAS=	yes
 .endif
 .if defined(WITH_ATLAS)
 LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
 BLAS_LIBS=	-lf77blas
 LAPACK_LIBS=	-lalapack -lcblas
 .else
 LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
 BLAS_LIBS=	-lblas
 LAPACK_LIBS=	-llapack
 .endif
 
 .ifdef WITH_MPI
 PKGNAMESUFFIX+=		-mpich
 BUILD_DEPENDS+=	${LOCALBASE}/include/mpif.h:${PORTSDIR}/net/mpich2 \
 		${LOCALBASE}/lib/libblacs.a:${PORTSDIR}/math/blacs \
 		${LOCALBASE}/lib/libscalapack.a:${PORTSDIR}/math/scalapack
 LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack
 # Note: -l?mumps still requires to be linked with -lblacs + -lscalapack
 RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2 \
 		${LOCALBASE}/lib/libblacs.a:${PORTSDIR}/math/blacs \
 		${LOCALBASE}/lib/libscalapack.a:${PORTSDIR}/math/scalapack
 CONFLICTS=	mumps-4*
 .else
 CONFLICTS=	mumps-mpich-4*
 .endif
 
 .ifndef WITH_MPI
 PLIST_SUB+=	WITH_LIBSEQ=""
 .else
 PLIST_SUB+=	WITH_LIBSEQ="@comment "
 .endif
 
 pre-configure:
 .ifdef WITH_MPI
 	${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.inc.generic \
 		${WRKSRC}/Makefile.inc
 .else
 	${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.inc.generic.SEQ \
 		${WRKSRC}/Makefile.inc
 .endif
 
 pre-build:
 	${DIRNAME} `${FC} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
 	${REINPLACE_CMD} -e 's+@CC@+${CC}+g ; s+@FC@+${FC}+g ; \
 	s+@CFLAGS@+${CFLAGS}+g; \
 	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
 .ifdef WITH_MPI
 	${REINPLACE_CMD} -e 's+@LAPACK_LIBS@+${LAPACK_LIBS}+g;' ${WRKSRC}/Makefile.inc
 .endif
 .ifdef WITH_METIS
 	${REINPLACE_CMD} -e 's+#LMETIS+LMETIS+' ${WRKSRC}/Makefile.inc
 .endif
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/lib/lib*.a ${STAGEDIR}${PREFIX}/lib
 .ifndef WITH_MPI
 	${INSTALL_DATA} ${WRKSRC}/libseq/libmpiseq.a ${STAGEDIR}${PREFIX}/lib
 .endif
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/userguide_${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/userguide_${PORTVERSION}.ps ${STAGEDIR}${DOCSDIR}
 	${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/userguide_${PORTVERSION}.ps
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 . for ex in Makefile README *.c *.F input_simpletest_*
 	${INSTALL_DATA} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR}
 . endfor
 . for ex in c_example *simpletest
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR}
 . endfor
 
 regression-test:
 .if defined (WITH_MPI) && defined(MAINTAINER_MODE)
 .  if !exists(${HOME}/.mpd.conf)
 	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${HOME}/.mpd.conf
 	${CHMOD} go-r ${HOME}/.mpd.conf
 	@${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!"
 .  endif
 	${LOCALBASE}/bin/mpd &
 	(cd ${WRKSRC}/examples &&	\
 	${LOCALBASE}/bin/mpirun -np 2 ./ssimpletest < input_simpletest_real ;	\
 	${LOCALBASE}/bin/mpirun -np 2 ./dsimpletest < input_simpletest_real ;	\
 	${LOCALBASE}/bin/mpirun -np 2 ./csimpletest < input_simpletest_cmplx ;	\
 	${LOCALBASE}/bin/mpirun -np 2 ./zsimpletest < input_simpletest_cmplx ;	\
 	${ECHO_MSG} "The solution should be (1,2,3,4,5)" ;	\
 	${LOCALBASE}/bin/mpirun -np 3 ./c_example ;	\
 	${ECHO_MSG} "The solution should be (1,2)")
 	${LOCALBASE}/bin/mpdallexit
 .else
 	(cd ${WRKSRC}/examples &&	\
 	./ssimpletest < input_simpletest_real ;			\
 	./dsimpletest < input_simpletest_real ;			\
 	./csimpletest < input_simpletest_cmplx ;		\
 	./zsimpletest < input_simpletest_cmplx ;		\
 	${ECHO_MSG} "The solution should be (1,2,3,4,5)" ;	\
 	./c_example ;						\
 	${ECHO_MSG} "The solution should be (1,2)")
 .endif
 
 .include <bsd.port.post.mk>
Index: head/math/mumps/files/patch-Make.inc+Makefile.inc.generic
===================================================================
--- head/math/mumps/files/patch-Make.inc+Makefile.inc.generic	(revision 382198)
+++ head/math/mumps/files/patch-Make.inc+Makefile.inc.generic	(revision 382199)
@@ -1,89 +1,89 @@
 --- Make.inc/Makefile.inc.generic.orig	2011-05-10 14:56:32.000000000 +0200
 +++ Make.inc/Makefile.inc.generic	2013-08-11 17:41:51.000000000 +0200
 @@ -39,7 +39,7 @@
  #          Metis/ParMetis and SCOTCH/PT-SCOTCH (ver 5.1 and later) orderings are now available for MUMPS.
  #
  
 -#SCOTCHDIR  = ${HOME}/scotch_5.1_esmumps
 +#SCOTCHDIR  = @LOCALBASE@
  #ISCOTCH    = -I$(SCOTCHDIR)/include 
  # You have to choose one among the following two lines depending on
  # the type of analysis you want to perform. If you want to perform only
 @@ -55,7 +55,7 @@
  IPORD    = -I$(topdir)/PORD/include/
  LPORD    = -L$(LPORDDIR) -lpord
  
 -#LMETISDIR = /local/metis/
 +#LMETISDIR = @LOCALBASE@/lib
  #IMETIS    = # Should be provided if you use parmetis
  
  # You have to choose one among the following two lines depending on
 @@ -70,7 +70,7 @@
  # The following variables will be used in the compilation process.
  # Please note that -Dptscotch and -Dparmetis imply -Dscotch and -Dmetis respectively.
  #ORDERINGSF = -Dscotch -Dmetis -Dpord -Dptscotch -Dparmetis
 -ORDERINGSF  = -Dpord
 +ORDERINGSF  += -Dpord
  ORDERINGSC  = $(ORDERINGSF)
  
  LORDERINGS = $(LMETIS) $(LPORD) $(LSCOTCH)
 @@ -91,11 +91,11 @@
  # RM : remove files
  RM      = /bin/rm -f
  # CC : C compiler
 -CC      = cc
 +CC      = @CC@
  # FC : Fortran 90 compiler
 -FC      = f90
 +FC      = @FC@
  # FL : Fortran linker
 -FL      = f90
 +FL      = @FC@
  # AR : Archive object in a library
  #      keep a space at the end if options have to be separated from lib name
  AR      = ar vr 
 @@ -105,13 +105,13 @@
  #RANLIB  = echo
  
  # SCALAP should define the SCALAPACK and  BLACS libraries.
 -SCALAP  = -lscalapack -lblacs
 +SCALAP  = -L@LOCALBASE@/lib -lblacs -lblacsc -lblacsf77 -lscalapack
  
  # INCLUDE DIRECTORY FOR MPI
 -INCPAR  = -I/usr/include
 +INCPAR  = -I@LOCALBASE@/include
  
  # LIBRARIES USED BY THE PARALLEL VERSION OF MUMPS: $(SCALAP) and MPI
 -LIBPAR  = $(SCALAP) -L/usr/lib -lmpi
 +LIBPAR  = -L@LOCALBASE@/lib -lfmpich -lmpich -lmpl $(SCALAP)
  
  # The parallel version is not concerned by the next two lines.
  # They are related to the sequential library provided by MUMPS,
 @@ -121,10 +121,10 @@
  
  # DEFINE HERE YOUR BLAS LIBRARY
  
 -LIBBLAS = -lblas
 +LIBBLAS = -L@LOCALBASE@/lib @LAPACK_LIBS@ @BLAS_LIBS@
  
  # DEFINE YOUR PTHREAD LIBRARY
 -LIBOTHERS = -lpthread
-+LIBOTHERS = @PTHREAD_LIBS@ @GCCLIBDIR@ @FORTRANLIBS@
++LIBOTHERS = -lpthread @GCCLIBDIR@ @FORTRANLIBS@
  
  # FORTRAN/C COMPATIBILITY:
  #  Use:
 @@ -137,11 +137,11 @@
  #     leave empty if your Fortran compiler does not change the symbols.
  #
  
 -CDEFS = -DAdd_
 +CDEFS ?= -DAdd_
  
  #COMPILER OPTIONS
 -OPTF    = -O
 -OPTC    = -O -I.
 +OPTF    = @FCFLAGS@
 +OPTC    = @CFLAGS@
  OPTL    = -O
  
  # CHOOSE BETWEEN USING THE SEQUENTIAL OR THE PARALLEL VERSION.
Index: head/math/mumps/files/patch-Make.inc+Makefile.inc.generic.SEQ
===================================================================
--- head/math/mumps/files/patch-Make.inc+Makefile.inc.generic.SEQ	(revision 382198)
+++ head/math/mumps/files/patch-Make.inc+Makefile.inc.generic.SEQ	(revision 382199)
@@ -1,78 +1,78 @@
 --- Make.inc/Makefile.inc.generic.SEQ.orig	2011-05-10 14:56:32.000000000 +0200
 +++ Make.inc/Makefile.inc.generic.SEQ	2013-08-11 18:13:02.000000000 +0200
 @@ -41,7 +41,7 @@
  #          Metis/ParMetis and SCOTCH/PT-SCOTCH (ver 5.1 and later) orderings are now available for MUMPS.
  #
  
 -#SCOTCHDIR  = ${HOME}/scotch_5.1_esmumps
 +#SCOTCHDIR  = @LOCALBASE@
  #ISCOTCH    = -I$(SCOTCHDIR)/include 
  # You have to choose one among the following two lines depending on
  # the type of analysis you want to perform. If you want to perform only
 @@ -57,7 +57,7 @@
  IPORD    = -I$(topdir)/PORD/include/
  LPORD    = -L$(LPORDDIR) -lpord
  
 -#LMETISDIR = /local/metis/
 +#LMETISDIR = @LOCALBASE@/lib
  #IMETIS    = # Should be provided if you use parmetis
  
  # You have to choose one among the following two lines depending on
 @@ -72,7 +72,7 @@
  # The following variables will be used in the compilation process.
  # Please note that -Dptscotch and -Dparmetis imply -Dscotch and -Dmetis respectively.
  #ORDERINGSF = -Dscotch -Dmetis -Dpord -Dptscotch -Dparmetis
 -ORDERINGSF  = -Dpord
 +ORDERINGSF  += -Dpord
  ORDERINGSC  = $(ORDERINGSF)
  
  LORDERINGS = $(LMETIS) $(LPORD) $(LSCOTCH)
 @@ -95,11 +95,11 @@
  # RM : remove files
  RM      = /bin/rm -f
  # CC : C compiler
 -CC      = cc
 +CC      = @CC@
  # FC : Fortran 90 compiler
 -FC      = f90
 +FC      = @FC@
  # FL : Fortran linker
 -FL      = f90
 +FL      = @FC@
  # AR : Archive object in a library
  #      keep a space at the end if options have to be separated from lib name
  AR      = ar vr 
 @@ -112,14 +112,14 @@
  # the sequential library provided by MUMPS, to use instead
  # of ScaLAPACK and MPI.
  INCSEQ  = -I$(topdir)/libseq
 -LIBSEQ  = -Llibseq -lmpiseq
 +LIBSEQ  = -L$(topdir)/libseq -lmpiseq
  
  # DEFINE HERE YOUR BLAS LIBRARY
  
 -LIBBLAS = -lblas
 +LIBBLAS = -L@LOCALBASE@/lib @BLAS_LIBS@ 
  
  # DEFINE HERE YOUR PTHREAD LIBRARY
 -LIBOTHERS = -lpthread
-+LIBOTHERS = @PTHREAD_LIBS@ @GCCLIBDIR@  @FORTRANLIBS@
++LIBOTHERS = -lpthread @GCCLIBDIR@  @FORTRANLIBS@
  
  # FORTRAN/C COMPATIBILITY:
  #  Use:
 @@ -132,12 +132,12 @@
  #     leave empty if your Fortran compiler does not change the symbols.
  #
  
 -CDEFS = -DAdd_
 +CDEFS ?= -DAdd_
  
  #COMPILER OPTIONS
  
 -OPTF    = -O
 -OPTC    = -O -I.
 +OPTF    = @FCFLAGS@
 +OPTC    = @CFLAGS@
  OPTL    = -O
  
  #Sequential:
Index: head/math/sage/Makefile
===================================================================
--- head/math/sage/Makefile	(revision 382198)
+++ head/math/sage/Makefile	(revision 382199)
@@ -1,131 +1,131 @@
 # Created by: Stephen Montgomery-Smith <stephen@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	sage
 PORTVERSION=	6.5
 CATEGORIES=	math
 MASTER_SITES=	http://boxen.math.washington.edu/home/sagemath/sage-mirror/src/ \
 		http://mirrors.xmission.com/sage/src/ \
 		http://www-ftp.lip6.fr/pub/math/sagemath/src/ \
 		http://www.sagemath.org/src-old/
 PKGNAMESUFFIX=	-math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Open source Mathematics software
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		convert:${PORTSDIR}/graphics/ImageMagick \
 		ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
 		automake:${PORTSDIR}/devel/automake \
 		autoconf:${PORTSDIR}/devel/autoconf
 LIB_DEPENDS=	libatlas.so:${PORTSDIR}/math/atlas \
 		liblapack.so:${PORTSDIR}/math/lapack \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 pre-extract:
 	@${ECHO_MSG}
 	@${ECHO_MSG} Instead of installing the port, which will take a considerable amount of
 	@${ECHO_MSG} extra time and space, you can instead type \"make build\".  Then you can move
 	@${ECHO_MSG} work/${PORTNAME}-${PORTVERSION} to wherever you like, and run sage from there.
 	@${ECHO_MSG} However, there is no guarantee that this alternative will always work.
 	@sleep 10
 
 PLIST_FILES=	bin/sage
 USE_TEX=	latex:build
 USES=		gmake iconv tk
 MAKE_JOBS_SAFE=	yes
 
 # Optimization flags will be defined by the source
 CFLAGS:=	${CFLAGS:C/^-O.*$//}
 FFLAGS:=	${CFLAGS:C/^-O.*$//}
 
 MAKE_ENV+=	SAGE_PORT=yes \
 		SAGE_ATLAS_LIB=${LOCALBASE}/lib \
 		DOT_SAGE=${WRKSRC}/tmp/.sage \
 		SAGE_FAT_BINARY=yes
 
 LATEST_LINK=	sage-math	# Conflicts with graphics/sage.
 
 # The following is needed for the lapack subpackage.
 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
 	@${LN} -s -f ${LOCALBASE}/bin/gmake ${WRKSRC}/local/bin/make
 
 post-build:
 	${RM} -rf ${WRKSRC}/tmp/.sage
 	${CHMOD} -R a+rX ${WRKSRC}
 
 check regression-test test: build
 	@${ECHO_MSG} This test can also be performed after installation by typing \"sage -testall\".
 	@${ECHO_MSG}
 	cd ${WRKSRC} && ${SETENV} DOT_SAGE=${WRKSRC}/tmp/.sage ./sage -testall
 	${RM} -f ${WRKSRC}/python*.core
 
 INSTALL_SAGE_DIR=	${PREFIX}/${PORTNAME}-${PORTVERSION}
 STAGED_SAGE_DIR=	${STAGEDIR}${INSTALL_SAGE_DIR}
 do-install:
 	cd ${WRKDIR} && ${FIND} -s ${WRKSRC} | \
 		${GREP} -v '^${WRKSRC}/upstream/' | \
 		${GREP} -v '^${WRKSRC}/tmp' | \
 		${SED} -e 's#${WRKDIR}/##' | \
 		${CPIO} -pmud -R ${BINOWN}:${BINGRP} ${STAGEDIR}${PREFIX}
 	${ECHO_CMD} | ${SETENV} DOT_SAGE=${STAGED_SAGE_DIR}/tmp/.sage ${STAGED_SAGE_DIR}/sage
 	${RM} -rf ${STAGED_SAGE_DIR}/tmp/.sage
 	${SED} -e "s+#SAGE_ROOT.*+SAGE_ROOT=${INSTALL_SAGE_DIR}+" ${WRKSRC}/sage > ${STAGEDIR}${PREFIX}/bin/sage
 	${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}/bin/sage
 
 post-install:
 	@${FIND} -s ${STAGED_SAGE_DIR} -not -type d | \
 		${SED} -e 's#${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	@${FIND} -s ${STAGED_SAGE_DIR} -type d -empty | \
 		${SED} -e 's#${STAGEDIR}${PREFIX}/#@exec ${MKDIR} %D/#' >> ${TMPPLIST}
 	@${FIND} -s ${STAGED_SAGE_DIR} -type d -depth | \
 		${SED} -e 's#${STAGEDIR}${PREFIX}/#@dirrm #' >> ${TMPPLIST}
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 701106
 BROKEN=		POSIX semaphores are required, and the support only works in FreeBSD 7-STABLE and later
 .endif
 
 MAKE_ENV+=	MAKE="${MAKE} -j${MAKE_JOBS_NUMBER}"
 
 .ifdef MAINTAINER_MODE
 test-fbsd-patches:	patch
 	${RM} -rf ${WRKSRC}/build/pkgs/*/src; \
 	for d in ${WRKSRC}/build/pkgs/*; do \
 		if ls $$d/fbsd-patch-* > /dev/null 2>&1; then \
 			${ECHO_MSG} Testing patches in $${d##*/}; \
 			b=$${d##*/}-`${CAT} $$d/package-version.txt | ${SED} 's/\.p.*//'`; \
 			c=${WRKSRC}/upstream/$$b.tar.bz2 ; \
 			if [ ! -e $$c ]; then \
 				c=${WRKSRC}/upstream/$$b.tar.gz ; \
 				if [ ! -e $$c ]; then \
 					${ECHO_MSG} Couldn\'t find $$c; \
 					exit 1; \
 				fi; \
 			fi; \
 			b=`echo $$b | sed 's/python/Python/'` ; \
 			if ! (cd $$d && tar xf $$c && ${MV} $$b src); then \
 				${ECHO_MSG} Unable to unarchive $$c; \
 				exit 1; \
 			fi; \
 			if ! (cd $$d && ${CAT} fbsd-patch-* | patch); then \
 				${ECHO_MSG} Patches in $${d##*/} failed; \
 				exit 1; \
 			fi; \
 		fi; \
 	done; \
 	${RM} -rf ${WRKSRC}/build/pkgs/*/src
 .endif
 
 .include <bsd.port.post.mk>
Index: head/math/sdpara/Makefile
===================================================================
--- head/math/sdpara/Makefile	(revision 382198)
+++ head/math/sdpara/Makefile	(revision 382199)
@@ -1,95 +1,94 @@
 # Created by: NAKATA, Maho <maho@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	sdpara
 PORTVERSION=	7.2.1
 PORTREVISION=	10
 CATEGORIES=	math parallel
 MASTER_SITES=	http://sdpa.indsys.chuo-u.ac.jp/sdpa/files/
 DISTFILES=	${SRCFILE}#${MANUALFILE}
 DIST_SUBDIR=	sdpa
 EXTRACT_ONLY=	${SRCFILE}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SDPARA parallel version of SDPA (math/sdpa)
 
 LIB_DEPENDS=	libscalapack.so:${PORTSDIR}/math/scalapack \
 		libblacs.so:${PORTSDIR}/math/blacs \
 		libmpich.so:${PORTSDIR}/net/mpich2
 
 SRCDATE=	20090109
 MANDATE=	20080618
 MANUALVER=	7.1.1
 SRCFILE=	${PORTNAME}.${PORTVERSION}.src.${SRCDATE}.tar.gz
 #MANUALFILE=	${PORTNAME}.${MANUALVER}.manual.${MANDATE}.pdf
 USES=		fortran gmake
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}
 
 .if exists(${LOCALBASE}/lib/libgoto2.so)
 WITH_BLAS?=	gotoblas
 .elif exists(${LOCALBASE}/lib/libatlas.so)
 WITH_BLAS?=	atlas
 .else
 WITH_BLAS?=	reference
 .endif
 
 . if ${WITH_BLAS} == reference
 LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
 LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack
 BLAS=		-lblas
 LAPACK=		-llapack
 .elif ${WITH_BLAS} == gotoblas
 LIB_DEPENDS+=	libgoto2.so:${PORTSDIR}/math/gotoblas
 BLAS=		-lgoto2p
 LAPACK=		-lgoto2p
 .elif ${WITH_BLAS} == atlas
 LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
 BLAS=		-lptf77blas
 LAPACK=		-lalapack -lptcblas
 .endif
 
 #PLIST_SUB+=	MANUALFILE=${MANUALFILE}
 
 SCALAPACK=	-L/usr/local/lib -lscalapack -lblacs -lblacsc
 FORTRAN_LIBS=	-lgfortran
 GCCLIBDIR=	-L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%MPICC%%|${LOCALBASE}/bin/mpicc|g ; \
 				s|%%MPICXX%%|${LOCALBASE}/bin/mpicxx|g ; \
 				s|%%MPIF77%%|${LOCALBASE}/bin/mpif77|g ; \
 				s|%%CFLAGS%%|${CFLAGS}|g ; \
 				s|%%CXXFLAGS%%|${CXXFLAGS}|g ; \
 				s|%%FFLAGS%%|${FFLAGS}|g ; \
 				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 ; \
 				s|%%MPIF77%%|${LOCALBASE}/bin/mpif77|g ; \
 				s|%%CFLAGS%%|${CFLAGS}|g ; \
 				s|%%CXXFLAGS%%|${CXXFLAGS}|g ; \
 				s|%%FFLAGS%%|${FFLAGS}|g ; \
 				s|%%BLAS%%|${BLAS}|g ; \
 				s|%%LAPACK%%|${LAPACK}|g ' ${WRKSRC}/mumps/Makefile
 
 pre-build:
 	${DIRNAME} `${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
 
 do-build:
 	cd ${WRKSRC} ; ${MAKE_CMD} mumps
 	cd ${WRKSRC} ; ${MAKE_CMD}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sdpara ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA}    ${WRKSRC}/param.sdpa ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA}    ${WRKSRC}/example* ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA}    ${WRKSRC}/param.sdpa ${STAGEDIR}${EXAMPLESDIR}
 #	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 #	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${MANUALFILE} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/math/sdpara/files/patch-Makefile
===================================================================
--- head/math/sdpara/files/patch-Makefile	(revision 382198)
+++ head/math/sdpara/files/patch-Makefile	(revision 382199)
@@ -1,50 +1,48 @@
---- 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
  ############################################################
  
 -CC       = mpicc
 -CXX      = mpicxx
 -FC       = mpif77
 -CFLAGS   = -O3
 -CXXFLAGS = -O3
 -FFLAGS   = -O3
 -
 -LAPACK_LIBS = /usr/local/lapack/lib/liblapack.a
 -BLAS_LIBS   = /usr/local/lapack/lib/libblas.a
 -
 -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%%
 +CFLAGS   = %%CFLAGS%%
 +CXXFLAGS = %%CXXFLAGS%%
 +F77FLAGS = %%FFLAGS%%
 +
 +LAPACK_LIBS = %%LAPACK%%
 +BLAS_LIBS   = %%BLAS%%
 +  
 +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:
 -	cd mumps; make
 +	cd mumps; $(MAKE)
  
  mumps-clean:
 -	cd mumps; make distclean
 +	cd mumps; $(MAKE) distclean
  
  update_make_headers:
  	g++ -MM *.cpp > make.headers
Index: head/math/spooles/Makefile
===================================================================
--- head/math/spooles/Makefile	(revision 382198)
+++ head/math/spooles/Makefile	(revision 382199)
@@ -1,112 +1,116 @@
 # Created by: Pedro Giffuni <giffunip@asme.org>
 # $FreeBSD$
 
 PORTNAME=	spooles
 PORTVERSION=	2.2
 PORTREVISION=	12
 CATEGORIES=	math
 MASTER_SITES=	http://www.netlib.org/linalg/spooles/
 .ifdef WITH_MPI
 PKGNAMESUFFIX=	-mpich
 .endif
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 DIST_SUBDIR=	spooles
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	SParse Object Oriented Linear Equations Solver
 
 .if defined(WITH_MPI)
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmpich.a:${PORTSDIR}/net/mpich2
 .endif
 
 USES=		gmake tar:tgz
 
 .if defined(WITH_MPI)
 PLIST_SUB+=	MPI=""
 PLIST_SUB+=	MT="@comment "
 CONFLICTS=	spooles-2*
 .else
 PLIST_SUB+=	MT=""
 PLIST_SUB+=	MPI="@comment "
 CONFLICTS=	spooles-mpich-2*
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} AllInOne.ps.gz Eigen.ps.gz \
 	 	Install.ps.gz LinSol.ps.gz Ordering.ps.gz \
 		PP99.ps.gz ReferenceManual.ps.gz
 .endif
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 .else
 PICFLAG?=	-fpic
 .endif
 
 .SILENT:
 
 OPTIONS_DEFINE=	DOCS
 
 pre-everything::
 .if !defined(WITH_MPI)
 	${ECHO_MSG} "make WITH_MPI=yes for mpich version"
 .endif
 
 do-extract:
 	${MKDIR} ${WRKSRC} ; cd ${WRKSRC} ; ${TAR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS}
 
 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)
 	@(cd ${WRKSRC}/MPI/src ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f makeGlobalLib)
 	@(cd ${WRKSRC}_SHARED/MPI/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f makeGlobalLib)
 	@(cd ${WRKSRC}_SHARED ; ld -Bshareable -o libspooles.so.1 -x -soname libspooles.so.1 --whole-archive spooles.a )
 
 .else
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} global -f makefile)
 	@(cd ${WRKSRC}/MT/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f makeGlobalLib)
 	@(cd ${WRKSRC}_SHARED; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} global -f makefile)
 	@(cd ${WRKSRC}_SHARED/MT/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f makeGlobalLib)
 	@(cd ${WRKSRC}_SHARED ; ld -Bshareable -o libspooles.so.1 -x -soname libspooles.so.1 --whole-archive spooles.a )
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/spooles
 	${INSTALL_DATA} ${WRKSRC}/spooles.a ${STAGEDIR}${PREFIX}/lib/libspooles.a
 	${INSTALL_DATA} ${WRKSRC}_SHARED/libspooles.so.1 ${STAGEDIR}${PREFIX}/lib
 	${LN} -sf libspooles.so.1 ${STAGEDIR}${PREFIX}/lib/libspooles.so
 
 .if defined(WITH_MPI)
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/spooles/MPI
 	${INSTALL_DATA} ${WRKSRC}/MPI/*.h ${STAGEDIR}${PREFIX}/include/spooles/MPI
 .else
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/spooles/MT
 	${INSTALL_DATA} ${WRKSRC}/MT/*.h ${STAGEDIR}${PREFIX}/include/spooles/MT
 .endif
 	${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/spooles/
 .for i in A2 BPG Chv ChvList ChvManager Coords DenseMtx DSTree Drand \
 	DV ETree FrontMtx GPart Graph I2Ohash IIheap IV IVL Ideq InpMtx \
 	Lock MSMD PatchAndGoInfo Pencil SolveMap SubMtx SubMtxList SubMtxManager \
 	SymbFac Tree Utilities ZV misc
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/spooles/${i}
 	${INSTALL_DATA} ${WRKSRC}/${i}/*.h ${STAGEDIR}${PREFIX}/include/spooles/${i}
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/AllInOne.ps.gz	${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Eigen.ps.gz		${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Install.ps.gz		${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/LinSol.ps.gz		${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Ordering.ps.gz	${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/PP99.ps.gz		${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/ReferenceManual.ps.gz	${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
Index: head/math/spooles/files/patch-Make.inc
===================================================================
--- head/math/spooles/files/patch-Make.inc	(revision 382198)
+++ head/math/spooles/files/patch-Make.inc	(revision 382199)
@@ -1,87 +1,87 @@
 --- Make.inc.orig	Tue Jan 19 06:48:55 1999
 +++ Make.inc	Tue Jan  9 12:57:18 2007
 @@ -12,7 +12,7 @@
  # for solaris
  #
  # CC = gcc
 -  CC = /usr/lang-4.0/bin/cc
 +# CC = cc
  #
  # for sgi
  #
 @@ -22,20 +22,23 @@
  #
  # CC = /opt/mpi/bin/mpicc
  #
 +# for FreeBSD
 +CC = %%CC%%
 +#
  #----------------------------------------
  #
  #  set the compiler flags
  # 
  # OPTLEVEL = 
  # OPTLEVEL = -g -v
 -  OPTLEVEL = -O
 +# OPTLEVEL = -O
  # OPTLEVEL = -xO5 -v
  # OPTLEVEL = -O3
  # OPTLEVEL = -O4
 -# CFLAGS = -Wall -g
 +CFLAGS = %%CFLAGS%%
  # CFLAGS = -Wall -pg
  # CFLAGS = $(OPTLEVEL) -D_POSIX_C_SOURCE=199506L
 -  CFLAGS = $(OPTLEVEL)
 +# CFLAGS += $(OPTLEVEL)
  # CFLAGS = -Wall $(OPTLEVEL)
  #
  #----------------------------------------
 @@ -50,8 +53,8 @@
  #  set any thread libraries
  #
  # 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
  #
  #---------------------------------------------------------------------
 @@ -79,15 +82,15 @@
  #  set the ranlib environment
  #  (if ranlib is not needed, we echo the library name)
  #
 -# RANLIB = ranlib
 -  RANLIB = echo
 +  RANLIB = ranlib
 +# RANLIB = echo
  #
  #---------------------------------------------------------------------
  #
  #  set suffix rule *.c --> *.o
  #
 -.c.o : 
 -	$(PURIFY) $(CC) -c $(CFLAGS) $<
 +#.c.o : 
 +#	$(PURIFY) $(CC) -c $(CFLAGS) $<
  #
  #---------------------------------------------------------------------
  #
 @@ -103,7 +106,7 @@
  #  MPI install library
  #
  # MPI_INSTALL_DIR = 
 -  MPI_INSTALL_DIR = /usr/local/mpich-1.0.13
 +MPI_INSTALL_DIR = %%LOCALBASE%%
  #
  #---------------------------------------------------------------------
  #
 @@ -115,7 +118,7 @@
  #
  # for solaris
  #
 -  MPI_LIB_PATH = -L$(MPI_INSTALL_DIR)/lib/solaris/ch_p4
 +MPI_LIB_PATH = -L$(MPI_INSTALL_DIR)/lib
  #
  # for hp
  #
Index: head/math/suitesparse/Makefile
===================================================================
--- head/math/suitesparse/Makefile	(revision 382198)
+++ head/math/suitesparse/Makefile	(revision 382199)
@@ -1,116 +1,115 @@
 # Created by: Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	suitesparse
 PORTVERSION=	4.0.2
 PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	http://www.cise.ufl.edu/research/sparse/SuiteSparse/
 DISTNAME=	SuiteSparse-${PORTVERSION}
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	SuiteSparse is a set of packages for sparse matrices calculation
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 USES=		fortran gmake
 
 OPTIONS_RADIO=	BLAS
 OPTIONS_RADIO_BLAS=	OPENBLAS REFERENCE ATLAS GOTO
 OPTIONS_DEFAULT=	OPENBLAS
 
 OPENBLAS_DESC=	Openblas
 OPENBLAS_USES=	blaslapack
 
 REFERENCE_DESC=	Blas / Lapack
 REFERENCE_USES=	blaslapack:netlib
 
 ATLAS_DESC=	ATLAS
 ATLAS_USES=	blaslapack:atlas
 
 GOTO_DESC=	GOTO
 GOTO_USES=	blaslapack:gotoblas
 
 .if defined (WITH_METIS)
 LIB_DEPENDS=	libmetis.so:${PORTSDIR}/math/metis4
 
 RESTRICTED=	GPL and METIS licenses are contradictory
 .endif
 
 CONFLICTS=	umfpack-*
 
-CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 .else
 PICFLAG?=	-fpic
 .endif
 
 USE_LDCONFIG=	yes
 WRKSRC=${WRKDIR}/SuiteSparse
 WRKSRC_SHARED=${WRKSRC}_shared
 SVERSION=1
 
 .if defined (WITH_METIS)
 METIS=${LOCALBASE}/lib/libmetis.a
 METIS_PATH=${LOCALBASE}/include/metis
 CHOLMOD_CONFIG=
 .else
 CHOLMOD_CONFIG=		-DNPARTITION
 .endif
 
 post-patch:
 	@${FIND} -X ${WRKSRC} -type f -name 'Makefile' -or -name '*.mk' | ${XARGS} \
 	${REINPLACE_CMD} -e '\|^AR =|s|ar|${AR}|' \
 			-e '\|^BLAS =|s|=.*|= ${LDFLAGS} ${BLASLIB}|' \
 			-e '\|^CC =|d' \
 			-e '\|^CFLAGS =|{s|-O[1-9]\{0,1\}||g;s|=|= ${CFLAGS} $${PICFLAG} |;}' \
 			-e '\|^CHOLMOD_CONFIG =|s|=.*|= ${CHOLMOD_CONFIG}|' \
 			-e '\|^CPLUSPLUS =|s|=.*|= ${CXX}|' \
 			-e '\|^F77 =|d' \
 			-e '\|^F77FLAGS =|s|=.*|= ${FFLAGS} $${PICFLAG}|' \
 			-e '\|^LAPACK =|s|=.*|= ${LDFLAGS} ${LAPACKLIB}|' \
 			-e '\|^METIS =|s|=.*|= ${METIS}|' \
 			-e '\|^METIS_PATH =|s|=.*|= ${METIS_PATH}|' \
 			-e 's|-I\$$(METIS_PATH)/Lib|-I${METIS_PATH}|' \
 			-e '\|^RANLIB =|s|ranlib|${RANLIB}|' \
 			-e '\|^SPQR_CONFIG =|s|=.*|= ${CHOLMOD_CONFIG}|' \
 			-e 's|# MAKE = gmake|MAKE = gmake|g' \
 			-e 's|/usr/local|${LOCALBASE}|g'
 	@${CP} -r ${WRKSRC} ${WRKSRC_SHARED}
 	@${FIND} -X ${WRKSRC_SHARED} -type f -name 'Makefile' -or -name '*.mk' | ${XARGS} \
 	${REINPLACE_CMD} -e 's|$$(CFLAGS)|$$(CFLAGS) $$(PICFLAG)|g'
 
 do-build:
 	@cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} PICFLAG= \
 		${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS}
 	@cd ${WRKSRC_SHARED} ; ${SETENV} ${MAKE_ENV} PICFLAG=${PICFLAG} \
 		${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS}
 
 post-build:
 	@for i in `find ${WRKSRC_SHARED} -type f -name '*.a'` ; do \
 		j=$${i##*/} ; ${LD} -Bshareable -o $${i%.a}.so.${SVERSION} -x \
 		-soname $${j%.a}.so.${SVERSION} --whole-archive $${i} ; \
 	done
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/suitesparse
 	@${LN} -sf ${PREFIX}/include/suitesparse ${STAGEDIR}${PREFIX}/include/ufsparse
 .for d in AMD BTF CAMD CCOLAMD CHOLMOD COLAMD CXSparse KLU SPQR UMFPACK
 	@${INSTALL_DATA} ${WRKSRC}/${d}/Include/*.h ${STAGEDIR}${PREFIX}/include/suitesparse
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/SuiteSparse_config/SuiteSparse_config.h ${STAGEDIR}${PREFIX}/include/suitesparse
 	@${INSTALL_DATA} ${WRKSRC}/UMFPACK/Source/umf_config.h ${STAGEDIR}${PREFIX}/include/suitesparse
 	@${INSTALL_DATA} ${WRKSRC}/SPQR/Include/*.hpp ${STAGEDIR}${PREFIX}/include/suitesparse
 	@for i in `find ${WRKSRC_SHARED} -type f -name '*.a'` ; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i##${WRKSRC_SHARED}/} \
 		$${i%.a}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib ; \
 		j=$${i##*/} ;  ${LN} -sf $${j%.a}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/$${j%.a}.so ; \
 	done
 
 .include <bsd.port.mk>
Index: head/math/superlu_mt/Makefile
===================================================================
--- head/math/superlu_mt/Makefile	(revision 382198)
+++ head/math/superlu_mt/Makefile	(revision 382199)
@@ -1,127 +1,123 @@
 # Created by: Pedro Giffuni <giffunip@asme.org>
 # $FreeBSD$
 
 PORTNAME=	superlu_mt
 PORTVERSION=	2.0.20080115
 PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	http://crd.lbl.gov/~xiaoye/SuperLU/ \
 		http://crd.lbl.gov/~xiaoye/:doc
 DISTNAME=	${PORTNAME}_2.0
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} simax97.ps.gz:doc
 DIST_SUBDIR=	superlu2
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Routines for performing multithreaded sparse factorization
 
 USES=		fortran gmake
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libgoto2.so)
 WITH_BLAS?=	gotoblas
 .elif exists(${LOCALBASE}/lib/libatlas.so)
 WITH_BLAS?=	atlas
 .else
 WITH_BLAS?=	reference
 .endif
 
 .if ${WITH_BLAS} == reference
 LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
 BLAS=	-lblas
 .elif ${WITH_BLAS} == gotoblas
 LIB_DEPENDS+=	libgoto2.so:${PORTSDIR}/math/gotoblas
 BLAS=	-lgoto2p
 BROKEN=	Build stops while testing
 .elif ${WITH_BLAS} == atlas
 LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
 BLAS=	-lptf77blas
 .endif
 
 .if ${ARCH} == "sparc64" || ${ARCH} == "amd64"
 FPIC=	-fPIC
 .else
 FPIC=	-fpic
 .endif
 
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not link on sparc64
 .endif
 
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/SuperLU_MT_2.0
 WRKSRC_SHARED=	${WRKDIR}/SuperLU_MT_2.0_shared
 ALL_TARGET=	lib
 SVERSION=	1
 
 ARCH2FIX=	CBLAS/Makefile MAKE_INC/make.openmp MAKE_INC/make.exemplar \
 		MAKE_INC/make.pthreads TESTING/MATGEN/Makefile	\
 		make.inc SRC/Makefile
 
 post-patch:
 .for fmk in ${ARCH2FIX}
 	@${REINPLACE_CMD} -e 's|^ARCH *.= ar|ARCMD = ar| ; \
 		s|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC}/${fmk}
 .endfor
 	${CP} -r ${WRKSRC} ${WRKSRC_SHARED}
 	@${REINPLACE_CMD} -e 's+%%BLAS%%+-L${LOCALBASE}/lib ${BLAS}+ ; \
 			s+%%CC%%+${CC}+; s+%%FC%%+${FC}+; \
 			s+%%CPPFLAGS%%+${CPPFLAGS}+; \
 			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}+ ; \
 			s+%%CC%%+${CC}+; s+%%FC%%+${FC}+; \
 			s+%%CPPFLAGS%%+${CPPFLAGS}+; \
 			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:
 	cd ${WRKSRC} ; ${MAKE_CMD} LDFLAGS="${LDFLAGS}"
 	cd ${WRKSRC_SHARED} ; ${MAKE_CMD} LDFLAGS="${LDFLAGS}"
 	${RM} -rf ${WRKDIR}/tmp_static
 	${MKDIR} ${WRKDIR}/tmp_static
 	cd ${WRKDIR}/tmp_static
 	${FIND} ${WRKSRC} -name "*\.a" -exec ${CP} {} ${WRKDIR}/tmp_static \;
 	${RM} -rf ${WRKDIR}/tmp_shared
 	${MKDIR} ${WRKDIR}/tmp_shared
 	${FIND} ${WRKSRC_SHARED} -name "*\.a" -exec ${CP} {} ${WRKDIR}/tmp_shared \;
 	@cd ${WRKDIR}/tmp_shared ; for i in `ls *.a | ${SED}  's/\.a//' `; do \
 	${RM} -f $${i}.so.* $${i}.so ; \
        	${FC} ${CFLAGS} ${FPIC} ${LDFLAGS} -shared -o $${i}.so.${SVERSION} \
 	-Wl,-soname,$${i}.so.${SVERSION} -Wl,--allow-multiple-definition \
 	-Wl,--whole-archive $${i}.a -Wl,--no-whole-archive -Wl,--as-needed; \
 		${LN} -s $${i}.so.${SVERSION} $${i}.so ;\
 	done
 
 do-install:
 	${INSTALL_LIB} ${WRKDIR}/tmp_static/libsuperlu_mt.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKDIR}/tmp_shared/libsuperlu_mt.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib
 	cd ${STAGEDIR}${PREFIX}/lib && ${LN} -s -f libsuperlu_mt.so.${SVERSION} libsuperlu_mt.so
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/SRC/*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 #	${INSTALL_DATA} ${WRKSRC}/INSTALL/*.ps ${STAGEDIR}${DOCSDIR}
 #	${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/*.ps
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/simax97.ps.gz ${STAGEDIR}${DOCSDIR}
 .endif
 
 regression-test: do-build
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} testing)
 	@(cd ${WRKSRC_SHARED} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} testing)
 
 .include <bsd.port.post.mk>
Index: head/math/superlu_mt/files/patch-make.inc
===================================================================
--- head/math/superlu_mt/files/patch-make.inc	(revision 382198)
+++ head/math/superlu_mt/files/patch-make.inc	(revision 382199)
@@ -1,57 +1,62 @@
---- 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
  #
 -PLAT = _sp
 +PLAT = _PTHREAD
  
  #
  #  The name of the libraries to be created/linked to
  #
 -TMGLIB       = libtmglib.a
 -SUPERLULIB   = libsuperlu_mt$(PLAT).a
 +TMGLIB       = libtmg.a
 +SUPERLULIB   = libsuperlu_mt.a
  
  # 
  # 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
 -BLASLIB   = -lessl
 +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
  #
  
 -CC           = xlc_r
 -CFLAGS       = -qarch=pwr5 -qalias=allptrs $(PREDEFS) -DPRNTlevel=0 -O3
 -FORTRAN	     = xlf
 -FFLAGS       = -O3 -qarch=pwr5
 -LOADER       = xlc_r
 -LOADOPTS     = -bmaxdata:0x80000000
 +CC           = %%CC%%
-+CFLAGS       = $(PREDEFS) %%CPPFLAGS%% %%CFLAGS%% %%PTHREAD_CFLAGS%%
++CFLAGS       = $(PREDEFS) %%CPPFLAGS%% %%CFLAGS%%
 +FORTRAN      = %%FC%%
 +FFLAGS       = %%FFLAGS%%
 +LOADER       = %%CC%%
 +LOADOPTS     = %%LDFLAGS%%
 +NOOPTS       = %%FPIC%%
  #
  #  C preprocessor defs for compilation for the Fortran interface
  #  (-DNoChange, -DAdd_, -DAdd__, or -DUpCase)
  #
 -CDEFS        = -DNoChange
 +CDEFS        = -DAdd_