diff --git a/devel/distorm/Makefile b/devel/distorm/Makefile
index e0ae5fc0deaa..2a728c9e428f 100644
--- a/devel/distorm/Makefile
+++ b/devel/distorm/Makefile
@@ -1,98 +1,98 @@
 # Created by: bf <bf2006a@yahoo.com>
 # $FreeBSD$
 
 PORTNAME?=	distorm
 DISTVERSION=	20121220-r230
 PORTREVISION?=	1
 CATEGORIES=	devel
 .if defined(PYTHON_SLAVEPORT)
 CATEGORIES+=	python
 .endif
 MASTER_SITES=	LOCAL/bf
 .if defined(PYTHON_SLAVEPORT)
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 .endif
 .if defined(PYTHON_SLAVEPORT) || make(makesum)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dislib.py
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 .endif
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT?=	Fast x86 and x86-64 disassembler library
 
 LICENSE=	GPLv3
 
 USES=		dos2unix
-USE_XZ =	yes
+USE_XZ=		yes
 
 .if defined(PYTHON_SLAVEPORT)
 USE_PYTHON=		2
 
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	distorm3
 PYDISTUTILS_PKGVERSION=	3
 
 PLIST_DIRS=	%%PYTHON_SITELIBDIR%%/distorm3
 
 PLIST_FILES=	bin/dislib.py \
 		%%PYTHON_SITELIBDIR%%/distorm3/sample.py \
 		%%PYTHON_SITELIBDIR%%/distorm3/__init__.py \
 		%%PYTHON_SITELIBDIR%%/distorm3/libdistorm3.so \
 		%%PYTHON_SITELIBDIR%%/distorm3/sample.pyc \
 		%%PYTHON_SITELIBDIR%%/distorm3/__init__.pyc \
 		%%PYTHON_SITELIBDIR%%/distorm3/sample.pyo \
 		%%PYTHON_SITELIBDIR%%/distorm3/__init__.pyo
 .else
 USE_LDCONFIG=	yes
 
 BUILD_WRKSRC=	${WRKSRC}/make/linux
 
 PLIST_FILES=	bin/disasm \
 		include/distorm.h \
 		include/mnemonics.h \
 		lib/libdistorm3.a \
 		lib/libdistorm3.so \
 		lib/libdistorm3.so.1
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 .else
 PICFLAG?=	-fpic
 .endif
 
 .if defined(PYTHON_SLAVEPORT)
 post-extract:
 	@${CP} ${_DISTDIR}/dislib.py ${WRKSRC}
 
 post-patch:
 	@${REINPLACE_CMD} -e "1{x;s|^|#!${PYTHON_CMD}|;G;}" ${WRKSRC}/dislib.py
 	@${REINPLACE_CMD} -e "\|extra_compile_args=|s| '-O2',||" ${WRKSRC}/setup.py
 
 post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/dislib.py ${STAGEDIR}${PREFIX}/bin
 
 .else
 do-build:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
 	EXTRAFLAGS="${PICFLAG} -DDISTORM_DYNAMIC" ${MAKE} ${_MAKE_JOBS} \
 	${MAKE_ARGS} clib clean)
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
 	EXTRAFLAGS="-DDISTORM_STATIC" ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} staticlib)
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${BUILD_WRKSRC}/disasm \
 	${WRKSRC}/examples/linux/main.c ${BUILD_WRKSRC}/libdistorm3.a
 
 check regression-test test: build
 	@cd ${BUILD_WRKSRC}; ./disasm disasm
 
 do-install:
 	@(cd ${BUILD_WRKSRC}; ${INSTALL_LIB} libdistorm3.a ${STAGEDIR}${PREFIX}/lib; \
 	${INSTALL_LIB} libdistorm3.so ${STAGEDIR}${PREFIX}/lib/libdistorm3.so.1; \
 	${LN} -sf libdistorm3.so.1 ${STAGEDIR}${PREFIX}/lib/libdistorm3.so; \
 	${INSTALL_PROGRAM} disasm ${STAGEDIR}${PREFIX}/bin)
 	@${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include
 
 .endif
 .include <bsd.port.post.mk>
diff --git a/devel/py-uncompyle2/Makefile b/devel/py-uncompyle2/Makefile
index 7346303b8898..d490d863ead7 100644
--- a/devel/py-uncompyle2/Makefile
+++ b/devel/py-uncompyle2/Makefile
@@ -1,27 +1,27 @@
 # Created by: Mikhail Teterin <mi@aldan.algebra.com>
 # $FreeBSD$
 
 PORTNAME=	uncompyle2
 PORTVERSION=	1.1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/Mysterie/${PORTNAME}/tarball/${HASH}/
 PKGNAMEPREFIX=	py-
 DISTNAME=	Mysterie-${PORTNAME}-${HASH}
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Decompiler for Python's .pyc and .pyo files
 
-HASH	=	3956a5a
+HASH=		3956a5a
 USE_PYTHON=	2
 USE_PYDISTUTILS=yes
 REINPLACE_ARGS=	-i ""
 
 pre-patch:
 	# Removing blanks at EOL
 	${FIND} ${WRKSRC} -type f -print0 | \
 		${XARGS} -0 ${REINPLACE_CMD} -E 's/[[:blank:]]+$$//g'
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/uncompyle2.py ${STAGEDIR}${PREFIX}/bin/uncompyle2
 
 .include <bsd.port.mk>
diff --git a/editors/lazarus-lcl-units/Makefile b/editors/lazarus-lcl-units/Makefile
index 75013b49ff51..c2ca47f6219a 100644
--- a/editors/lazarus-lcl-units/Makefile
+++ b/editors/lazarus-lcl-units/Makefile
@@ -1,16 +1,17 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
 PORTREVISION=	0
 PKGNAMESUFFIX=	-lcl-units
 
 COMMENT=	Lazarus components library units
 
 USE_FPC=	fcl-base fcl-db fcl-image fcl-process fcl-registry fcl-xml iconvenc fcl-res
 
 LCL_INTERFACE=	#
 
 MASTERDIR=	${.CURDIR}/../../editors/lazarus
 
-OPT	=	"-Fu../../lcl/ -Fu../lcl -Fu../../lcl/forms -Fu../../lcl/nonwin32 -Fu../../lcl/widgetset -Fi../../lcl/include"
+OPT=		"-Fu../../lcl/ -Fu../lcl -Fu../../lcl/forms -Fu../../lcl/nonwin32 -Fu../../lcl/widgetset -Fi../../lcl/include"
+
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index d91f31fa9bc0..176dba3a5d1e 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -1,63 +1,63 @@
 # Created by: Mikhail Teterin <mi@aldan.algebra.com>
 # $FreeBSD$
 
 PORTNAME=	djvulibre
 PORTVERSION=	3.5.25.3
 PORTREVISION=	2
 CATEGORIES=	graphics www
 MASTER_SITES=	SF/djvu/DjVuLibre/${PORTVERSION:R}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	DjVu base libraries and utilities
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libtiff.so:${PORTSDIR}/graphics/tiff
 
 USES=		pathfix iconv
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 CONFIGURE_ENV=	JPEG_CFLAGS="-I${LOCALBASE}/include" \
 		JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \
 		TIFF_CFLAGS="-I${LOCALBASE}/include" \
 		TIFF_LIBS="-L${LOCALBASE}/lib -ltiff" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-threads=pthread --enable-shared
 USE_LDCONFIG=	yes
 CONFLICTS=	djvulibre-nox11-3*
-WRKSRC =	${WRKDIR}/${DISTNAME:R}
+WRKSRC=		${WRKDIR}/${DISTNAME:R}
 
 PORTDOCS=	djvu2spec.djvu djvu3spec.djvu djvuchanges.txt lizard2002.djvu lizard2007.djvu
 
 OPTIONS_DEFINE=		DOCS ANY2DJVU
 OPTIONS_SUB=		yes
 
 ANY2DJVU_DESC=		Install any2djvu script (requires curl)
 ANY2DJVU_RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/-[Og]\*)/d ; \
 		s|$$OPTS -O[[:digit:]]*|$$OPTS|g ; \
 		s|$$OPTS $$opt|$$OPTS|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|$${FLAGS}|| ; \
 		s|@CPPFLAGS@|$${FLAGS} &|' \
 		${WRKSRC}/tools/jb2cmp/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|_PROGRAM} -m 0755|_SCRIPT}|' \
 		${WRKSRC}/tools/Makefile.in
 .if empty(PORT_OPTIONS:MANY2DJVU)
 	@${REINPLACE_CMD} -e 's,any2djvu,,' ${WRKSRC}/tools/Makefile.in
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile
index cc0a96a911c3..651e795d78f7 100644
--- a/graphics/ocaml-lablgl/Makefile
+++ b/graphics/ocaml-lablgl/Makefile
@@ -1,94 +1,94 @@
 # Created by: Ronald Kuehn <rk@ronald.org>
 # $FreeBSD$
 
 PORTNAME=	lablgl
 PORTVERSION=	20120306
 PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/ \
 		https://forge.ocamlcore.org/frs/download.php/816/
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL interface for Objective Caml
 
 LICENSE=	BSD3CLAUSE
 
 WRKSRC=		${WRKDIR}/lablGL
 USES=		gmake
 USE_XORG=	x11 xext xmu
 USE_GL=		glut
 USE_OCAML=	yes
 USE_OCAML_WASH=	yes
 ALL_TARGET=	all opt
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	THREADS
 THREADS_DESC=	Threaded Tcl/Tk (must match lang/ocaml)
 
 OPTIONS_DEFAULT=	THREADS
 
 PATTERN=	[[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]]
 
 DOCSDIR=	${PREFIX}/share/doc/ocaml/lablgl
 EXAMPLESDIR=	${PREFIX}/share/examples/ocaml/lablgl
 
 CONFLICTS=	ocaml-notk-[0-9]* ocaml-nox11-[0-9]*
 
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 USES+=		tk:84,85
 .if ${PORT_OPTIONS:MTHREADS}
 THR_CPP=	${PTHREAD_CFLAGS}
-THR_LD =	${PTHREAD_LIBS}
+THR_LD=		${PTHREAD_LIBS}
 .endif
 
 post-extract:
 	@${CP} ${WRKSRC}/Makefile.config.freebsd ${WRKSRC}/Makefile.config
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,/usr/X11R6,${LOCALBASE},g" \
 		-e "s,/usr/local,${LOCALBASE},g" \
 		-e "s,^\(BINDIR[ \t]*=\).*,\1${PREFIX}/bin,g" \
 		-e "s,^\(RANLIB[ \t]*=\).*,\1ranlib,g" \
 		-e "s,^#\(LIBDIR[ \t]*=\).*,\1${PREFIX}/lib/ocaml,g" \
 		-e "s,^#\(DLLDIR[ \t]*=\).*,\1${PREFIX}/lib/ocaml/stublibs,g" \
 		-e "/^TKINCLUDES/s,=.*$$,= -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}," \
 		-e "/^TKLIBS/s,=.*$$,= -L${LOCALBASE}/lib -ltk${TK_SHLIB_VER}\
 		-ltcl${TCL_SHLIB_VER} ${THR_LD}," \
 		${WRKSRC}/Makefile.config
 
 	@${REINPLACE_CMD} \
 		-e "s,^\(INSTALLDIR[ \t]*=\).*,\1${PREFIX}/lib/ocaml/lablGL,g" \
 		-e "s!^\(COPTS[ \t]*=\).*!\1-c ${CFLAGS} ${THR_CPP}!g" \
 		${WRKSRC}/Makefile.common ${WRKSRC}/Makefile
 
 	@${REINPLACE_CMD} -E \
 		-e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \3,' \
 		-e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_SCRIPT} \3,' \
 		-e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \3,' \
 		${WRKSRC}/src/Makefile ${WRKSRC}/LablGlut/src/Makefile \
 		${WRKSRC}/Togl/src/Makefile
 
 pre-install:
 #
 # XXX: for incorrect PREFIX. Really should be done in bsd.ocaml.mk...
 #
 .if !exists(${PREFIX}/lib/ocaml/stublibs)
 	@${MKDIR} ${PREFIX}/lib/ocaml/stublibs
 .endif
 
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}/lablglut
 	@${MKDIR} ${EXAMPLESDIR}/togl
 	@(cd ${WRKSRC}/LablGlut/examples && ${COPYTREE_SHARE} \* \
 		${EXAMPLESDIR}/lablglut '! -name Makefile')
 	@(cd ${WRKSRC}/Togl/examples && ${COPYTREE_SHARE} \* \
 		${EXAMPLESDIR}/togl '! -name Makefile')
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/korean/baekmukfonts-bdf/Makefile b/korean/baekmukfonts-bdf/Makefile
index bcd265c751c0..b564bc239d86 100644
--- a/korean/baekmukfonts-bdf/Makefile
+++ b/korean/baekmukfonts-bdf/Makefile
@@ -1,65 +1,65 @@
 # Created by: Junho CHOI <junho.choi@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	baekmukfonts
 PORTVERSION=	2.0
 PORTREVISION=	5
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=	ftp://ftp.mizi.com/pub/baekmuk/obsoletes/ \
 		ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/
 PKGNAMESUFFIX=	-bdf
 DISTNAME=	baekmuk-${PORTVERSION}
 DISTFILES=	baekmuk-${PORTVERSION}${EXTRACT_SUFX} \
 		batang10.bdf.gz batang10b.bdf.gz \
 		gulim10.bdf.gz gulim10b.bdf.gz
 EXTRACT_ONLY=	baekmuk-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free Hangul fonts for X11(baekmuk)
 
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 FONTLIST=	batang10 batang10b batang12 batang12b batang14 batang14b \
 		batang16 batang16b batang18 batang18b batang20 batang20b \
 		batang24 batang24b \
 		dotum10 dotum12 dotum14 dotum16 dotum18 dotum20 dotum24 \
 		gulim10 gulim10b gulim12 gulim12b gulim14 gulim14b gulim16 \
 		gulim16b gulim18 gulim18b gulim20 gulim20b gulim24 gulim24b \
 		hline10 hline12 hline14 hline16 hline18 hline20 hline24
 
-FONTLIST_MANUAL =	batang10 batang10b gulim10 gulim10b
+FONTLIST_MANUAL=	batang10 batang10b gulim10 gulim10b
 
 BDFTOPCF=	${PREFIX}/bin/bdftopcf
 MKFONTDIR=	${PREFIX}/bin/mkfontdir
 CHARSETSUB=	s/ksx1001.1997/ksc5601.1987/g
 FONTSDIR=	lib/X11/fonts/local
 MAKE_ENV=	FONTSDIR=${FONTSDIR}
 PLIST_SUB=	FONTSDIR=${FONTSDIR}
 USES=		perl5
 USE_PERL5=	build
 
 # manually install hinted fonts
 do-configure:
 .for FONTNAME in ${FONTLIST_MANUAL}
 	${GZIP_CMD} -cd ${_DISTDIR}/${FONTNAME}.bdf.gz \
 		> ${WRKDIR}/${FONTNAME}.bdf
 .endfor
 
 # change charset to ksc5601.1987...
 do-build:
 .for FONTNAME in ${FONTLIST}
 	${PERL} -pi -e ${CHARSETSUB} ${WRKDIR}/${FONTNAME}.bdf
 	${BDFTOPCF} ${WRKDIR}/${FONTNAME}.bdf | ${GZIP_CMD} -c \
 		> ${WRKDIR}/${FONTNAME}.pcf.gz
 .endfor
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
 .for FONTNAME in ${FONTLIST}
 	${INSTALL_DATA} ${WRKDIR}/${FONTNAME}.pcf.gz \
 			${STAGEDIR}${PREFIX}/${FONTSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/gambit-c/Makefile b/lang/gambit-c/Makefile
index 56df87510360..609f4b9aa41e 100644
--- a/lang/gambit-c/Makefile
+++ b/lang/gambit-c/Makefile
@@ -1,52 +1,52 @@
 # Created by: Rob Zinkov
 # $FreeBSD$
 
 PORTNAME=	gambit-c
 DISTVERSION=	v4_6_6
 PORTEPOCH=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/
 DISTNAME=	gambc-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gambit programming system where the compiler generates portable C code
 
 LICENSE=	APACHE20
 
 MAN1=		gsi.1
 
 USES=		gmake tar:tgz
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS =--enable-single-host --enable-gcc-opts
+CONFIGURE_ARGS=	--enable-single-host --enable-gcc-opts
 CONFIGURE_ARGS+=--prefix=${PREFIX} --docdir=${PREFIX}/share/doc/gambit-c
 CONFIGURE_ARGS+=--libdir=${PREFIX}/lib/gambit-c/ --includedir=${PREFIX}/include/gambit-c
 CONFIGURE_ARGS+=--enable-interpreter-name=gsi-gambit  --enable-compiler-name=gsc-gambit
 
 INFO=		gambit-c
 
 
 USE_LDCONFIG=	${PREFIX}/lib/gambit-c
 
 PLIST_SUB+=	GSI_INC=include/gambit-c
 PLIST_SUB+=	GSI_DOC=share/doc/gambit-c
 PLIST_SUB+=	GSI_LIB=lib/gambit-c
 
 # This is needed because 4.2 < gcc -v < 4.4 has optimisations that make the
 # build take more than 20Gb of virtual memory.
 CFLAGS+=	-fno-move-loop-invariants
 
 NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|^\(FLAGS_OBJ = \).*|\1 ${CFLAGS}|' ${WRKSRC}/makefile.in
 	@${REINPLACE_CMD} -e 's|^\(FLAGS_DYN = \).*|\1 ${CFLAGS}|' ${WRKSRC}/makefile.in
 	@${REINPLACE_CMD} -e 's|^\(FLAGS_OBJ = \).*|\1 ${CFLAGS}|' ${WRKSRC}/lib/makefile.in
 	@${REINPLACE_CMD} -e 's|^\(FLAGS_DYN = \).*|\1 ${CFLAGS}|' ${WRKSRC}/lib/makefile.in
 	@${REINPLACE_CMD} -e 's|^\(FLAGS_OBJ = \).*|\1 ${CFLAGS}|' ${WRKSRC}/gsi/makefile.in
 	@${REINPLACE_CMD} -e 's|^\(FLAGS_DYN = \).*|\1 ${CFLAGS}|' ${WRKSRC}/gsi/makefile.in
 	@${REINPLACE_CMD} -e 's|^\(FLAGS_OBJ = \).*|\1 ${CFLAGS}|' ${WRKSRC}/gsc/makefile.in
 	@${REINPLACE_CMD} -e 's|^\(FLAGS_DYN = \).*|\1 ${CFLAGS}|' ${WRKSRC}/gsc/makefile.in
 
 post-configure:
 	@${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 725dca414399..3d0165c87ff4 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -1,229 +1,229 @@
 # $FreeBSD$
 
 PORTNAME=	sbcl
 PORTVERSION=	1.1.12
 PORTEPOCH=	1
 CATEGORIES=	lang lisp
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
 		ftp://ftp.SpringDaemons.com/soft/sbcl-binary/:binaries
 DISTFILES=	\
 	${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Common Lisp development system derived from the CMU CL system
 
 LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
 
 USES=		gmake tar:bzip2
 
-OPTIONS_DEFINE =	SBCL THREADS
+OPTIONS_DEFINE=		SBCL THREADS
 
 SBCL_DESC=	Bootstrap with installed SBCL binary, if available
 THREADS_DESC=	Experimental threading support
 
 CONTRIB_MODULES=	asdf			\
 			asdf-install		\
 			sb-aclrepl		\
 			sb-bsd-sockets		\
 			sb-cltl2		\
 			sb-concurrency		\
 			sb-cover		\
 			sb-executable		\
 			sb-gmp			\
 			sb-grovel		\
 			sb-introspect		\
 			sb-md5			\
 			sb-posix		\
 			sb-queue		\
 			sb-rotate-byte		\
 			sb-rt			\
 			sb-simple-streams	\
 			sb-sprof
 MAN1=		sbcl.1
 NEWBOOTNAME=	${PORTNAME}-${PORTVERSION}-${ARCH}-freebsd${OSREL:R}
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	is a native code compiler, and has not been ported to\
 this architecture yet
 SBCL_HOME=	${PREFIX}/lib/sbcl
 
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 CFLAGS+=	-fno-omit-frame-pointer
 CPPFLAGS+=	-I. -DSBCL_PREFIX=\\\"\$$(SBCL_PREFIX)\\\"
 
 .if ${ARCH} == "i386"
 DYNAMIC_SPACE_SIZE?=	512
 PLIST_SUB+=	I386_ONLY="" AMD64_ONLY="@comment "
 SBCLCONFIG=	 Config.x86-freebsd
 .else
 DYNAMIC_SPACE_SIZE?=	1024
 PLIST_SUB+=	I386_ONLY="@comment " AMD64_ONLY=""
 SBCLCONFIG=	Config.x86-64-freebsd
 .endif
 
 MAKE_SH_ARGS?=	--prefix=${PREFIX} --dynamic-space-size=${DYNAMIC_SPACE_SIZE} \
 --with-sb-core-compression --with-sb-qshow
 NM?=	/usr/bin/nm
 NMFLAGS?=	-gp
 
 .if ${PORT_OPTIONS:MDOCS} || make(makesum)
 DISTFILES+=	\
 	${PORTNAME}-${PORTVERSION}-documentation-html${EXTRACT_SUFX}
 MANUALS=	asdf.html sbcl.html
 MODULESDOCS=	asdf/README asdf/README.SBCL	\
 		asdf-install/README 		\
 		sb-aclrepl/README		\
 		sb-bsd-sockets/FAQ sb-bsd-sockets/NEWS \
 		sb-md5/README			\
 		sb-posix/README			\
 		sb-rotate-byte/README		\
 		sb-simple-streams/README
 TEXTDOCS=	BUGS CREDITS COPYING NEWS PRINCIPLES TLA TODO
 .endif
 
 # If the SBCL option is enabled, try to use existing "sbcl" first:
 .if empty(PORT_OPTIONS:MSBCL) || !exists(${LOCALBASE}/bin/sbcl) || make(makesum)
 BOOT_VERSION=	1.0.31
 
 . if make(makesum)
 BOOT_ARCH_OS_LIST=	amd64-freebsd8 amd64-freebsd7 i386-freebsd8 \
 			i386-freebsd7
 . else
 .  if ${OSREL:R} > 8	# We'll use 8.x bootstrap for now
 BOOT_ARCH_OS_LIST=	${ARCH}-freebsd8
 .  else
 BOOT_ARCH_OS_LIST=	${ARCH}-freebsd${OSREL:R}
 .  endif
 . endif
 
 . for BOOT_ARCH_OS in ${BOOT_ARCH_OS_LIST}
 BOOT_DISTNAME=	${PORTNAME}-${BOOT_VERSION}-${BOOT_ARCH_OS}
 DISTFILES:=	${DISTFILES} ${BOOT_DISTNAME}-binary${EXTRACT_SUFX}:binaries
 . endfor
 
 XC_HOST?=	${WRKDIR}/${BOOT_DISTNAME}/src/runtime/sbcl --core \
 ${WRKDIR}/${BOOT_DISTNAME}/output/sbcl.core \
 --dynamic-space-size ${DYNAMIC_SPACE_SIZE} \
 --disable-debugger --userinit /dev/null --sysinit /dev/null
 MAKE_SH_ARGS+=	--xc-host='${XC_HOST}'
 
 .endif # SBCL
 
 .if ${PORT_OPTIONS:MTHREADS}
 MAKE_SH_ARGS+=	--with-sb-thread
 .if defined(WITH_FUTEX)
 MAKE_SH_ARGS+=	--with-sb-futex
 .else
 MAKE_SH_ARGS+=	--without-sb-futex
 .endif
 .if defined(WITH_SAFEPOINT) || defined(WITH_STRICT_SAFEPOINT)
 MAKE_SH_ARGS+=	--with-sb-safepoint --with-sb-thruption --with-sb-wtimer
 .if defined(WITH_STRICT_SAFEPOINT)
 MAKE_SH_ARGS+=	--with-sb-safepoint-strictly
 .else
 MAKE_SH_ARGS+=	--without-sb-safepoint-strictly
 .endif
 .else
 MAKE_SH_ARGS+=	--without-sb-safepoint --without-sb-safepoint-strictly \
 		--without-sb-thruption --without-sb-wtimer
 .endif
 .else
 MAKE_SH_ARGS+=	--without-sb-thread
 .endif
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "---------------------------------------------------------"
 	@${ECHO_MSG} "You might need to adjust memory limits in order to"
 	@${ECHO_MSG} "build SBCL."
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You can use the DYNAMIC_SPACE_SIZE knob to change the size"
 	@${ECHO_MSG} "of SBCL dynamically-allocated memory."
 	@${ECHO_MSG} "---------------------------------------------------------"
 	@${ECHO_MSG}
 
 post-patch:
 	@${ECHO_CMD} "CC=${CC}" >> ${WRKSRC}/src/runtime/${SBCLCONFIG}
 	@${ECHO_CMD} "CFLAGS=${CFLAGS}" >> \
 		${WRKSRC}/src/runtime/${SBCLCONFIG}
 	@${ECHO_CMD} "CPPFLAGS=${CPPFLAGS}" >> \
 		${WRKSRC}/src/runtime/${SBCLCONFIG}
 	@${ECHO_CMD} "GREP=${GREP}" >> ${WRKSRC}/src/runtime/${SBCLCONFIG}
 	@${ECHO_CMD} "LD=${LD}" >> ${WRKSRC}/src/runtime/${SBCLCONFIG}
 	@${ECHO_CMD} "LINKFLAGS=${LDFLAGS} -dynamic -rdynamic" >> \
 		${WRKSRC}/src/runtime/${SBCLCONFIG}
 	@${ECHO_CMD} "NM=${NM} ${NMFLAGS}" >> \
 		${WRKSRC}/src/runtime/${SBCLCONFIG}
 	@${REINPLACE_CMD} -E -e 's,-lthr,-pthread,g' \
 	    -e 's,-lpthread,-pthread,g' ${WRKSRC}/src/runtime/${SBCLCONFIG}
 	@${GREP} -Fe '.core' -l -r ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
 	-e 's|\.core|_core|g'
 	@${REINPLACE_CMD} \
 		-e 's|/usr/local|${PREFIX}|g' \
 		${WRKSRC}/doc/sbcl.1
 	@${REINPLACE_CMD} -E -e 's!-sbcl-shared!& ${CFLAGS}!' \
 		-e 's!\$$(TEST_FILESTEM|x|1)_core!$${\1}_core!g' \
 		${WRKSRC}/tests/core.test.sh \
 		${WRKSRC}/tests/foreign.test.sh
 	@${REINPLACE_CMD} -E -e 's!"-O3"!!' \
 		-e 's!("-sbcl-(pic|shared)"[[:blank:]]*)+!& ${CFLAGS:C/.*/"&"/}!' \
 		${WRKSRC}/tests/foreign-stack-alignment.impure.lisp \
 		${WRKSRC}/tests/kill-non-lisp-thread.impure.lisp \
 		${WRKSRC}/tests/swap-lispobjs.impure.lisp \
 		${WRKSRC}/tests/threads.impure.lisp
 	@${REINPLACE_CMD} -e 's|( cd ./doc ; sh ./clean.sh )|#&|' \
 		${WRKSRC}/clean.sh
 	@case "`${CC} --version`" in \
 		*clang*) \
 			${REINPLACE_CMD} -e '/#define END()/s/\.end//' \
 				${WRKSRC}/src/runtime/x86-assem.S \
 				${WRKSRC}/src/runtime/x86-64-assem.S ;; \
 	esac
 	${REINPLACE_CMD} -e 's!/bin/bash!${LOCALBASE}&!' \
 		${WRKSRC}/release.sh \
 		${WRKSRC}/src/code/run-program.lisp \
 		${WRKSRC}/tests/run-compiler.sh
 
 do-build:
 	@${FIND} ${WRKSRC} \( -name '*.orig' -o -name '*.bak' \) -delete
 	@(cd ${WRKSRC} && ${SETENV} CC="${CC}" ${SH} make.sh ${MAKE_SH_ARGS})
 	@${RM} -rf ${WRKSRC}/contrib/sb-cover/test-output
 	@${REINPLACE_CMD} -E -e \
 		's|\$$Date\$$|'"`${SETENV} LANG=C /bin/date '+%B %d, %Y'`|g" \
 		${WRKSRC}/doc/sbcl.1
 
 do-install:
 	${MKDIR} ${SBCL_HOME}/
 	${INSTALL_PROGRAM} ${WRKSRC}/src/runtime/sbcl ${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/output/sbcl_core ${SBCL_HOME}/
 .for MOD in ${CONTRIB_MODULES}
 	${MKDIR} ${SBCL_HOME}/${MOD}
 	${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/*.lisp ${SBCL_HOME}/${MOD}/
 	${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/*.fasl ${SBCL_HOME}/${MOD}/
 	(if test -f ${WRKSRC}/contrib/${MOD}/${MOD}.asd; then ${INSTALL_DATA} \
 	    ${WRKSRC}/contrib/${MOD}/${MOD}.asd ${SBCL_HOME}/${MOD}/; fi)
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}/
 	${INSTALL_DATA} ${MANUALS:S,^, ${WRKSRC}/doc/manual/,g} ${DOCSDIR}/
 	${INSTALL_DATA} ${TEXTDOCS:S,^,${WRKSRC}/,g} ${DOCSDIR}/
 	${MKDIR} ${MODULESDOCS:C,/[^/]+$,,g:u:S,^,${DOCSDIR}/,g}
 . for MODDOC in ${MODULESDOCS}
 	${INSTALL_DATA} ${WRKSRC}/contrib/${MODDOC} ${DOCSDIR}/${MODDOC}
 . endfor
 .endif
 	${INSTALL_MAN} ${WRKSRC}/doc/sbcl.1 ${MAN1PREFIX}/man/man1
 	${MKDIR} ${SBCL_HOME}/site-systems
 	@${TOUCH} ${SBCL_HOME}/site-systems/.keep_me
 
 check regression-test test: build
 	(cd ${WRKSRC}/tests && ${SETENV} CC="${CC}" ${SH} run-tests.sh)
 
 bootstrap:
 	${CP} -r ${WRKSRC} ${WRKDIR}/${NEWBOOTNAME}
 	(cd ${WRKDIR}/ && \
 	    ${WRKDIR}/${NEWBOOTNAME}/binary-distribution.sh ${NEWBOOTNAME})
 	(cd ${WRKDIR}/ && ${BZIP2_CMD} ${NEWBOOTNAME}-binary.tar)
 
 .include <bsd.port.mk>
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 29318a03ae0a..696b4ccdc019 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,972 +1,972 @@
 # Created by: Mario S F Ferreira <lioux@linf.unb.br>
 # $FreeBSD$
 
 PORTNAME=	${QMAIL_PORTNAME}
 PORTVERSION?=	${QMAIL_VERSION}
 PORTREVISION?=	1
 CATEGORIES=	mail
 MASTER_SITES+=	${MASTER_SITE_QMAIL}
 DISTNAME=	${PORTNAME}-${QMAIL_VERSION}
 DISTFILES?=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY?=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	bdrewery@FreeBSD.org
 COMMENT?=	Secure, reliable, efficient, simple, and fast MTA
 
 DIST_SUBDIR=	qmail
 
 CONFLICTS?=	qmail-ldap-[0-9]* *qmail-mysql-[0-9]* qmail-spamcontrol-[0-9]* *qmail-tls-[0-9]*
 CONFLICTS+=	qmail-vida-[0-9]*
 
 USES=		qmail:vars
 PREFIX?=	${QMAIL_PREFIX}
 PLIST_SUB+=	QMAIL_PREFIX="${PREFIX}"
 
 MAKE_JOBS_UNSAFE=	yes
 
 PORTSCOUT=	skipv:1.04
 
 # Need root for build for now due to all of the users/dirs/chmod. Can cleanup
 # once pkg_install is EOL.
 NEED_ROOT=	yes
 
 USERS=		alias
 .for usersuffix in d l p q r s
 USERS+=		qmail${usersuffix}
 .endfor
 GROUPS=		qmail qnofiles
 
 # Options description for qmail and all slave ports
 ALTQUEUE_DESC=			Run a QMAILQUEUE external queue
 AUTOHOMEDIRMAKE_DESC=		auto-homedir-make feature
 AUTOMAILDIRMAKE_DESC=		The auto-maildir-make feature
 BIGBROTHER_DESC=		Use the control/bigbrother program
 BIGTODO_DESC=			Bruce Guenter's BigToDo patch
 BIG_CONCURRENCY_PATCH_DESC=	Use a concurrency greater than 240
 BIG_TODO_PATCH_DESC=		Enable big_todo qmail patch
 BIND_8_COMPAT_DESC=		Needed if compile fails building dns.c
 BLOCKEXEC_PATCH_DESC=		Block many windows viruses/worms
 CLEARTEXTPASSWD_DESC=		Use cleartext passwords (Dangerous!)
 DASH_EXT_DESC=			Dash_ext extended mail addresses add
 DATA_COMPRESS_DESC=		Smtp on the fly DATA compression
 DISCBOUNCES_PATCH_DESC=		Discard double-bounces
 DNS_CNAME_DESC=			Request CNAME (vs ANY for BIND 4 bug)
 ENHACELOGS_DESC=		Enhace qmail-smtpd logs (spamcontrol-like)
 EXTERNAL_TODO_DESC=		External high-performance todo processing
 EXTTODO_PATCH_DESC=		Extern high-perform. todo processing
 GRTDELAY_DESC=			Add jms1's Greet Delay feature
 IGNOREVERISIGN_DESC=		Disallow dns wildchar matches on gtlds
 LDAP_DEBUG_DESC=		Possibility to log and debug imap/pop
 LOCALTIME_PATCH_DESC=		Emit dates in the local timezone
 MAILDIRQUOTA_PATCH_DESC=	Maildir++ support
 OUTGOINGIP_PATCH_DESC=		Set the IP address to send messages
 PAM111421_DESC=			Smtpd allow email in case PAM failure
 QEXTRA_DESC=			Enable QUEUE_EXTRA copy feature
 QLDAP_CLUSTER_DESC=		Cluster support
 QMAILQUEUE_PATCH_DESC=		Run a QMAILQUEUE program
 QMQP_COMPRESS_DESC=		QMQP on the fly compression
 QMTPC_PATCH_DESC=		Send email using qmtp protocol
 QUOTATRASH_DESC=		Include the Trash in the quota
 RCDLINK_DESC=			Create rc.d/qmail symlink
 SENDERCHECK4_DESC=		LOOSE checks exclusively for RELAY clients
 SMTPEXECCHECK_DESC=		Smtp DOS/Windows executable detection
 SMTPEXTFORK_DESC=		Allow qmail-smtpd fork external progs
 SMTP_AUTH_PATCH_DESC=		Provide SMTP Authentication
 SPF_PATCH_DESC=			Implement SPF checker
 SRS_DESC=			Sender Rewriting Scheme support
 TARPIT_PATCH_DESC=		Implement TARPIT functions
 TLS_DESC=			SMTP TLS support
 TLS_DEBUG_DESC=			Enable additional debug information
 XF_QUITASAP_DESC=		Close SMTP session ASAP (SMTPEXTFORK)
 
 .if defined(SLAVE_LDAP) || \
     defined(SLAVE_SPAMCONTROL)
 _USE_NETQMAIL=			no
 .else
 _USE_NETQMAIL=			yes
 .endif
 
 .if ${_USE_NETQMAIL} == yes
 QMAIL_PORTNAME=			netqmail
 QMAIL_VERSION=			1.06
 BARRIER_SENDMAIL_F_PATCH=	yes
 BARRIER_QMAILQUEUE_PATCH=	yes
 .else
 # This is only used for slave ports.
 QMAIL_PORTNAME=			qmail
 QMAIL_VERSION=			1.03
 .endif
 
 .if defined(SLAVE_LDAP) || \
     defined(SLAVE_MYSQL)
 BARRIER_MAILDIRQUOTA_PATCH=	yes
 BARRIER_SPF_PATCH=		yes
 .endif
 
 .if defined(SLAVE_LDAP) || \
     defined(SLAVE_SPAMCONTROL) || \
     defined(SLAVE_MYSQL)
 BARRIER_BLOCKEXEC_PATCH=	yes
 BARRIER_QMAILQUEUE_PATCH=	yes
 BARRIER_SMTP_AUTH_PATCH=	yes
 .endif
 
 .if defined(SLAVE_LDAP)
 BARRIER_BIG_CONCURRENCY_PATCH=	yes
 BARRIER_EXTTODO_PATCH=		yes
 .endif
 
 .if defined(SLAVE_LDAP) || \
     defined(SLAVE_SPAMCONTROL)
 BARRIER_QMTPC_PATCH=		yes
 BARRIER_DISCBOUNCES_PATCH=	yes
 BARRIER_SENDMAIL_F_PATCH=	yes
 BARRIER_BIG_TODO_PATCH=		yes
 BARRIER_DNS_PATCH=		yes
 BARRIER_OUTGOINGIP_PATCH=	yes
 .endif
 
 .if defined(SLAVE_LDAP) || \
     defined(SLAVE_SPAMCONTROL) || \
     defined(SLAVE_TLS)
 BARRIER_RFC2821_PATCH=		yes
 BARRIER_TARPIT_PATCH=		yes
 .endif
 
 .if defined(SLAVE_SPAMCONTROL)
 BARRIER_DNS_CNAME=		yes
 .endif
 
 PATCH_DIST_STRIP+=	-p1
 
 .if !defined(BARRIER_DNS_PATCH)
 # Patch necessary to cope with non-RFC >512 dns entries
 # Since AOL has been using those, the problem has skyrocketed from minor to
 # groundzero. qmail being RFC compliant need to be "fixed" to work with those
 PATCH_SITES+=	http://www.ckdhr.com/ckd/:dns
 PATCHFILES+=	qmail-103.patch:dns
 .endif
 
 .if !defined(BARRIER_SENDMAIL_F_PATCH)
 # David Phillips noticed that sendmail's -f option sets a default
 # From: header, and so should qmail's emulation.
 PATCH_SITES+=	http://david.acz.org/software/:sendmail_flagf
 PATCHFILES+=	sendmail-flagf.patch:sendmail_flagf
 .endif
 
 .if !defined(BARRIER_RFC2821_PATCH)
 # This patch changes qmail-remote to skip over MX servers that greet with
 # codes 400 to 499 and to bounce mail when any MX server that qmail tries
 # greets with a code 500 to 599.
 # Created by Matthias Andree
 PATCH_SITES+=	http://www-dt.e-technik.uni-dortmund.de/~ma/qmail/:rfc2821
 PATCHFILES+=	patch-qmail-1.03-rfc2821.diff:rfc2821
 .endif
 
 .if defined(SLAVE_LDAP)
 PATCH_SITES+=	http://www.nrg4u.com/qmail/:ldap
 PATCHFILES+=	qmail-ldap-1.03-${LDAP_PATCH_DATE}.patch.gz:ldap
 .elif defined(SLAVE_MYSQL)
 PATCH_SITES+=	http://iain.cx/unix/qmail/download/:mysql
 PATCHFILES+=	netqmail-mysql-${MYSQL_PATCH_VERSION}.patch:mysql
 .elif defined(SLAVE_TLS)
 PATCH_SITES+=	http://inoa.net/qmail-tls/:tls
 TLS_PATCH_NAME=	${QMAIL_PORTNAME}-${QMAIL_VERSION}-tls-${TLS_PATCH_DATE}.patch
 PATCHFILES+=	${TLS_PATCH_NAME}:tls
 .endif
 
 PATCH_SITES+=	${MASTER_SITE_LOCAL:S/$/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip/}
 PATCH_SITE_SUBDIR+=	bdrewery/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip
 PATCH_SITES+=	http://mirror.shatow.net/freebsd/qmail/:DEFAULT,dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip
 
 OPTIONS_DEFINE+=DOCS
 
 .if !defined(BARRIER_SMTP_AUTH_PATCH)
 SMTP_AUTH_VERSION=	0.31
 SMTP_AUTH_DIR=		${WRKDIR}/qmail-smtpd-auth-${SMTP_AUTH_VERSION}
 
 OPTIONS_DEFINE+=SMTP_AUTH_PATCH
 .endif
 .if !defined(BARRIER_QMAILQUEUE_PATCH)
 OPTIONS_DEFINE+=QMAILQUEUE_PATCH
 .endif
 .if !defined(BARRIER_BIG_TODO_PATCH)
 OPTIONS_DEFINE+=BIG_TODO_PATCH
 .endif
 .if !defined(BARRIER_BIG_CONCURRENCY_PATCH)
 OPTIONS_DEFINE+=BIG_CONCURRENCY_PATCH
 .endif
 .if !defined(BARRIER_OUTGOINGIP_PATCH)
 OPTIONS_DEFINE+=OUTGOINGIP_PATCH
 .endif
 .if !defined(BARRIER_LOCALTIME_PATCH)
 OPTIONS_DEFINE+=LOCALTIME_PATCH
 .endif
 .if !defined(BARRIER_QMTPC_PATCH)
 OPTIONS_DEFINE+=QMTPC_PATCH
 .endif
 .if !defined(BARRIER_MAILDIRQUOTA_PATCH)
 OPTIONS_DEFINE+=MAILDIRQUOTA_PATCH
 .endif
 .if !defined(BARRIER_BLOCKEXEC_PATCH)
 OPTIONS_DEFINE+=BLOCKEXEC_PATCH
 .endif
 .if !defined(BARRIER_DISCBOUNCES_PATCH)
 OPTIONS_DEFINE+=DISCBOUNCES_PATCH
 .endif
 .if !defined(BARRIER_SPF_PATCH)
 OPTIONS_DEFINE+=SPF_PATCH
 .endif
 .if !defined(BARRIER_TARPIT_PATCH)
 OPTIONS_DEFINE+=TARPIT_PATCH
 .endif
 .if !defined(BARRIER_EXTTODO_PATCH)
 OPTIONS_DEFINE+=EXTTODO_PATCH
 .endif
 
 .if defined(SLAVE_TLS)
 OPTIONS_DEFINE+=TLS_DEBUG
 .elif defined(SLAVE_LDAP)
 OPTIONS_DEFINE+=TLS ALTQUEUE BIGBROTHER BIGTODO BIND_8_COMPAT CLEARTEXTPASSWD \
 		DASH_EXT DATA_COMPRESS EXTERNAL_TODO IGNOREVERISIGN \
 		QLDAP_CLUSTER QMQP_COMPRESS QUOTATRASH SMTPEXECCHECK \
 		AUTOMAILDIRMAKE AUTOHOMEDIRMAKE LDAP_DEBUG SMTPEXTFORK \
 		XF_QUITASAP SENDERCHECK4 ENHACELOGS GRTDELAY SRS
 
 OPTIONS_DEFAULT+=	TLS DASH_EXT DATA_COMPRESS EXTERNAL_TODO QLDAP_CLUSTER \
 			QLDAP_CLUSTER QMQP_COMPRESS SMTPEXECCHECK \
 			AUTOMAILDIRMAKE AUTOHOMEDIRMAKE
 
 LDAP_PARAMS=	ALTQUEUE BIGBROTHER BIGTODO BIND_8_COMPAT CLEARTEXTPASSWD \
 		DASH_EXT DATA_COMPRESS EXTERNAL_TODO IGNOREVERISIGN \
 		QLDAP_CLUSTER QMQP_COMPRESS QUOTATRASH SMTPEXECCHECK
 
 .elif defined(SLAVE_SPAMCONTROL)
 OPTIONS_DEFINE+=PAM111421 SMTPEXTFORK \
 		XF_QUITASAP
 
 OPTIONS_DEFAULT+=	PAM111421
 .endif
 
 OPTIONS_DEFINE+=QEXTRA
 
 .if !defined(BARRIER_DNS_CNAME)
 OPTIONS_DEFINE+=	DNS_CNAME
 OPTIONS_DEFAULT+=	DNS_CNAME
 .endif
 
 .if !defined(SLAVE_LDAP)
 OPTIONS_DEFINE+=RCDLINK
 OPTIONS_DEFAULT+=	RCDLINK
 .endif
 
 OPTIONS_SUB=	yes
 
 ALL_TARGET+=	default dot-qmail.5 qmail-control.5 qmail-getpw.8 \
 		qmail-limits.7 qmail-newmrh.8 qmail-newu.8 qmail-pw2u.8 \
 		qmail-send.8 qmail-start.8 qmail-users.5
 
 MMAN1+=	forward.1 condredirect.1 bouncesaying.1 except.1 maildirmake.1 \
 	maildir2mbox.1 maildirwatch.1 mailsubj.1 qreceipt.1 qbiff.1 preline.1 \
 	tcp-env.1
 MMAN5+=	addresses.5 envelopes.5 maildir.5 mbox.5 dot-qmail.5 qmail-control.5 \
 	qmail-header.5 qmail-log.5 qmail-users.5 tcp-environ.5
 MMAN7+=	forgeries.7 qmail-limits.7 qmail.7
 MMAN8+=	qmail-local.8 qmail-lspawn.8 qmail-getpw.8 qmail-remote.8 \
 	qmail-rspawn.8 qmail-clean.8 qmail-send.8 qmail-start.8 splogger.8 \
 	qmail-queue.8 qmail-inject.8 qmail-showctl.8 qmail-newmrh.8 \
 	qmail-newu.8 qmail-pw2u.8 qmail-qread.8 qmail-qstat.8 qmail-tcpok.8 \
 	qmail-tcpto.8 qmail-pop3d.8 qmail-popup.8 qmail-qmqpc.8 qmail-qmqpd.8 \
 	qmail-qmtpd.8 qmail-smtpd.8 qmail-command.8
 
 .if defined(SLAVE_MYSQL)
 PKGMESSAGE_SUFFIX=	mysql
 .endif
 
 .if defined(SLAVE_SPAMCONTROL)
 EXTRA_MAN8=	qmail-badloadertypes.8 qmail-badmimetypes.8 qmail-mfrules.8 \
 		qmail-recipients.8 qmail-smtpam.8
 ALL_TARGET+=	${EXTRA_MAN8}
 MMAN8+=		${EXTRA_MAN8}
 USES+=		perl5
 USE_PERL5=	patch build
 CFLAGS+=	-include /usr/include/errno.h
 .endif
 
 .if defined(SLAVE_LDAP)
 PKGMESSAGE_SUFFIX=	ldap
 PLIST_SUB+=	LDAP="" NO_LDAP="@comment "
 .else
 PLIST_SUB+=	LDAP="@comment " NO_LDAP=""
 PLIST_SUB+=	SRS="@comment "
 .endif
 
 .if defined(SLAVE_SPAMCONTROL)
 PLIST_SUB+=	SPAMCONTROL=""
 .else
 PLIST_SUB+=	SPAMCONTROL="@comment "
 .endif
 
 .if defined(SLAVE_TLS)
 PKGMESSAGE_SUFFIX=	tls
 PLIST_SUB+=	TLS="" NO_TLS="@comment "
 .else
 PLIST_SUB+=	TLS="@comment " NO_TLS=""
 .endif
 
 .if defined(PKGMESSAGE_SUFFIX)
 SLAVEPORT_LINE=	${PKGMESSAGE_SUFFIX}
 .elif defined(SLAVE_SPAMCONTROL)
 SLAVEPORT_LINE=	spamcontrol
 .endif
 
 SUB_FILES+=	mailer.conf.sample bootfiles.sed enable-qmail
 SUB_LIST+=	ECHO_CMD=${ECHO_CMD} RCDLINK=${RCDLINK}
 
 .if defined(PKGMESSAGE_SUFFIX)
 SUB_FILES+=	pkg-message-${PKGMESSAGE_SUFFIX}
 PKGMESSAGE?=	${WRKDIR}/pkg-message-${PKGMESSAGE_SUFFIX}
 .else
 SUB_FILES+=	pkg-message
 .endif
 
 .if !defined(SLAVE_LDAP)
 SUB_FILES+=	qmailsmtpd
 .endif
 
 WRKDIR_doc=	${WRKDIR}/doc
 
 PORTDOCS=	*
 
 DOCFILES_WRKSRC+=	BLURB BLURB2 BLURB3 BLURB4 INTERNALS SECURITY \
 			THOUGHTS FAQ UPGRADE SENDMAIL INSTALL INSTALL.alias \
 			INSTALL.ctl INSTALL.ids INSTALL.maildir INSTALL.mbox \
 			INSTALL.vsm TEST.deliver TEST.receive REMOVE.sendmail \
 			REMOVE.binmail PIC.local2alias PIC.local2ext \
 			PIC.local2local PIC.local2rem PIC.local2virt \
 			PIC.nullclient PIC.relaybad PIC.relaygood PIC.rem2local
 DOCFILES_WRKDIR+=	mailer.conf.sample
 
 .if defined(SLAVE_LDAP)
 DOCFILES_WRKSRC+=	QLDAPINSTALL QLDAPNEWS POPBEFORESMTP QLDAPTODO \
 			QLDAPPICTURE QLDAPGROUP EXTTODO qmail.schema
 .elif defined(SLAVE_TLS)
 DOCFILES_WRKDIR+=	TLS.readme
 .elif defined(SLAVE_SPAMCONTROL)
 DOCFILES_WRKDIR_doc+=	FILES.spamcontrol HISTORY.spamcontrol \
 			INSTALL.spamcontrol LICENSE.spamcontrol \
 			LOGGING.spamcontrol PROPOSAL.mav README.bigtodo \
 			README.bouncemaxbytes README.clamav README.djbdns \
 			README.mav \
 			README.qmailqueue README.recipients \
 			README.wildmat README_spamcontrol.html \
 			RELEASE_22.spamcontrol RELEASE_23.spamcontrol \
 			RELEASE_24.spamcontrol RELEASE_25.spamcontrol \
 			RELEASE_26.spamcontrol RELEASE_27.spamcontrol \
 			SMTPREPLY.spamcontrol \
 			TODO.spamcontrol badloadertypes badmailfrom \
 			badmimetypes badrcptto smtpreplies
 SCRIPTS+=	qmail-alias2recipients qmail-pwd2recipients \
 		qmail-users2recipients qmail-vpopmail2recipients
 .endif
 
 .if !defined(SLAVE_LDAP)
 BOOTFILES=	home home+df proc proc+df binm1 binm1+df \
 		binm2 binm2+df binm3 binm3+df maildir
 .endif
 
 CONFIGUREPROGRAMS=	dnsfq hostname dnsip ipmeprint dnsptr
 CONFIGURESCRIPTS=	config config-fast
 
 .if defined(SLAVE_LDAP)
 TLS_USE=	OPENSSL=yes
 .endif
 
 # Port will control all PREFIX handling.
 install-mtree:
 	@${DO_NADA}
 NO_MTREE=	yes
 NO_PREFIX_RMDIR=yes
 
 .include <bsd.port.options.mk>
 
 .if ( ${ARCH} == "amd64" || ${ARCH} == "ia64" ) && !defined(SLAVE_LDAP) \
     && !defined(SLAVE_SPAMCONTROL)
 EXTRA_PATCHES+=			${FILESDIR}/extra-patch-amd64
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PREFIX} != ${LOCALBASE}
 DOCSDIR=	${PREFIX}/doc
 .endif
 
 .if ${OSVERSION} >= 900007
 SUB_LIST+=	MANPATH="@comment "
 . if defined(SLAVE_LDAP)
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-utmpx-ldap
 . elif !defined(SLAVE_SPAMCONTROL)
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-utmpx
 . endif
 .else
 SUB_LIST+=	MANPATH=""
 .endif
 
 .if defined(SLAVE_TLS)
 CFLAGS+=	-I${OPENSSLBASE}/include -L${OPENSSLBASE}/lib -DTLS=${TLS_PATCH_DATE}
 . if ${PORT_OPTIONS:MTLS_DEBUG}
 CFLAGS+=	-DDEBUG
 . endif
 .endif
 
 .if defined(SLAVE_LDAP)
 
 . for param in ${LDAP_PARAMS}
 .  if ${PORT_OPTIONS:M${param}}
 LDAPFLAGS+=	-D${param}
 .  endif
 . endfor
 
 . if ${PORT_OPTIONS:MSRS}
 BUILD_DEPENDS+=	srs:${PORTSDIR}/mail/libsrs2
 MASTER_SITES+=	http://qmail-ldap-smtpauthuser.googlecode.com/svn/trunk/:srs_ldap
-SRS_LDAP_PATCH =	qmail-ldap-1.03-20060201-SRS.patch
+SRS_LDAP_PATCH=		qmail-ldap-1.03-20060201-SRS.patch
 DISTFILES+=	${SRS_LDAP_PATCH}:srs_ldap
 . endif
 
 .endif
 
 .if ${PORT_OPTIONS:MSMTP_AUTH_PATCH}
 MASTER_SITES+=	http://tomclegg.net/qmail/:smtp_auth \
 		${MASTER_SITE_LOCAL:S/$/:smtp_auth/}
 MASTER_SITE_SUBDIR+=	garga/qmail/:smtp_auth
 DISTFILES+=	qmail-smtpd-auth-${SMTP_AUTH_VERSION}.tar.gz:smtp_auth
 EXTRACT_ONLY+=	qmail-smtpd-auth-${SMTP_AUTH_VERSION}.tar.gz
 MASTER_SITES+=	http://tomclegg.net/qmail/:close3
 DISTFILES+=	qmail-smtpd-auth-close3.patch:close3
 . if defined(SLAVE_TLS)
 AUTH_PATCH=	auth.patch.diff-tls-20110119
 . elif ${PORT_OPTIONS:MSPF_PATCH}
 AUTH_PATCH=	auth.patch.diff
 . endif
 
 . if defined(AUTH_PATCH)
 DISTFILES+=	${AUTH_PATCH}:smtp_auth
 . endif
 .endif
 
 .if ${PORT_OPTIONS:MMAILDIRQUOTA_PATCH}
 PATCH_SITES+=	http://www.alexdupre.com/qmail/:quota
 PATCHFILES+=	${PORTNAME}-maildir++.patch:quota
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-maildir++
 .endif
 
 .if ${PORT_OPTIONS:MBLOCKEXEC_PATCH}
 PATCH_SITES+=	http://www.alexdupre.com/qmail/:blockexec
 PATCHFILES+=	qmail-block-executables.patch:blockexec
 .endif
 
 .if ${PORT_OPTIONS:MDISCBOUNCES_PATCH}
 PATCH_SITES+=	http://www.alexdupre.com/qmail/:doublebounce
 PATCHFILES+=	qmail-discard-double-bounces.patch:doublebounce
 .endif
 
 .if ${PORT_OPTIONS:MSPF_PATCH}
 . if defined(SLAVE_TLS) || defined(SLAVE_SPAMCONTROL)
 .  if defined(SLAVE_SPAMCONTROL)
 SPF_SPAMCONTROL_PATCH=	qmail-spf-rc5.patch-spamcontrol-27_2
 PATCH_SITES+=		${MASTER_SITE_LOCAL:S/$/:spf_spamcontrol/}
 PATCH_SITE_SUBDIR+=	garga/qmail/:spf_spamcontrol
 PATCHFILES+=		${SPF_SPAMCONTROL_PATCH}:spf_spamcontrol
 .  else
 # XXX - Move change out of conflicting Makefile hunk
 .    if ${PORT_OPTIONS:MSMTP_AUTH_PATCH}
 SPF_TLS_PATCH=	qmail-spf-rc5.patch-auth-tls-20110119
 .    else
 SPF_TLS_PATCH=	qmail-spf-rc5.patch-tls-20110119
 .    endif
 #MASTER_SITES+=	http://manuel.mausz.at/programming/patches/qmail/:spf_tls
 MASTER_SITES+=		${MASTER_SITE_LOCAL:S/$/:spf_tls/}
 MASTER_SITE_SUBDIR+=	bdrewery/qmail/:spf_tls
 DISTFILES+=	${SPF_TLS_PATCH}:spf_tls
 .  endif
 . else
 PATCH_SITES+=	http://www.saout.de/misc/spf/:spf
 PATCHFILES+=	qmail-spf-rc5.patch:spf
 . endif
 .endif
 
 .if ${PORT_OPTIONS:MEXTTODO_PATCH}
 PLIST_SUB+=		EXTTODO=""
 DOCFILES_WRKSRC+=	EXTTODO
 
 . if !empty(PORT_OPTIONS:MBIG_TODO_PATCH) || !empty(PORT_OPTIONS:MBIGTODO)
 MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:ext_big_todo/}
 MASTER_SITE_SUBDIR+=	garga/qmail/:ext_big_todo
 EXT_BIG_TODO_PATCH=	ext_todo-20030105+big-todo.103.patch
 DISTFILES+=	${EXT_BIG_TODO_PATCH}:ext_big_todo
 . endif
 
 . if ${PORT_OPTIONS:MSPF_PATCH}
 .  if defined(SLAVE_TLS)
 # XXX - Move qmail-todo out of conflicting Makefile hunk
 EXTTODO_PATCH=	ext_todo-20030105_spf_tls.patch
 MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:exttodo/}
 MASTER_SITE_SUBDIR+=	garga/qmail/:exttodo
 DISTFILES+=	${EXTTODO_PATCH}:exttodo
 .  else
 PATCH_SITES+=	${MASTER_SITE_LOCAL:S/$/:exttodo/}
 PATCH_SITE_SUBDIR+=	garga/qmail/:exttodo
 PATCHFILES+=	ext_todo-20030105_spf.patch:exttodo
 .  endif
 . elif defined(SLAVE_MYSQL)
 PATCH_SITES+=	${MASTER_SITE_LOCAL:S/$/:exttodo/}
 PATCHFILES+=	ext_todo-20030105_mysql.patch:exttodo
 PATCH_SITE_SUBDIR+=	garga/qmail/:exttodo
 . elif defined(SLAVE_TLS)
 PATCH_SITES+=	${MASTER_SITE_LOCAL:S/$/:exttodo/}
 PATCHFILES+=	ext_todo-20030105_tls.patch:exttodo
 PATCH_SITE_SUBDIR+=	bdrewery/qmail/:exttodo
 . else
 PATCH_SITES+=	http://www.nrg4u.com/qmail/:exttodo
 PATCHFILES+=	ext_todo-20030105.patch:exttodo
 . endif
 .else
 PLIST_SUB+=	EXTTODO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDNS_CNAME}
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-dns-cname
 .endif
 
 .if !defined(BARRIER_DNS_PATCH) \
 	|| !empty(PORT_OPTIONS:MQMAILQUEUE_PATCH) \
 	|| !empty(PORT_OPTIONS:MBIG_TODO_PATCH) \
 	|| !empty(PORT_OPTIONS:MBIG_CONCURRENCY_PATCH) \
 	|| !empty(PORT_OPTIONS:MOUTGOINGIP_PATCH) \
 	|| !empty(PORT_OPTIONS:MQMTPC_PATCH)
 PATCH_SITES+=	${MASTER_SITE_QMAIL}
 .endif
 
 .if ${PORT_OPTIONS:MQMAILQUEUE_PATCH}
 PATCHFILES+=	qmailqueue-patch
 .endif
 .if ${PORT_OPTIONS:MBIG_TODO_PATCH}
 PATCHFILES+=	big-todo.103.patch
 .endif
 .if ${PORT_OPTIONS:MBIG_CONCURRENCY_PATCH}
 .  if defined(SLAVE_SPAMCONTROL)
 PATCHFILES+=	big-concurrency-spamcontrol-2731.patch
 .  else
 PATCHFILES+=	big-concurrency.patch
 .  endif
 .endif
 .if !empty(PORT_OPTIONS:MOUTGOINGIP_PATCH) && !empty(PORT_OPTIONS:MQMTPC_PATCH)
 PATCHFILES+=	qmail-1.03-qmtpc_outgoingip_20090630.patch:qmtpc_outgoingip
 .elif ${PORT_OPTIONS:MOUTGOINGIP_PATCH}
 PATCHFILES+=	outgoingip.patch
 .elif ${PORT_OPTIONS:MQMTPC_PATCH}
 PATCHFILES+=	qmail-1.03-qmtpc.patch
 .endif
 
 .if ${PORT_OPTIONS:MLOCALTIME_PATCH}
 PATCH_SITES+=	http://www.alib.jp/files/:localtime
 PATCHFILES+=	qmail-date-localtime.patch:localtime
 .endif
 
 .if ${PORT_OPTIONS:MTARPIT_PATCH}
 PATCH_SITES+=	http://www.palomine.net/qmail/:tarpit
 PATCHFILES+=	tarpit.patch:tarpit
 .endif
 
 .if ${PORT_OPTIONS:MSMTPEXTFORK} && \
     ( defined(SLAVE_SPAMCONTROL) || defined(SLAVE_LDAP) )
 . if defined(SLAVE_SPAMCONTROL)
 SMTPEXTFORK_PATCH=	smtpextfork-spamcontrol-2731.patch
 . else
 SMTPEXTFORK_PATCH=	smtpextfork-ldap-20060201_4.patch
 . endif
 
 MASTER_SITES+=	http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail-smtpextfork/patches/:extfork \
 		${MASTER_SITE_LOCAL:S/$/:extfork/}
 MASTER_SITE_SUBDIR+=	garga/qmail/:extfork
 DISTFILES+=	${SMTPEXTFORK_PATCH:S/$/:extfork/} \
 		README.smtpextfork:extfork
 .endif
 
 .if defined(SLAVE_LDAP) && ${PORT_OPTIONS:MSENDERCHECK4}
 PATCH_SITES+=	http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail/:sendercheck4 \
 		${MASTER_SITE_LOCAL:S/$/:sendercheck4/}
 PATCH_SITE_SUBDIR+=	garga/qmail/:sendercheck4
 PATCHFILES+=	qmail-ldap-1.03_qmail-smtpd_SENDERCHECK4.patch:sendercheck4
 .endif
 
 .if defined(SLAVE_LDAP) && ${PORT_OPTIONS:MGRTDELAY}
 PATCH_SITES+=	http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail/:grtdelay \
 		${MASTER_SITE_LOCAL:S/$/:grtdelay/}
 PATCH_SITE_SUBDIR+=	garga/qmail/:grtdelay
 PATCHFILES+=	qmail-ldap-20060201-grtdelay.patch:grtdelay
 DOCFILES_WRKSRC+=	README.GREETDELAY
 .endif
 
 .if defined(SLAVE_LDAP) && ${PORT_OPTIONS:MENHACELOGS}
 PATCH_SITES+=	http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail/:ldapenhacelog \
 		${MASTER_SITE_LOCAL:S/$/:ldapenhacelog/}
 PATCH_SITE_SUBDIR+=	garga/qmail/:ldapenhacelog
 PATCHFILES+=	enhacelogging-ldap-20120221.patch:ldapenhacelog
 .endif
 
 .if defined(SLAVE_SPAMCONTROL)
 MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:ucspi_ssl/} \
 		http://www.fehcom.de/ipnet/ucspi-ssl/:ucspi_ssl
 MASTER_SITE_SUBDIR+=	bdrewery/ucspi-ssl/:ucspi_ssl
 UCSPI_SSL_VER=	0.94
 UCSPI_SSL_DIST=	ucspi-ssl-${UCSPI_SSL_VER}.tgz
 DISTFILES+=	${UCSPI_SSL_DIST}:ucspi_ssl
 
 UCSPISRC=	${WRKDIR}/host/superscript.com/net/ucspi-ssl-${UCSPI_SSL_VER}
 # XXX not yet, needs more cleanup
 #UCSPISRC!=	${MAKE} -C ${PORTSDIR}/sysutils/ucspi-ssl-tls -V WRKSRC
 #PATCH_DEPENDS+=	${UCSPISRC}/compile/ucspissl.a:${PORTSDIR}/sysutils/ucspi-ssl-tls:build
 .endif
 
 # Some default values, these can be modified by make command line
 .if ${PORT_OPTIONS:MBIG_CONCURRENCY_PATCH}
 WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT?=	509
 CFLAGS+=	-DFD_SETSIZE=`expr 2 \* ${WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT} + 6`
 .endif
 
 .if ${PORT_OPTIONS:MRCDLINK} && !defined(SLAVE_LDAP)
 PLIST_SUB+=	RCDLINK=""
 RCDLINK=
 .else
 PLIST_SUB+=	RCDLINK="@comment "
 RCDLINK=	\#
 .endif
 
 # Fill SELECTED_OPTIONS with options to write conf-spamcontrol
 .if defined(SLAVE_SPAMCONTROL)
 
 . if ${PORT_OPTIONS:MPAM111421}
 SELECTED_OPTIONS+=	pam111421=yes
 . else
 SELECTED_OPTIONS+=	pam111421=no
 . endif
 
 .endif
 
 pre-everything::
 .if !defined(BARRIER_BIG_CONCURRENCY_PATCH)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You may use the following build options:"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT=NUMBER"
 	@${ECHO_MSG} "				(default NUMBER=${WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT})"
 	@${ECHO_MSG} "				set this to a value reasonable for"
 	@${ECHO_MSG} "				your system if you use the patch"
 	@${ECHO_MSG} ""
 .endif
 
 .if !defined(QMAIL_PREFIX)
 	@${ECHO_MSG} "QMAIL_PREFIX=PREFIX_PATH"
 	@${ECHO_MSG} "		(default PREFIX_PATH=${PREFIX})"
 	@${ECHO_MSG} "		A normal qmail installation puts"
 	@${ECHO_MSG} "		everything into /var/qmail/."
 	@${ECHO_MSG} "		If you want to install to ${LOCALBASE},"
 	@${ECHO_MSG} "		then \"${LOCALBASE}/qmail\" is suggested"
 	@${ECHO_MSG} "		instead of \"${LOCALBASE}\", but both will"
 	@${ECHO_MSG} "		work."
 	@${ECHO_MSG} ""
 .endif
 
 post-extract:
 .if defined(SLAVE_SPAMCONTROL)
 	@cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${SPAMCONTROL_DIST}
 	@cd ${WRKDIR} && ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${UCSPI_SSL_DIST}
 .endif
 
 # XXX - Move all the major patch applications to post-extract
 #
 # Apply main distro patch (which requires building a dependency and
 # running a script) before PATCHFILES get applied.
 .if defined(SLAVE_SPAMCONTROL)
 pre-patch:
 .  if ${OSVERSION} < 900007
 # Prevent applying utmpx patch
 	@${ECHO_CMD} > ${WRKSRC}/qbiff.c.patch
 .  endif
 	@${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail
 	@${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \
 		> ${WRKSRC}/conf-spamcontrol
 . for option in ${SELECTED_OPTIONS}
 	@${ECHO_CMD} ${option} >> ${WRKSRC}/conf-spamcontrol
 . endfor
 	@${ECHO_CMD} "${UCSPISRC}/compile" > ${WRKSRC}/conf-ucspissl
 	${ECHO_CMD} "${CC} ${CFLAGS}" > ${UCSPISRC}/src/conf-cc
 	${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${UCSPISRC}/src/conf-ld
 	${ECHO_CMD} "${PREFIX}" > ${UCSPISRC}/src/conf-home
 	${ECHO_CMD} "${PREFIX}/bin" > ${UCSPISRC}/src/conf-tcpbin
 	${ECHO_CMD} "/etc/ssl" > ${UCSPISRC}/src/conf-cadir
 	${ECHO_CMD} "/etc/ssl/cert.pem" > ${UCSPISRC}/src/conf-cafile
 	${ECHO_CMD} "/etc/ssl/dh1024.pem" > ${UCSPISRC}/src/conf-dhfile
 	@cd ${UCSPISRC} && ${SETENV} ${MAKE_ENV} package/compile
 	@cd ${WRKSRC} && ${SH} ./install_spamcontrol.sh
 # Any rejected patches are a failure
 	@if [ "`find ${WRKSRC} -name '*.rej' | wc -l`" -ne 0 ]; then \
 		${ECHO_MSG} "===> Failed to apply spamcontrol patch"; \
 		${FALSE}; \
 	fi
 # Fix trailing whitespace which breaks some patches
 	${SED} -i '' -e 's,^\(binm3 binm3+df\) $$,\1,' ${WRKSRC}/Makefile
 .endif
 
 post-patch:
 .if ${PORT_OPTIONS:MSMTP_AUTH_PATCH}
 	@${CP} ${SMTP_AUTH_DIR}/base64.[ch] ${WRKSRC}
 . if defined(AUTH_PATCH)
 	@${PATCH} -d ${SMTP_AUTH_DIR} < ${DISTDIR}/${DIST_SUBDIR}/${AUTH_PATCH}
 . endif
 	@${PATCH} -d ${WRKSRC} < ${SMTP_AUTH_DIR}/auth.patch
 . if defined(SLAVE_TLS) && ${PORT_OPTIONS:MSPF_PATCH} && defined(SPF_TLS_PATCH)
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SPF_TLS_PATCH}
 .  if ${PORT_OPTIONS:MEXTTODO_PATCH} && defined(EXTTODO_PATCH)
 	@${PATCH} -p1 -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${EXTTODO_PATCH}
 .  endif
 . endif
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/qmail-smtpd-auth-close3.patch
 .elif defined(SLAVE_TLS) && ${PORT_OPTIONS:MSPF_PATCH} && defined(SPF_TLS_PATCH)
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SPF_TLS_PATCH}
 . if ${PORT_OPTIONS:MEXTTODO_PATCH} && defined(EXTTODO_PATCH)
 	@${PATCH} -p1 -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${EXTTODO_PATCH}
 . endif
 .endif
 .if defined(SLAVE_MYSQL)
 	@${REINPLACE_CMD} \
 	  -e 's|/opt/mysql|${LOCALBASE}|' \
 	  -e "s,MYSQL_LIBS=.*,MYSQL_LIBS=\`${LOCALBASE}/bin/mysql_config --libs\`," \
 		${WRKSRC}/Makefile
 .elif defined(SLAVE_SPAMCONTROL)
 . if ${PORT_OPTIONS:MSMTPEXTFORK}
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SMTPEXTFORK_PATCH}
 .  if ${PORT_OPTIONS:MXF_QUITASAP}
 	@${REINPLACE_CMD} 's!//#define XF_QUITASAP!#define XF_QUITASAP!g' \
 		${WRKSRC}/qmail-smtpd.c
 .  endif
 . endif
 	@${REINPLACE_CMD} -E "/qhpsi *= *\"unknown\"/d; s/(\*qqx *== *'D')/qhpsi \&\& \1/g" \
 		${WRKSRC}/qmail-smtpd.c
 .elif defined(SLAVE_TLS)
 	@${HEAD} -105 ${DISTDIR}/${DIST_SUBDIR}/${TLS_PATCH_NAME} > \
 		${WRKDIR}/TLS.readme
 	@${REINPLACE_CMD} "s|/usr/local/ssl|${OPENSSLBASE}|" \
 		${WRKSRC}/Makefile
 .elif defined(SLAVE_LDAP)
 	@${REINPLACE_CMD} "s|^LDAPLIBS=-L/usr/local/lib|LDAPLIBS=-L${LOCALBASE}/lib|; \
 			   s|^LDAPINCLUDES=-I/usr/local/include|LDAPINCLUDES=-I${LOCALBASE}/include|" \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} "s|^#SHADOWLIBS=-lcrypt$$|SHADOWLIBS=-lcrypt|" \
 		${WRKSRC}/Makefile
 . if ${PORT_OPTIONS:MSMTPEXTFORK}
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SMTPEXTFORK_PATCH}
 #	@${PATCH} -d ${WRKSRC} < ${FILESDIR}/extra-patch-smtpextfork-qmail-smtpd.c
 .  if ${PORT_OPTIONS:MXF_QUITASAP}
 	@${REINPLACE_CMD} 's!//#define XF_QUITASAP!#define XF_QUITASAP!g' \
 		${WRKSRC}/qmail-smtpd.c
 .  endif
 . endif
 . if ${PORT_OPTIONS:MTLS}
 	@${REINPLACE_CMD} "s|^#TLS=|TLS=|; \
 			   s|^#TLSINCLUDES=-I/usr/local/include|TLSINCLUDES=-I${OPENSSLBASE}/include|; \
 			   s|^#TLSLIBS=-L/usr/local/lib|TLSLIBS=-L${OPENSSLBASE}/lib|; \
 			   s|^#OPENSSLBIN=/usr/local/bin/openssl|OPENSSLBIN=${OPENSSLBASE}/bin/openssl|" \
 		${WRKSRC}/Makefile
 . endif
 . if ${PORT_OPTIONS:MDATA_COMPRESS} || ${PORT_OPTIONS:MQMQP_COMPRESS}
 	@${REINPLACE_CMD} "s|^#ZLIB=-lz$$|ZLIB=-lz|" \
 		${WRKSRC}/Makefile
 . endif
 . if ${PORT_OPTIONS:MAUTOMAILDIRMAKE}
 	@${REINPLACE_CMD} "s|^#MDIRMAKE=|MDIRMAKE=|" ${WRKSRC}/Makefile
 . endif
 . if ${PORT_OPTIONS:MAUTOHOMEDIRMAKE}
 	@${REINPLACE_CMD} "s|^#HDIRMAKE=|HDIRMAKE=|" ${WRKSRC}/Makefile
 . endif
 . if ${PORT_OPTIONS:MLDAP_DEBUG}
 	@${REINPLACE_CMD} "s|^#DEBUG=|DEBUG=|" ${WRKSRC}/Makefile
 . endif
 . if defined(LDAPFLAGS)
 	@${REINPLACE_CMD} "s|^#LDAPFLAGS=.*$$|LDAPFLAGS=${LDAPFLAGS}|" \
 		${WRKSRC}/Makefile
 . endif
 . if ${PORT_OPTIONS:MSRS}
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SRS_LDAP_PATCH}
 . endif
 .endif
 .if defined(EXT_BIG_TODO_PATCH)
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${EXT_BIG_TODO_PATCH}
 .endif
 	@${REINPLACE_CMD} 's!/var/qmail!${PREFIX}!; \
 			   s!/usr/local/!${LOCALBASE}/!' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's!nofiles!qnofiles!g' \
 		${WRKSRC}/conf-groups
 	@${REINPLACE_CMD} '/"man"/d; /man\/man/d; /man\/cat/d; \
 			   /"doc"/d; /"boot","/d' \
 		${WRKSRC}/hier.c
 .if ${PORT_OPTIONS:MQEXTRA}
 	@${REINPLACE_CMD} 's!QUEUE_EXTRA ""!QUEUE_EXTRA "Tlog\\0"!g; \
 			   s!QUEUE_EXTRALEN 0!QUEUE_EXTRALEN 5!g' \
 			   ${WRKSRC}/extra.h
 .endif
 	@${REINPLACE_CMD} -e "s/void *main/int main/g" ${WRKSRC}/*.c
 	@${REINPLACE_CMD} -e "/int main/ s/argc, *argv/int argc, char **argv/" ${WRKSRC}/install.c
 	@${ECHO_CMD} "MANPATH ${MANPREFIX}/man" > ${WRKDIR}/qmail.conf
 
 do-configure:
 	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
 	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-qmail
 .if !empty(PORT_OPTIONS:MBIG_CONCURRENCY_PATCH) \
 	&& defined(WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT)
 	@if [ ${WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT} -gt 0 ]; then \
 		${ECHO_CMD} "${WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT}" \
 			> ${WRKSRC}/conf-spawn ; \
 	fi
 .endif
 
 post-build:
 	@${ECHO_MSG} "===> Rebuilding DJB installer to respect STAGEDIR"
 	@${MV} -f ${WRKSRC}/conf-qmail ${WRKSRC}/conf-qmail.sav
 	@${ECHO_CMD} "${STAGEDIR}${PREFIX}" > ${WRKSRC}/conf-qmail
 	@${MV} -f ${WRKSRC}/install ${WRKSRC}/install.nostage
 	@cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c
 	@cd ${WRKSRC} ; ${DO_MAKE_BUILD} install instcheck
 	@${MV} -f ${WRKSRC}/conf-qmail.sav ${WRKSRC}/conf-qmail
 
 do-install:
 .for i in ${BOOTFILES}
 	@if  [ -f ${WRKSRC}/${i}.sh ] ; then \
 		${SED} -f ${WRKDIR}/bootfiles.sed ${WRKSRC}/$i.sh > ${WRKDIR}/${i} ; \
 	elif [ -f ${FILESDIR}/${i} ] ; then \
 		${SED} -f ${WRKDIR}/bootfiles.sed ${FILESDIR}/$i > ${WRKDIR}/${i} ; \
 	fi
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/configure
 	@cd ${WRKSRC} ; ./install
 .for f in ${CONFIGUREPROGRAMS}
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/configure
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/install.nostage ${STAGEDIR}${PREFIX}/configure/install
 .for f in ${CONFIGURESCRIPTS}
 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/configure
 .endfor
 .for i in ${BOOTFILES}
 	${INSTALL_SCRIPT} ${WRKDIR}/${i:T} ${STAGEDIR}${PREFIX}/boot
 .endfor
 .if !defined(SLAVE_LDAP)
 	${INSTALL_SCRIPT} ${WRKDIR}/qmailsmtpd ${STAGEDIR}${PREFIX}/boot
 .endif
 .for i in 1 5 7 8
 	@${MKDIR} ${STAGEDIR}${PREFIX}/man/man$i
 . for j in ${MMAN${i}}
 	${INSTALL_MAN} ${WRKSRC}/$j ${STAGEDIR}${PREFIX}/man/man${i}
 . endfor
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 . for sub in WRKSRC WRKDIR WRKDIR_doc
 .  for doc in ${DOCFILES_${sub}}
 	${INSTALL_DATA} ${${sub}}/${doc} ${STAGEDIR}${DOCSDIR}
 .  endfor
 . endfor
 . if ${PORT_OPTIONS:MSMTPEXTFORK} && ( defined(SLAVE_SPAMCONTROL) || defined(SLAVE_LDAP) )
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/README.smtpextfork ${STAGEDIR}${DOCSDIR}
 . endif
 . if defined(PACKAGE_BUILDING)
 	@${ECHO_CMD} "FreeBSD Binary package qmail installation" \
 		> ${STAGEDIR}${DOCSDIR}/SYSDEPS
 . else
 	@cd ${WRKSRC} && ${CAT} `${CAT} SYSDEPS` \
 		> ${STAGEDIR}${DOCSDIR}/SYSDEPS
 . endif
 .endif
 	@${MKDIR} ${STAGEDIR}${PREFIX}/scripts
 	${INSTALL_SCRIPT} ${FILESDIR}/mkaliasdir ${STAGEDIR}${PREFIX}/scripts
 	${INSTALL_SCRIPT} ${WRKDIR}/enable-qmail ${STAGEDIR}${PREFIX}/scripts
 .for script in ${SCRIPTS}
 	${INSTALL_SCRIPT} ${WRKDIR}/scripts/${script} ${STAGEDIR}${PREFIX}/scripts
 .endfor
 #	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .if defined(SLAVEPORT_LINE)
 	@${ECHO_CMD} "============================================="
 	@${ECHO_CMD}
 	@${ECHO_CMD} "ATTENTION"
 	@${ECHO_CMD}
 	@${ECHO_CMD} "Add the following line to your /etc/make.conf"
 	@${ECHO_CMD} "QMAIL_SLAVEPORT=${SLAVEPORT_LINE}"
 	@${ECHO_CMD}
 	@${ECHO_CMD} "============================================="
 	@${ECHO_CMD}
 .endif
 
 post-install:
 .if defined(SLAVE_LDAP)
 .for file in qmail-imapd qmail-pop3d qmail-qmqpd qmail-smtpd
 	@${MV} ${STAGEDIR}${PREFIX}/control/${file}.rules \
 	    ${STAGEDIR}${PREFIX}/control/${file}.rules.sample
 .endfor
 	@${MV} ${STAGEDIR}${PREFIX}/control/signatures \
 	    ${STAGEDIR}${PREFIX}/control/signatures.sample
 	@${FIND} ${WRKDIR} -type f -name run -exec ${SED} -i "" \
 	    -e 's|${STAGEDIR}|${PREFIX}|' {} +
 .endif
 	@${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/man.d
 	${INSTALL_DATA} ${WRKDIR}/qmail.conf ${STAGEDIR}${LOCALBASE}/etc/man.d/qmail.conf
 	@${ECHO_CMD} "===> Fixing plist for ${PREFIX} ownership"
 	@{ \
 	  ${ECHO_CMD} "@owner root"; \
 	  ${ECHO_CMD} "@group qmail"; \
 	  ${ECHO_CMD} "@exec install -d -o root -g qmail ${PREFIX}"; \
 	  ${ECHO_CMD} "@unexec rmdir ${QMAIL_PREFIX} 2>/dev/null || :"; \
 	} >> ${TMPPLIST}
 # Stop check-orphans finding the queue dir
 	${RM} -rf ${STAGEDIR}${PREFIX}/queue/
 
 certificate:
 .if defined(SLAVE_TLS) || defined(SLAVE_LDAP)
 	@if [ -f ${OPENSSLDIR}/openssl.cnf ]; then \
 		if [ ! -d ${WRKDIR} ]; then \
 			${MKDIR} ${WRKDIR} ; \
 		fi ; \
 		${OPENSSLBASE}/bin/openssl req -new -x509 -nodes \
 			-out ${WRKDIR}/servercert.pem -days 366 \
 			-keyout ${WRKDIR}/servercert.pem ; \
 		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
 		${OPENSSLBASE}/bin/openssl ciphers > ${QMAIL_PREFIX}/control/tlsclientciphers ; \
 		${OPENSSLBASE}/bin/openssl ciphers > ${QMAIL_PREFIX}/control/tlsserverciphers ; \
 		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
 	else \
 		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
 	fi
 .endif
 
 certificate-req:
 .if defined(SLAVE_TLS) || defined(SLAVE_LDAP)
 	@if [ -f ${OPENSSLDIR}/openssl.cnf ]; then \
 		if [ ! -d ${WRKDIR} ]; then \
 			${MKDIR} ${WRKDIR} ; \
 		fi ; \
 		${OPENSSLBASE}/bin/openssl req -new -nodes \
 			-out ${WRKDIR}/req.pem \
 			-keyout ${WRKDIR}/servercert.pem ; \
 		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
 		${ECHO_MSG} ; \
 		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
 		${ECHO_MSG} "===> Send ${WRKDIR}/req.pem to your CA to obtain signed_req.pem, and do:" ; \
 		${ECHO_MSG} "===> cat signed_req.pem >> ${PREFIX}/control/servercert.pem" ; \
 	else \
 		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
 	fi
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/R-cran-SuppDists/Makefile b/math/R-cran-SuppDists/Makefile
index b0bfe861ee79..ee4675b8c826 100644
--- a/math/R-cran-SuppDists/Makefile
+++ b/math/R-cran-SuppDists/Makefile
@@ -1,38 +1,38 @@
 # Created by: b.f. <bf@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	SuppDists
 DISTVERSION=	1.1-9.1
 PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_CRAN} \
 		http://r.research.att.com/benchmarks/:benchmark \
 		LOCAL/bf:benchmark
 DISTFILES=	${PORTNAME}_${DISTVERSION}${EXTRACT_SUFX} \
 		${BENCHMARK_SCRIPT}:benchmark
 EXTRACT_ONLY=	${PORTNAME}_${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Supplementary distributions and RNG for R
 
 LICENSE=		GPLv2
 
 BENCHMARK_SCRIPT=	R-benchmark-25.R
 USES=	cran:auto-plist
-WRKSRC =		${WRKDIR}/${PORTNAME}
+WRKSRC=			${WRKDIR}/${PORTNAME}
 
 .if defined(MAINTAINER_MODE)
 USES+=	dos2unix
 DOS2UNIX_FILES=	../${BENCHMARK_SCRIPT}
 
 post-extract:
 	@${CP} ${_DISTDIR}/${BENCHMARK_SCRIPT} ${WRKDIR}
 
 post-install: benchmark
 
 benchmark:
 	@${LOCALBASE}/bin/Rscript --vanilla ${WRKDIR}/${BENCHMARK_SCRIPT}
 
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/R/Makefile b/math/R/Makefile
index e93fd9fa0344..05fc93b47949 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,397 +1,397 @@
 # Created by: Maurice Castro <maurice@serc.rmit.edu.au>
 # $FreeBSD$
 
 PORTNAME?=	R
 PORTVERSION=	3.0.2
 PORTREVISION=	2
 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} \
+INSTALL_TARGET=		install
+CONFIGURE_ARGS=		--enable-memory-profiling rdocdir=${DOCSDIR} \
 			--with-system-bzlib --with-system-zlib
 CONFIGURE_ENV+=		FCFLAGS="${FFLAGS}" \
 			INSTALL_DATA="${INSTALL} ${COPY} ${_SHROWNGRP} -m 644" \
 			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
+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
 
 .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
 
 .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+=		libpng15.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>
diff --git a/math/arpack-ng/Makefile b/math/arpack-ng/Makefile
index 7a005db6a89d..5f9ca1aa9074 100644
--- a/math/arpack-ng/Makefile
+++ b/math/arpack-ng/Makefile
@@ -1,83 +1,83 @@
 # Created by: bf <bf@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	arpack-ng
 PORTVERSION=	3.1.5
 CATEGORIES=	math
 MASTER_SITES=	http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/ \
 		LOCAL/bf
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Revised Argand library for solving large-scale eigenvalue problems
 
 LICENSE=	BSD
 
 USES=		fortran libtool
 USE_LDCONFIG=	yes
 
 CONFLICTS=	arpack-[0-9]*
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--disable-mpi --with-blas="${BLAS}" \
 			--with-lapack="${LAPACK}"
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	lib/libarpack.a \
 		lib/libarpack.so \
 		lib/libarpack.so.2 \
 		lib/libarpack.so.2.0.0 \
 		libdata/pkgconfig/arpack.pc
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
 .endif
 
 WITH_BLAS?=	blas
 
 .if ${WITH_BLAS} == "gotoblas"
 BLAS=		-lgoto2p
-LAPACK =	-lgoto2p
+LAPACK=		-lgoto2p
 LIB_DEPENDS+=	libgoto2p.so:${PORTSDIR}/math/gotoblas
 .elif ${WITH_BLAS} == "atlas"
 BLAS=		-lptf77blas
-LAPACK =	-lalapack -lptcblas
+LAPACK=		-lalapack -lptcblas
 LIB_DEPENDS+=	libptf77blas.so:${PORTSDIR}/math/atlas
 .elif ${WITH_BLAS} == "blas"
 BLAS=		-lblas
-LAPACK =	-llapack
+LAPACK=		-llapack
 LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas \
 		liblapack.so:${PORTSDIR}/math/lapack
 .else
-IGNORE =	unknown value of WITH_BLAS: ${WITH_BLAS}
+IGNORE=		unknown value of WITH_BLAS: ${WITH_BLAS}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -Ee 's|\(libdir\)(/pkgconfig)|(prefix)/libdata\1|' \
 	${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/BLAS_LIBS.*LAPACK_LIBS/ \
 	{s/LAPACK_LIBS/BLAS_LIBS/;s/BLAS_LIBS/LAPACK_LIBS/;}' \
 	${WRKSRC}/Makefile.in \
 	${WRKSRC}/arpack.pc.in \
 	${WRKSRC}/TESTS/Makefile.in
 
 post-build:
 	@cd ${WRKSRC}/.libs; ${STRIP_CMD} libarpack.a libarpack.so.*.*
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/DOCUMENTS && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}
 .endif
 
 check regression-test test: build
 	@cd ${WRKSRC}; ${DO_MAKE_BUILD} check
 
 .include <bsd.port.post.mk>
diff --git a/math/arpack/Makefile b/math/arpack/Makefile
index f87206db41a4..2e6de35bff87 100644
--- a/math/arpack/Makefile
+++ b/math/arpack/Makefile
@@ -1,204 +1,204 @@
 # Created by: Pedro F. Giffuni
 # $FreeBSD$
 
 PORTNAME=	arpack
 PORTVERSION=	96
 PORTREVISION=	12
 CATEGORIES=	math
 MASTER_SITES=	http://www.caam.rice.edu/software/ARPACK/SRC/
 DISTFILES=	${PORTNAME}${PORTVERSION}.tar.gz patch.tar.gz
 DIST_SUBDIR=	arpack
 EXTRACT_ONLY=	${PORTNAME}${PORTVERSION}.tar.gz
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Argand Library: large eigenvalue subroutines (serial version)
 
 BUILD_DEPENDS=	tradcpp:${PORTSDIR}/devel/tradcpp
 
 CONFLICTS=	arpack-ng-[0-9]*
 CPP=		tradcpp
 FFLAGS+=	-ffixed-line-length-none
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 USES=		fortran
 USE_LDCONFIG=	yes
-WRKSRC =	${WRKDIR}/ARPACK
+WRKSRC=		${WRKDIR}/ARPACK
 
 # The following lapack symbols in arpack are renamed to avoid conflicts with other
 # lapack libraries:
 RENAMED_SYMBOLS=	cgbtf2 cgbtrf cgbtrs cgeqr2 cgttrf cgttrs clacgv \
 			clacon clacpy cladiv clahqr clange clanhs clarf \
 			clarfg clarnv clartg clascl claset classq claswp \
 			clatrs cmach crot ctrevc ctrexc ctrsen ctrsyl cunm2r \
 			dgbtf2 dgbtrf dgbtrs dgeqr2 dgttrf dgttrs dlabad \
 			dlacon dlacpy dladiv dlae2 dlaev2 dlaexc dlagtm \
 			dlahqr dlaln2 dlamc1 dlamc2 dlamc3 dlamc4 dlamc5 \
 			dlamch dlange dlanhs dlanst dlanv2 dlaptm dlapy2 \
 			dlapy3 dlaran dlarf dlarfg dlarfx dlarnd dlarnv \
 			dlartg dlaruv dlascl dlaset dlasr dlasrt dlassq \
 			dlaswp dlasy2 dorm2r dpttrf dpttrs dsteqr dtrevc \
 			dtrexc dtrsen dtrsyl dzsum1 icmax1 ilaenv izmax1 \
 			lsame lsamen scsum1 second sgbtf2 sgbtrf sgbtrs \
 			sgeqr2 sgttrf sgttrs slabad slacon slacpy sladiv \
 			slae2 slaev2 slaexc slagtm slahqr slaln2 slamc1 \
 			slamc2 slamc3 slamc4 slamc5 slamch slange slanhs \
 			slanst slanv2 slaptm slapy2 slapy3 slaran slarf \
 			slarfg slarfx slarnd slarnv slartg slaruv slascl \
 			slaset slasr slasrt slassq slaswp slasy2 sorm2r \
 			spttrf spttrs ssteqr strevc strexc strsen strsyl \
 			xerbla xlaenv zgbtf2 zgbtrf zgbtrs zgeqr2 zgttrf \
 			zgttrs zlacgv zlacon zlacpy zladiv zlahqr zlange \
 			zlanhs zlarf zlarfg zlarnv zlartg zlascl zlaset \
 			zlassq zlaswp zlatrs zmach zrot ztrevc ztrexc ztrsen \
 			ztrsyl zunm2r
 
 BANDTESTS=	ssbdr1 ssbdr2 ssbdr3 ssbdr4 ssbdr5 ssbdr6 \
 		dsbdr1 dsbdr2 dsbdr3 dsbdr4 dsbdr5 dsbdr6 \
 		snbdr1 snbdr2 snbdr3 snbdr4 snbdr5 snbdr6 \
 		dnbdr1 dnbdr2 dnbdr3 dnbdr4 dnbdr5 dnbdr6 \
 		cnbdr1 cnbdr2 cnbdr3 cnbdr4 \
 		znbdr1 znbdr2 znbdr3 znbdr4
 COMPLEXTESTS=	cndrv1 cndrv2 cndrv3 cndrv4 \
 		zndrv1 zndrv2 zndrv3 zndrv4
 NONSYMTESTS=	sndrv1 sndrv2 sndrv3 sndrv4 sndrv5 sndrv6 \
 		dndrv1 dndrv2 dndrv3 dndrv4 dndrv5 dndrv6
 SIMPLETESTS=	sssimp dssimp snsimp dnsimp cnsimp znsimp
 SVDTESTS=	ssvd dsvd
 SYMTESTS=	ssdrv1 ssdrv2 ssdrv3 ssdrv4 ssdrv5 ssdrv6 \
 		dsdrv1 dsdrv2 dsdrv3 dsdrv4 dsdrv5 dsdrv6
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	ug.ps.gz
 .endif
 
 .if exists(${LOCALBASE}/lib/libatlas.so)
 WITH_BLAS?=	atlas
 .else
 WITH_BLAS?=	reference
 .endif
 
 .if ${WITH_BLAS} == atlas
 LIB_DEPENDS+=		libatlas.so:${PORTSDIR}/math/atlas
 BLAS?=			-lf77blas
 .else
 LIB_DEPENDS+=		libblas.so:${PORTSDIR}/math/blas
 BLAS?=			-lblas
 .endif
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 .else
 PICFLAG?=	-fpic
 .endif
 
 post-extract:
 	@${TAR} -C ${WRKDIR} -xzf ${_DISTDIR}/patch.tar.gz
 	@${GZIP_CMD} ${WRKSRC}/DOCUMENTS/ex-*.doc
 
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e '/^(home|AR|FC|LDFLAGS|MAKE|PLAT|RANLIB|SHELL)[[:blank:]]+=/d' \
 		-e '/^ARPACKLIB[[:blank:]]+=/s/_\$$\(PLAT\)//' \
 		-e '\|^BLASLIB[[:blank:]]+=|s|=.*|= ${LDFLAGS} ${BLAS}|' \
 		-e '/^DIRS[[:blank:]]+=/s/\$$\(BLASdir\)//' \
 		-e '\|^FFLAGS[[:blank:]]+=|s|=.*|= ${FFLAGS} $${PICFLAG}|' \
 			${WRKSRC}/ARmake.inc
 	@${CP} -R ${WRKSRC} ${WRKSRC}_SHARED
 	@${ECHO_CMD} ${RENAMED_SYMBOLS} | ${AWK} \
 		'BEGIN { printf "%s\n\n%s\t%s\n%s\t%s\n\n", \
 			"/* arpack symbol renaming preprocessor macros, C interface */", \
 			"#ifndef", "_ARPACK_COMPAT_C_H_", \
 			"#define", "_ARPACK_COMPAT_C_H_" \
 			> "${WRKDIR}/arpack_compat_c.h" ; \
 			printf "%s\n\n%s\t%s\n%s\t%s\n\n", \
 			"/* arpack symbol renaming preprocessor macros, FORTRAN interface */", \
 			"#ifndef", "_ARPACK_COMPAT_F_H_", \
 			"#define", "_ARPACK_COMPAT_F_H_" \
 			> "${WRKDIR}/arpack_compat_f.h" } ; \
 		{ for (i = 1; i <= NF; i++) { \
 			printf  "%s\t%s%s\t%s%s%s\n", "#define", $$i, "_", \
 			"arpack_", $$i, "_" > "${WRKDIR}/arpack_compat_c.h" ; \
 			printf  "%s\t%s\t%s%s\n%s\t%s\t%s%s\n", "#define", \
 			toupper($$i), "ARPACK_", toupper($$i), "#define", $$i, \
 			"ARPACK_", toupper($$i) \
 			> "${WRKDIR}/arpack_compat_f.h" } } ; \
 		END { print "\n#endif" >  "${WRKDIR}/arpack_compat_c.h" ; \
 		print "\n#endif" >  "${WRKDIR}/arpack_compat_f.h" }' -
 
 pre-build:
 	@${ECHO_CMD} "Renaming LAPACK functions ..."
 	@for f in `${FIND} ${WRKDIR} -type f -mindepth 2 -name '*.f'` ; do \
 		${MV} $${f} $${f}.unproc ; \
 		${CPP} -C -I${WRKDIR} -imacros arpack_compat_f.h \
 			$${f}.unproc $${f} ; done
 
 do-build:
 	@cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} \
 		PICFLAG= home="${WRKSRC}" \
 		${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
 	@cd ${WRKSRC}_SHARED ; ${SETENV} ${MAKE_ENV} \
 		PICFLAG=${PICFLAG}  home="${WRKSRC}_SHARED" \
 		${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} ; \
 		${FC} ${FFLAGS} ${PICFLAG} ${LDFLAGS} -shared \
 		-o libarpack.so.1 -Wl,-x -Wl,-soname,libarpack.so.1 \
 		-Wl,--whole-archive libarpack.a -Wl,--no-whole-archive
 
 do-install:
 	@${INSTALL_DATA} ${FILESDIR}/arpack.h ${WRKDIR}/arpack_compat_c.h \
 		${WRKDIR}/arpack_compat_f.h ${STAGEDIR}${PREFIX}/include
 	@${INSTALL_DATA} ${WRKSRC}/libarpack.a ${STAGEDIR}${PREFIX}/lib
 	@${INSTALL_DATA} -s ${WRKSRC}_SHARED/libarpack.so.1 ${STAGEDIR}${PREFIX}/lib
 	@${LN} -sf libarpack.so.1 ${STAGEDIR}${PREFIX}/lib/libarpack.so
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/DOCUMENTS/ex-*.doc.gz ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/ug.ps.gz ${STAGEDIR}${DOCSDIR}
 .endif
 
 .if defined(MAINTAINER_MODE)
 check regression-test test: simpletest
 .endif
 
 simpletest: build
 	@cd ${WRKSRC}/EXAMPLES/SIMPLE ; ${SETENV} ${MAKE_ENV} \
 		PICFLAG= home="${WRKSRC}" \
 		${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} simple ; \
 		${SIMPLETESTS:S|^|./|:S|$| ; |}
 	@cd ${WRKSRC}_SHARED/EXAMPLES/SIMPLE ; ${SETENV} ${MAKE_ENV} \
 		PICFLAG=${PICFLAG}  home="${WRKSRC}_SHARED" \
 		${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} simple ; \
 		${SIMPLETESTS:S|^|./|:S|$| ; |}
 
 fulltest: fulltest-static fulltest-shared
 
 fulltest-static: lapack-drivers-static
 .for d in BAND COMPLEX NONSYM SVD SYM
 	@cd ${WRKSRC}/EXAMPLES/${d} ; ${SETENV} ${MAKE_ENV} \
 		PICFLAG= home="${WRKSRC}" \
 		${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} ${${d}TESTS} ; \
 		${${d}TESTS:S|^|./|:S|$| ; |}
 .endfor
 
 fulltest-shared: lapack-drivers-shared
 .for d in BAND COMPLEX NONSYM SIMPLE SVD SYM
 	@cd ${WRKSRC}_SHARED/EXAMPLES/${d} ; ${SETENV} ${MAKE_ENV} \
 		PICFLAG=${PICFLAG}  home="${WRKSRC}_SHARED" \
 		${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} ${${d}TESTS} ; \
 		${${d}TESTS:S|^|./|:S|$| ; |}
 .endfor
 
 lapack-drivers-static: build
 	@cd ${WRKSRC}/LAPACK ; ${SETENV} ${MAKE_ENV} \
 		PICFLAG= home="${WRKSRC}" \
 		${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} sdrv ddrv cdrv zdrv
 
 lapack-drivers-shared: build
 	@cd ${WRKSRC}_SHARED/LAPACK ; ${SETENV} ${MAKE_ENV} \
 		PICFLAG=${PICFLAG}  home="${WRKSRC}_SHARED" \
 		${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} sdrv ddrv cdrv zdrv
 
 .include <bsd.port.post.mk>
diff --git a/math/atlas-devel/Makefile b/math/atlas-devel/Makefile
index f9459990f6c6..29ab29a710b0 100644
--- a/math/atlas-devel/Makefile
+++ b/math/atlas-devel/Makefile
@@ -1,265 +1,265 @@
 # Created by: Nakata Maho <maho@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	atlas
 PORTVERSION=	3.9.11
 PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF/math-${PORTNAME}/Developer%20%28unstable%29/${PORTVERSION}
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Development version of math/atlas
 
-IGNORE =	: dependent ports have been altered to link with math/atlas -- please\
+IGNORE=		: dependent ports have been altered to link with math/atlas -- please\
 use that port instead of math/atlas-devel, while the latter is being revised
 MANUAL_PACKAGE_BUILD=	Optimizes for the local machine.
 
 USES=		fortran gmake tar:bzip2
 USE_GCC=	yes
 WRKSRC=		${WRKDIR}/ATLAS
 USE_LDCONFIG=	yes
 CONFLICTS=	atlas-[0-9]* cblas-[0-9]*
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 NOT_FOR_ARCHS=	alpha
 
 CCOMPILER=	${CC}
 LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
 LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 .else
 PICFLAG?=	-fpic
 .endif
 
 .if ${ARCH} == "i386"
 POINTER=	32
 .endif
 .if ${ARCH} == "amd64"
 POINTER=	64
 .endif
 .if ${ARCH} == "sparc64"
 POINTER=	64
 .endif
 
 .if (${OSVERSION} < 700000) && defined(WITH_GCC42KERNEL)
 BUILD_DEPENDS+=	gcc42:${PORTSDIR}/lang/gcc42
 KERNELFLAG=	-Ss kern gcc42
 .else
 KERNELFLAG=	""
 .endif
 
 .if defined(WITH_WALL_TIMER)
 .  if defined(MHZ) && ( ${ARCH} == "i386" || ${ARCH} == "amd64" )
 TIMEFLAG=	-D c -DPentiumCPS=${MHZ}
 .  else
 TIMEFLAG=	-D c -DWALL
 .  endif
 .else
 TIMEFLAG=	""
 .endif
 
 # only used for lapack sub-project
 .if defined(WITH_OPTIMIZED_FLAGS)
 .if defined(CPUTYPE)
 FFLAGS+=	-march=${CPUTYPE} -pipe -O2 -ffast-math
 .else
 FFLAGS+=	-pipe -O2 -ffast-math
 .endif
 .endif
 .if defined(WITH_STATICLIB)
 PLIST_SUB+=	WITH_STATICLIB=""
 .else
 PLIST_SUB+=	WITH_STATICLIB="@comment "
 .endif
 
 post-extract:
 	@${ECHO_MSG} 'This port engages in a long, computationally-demanding tuning process.'
 	@${ECHO_MSG} 'Builds can take a day or more on older hardware, and temporarily occupy'
 	@${ECHO_MSG} 'several hundred megabytes of disk space.  You are advised to disable'
 	@${ECHO_MSG} 'all forms of power management or CPU throttling (APM, ACPI, Intel'
 	@${ECHO_MSG} 'SpeedStep, AMD PowerNow, AMD Cool and Quiet, p4tcc, powerd, etc.)'
 	@${ECHO_MSG} 'that may change the disk I/O or CPU behavior during the build, and'
 	@${ECHO_MSG} 'to set operating parameters to static values at which you ultimately'
 	@${ECHO_MSG} 'intend to use the software.  You should also avoid placing heavy loads'
 	@${ECHO_MSG} 'on the system during the build, and temporarily disable any automatons'
 	@${ECHO_MSG} 'that may do so.  If you fail to follow these guidelines, you may prolong'
 	@${ECHO_MSG} 'the build, perhaps indefinitely, and you may obtain libraries with'
 	@${ECHO_MSG} 'sub-optimal performance.'
 	@${ECHO_MSG}
 	@${ECHO_MSG} 'Occasionally the autoconfiguration may fail for certain platforms, and'
 	@${ECHO_MSG} 'you may have to override the architecture, compiler flags, assembly'
 	@${ECHO_MSG} 'language dialect, or pointer bit-width by issuing additional configure'
 	@${ECHO_MSG} 'arguments.  Consult the FAQ, installation guide, and errata page at'
 	@${ECHO_MSG} 'the project website for help if this is necessary, and notify the'
 	@${ECHO_MSG} 'port maintainer.'
 	@${ECHO_MSG}
 	@${ECHO_MSG} "This port purposely ignores the CC and CFLAGS settings"
 	@${ECHO_MSG} "Program and compiler flags are fine-tuned to the gcc 4.2.x"
 	@${ECHO_MSG} "compiler, although other gcc versions may be used; gcc 4.1.x"
 	@${ECHO_MSG} "is NOT recommended"
 	@${ECHO_MSG}
 .if !defined(WITH_STATICLIB)
 	@${ECHO_MSG} "You can build static libraries with"
 	@${ECHO_MSG} "make -DWITH_STATICLIB"
 	@${ECHO_MSG}
 .endif
 .if !defined(WITH_WALL_TIMER)
 	@${ECHO_MSG} "If your machine will be solely dedicated to"
 	@${ECHO_MSG} "building atlas with gcc during the lengthy optimization"
 	@${ECHO_MSG} "process, and not subjected to other loads, you"
 	@${ECHO_MSG} "may enable the more accurate wall timer (instead of"
 	@${ECHO_MSG} "the default CPU-time timer) with make -DWITH_WALL_TIMER"
 	@${ECHO_MSG} "If, in addition, you are on i386 or amd64, you may set MHZ"
 	@${ECHO_MSG} "to your CPU clock frequency in MHz (rounded to the nearest"
 	@${ECHO_MSG} "integer value) in the build environment for cycle-to-time"
 	@${ECHO_MSG} "conversion"
 	@${ECHO_MSG}
 .endif
 .if (${OSVERSION} < 700000)
 .if !defined(WITH_GCC42KERNEL)
 	@${ECHO_MSG} "If you don't want to make gcc 4.2.x your default compiler (CC),"
 	@${ECHO_MSG} "but you want to have ATLAS use it to compile all the kernel"
 	@${ECHO_MSG} "routines (this usually results in superior performance, and a"
 	@${ECHO_MSG} "slightly faster build), while compiling interface routines and"
 	@${ECHO_MSG} "doing any linking with gcc 3.x, make a hybrid build with"
 	@${ECHO_MSG} "make -DWITH_GCC42KERNEL"
 	@${ECHO_MSG}
 .endif
 .endif
 
 pre-configure:
 	@${REINPLACE_CMD} -e "s|%%CC%%|${CCOMPILER}|g" \
 		-e "s|%%FC%%|${FC}|g"  ${WRKSRC}/CONFIG/src/atlcomp.txt
 	@${REINPLACE_CMD} -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g" \
 			  -e "s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g" \
 			  -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${WRKSRC}/CONFIG/src/SpewMakeInc.c
 
 do-configure:
 #non-threaded
 #dummy f77lib, it is not used.
 	${MKDIR} ${WRKSRC}/NON_THREADED ; cd ${WRKSRC}/NON_THREADED ; \
 		../configure -v 2 -t 0 ${TIMEFLAG} -b ${POINTER} -Si cputhrchk 0 ${KERNELFLAG} -Ss f77lib " "
 	${MKDIR} ${WRKSRC}/NON_THREADED_PIC ; cd ${WRKSRC}/NON_THREADED_PIC ; \
 		../configure -v 2 -t 0 -b ${POINTER} -Fa alg '${PICFLAG} -DPIC' ${TIMEFLAG} -Si cputhrchk 0 ${KERNELFLAG} -Ss f77lib " "
 #threaded
 #dummy f77lib, it is not used.
 	cd ${WRKSRC}; ${PATCH} < ${FILESDIR}/thread-patch
 	${MKDIR} ${WRKSRC}/THREADED ; cd ${WRKSRC}/THREADED ; \
 		../configure -v 2 -b ${POINTER} -Fa alg '${PTHREAD_CFLAGS} ' ${TIMEFLAG} -Si cputhrchk 0 ${KERNELFLAG} -Ss f77lib " "
 	${MKDIR} ${WRKSRC}/THREADED_PIC ; cd ${WRKSRC}/THREADED_PIC ; \
 		../configure -v 2 -b ${POINTER} -Fa alg '${PTHREAD_CFLAGS} ${PICFLAG} -DPIC' ${TIMEFLAG} -Si cputhrchk 0 ${KERNELFLAG} -Ss f77lib " "
 
 do-build:
 # make lapack
 .if ! exists(${WRKDIR}/lapack/Makefile)
 	@${ECHO_MSG} "===>  Extracting lapack sub project"
 	@${MKDIR} ${WRKDIR}/lapack
 	@${CP} -r ${PORTSDIR}/math/lapack/files ${WRKDIR}/lapack
 	@${CP} ${PORTSDIR}/math/lapack/Makefile ${WRKDIR}/lapack
 	@${CP} ${PORTSDIR}/math/lapack/distinfo ${WRKDIR}/lapack
 	@${CP} ${PORTSDIR}/math/lapack/pkg-descr ${WRKDIR}/lapack
 	@cd ${WRKDIR}/lapack ; ${MAKE} "FFLAGS=${FFLAGS}" FC="${FC}" build WRKDIRPREFIX=""
 .endif
 .if defined(WITH_STATICLIB)
 	(cd ${WRKSRC}/NON_THREADED ; ${MAKE})
 	(cd ${WRKSRC}/THREADED ; ${MAKE})
 .endif
 	(cd ${WRKSRC}/NON_THREADED_PIC ; ${MAKE})
 	(cd ${WRKSRC}/THREADED_PIC ; ${MAKE})
 test:
 	@${MAKE} do-test
 
 ATLAS_LIBS1=libalapack libatlas libcblas libf77blas #libtstatlas
 ATLAS_LIBS2=libptcblas libptf77blas
 LAPACKWRKSRC=`cd ${WRKDIR}/lapack; ${MAKE} -V WRKSRC WRKDIRPREFIX=""`
 
 post-build:
 .if defined(WITH_STATICLIB)
 # make atlas-enhanced lapack (static ver)
 	(cd ${WRKSRC}; ${MKDIR} tmp1 ; \
 		${CP} ${LAPACKWRKSRC}/liblapack.a tmp1 ;\
 		cd tmp1 ;\
 		ar x liblapack.a ;\
 		ar x ../NON_THREADED/lib/liblapack.a ;\
 		ar r ../NON_THREADED/lib/libalapack.a *.o ;\
 		ranlib ../NON_THREADED/lib/libalapack.a )
 #  make atlas-enhanced lapack (static and thread-safe ver)
 	(cd ${WRKSRC}; ${MKDIR} tmp2 ; \
 		${CP} ${LAPACKWRKSRC}/liblapack.a tmp2 ;\
 		cd tmp2 ;\
 		ar x liblapack.a ;\
 		ar x ../THREADED/lib/liblapack.a ;\
 		ar r ../THREADED/lib/libalapack.a *.o ;\
 		ranlib ../THREADED/lib/libalapack.a )
 .endif
 # make atlas-enhanced lapack (shared ver)
 	( cd ${WRKSRC}; ${MKDIR} tmp3 ;\
 		${CP} ${LAPACKWRKSRC}_shared/liblapack.a tmp3 ;\
 		cd tmp3 ;\
 		ar x liblapack.a ;\
 		ar x ../NON_THREADED_PIC/lib/liblapack.a ;\
 		ar r ../NON_THREADED_PIC/lib/libalapack.a *.o ;\
 		ranlib ../NON_THREADED_PIC/lib/libalapack.a )
 # make atlas-enhanced lapack (shared and thread-safe ver)
 	( cd ${WRKSRC}; ${MKDIR} tmp4 ;\
 		${CP} ${LAPACKWRKSRC}_shared/liblapack.a tmp4 ;\
 		cd tmp4 ;\
 		ar x liblapack.a ;\
 		ar x ../THREADED_PIC/lib/liblapack.a ;\
 		ar r ../THREADED_PIC/lib/libalapack.a *.o ;\
 		ranlib ../THREADED_PIC/lib/libalapack.a )
 
 # make atlas shared library
 .for i in ${ATLAS_LIBS1}
 	( cd ${WRKSRC}/NON_THREADED_PIC/lib ; \
 		ld -Bshareable -o ${i}.so.2 -x -soname ${i}.so.2 --whole-archive ${i}.a )
 .endfor
 
 # make atlas shared (thread-safe) library
 .for i in ${ATLAS_LIBS1}
 	( cd ${WRKSRC}/THREADED_PIC/lib ; \
 		ld -Bshareable -o ${i}_r.so.2 -x -soname ${i}_r.so.2 --whole-archive ${i}.a )
 .endfor
 .for i in ${ATLAS_LIBS2}
 	( cd ${WRKSRC}/THREADED_PIC/lib ; \
 		ld -Bshareable -o ${i}.so.2 -x -soname ${i}.so.2 --whole-archive ${i}.a )
 .endfor
 do-install:
 .for i in ${ATLAS_LIBS1}
 .if defined(WITH_STATICLIB)
 	@${INSTALL_DATA} ${WRKSRC}/NON_THREADED/lib/${i}.a       ${PREFIX}/lib
 .endif
 	@${INSTALL_DATA} ${WRKSRC}/NON_THREADED_PIC/lib/${i}.so.2    ${PREFIX}/lib
 	@${LN} -sf ${i}.so.2 ${PREFIX}/lib/${i}.so
 .endfor
 .for i in ${ATLAS_LIBS1}
 .if defined(WITH_STATICLIB)
 	@${INSTALL_DATA} ${WRKSRC}/THREADED/lib/${i}.a       ${PREFIX}/lib/${i}_r.a
 .endif
 	@${INSTALL_DATA} ${WRKSRC}/THREADED_PIC/lib/${i}_r.so.2    ${PREFIX}/lib/${i}_r.so.2
 	@${LN} -sf ${i}_r.so.2 ${PREFIX}/lib/${i}_r.so
 .endfor
 .for i in ${ATLAS_LIBS2}
 .if defined(WITH_STATICLIB)
 	@${INSTALL_DATA} ${WRKSRC}/THREADED/lib/${i}.a       ${PREFIX}/lib
 .endif
 	@${INSTALL_DATA} ${WRKSRC}/THREADED_PIC/lib/${i}.so.2    ${PREFIX}/lib
 	@${LN} -sf ${i}.so.2 ${PREFIX}/lib/${i}.so
 .endfor
 
 	@${INSTALL_DATA} ${WRKSRC}/include/cblas.h   ${PREFIX}/include
 	@${INSTALL_DATA} ${WRKSRC}/include/clapack.h ${PREFIX}/include
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
 .include <${FILESDIR}/Makefile.test>
 .include <bsd.port.post.mk>
diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index 7d9a019b42f3..0a58a540f184 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -1,263 +1,263 @@
 # Created by: Nakata Maho <maho@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	atlas
 PORTVERSION=	3.8.4
 PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/math-${PORTNAME}/Stable/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Automatically Tuned Linear Algebra Software (ATLAS)
 
 LICENSE=	BSD
 
 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=	ARCHDEF TSC WALL_TIMER
 OPTIONS_DEFAULT=	SHARED
 OPTIONS_MULTI=	BUILDTYPE
 OPTIONS_MULTI_BUILDTYPE=	SHARED STATIC
 ARCHDEF_DESC=		Use a specified architectural default
 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
 
 NO_STAGE=	yes
 .include <bsd.port.pre.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
 
 .for i in DATA DOCS
 .  if !defined(NOPORT${i})
 PORT${i}=	*
 .  endif
 .endfor
 
 .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
+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_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}|" \
 		${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 [ "x${WITH_WALL_TIMER}" != "x" ] ; then \
 		TIMEFLAG= ; \
 		if [ \( ${ARCH} = "i386" -o ${ARCH} = "amd64" \) -a "x${WITH_TSC}" != "x" ] ; 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}=yes \
 		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} ${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}
 
 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} ${MAKE_ARGS} time ; \
 	cd ARCHS ; ${SETENV} ${MAKE_ENV} ${MAKE} ${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} ${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 ${PREFIX}/lib/${i:S|lapack|alapack|}.a
 .  endif
 .  if ${PORT_OPTIONS:MSHARED}
 	@${INSTALL_DATA} ${WRKSRC}/shared/lib/${i}.a ${PREFIX}/lib/${i:S|lapack|alapack|}_pic.a
 	@${INSTALL_DATA} ${WRKSRC}/shared/lib/${i:S|lapack|alapack|}.so.2 ${PREFIX}/lib
 	@${LN} -sf ${i:S|lapack|alapack|}.so.2 ${PREFIX}/lib/${i:S|lapack|alapack|}.so
 .  endif
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/include/cblas.h   ${PREFIX}/include
 	@${INSTALL_DATA} ${WRKSRC}/include/clapack.h ${PREFIX}/include
 .for opt in shared static
 .  if ${PORT_OPTIONS:M${opt:tu}}
 	@${MKDIR} ${PREFIX}/include/atlas/${opt}
 	@${INSTALL_DATA} ${WRKSRC}/${opt}/include/* ${PREFIX}/include/atlas/${opt}
 	@cd ${PREFIX} ; \
 	${FIND} include/atlas/${opt} -type f -o -type l | ${SORT} >> ${TMPPLIST}
 	@${ECHO_CMD} "@dirrm include/atlas/${opt}" >> ${TMPPLIST}
 .    if !defined(NOPORTDATA)
 	@${MKDIR} ${DATADIR}/${opt}
 	@cd ${WRKSRC}/${opt}/bin ; ${TAR} -czf INSTALL_LOG.tgz INSTALL_LOG ; \
 	${INSTALL_DATA} INSTALL_LOG.tgz ${DATADIR}/${opt}
 	@${INSTALL_DATA} ${WRKSRC}/${opt}/ARCHS/*.tgz ${DATADIR}/${opt}
 .    endif
 .  endif
 .endfor
 	@${ECHO_CMD} "@dirrm include/atlas" >> ${TMPPLIST}
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/blas/Makefile b/math/blas/Makefile
index 55d35d33362f..f59b48f92d9d 100644
--- a/math/blas/Makefile
+++ b/math/blas/Makefile
@@ -1,15 +1,15 @@
 # Created by: ljo
 # $FreeBSD$
 
 PORTNAME=	blas
 PORTREVISION=	2
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Basic Linear Algebra Subroutines
 
 DESCR=	${.CURDIR}/pkg-descr
-BLAS_SLAVEPORT	=	yes
+BLAS_SLAVEPORT=	yes
 
 MASTERDIR=	${.CURDIR}/../lapack
 
 .include "${MASTERDIR}/Makefile"
diff --git a/math/cblas/Makefile b/math/cblas/Makefile
index fc6a896f41bc..5d6e3bb43f56 100644
--- a/math/cblas/Makefile
+++ b/math/cblas/Makefile
@@ -1,134 +1,134 @@
 # Created by: bf@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	cblas
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	NL/blas/blast-forum/ LOCAL/bf
 DISTFILES=	cblas.tgz
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Reference implementation of the C interface to the legacy Fortran BLAS
 
 LICENSE=	BSD
 
 USES=		fortran
 
 CONFLICTS_INSTALL=	atlas-[0-9]* atlas-devel-[0-9]*
 
 OPTIONS_DEFINE=	PROFILE SHARED STATIC DOCS
 OPTIONS_DEFAULT=	SHARED STATIC
 PROFILE_DESC=	Build profiling libraries
 SHARED_DESC=	Build shared libraries and PIC archives
 STATIC_DESC=	Build (non-PIC) archives
 
 PLIST_FILES=	include/cblas.h include/cblas_f77.h
 PLIST_SUB=	SVERSION="${SVERSION}"
 
 SVERSION=	2
 
-WRKSRC =		${WRKDIR}/CBLAS
-WRKSRC_PROFILE =	${WRKSRC}_PROFILE
+WRKSRC=			${WRKDIR}/CBLAS
+WRKSRC_PROFILE=		${WRKSRC}_PROFILE
 WRKSRC_SHARED=		${WRKSRC}_SHARED
 WRKSRC_STATIC=		${WRKSRC}
 
 .include <bsd.port.options.mk>
 
 .if make(makesum) || ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	blas-report.pdf
 EXTRACT_ONLY=	cblas.tgz
 .endif
 
 MANGLING?=	-DADD_
 CFLAGS+=	${MANGLING}
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 .else
 PICFLAG?=	-fpic
 .endif
 
 FLAGS_PROFILE?=	-pg
 FLAGS_SHARED ?=	${PICFLAG}
 
 .if ${PORT_OPTIONS:MSHARED}
 PLIST_FILES+=	lib/libcblas_pic.a lib/libcblas.so lib/libcblas.so.${SVERSION}
 TESTS ?=	test-shared
 USE_LDCONFIG=	yes
 .endif
 .if ${PORT_OPTIONS:MSTATIC}
 PLIST_FILES+=	lib/libcblas.a
 TESTS ?=	test-static
 .endif
 .if ${PORT_OPTIONS:MPROFILE}
 PLIST_FILES+=	lib/libcblas_p.a
 TESTS ?=	test-profile
 .endif
 
 post-patch:
 	@${SED} -Ee '\@^CBLIB[[:blank:]]*=@s@cblas.*\.a@libcblas.a@; \
 		\@^((BL|RAN)LIB|CC|FC)[[:blank:]]*=@d; \
 		\@^((C|F)FLAGS)[[:blank:]]*=@s@=.*@+= $${EXTRAFLAGS}@; \
 		\@^LOADER@{x; s|^|LOADFLAGS = $${LDFLAGS} $${EXTRAFLAGS}|; G;};' \
 			${WRKSRC}/Makefile.LINUX > ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's@$$(ARCH)@$$(AR)@' ${WRKSRC}/src/Makefile
 .for o in PROFILE SHARED
 .if ${PORT_OPTIONS:M${o}}
 	@${CP} -a ${WRKSRC} ${WRKSRC_${o}}
 .endif
 .endfor
 
 do-build: build-profile build-shared build-static
 
 .for o in PROFILE SHARED STATIC
 build-${o:tl}: patch
 .if ${PORT_OPTIONS:M${o}}
 	@${PRINTF} "\n\nBuilding ${o:tl} libraries:\n\n\n"
 	@cd ${WRKSRC_${o}}/src; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FLAGS_${o}}" \
 	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} all
 
 .endif
 .endfor
 
 post-build:
 .if ${PORT_OPTIONS:MSHARED}
 	cd ${WRKSRC_SHARED}/lib ; ${FC} ${FFLAGS} ${FFLAGS_SHARED} ${LDFLAGS} -shared \
 	-o libcblas.so.${SVERSION} -Wl,-x -Wl,-soname,libcblas.so.${SVERSION} \
 	-Wl,--whole-archive libcblas.a -Wl,--no-whole-archive
 .endif
 
 .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
 BLAS?=			-L${LOCALBASE}/lib -lblas
 BUILD_DEPENDS +=	${LOCALBASE}/lib/libblas.so:${PORTSDIR}/math/blas
 MAKE_ENV+=		BLLIB="${BLAS}"
 
 check regression-test test: ${TESTS}
 
 .for o in PROFILE SHARED STATIC
 test-${o:tl}: build-${o:tl}
 .if ${PORT_OPTIONS:M${o}}
 	@${PRINTF} "\n\nTesting ${o:tl} libraries:\n\n\n"
 	@cd ${WRKSRC_${o}}/testing; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FLAGS_${o}}" \
 	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} all run
 	@${CAT} ${WRKSRC_${o}}/testing/*.out
 
 .endif
 .endfor
 .endif
 
 do-install:
 	@${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include
 .if ${PORT_OPTIONS:MSTATIC}
 	@${INSTALL_LIB} ${WRKSRC}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib
 .endif
 .if ${PORT_OPTIONS:MSHARED}
 	@${INSTALL_LIB} ${WRKSRC_SHARED}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib/libcblas_pic.a
 	@${INSTALL_LIB} ${WRKSRC_SHARED}/lib/libcblas.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib
 	@${LN} -sf libcblas.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/libcblas.so
 .endif
 .if ${PORT_OPTIONS:MPROFILE}
 	@${INSTALL_LIB} ${WRKSRC_PROFILE}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib/libcblas_p.a
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/eispack/Makefile b/math/eispack/Makefile
index d251bf0fd246..57fe451ebfd3 100644
--- a/math/eispack/Makefile
+++ b/math/eispack/Makefile
@@ -1,61 +1,61 @@
 # Created by: ljo
 # $FreeBSD$
 
 PORTNAME=	eispack
 PORTVERSION=	1.0
 PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	NL
 DISTFILES=	${SRCS}
 EXTRACT_ONLY=	#empty
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Eigenvalue system package
 
 DIST_SUBDIR=	${PORTNAME}
 NO_WRKSUBDIR=	yes
 
 USES=		fortran
 USE_LDCONFIG=	yes
 
 SHLIB_MAJOR=	2
 PLIST_FILES=	lib/libeispack.a lib/libeispack.so lib/libeispack.so.${SHLIB_MAJOR}
 
 LDFLAGS+=	${FFLAGS}
 SRCCONF=	/dev/null
 MAKE_ENV+=	SHLIB_MAJOR="${SHLIB_MAJOR}" \
 		SRCCONF="${SRCCONF}"
 
 OPTIONS_DEFINE=	PROFILE
 
 .include <bsd.port.options.mk>
 
 .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\
+IGNORE=		you have chosen WITH_PROFILE, but have not installed the\
 base system profiling libraries
 .endif
 PLIST_FILES+=	lib/libeispack_p.a
 .else
 MAKE_ENV+=	NO_PROFILE=yes
 .endif
 
 SRCS=	csroot.f epslon.f pythag.f bakvec.f balanc.f balbak.f bandr.f \
 	bandv.f bisect.f bqr.f cbabk2.f cbal.f cg.f ch.f cinvit.f combak.f \
 	comhes.f comlr.f comlr2.f comqr.f comqr2.f cortb.f corth.f elmbak.f \
 	elmhes.f eltran.f figi.f figi2.f hqr.f hqr2.f htrib3.f htribk.f \
 	htrid3.f htridi.f imtql1.f imtql2.f imtqlv.f invit.f minfit.f \
 	ortbak.f orthes.f ortran.f otqlrat.f qzhes.f qzit.f qzval.f qzvec.f \
 	ratqr.f rebak.f rebakb.f reduc.f reduc2.f rg.f rgg.f rs.f rsb.f \
 	rsg.f rsgab.f rsgba.f rsm.f rsp.f rst.f rt.f svd.f tinvit.f tql1.f \
 	tql2.f tqlrat.f trbak1.f trbak3.f tred1.f tred2.f tred3.f tridib.f \
 	tsturm.f cdiv.f
 
 post-extract:
 	@(cd ${_DISTDIR}; ${CP} ${SRCS} ${WRKSRC})
 	${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/math/fflas-ffpack/Makefile b/math/fflas-ffpack/Makefile
index 425c8764db4e..77bd96248dac 100644
--- a/math/fflas-ffpack/Makefile
+++ b/math/fflas-ffpack/Makefile
@@ -1,107 +1,107 @@
 # Created by: b.f. <bf@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	fflas-ffpack
 PORTVERSION=	1.4.3
 PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://linalg.org/ LOCAL/bf
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Library for dense linear algebra over word-size finite fields
 
 LICENSE=	LGPL20
 
 LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gmp="${LOCALBASE}"
 
 OPTIONS_DEFINE=		DOXYGEN OPTIMIZED_CFLAGS
 
 .include <bsd.port.options.mk>
 
 .if ${LOCALBASE} == "/usr/local"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 .if defined(MAINTAINER_MODE)
 CONFIGURE_ARGS+=	 --with-givaro="${LOCALBASE}"
 LIB_DEPENDS+=	libgivaro.so:${PORTSDIR}/math/givaro
 .else
 CONFIGURE_ARGS+=	--with-givaro=no
 .endif
 
 #a C interface to BLAS is needed
 WITH_BLAS?=	gsl
 
 .if ${WITH_BLAS} == "gotoblas"
 CONFIGURE_ARGS+=	--with-gotoblas2="${LOCALBASE}" --with-lapack=blas
 LIB_DEPENDS+=	libgoto2p.so:${PORTSDIR}/math/gotoblas
 USES+=		fortran
 .elif ${WITH_BLAS} == "atlas"
 CONFIGURE_ARGS+=	--with-cblas="${LOCALBASE}" --with-lapack=blas
 LIB_DEPENDS+=	libcblas.so:${PORTSDIR}/math/atlas
 USES+=		fortran
 .elif ${WITH_BLAS} == "gsl"
 CONFIGURE_ARGS+=	--with-gsl="${LOCALBASE}"
 LIB_DEPENDS+=	libgslcblas.so:${PORTSDIR}/math/gsl
 .else
-IGNORE =	unknown value of WITH_BLAS: ${WITH_BLAS}
+IGNORE=		unknown value of WITH_BLAS: ${WITH_BLAS}
 .endif
 
 .if ${PORT_OPTIONS:MDOXYGEN}
 BUILD_DEPENDS+=		doxygen:${PORTSDIR}/devel/doxygen
 CONFIGURE_ARGS+=	--enable-doc --with-docdir="${DOCSDIR}"
 PLIST_SUB+=	DOXYGEN=""
 .else
 PLIST_SUB+=	DOXYGEN="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 MANUAL_PACKAGE_BUILD=	: optimizes for the build machine
 .else
 CONFIGURE_ARGS+=	--disable-optimization
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e '/DEFAULT_CFLAGS=/{s/-O2 //;s/-pipe//;}' \
 		-e '/DEBUG_CFLAGS=.*-DNDEBUG/s/$${DEBUG_CFLAGS} //' \
 		-e '/^WARN_CFLAGS="-Wall"/d' \
 		-e '/if test "x$$WARN" = "xyes"/s/$$/ WARN_CFLAGS="-Wall" ;/' \
 		-e 's/\(-lgoto2\)\( -pthread\)\{0,1\}/\1p/g' -e 's/libgoto2/&p/g' \
 		-e '/"GOTO2")/{N; s/LAPACK_LIBS=""/LAPACK_LIBS="-lgoto2p"/; }' \
 		-e 's/liblapack_atlas/libalapack/g' \
 		-e 's/$${LAPACK_LIBS} -llapack_atlas/-lalapack -lf77blas -lcblas/g' \
 		${WRKSRC}/configure
 #Unfortunately, we must leave stdint.h --> cstdint unresolved when not using
 #lang/gcc4*, or switch to TR1 headers, due to our aging base system libstdc++
 	${REINPLACE_CMD} -E \
 	-e 's/(#include[[:blank:]]+<)(std)(arg|def|io|lib)(\.h>)/\1c\2\3>/' \
 		${WRKSRC}/fflas-ffpack/field/nonzero-randiter.h \
 		${WRKSRC}/fflas-ffpack/field/modular-randiter.h \
 		${WRKSRC}/fflas-ffpack/utils/args-parser.h \
 		${WRKSRC}/fflas-ffpack/utils/debug.h \
 		${WRKSRC}/fflas-ffpack/utils/Matio.h \
 		${WRKSRC}/utils/args-parser.h \
 		${WRKSRC}/utils/debug.h \
 		${WRKSRC}/utils/Matio.h
 .if ${PORT_OPTIONS:MDOXYGEN}
 	@${REINPLACE_CMD} -e 's/sed -i/& ""/' ${WRKSRC}/doc/Makefile.in
 .endif
 
 .if ${PORT_OPTIONS:MDOXYGEN}
 post-install:
 	@${TOUCH} ${DOCSDIR}/fflas-ffpack-dev-html/.keep-me
 
 .endif
 
 .if defined(MAINTAINER_MODE)
 check regression-test test: build
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 	${MAKE_ARGS} check
 
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 60e34baac2a9..b0546f19ed9d 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -1,155 +1,155 @@
 # Created by: Lars Koeller <Lars.Koeller@Uni-Bielefeld.DE>
 # $FreeBSD$
 #    $MCom: ports-experimental/math/fftw3/Makefile,v 1.1 2006/03/28 00:08:57 ahze Exp $
 
 PORTNAME=	fftw3
 PORTVERSION=	3.3.3
 PORTREVISION?=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.fftw.org/ \
 		ftp://ftp.fftw.org/pub/fftw/
 PKGNAMESUFFIX=	${FFTW3_PKGNAMESUFFIX}
 DISTNAME=	fftw-${PORTVERSION}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT?=	Fast C routines to compute the Discrete Fourier Transform
 
 LICENSE=	GPLv2
 
 #current flavors: default, float, long, and quad
 FFTW3_FLAVOR?=	default
 FFTW3_SUFX=
 
 GNU_CONFIGURE=	yes
 USES=		pathfix perl5 pkgconfig
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS =	--enable-shared --enable-threads --disable-fortran
+CONFIGURE_ARGS=		--enable-shared --enable-threads --disable-fortran
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 .if ${FFTW3_FLAVOR} == "default"
 INFO=	fftw3
 .else
 #For non-default flavors, build and install the flavor-dependent components
 #only, so that these flavors may coexist with the default flavor
 INSTALL_TARGET=	install-pkgconfigDATA install-libLTLIBRARIES install-exec
 .endif
 
-OPTIONS_DEFINE =	G77_WRAPPERS OPENMP OPTIMIZED_CFLAGS
+OPTIONS_DEFINE=		G77_WRAPPERS OPENMP OPTIMIZED_CFLAGS
 
 G77_WRAPPERS_DESC=	Alter Fortran wrappers for use with g77
 OPENMP_DESC=		Build OpenMP multithreaded libraries
 
 OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENMP}
 CONFIGURE_ARGS+=	--enable-openmp
 PLIST_SUB+=	OPENMP=""
 USES+=		compiler:openmp
 .else
 CONFIGURE_ARGS+=	--disable-openmp
 PLIST_SUB+=	OPENMP="@comment "
 USES+=		compiler:env
 .endif
 
 #Users must add altivec to MACHINE_CPU when desired:
 #this is not currently done in bsd.cpu.mk
 .if ${FFTW3_FLAVOR} == "default"
 .  if !empty(MACHINE_CPU:Mavx)
 CONFIGURE_ARGS+=--enable-avx
 .  elif !empty(MACHINE_CPU:Msse2)
 CONFIGURE_ARGS+=--enable-sse2
 .  endif
 .elif ${FFTW3_FLAVOR} == "float"
 FFTW3_SUFX=	f
 FFTW3_PKGNAMESUFFIX=	-float
 CONFIGURE_ARGS+=--enable-float
 .  if !empty(MACHINE_CPU:Mavx)
 CONFIGURE_ARGS+=--enable-avx
 .  elif !empty(MACHINE_CPU:Msse)
 CONFIGURE_ARGS+=--enable-sse
 .  elif !empty(ARCH:Mpowerpc*) && !empty(MACHINE_CPU:Maltivec)
 CONFIGURE_ARGS+=--enable-altivec
 .  endif
 .elif ${FFTW3_FLAVOR} == "long"
 FFTW3_SUFX=	l
 FFTW3_PKGNAMESUFFIX=	-long
 CONFIGURE_ARGS+=--enable-long-double
 .elif ${FFTW3_FLAVOR} == "quad"
 FFTW3_SUFX=	q
 FFTW3_PKGNAMESUFFIX=	-quad
 CONFIGURE_ARGS+=--enable-quad-precision
-ONLY_FOR_ARCHS =	i386 amd64
+ONLY_FOR_ARCHS=		i386 amd64
 USE_GCC=	yes
 .endif
 
 .if ${FFTW3_FLAVOR} == "default"
 PLIST_SUB+=	DEF="" NONDEF="@comment "
 .else
 PLIST_SUB+=	DEF="@comment " NONDEF=""
 .endif
 
 PLIST_SUB+=	FFTW3_SUFX="${FFTW3_SUFX}"
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O3 -ffast-math -fstrict-aliasing
 .  if !defined(WITH_DEBUG)
 CFLAGS+=	-fomit-frame-pointer
 .  endif
 .  if ${ARCH} == "i386" && (${COMPILER_TYPE} == "gcc" || !empty(USE_GCC))
 CFLAGS+=	-malign-double
 .  endif
 WITHOUT_NO_STRICT_ALIASING=	yes
 .endif # end OPTIMIZED_CFLAGS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/fftw|${PREFIX}/etc/fftw|' \
 		${WRKSRC}/Makefile.in \
 		${WRKSRC}/api/import-system-wisdom.c \
 		${WRKSRC}/doc/fftw3* \
 		${WRKSRC}/tools/*
 	@${REINPLACE_CMD} \
 	-e '/libfftw3@PREC_SUFFIX@_threads\.la:/{N; \
 	s/$$(LIBS)/$$(PTHREAD_LIBS) &/;}' \
 		${WRKSRC}/threads/Makefile.in
 .if ${FFTW3_FLAVOR} != "default"
 	@${REINPLACE_CMD} -E \
 	-e '/(DIST_COMMON|bin_SCRIPTS|BUILT_SOURCES|EXTRA_DIST) =/,\
 	/[^\]$$/s/[^[:blank:]]*fftw-wisdom-to-conf[^[:blank:]]*//' \
 		${WRKSRC}/tools/Makefile.in
 .endif
 	@${FIND} ${WRKSRC} -type f \( -name \*.bak -or -name \*.orig \) -delete
 
 post-configure:
 #After issuing --disable-fortran in order to avoid using a Fortran compiler
 #during configuration, edit config.h to provide Fortran wrappers appropriate for
 #gfortran, with ac_cv_f77_mangling="lower case, underscore, no extra underscore"
 	@${REINPLACE_CMD} -e '/DISABLE_FORTRAN/d' ${WRKSRC}/config.h
 	@${ECHO_CMD} "#define F77_FUNC(name,NAME) name ## _" >> ${WRKSRC}/config.h
 	@${ECHO_CMD} "#define F77_FUNC_(name,NAME) name ## _" >> ${WRKSRC}/config.h
 	@${ECHO_CMD} "#define F77_FUNC_EQUIV 1" >> ${WRKSRC}/config.h
 .if ${PORT_OPTIONS:MG77_WRAPPERS}
 	@${ECHO_CMD} "#define WITH_G77_WRAPPERS 1" >> ${WRKSRC}/config.h
 .endif
 
 .if ${FFTW3_FLAVOR} != "default"
 post-install:
 	@${INSTALL_MAN} ${WRKSRC}/tools/fftw${FFTW3_SUFX}-wisdom.1 ${STAGEDIR}${PREFIX}/man/man1
 .endif
 
 regression-test test: smallcheck
 
 .for t in bigcheck check exhaustive-check paranoid-check smallcheck
 ${t}: build
 	@cd ${WRKSRC}/tests; ${SETENV} ${MAKE_ENV} ${MAKE} \
 	${MAKE_ARGS} ${t}
 
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/math/givaro/Makefile b/math/givaro/Makefile
index 01255895032a..e3953eb13909 100644
--- a/math/givaro/Makefile
+++ b/math/givaro/Makefile
@@ -1,58 +1,58 @@
 # Created by: b.f. <bf@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	givaro
 PORTVERSION=	3.5.0
 CATEGORIES=	math
 MASTER_SITES=	https://forge.imag.fr/frs/download.php/133/ LOCAL/bf
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	C++ library for computer algebra
 
 LICENSE=	CeCILL-Bv1
 LICENSE_NAME=	Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre] B license, version 1
 LICENSE_FILE=	${WRKSRC}/Licence_CeCILL-B_V1-en.txt
 LICENSE_PERMS=	auto-accept
 
 LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS =	--with-gmp="${LOCALBASE}"
+CONFIGURE_ARGS=	--with-gmp="${LOCALBASE}"
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOXYGEN
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOXYGEN}
 BUILD_DEPENDS +=	doxygen:${PORTSDIR}/devel/doxygen
 CONFIGURE_ARGS+=	--enable-doc --with-docdir="${DOCSDIR}"
 PLIST_SUB+=	DOXYGEN=""
 .else
 PLIST_SUB+=	DOXYGEN="@comment "
 .endif
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e '/DEFAULT_CFLAGS=/{s/-O2 //;s/-pipe//;}' \
 		-e '/DEBUG_CFLAGS=.*-DNDEBUG/s/$${DEBUG_CFLAGS} //' \
 		-e '/^WARN_CFLAGS="-Wall"/d' \
 		-e '/if test "x$$WARN" = "xyes"/s/$$/ WARN_CFLAGS="-Wall" ;/' \
 		${WRKSRC}/configure
 .if ${PORT_OPTIONS:MDOXYGEN}
 	@${REINPLACE_CMD} -e 's/sed -i/& ""/' ${WRKSRC}/docs/Makefile.in
 .endif
 
 .if ${PORT_OPTIONS:MDOXYGEN}
 post-install:
 	@${TOUCH} ${DOCSDIR}/givaro-dev-html/.keep-me
 
 .endif
 
 check regression-test test: build
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
 	${MAKE_ARGS} check
 
 .include <bsd.port.mk>
diff --git a/math/gotoblas/Makefile b/math/gotoblas/Makefile
index db46add9417c..6986483aad12 100644
--- a/math/gotoblas/Makefile
+++ b/math/gotoblas/Makefile
@@ -1,152 +1,152 @@
 # Created by: Sato Hiroki <hrs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gotoblas
 PORTVERSION=	2.${GOTOBLAS2VER}.${LAPACKVER}
 PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|maho/gotoblas|} \
 		NL:lapack,lapack_tmg
 MASTER_SITE_SUBDIR=	lapack/:lapack lapack/timing/:lapack_tmg
 DISTFILES=	GotoBLAS2-${GOTOBLAS2VER}_bsd.tar.gz \
 		lapack-${LAPACKVER}.tgz:lapack \
 		large.tgz:lapack_tmg timing.tgz:lapack_tmg
 EXTRACT_ONLY=	${GOTOBLAS2_SRCFILE}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast implementation of Basic Linear Algebra Subprograms
 
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/00License.txt
 
 DIST_SUBDIR=	gotoblas
 GOTOBLAS2VER=	1.13
 GOTOBLAS2_SRCFILE=	GotoBLAS2-${GOTOBLAS2VER}_bsd.tar.gz
 LAPACKVER=	3.4.0
 LAPACK_SRCFILE=	lapack-${LAPACKVER}.tgz
 LARGE_FILE=	large.tgz
 TIMING_FILE=	timing.tgz
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/GotoBLAS2
 
 USES=		fortran gmake perl5
 USE_GCC=	yes
 USE_PERL5=	build
 GOTOLIBS=	libgoto2 libgoto2p
 GOTOFILES=	${GOTOLIBS:S|$|.so|} ${GOTOLIBS:S|$|.so.1|} ${GOTOLIBS:S|$|.a|}
 PLIST_FILES=	${GOTOFILES:S|^|lib/|}
 SUB_FILES=	pkg-message
 SUB_LIST=	MAXTHREADS=${MAXTHREADS}
 
 .if defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT_i386=	DYNAMIC_ARCH
 OPTIONS_DEFAULT_amd64=	DYNAMIC_ARCH
 .endif
 
 OPTIONS_DEFINE_i386=	DYNAMIC_ARCH
 OPTIONS_DEFINE_amd64=	DYNAMIC_ARCH
 OPTIONS_DEFINE=	INTERFACE64 OPENMP
 DYNAMIC_ARCH_DESC=	Support multiple CPU types on i386 and amd64
 INTERFACE64_DESC=	Use 8 byte integers on 64-bit architectures
 OPENMP_DESC=		Use OpenMP for threading
 #		QUAD_PRECISION	"Support IEEE quad precision (experimental)" off
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 MAXTHREADS?=	8
 
 .if ${ARCH:M*64} == ""
 GOTOFLAGS+=	BINARY32=1
 .else
 GOTOFLAGS+=	BINARY64=1
 .endif
 
 .if ${PORT_OPTIONS:MDYNAMIC_ARCH}
 GOTOFLAGS+=	DYNAMIC_ARCH=1
 .endif
 
 .if ${PORT_OPTIONS:MINTERFACE64}
 GOTOFLAGS+=	INTERFACE64=1
 .endif
 
 .if ${PORT_OPTIONS:MOPENMP}
 GOTOFLAGS+=	USE_OPENMP=1
 .endif
 
 .if ${PORT_OPTIONS:MQUAD_PRECISION}
-BROKEN =	WITH_QUAD_PRECISION is broken; please disable this option
+BROKEN=		WITH_QUAD_PRECISION is broken; please disable this option
 GOTOFLAGS+=	QUAD_PRECISION=1
 .endif
 
 post-extract:
 	${FIND} ${WRKSRC} -type f -name '.*' -delete
 	cd ${DISTDIR}/${DIST_SUBDIR} ; \
 	${CP} ${LAPACK_SRCFILE} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC}
 	${MKDIR} ${WRKDIR}/lib
 
 post-patch:
 	${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" -e "s+%%CC%%+${CC}+" \
 		${WRKSRC}/Makefile.rule
 	${REINPLACE_CMD} -e "s+%%LAPACKVER%%+${LAPACKVER}+g" \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e "s+%%LAPACKVER%%+${LAPACKVER}+g" \
 		${WRKSRC}/exports/gensymbol
 	${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \
 		${WRKSRC}/Makefile.rule \
 		${WRKSRC}/Makefile.tail \
 		${WRKSRC}/driver/level3/Makefile \
 		${WRKSRC}/driver/others/Makefile \
 		${WRKSRC}/exports/Makefile \
 		${WRKSRC}/interface/Makefile \
 		${WRKSRC}/kernel/Makefile \
 		${WRKSRC}/kernel/Makefile.L3 \
 		${WRKSRC}/lapack/laswp/Makefile \
 		${WRKSRC}/reference/Makefile
 	${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \
 	-e 's+%%_GCC_RUNTIME%%+${_GCC_RUNTIME}+' \
 	-e 's+$$(CROSS_SUFFIX)+${LOCALBASE}/bin/+' \
 		${WRKSRC}/Makefile.system
 .if ${PORT_OPTIONS:MOPENMP}
 	${REINPLACE_CMD} -e "s+GOTO_NUM_THREADS+OMP_NUM_THREADS+g" \
 		${WRKSRC}/test/Makefile \
 		${WRKSRC}/ctest/Makefile
 .endif
 
 do-build:
 	cd ${WRKSRC} ; ${SETENV} ${GOTOFLAGS} NUM_THREADS=1 USE_THREAD=0 \
 	${MAKE_CMD} ${MAKE_ARGS}
 	${CP} ${WRKSRC}/libgoto2.a ${WRKDIR}/lib/libgoto2.a
 	${CP} ${WRKSRC}/libgoto2.so ${WRKDIR}/lib/libgoto2.so.1
 	cd ${WRKSRC} ; ${MAKE_CMD} ${MAKE_ARGS} clean
 	cd ${WRKSRC} ; ${SETENV} ${GOTOFLAGS} NUM_THREADS=${MAXTHREADS} \
 	USE_THREAD=1 ${MAKE_CMD} ${MAKE_ARGS}
 	${CP} ${WRKSRC}/libgoto2.a ${WRKDIR}/lib/libgoto2p.a
 	${CP} ${WRKSRC}/libgoto2.so ${WRKDIR}/lib/libgoto2p.so.1
 .if ! ${PORT_OPTIONS:MDEBUG}
 	${LOCALBASE}/bin/strip -X ${WRKDIR}/lib/*.so.1
 .endif
 
 BENCHMARK_MAXTHREADS?=	${MAXTHREADS}
 .if ${PORT_OPTIONS:MOPENMP}
-BENCHMARK_THREADS_FLAG =	OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS}
+BENCHMARK_THREADS_FLAG=		OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS}
 .else
-BENCHMARK_THREADS_FLAG =	GOTO_NUM_THREADS=${BENCHMARK_MAXTHREADS}
+BENCHMARK_THREADS_FLAG=		GOTO_NUM_THREADS=${BENCHMARK_MAXTHREADS}
 .endif
 
 benchmark: build
 	cd ${WRKSRC} ; ${SETENV} ${GOTOFLAGS} NUM_THREADS=${MAXTHREADS} \
 	USE_THREAD=1 ${MAKE_CMD} ${MAKE_ARGS} hpl
 	cd ${WRKSRC}/benchmark ; ${SETENV} ${GOTOFLAGS} NUM_THREADS=${MAXTHREADS} \
 	USE_THREAD=1 ${BENCHMARK_THREADS_FLAG} ${MAKE_CMD} ${MAKE_ARGS}
 
 do-install:
 	cd ${WRKDIR}/lib ; \
 	${INSTALL_DATA} ${GOTOLIBS:S|$|.a|} ${GOTOLIBS:S|$|.so.1|} \
 	${PREFIX}/lib/
 	cd ${PREFIX}/lib ; \
 	for i in ${GOTOLIBS:S|$|.so|}; do \
 		${LN} -sf $$i.1 $$i ; \
 	done
 
 .include <bsd.port.post.mk>
diff --git a/math/jags/Makefile b/math/jags/Makefile
index 9c99492639ca..cc8c69b311f1 100644
--- a/math/jags/Makefile
+++ b/math/jags/Makefile
@@ -1,101 +1,101 @@
 # Created by: Eric van Gyzen <vangyzen@stat.duke.edu>
 # $FreeBSD$
 
 PORTNAME=	mcmc-jags
 PORTVERSION=	3.4.0
 PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	SF:1,2,3,4
 MASTER_SITE_SUBDIR=	mcmc-jags/JAGS/${S}.x/Source/:1 \
 		mcmc-jags/Examples/${S}.x/:2 \
 		mcmc-jags/Manuals/2.x/:3 \
 		mcmc-jags/Manuals/${S}.x/:4
 DISTFILES=	JAGS-${PORTVERSION}${EXTRACT_SUFX}:1
 EXTRACT_ONLY=	${DISTFILES:M*[12]:C|:.*||}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Just Another Gibbs Sampler
 
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 USES=		bison fortran gmake libtool
 USE_LDCONFIG=	yes
 
 DIST_SUBDIR=	${PORTNAME}
 WRKSRC=		${WRKDIR}/JAGS-${PORTVERSION}
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB=	MODULEVERSION=${S}
 S=		${PORTVERSION:C|\..*||}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS} || make(makesum)
 DISTFILES+=	jags_developer_manual.pdf:3 jags_installation_manual.pdf:4 \
 		jags_user_manual.pdf:4
 PORTDOCS=	${DISTFILES:M*[34]:C|:.*||}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES} || make(makesum)
 DISTFILES+=	classic-bugs.tar.gz:2
 PORTEXAMPLES=	*
 .endif
 
 .if exists(${LOCALBASE}/lib/libatlas.so)
 WITH_BLAS?=	atlas
 .else
 WITH_BLAS?=	reference
 .endif
 
 .if ${WITH_BLAS} == "atlas"
 LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
 CONFIGURE_ARGS=	--with-lapack="-lalapack -lptcblas" --with-blas="-lptf77blas"
 .elif ${WITH_BLAS} == "reference"
 LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
 LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack
 CONFIGURE_ARGS=	--with-lapack="-llapack" --with-blas="-lblas"
 .else
-IGNORE =	: invalid value for WITH_BLAS: ${WITH_BLAS}
+IGNORE=		: invalid value for WITH_BLAS: ${WITH_BLAS}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/etc/Makefile.in
 	@${REINPLACE_CMD} \
 		-e '/@WINDOWS_FALSE@bin_SCRIPTS =/s/jags/mcmc-&/' \
 		-e '/CLEANFILES =/s/jags/mcmc-&/' \
 		-e '/@WINDOWS_FALSE@jags:/s/jags/mcmc-&/' \
 		-e '/@WINDOWS_FALSE@.*rm -f jags/s/jags/mcmc-&/' \
 		-e '/@WINDOWS_FALSE@.*mv jags.tmp jags/s/jags/mcmc-&/2' \
 		${WRKSRC}/src/terminal/Makefile.in
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${SED} -i '' -e '\|JAGS ?=|{s|jags|mcmc-&|;s|/usr/local|${PREFIX}|;}' \
 		${WRKDIR}/classic-bugs/vol[12]/Makefile
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${_DISTDIR}; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKDIR}/classic-bugs; ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .if defined(MAINTAINER_MODE)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/R/library/coda/R/coda.rdb:${PORTSDIR}/math/R-cran-coda
 
 check test: install
 .for i in 1 2
 	@cd ${WRKDIR}/classic-bugs/vol${i}; ${SETENV} ${MAKE_ENV} \
 	${MAKE_CMD} ${MAKE_ARGS} check
 .endfor
 	@${FIND} ${WRKDIR}/classic-bugs -type f -name check.log | ${SORT} | \
 	${XARGS} -tI @  ${CAT} @
 
 .endif
 .include <bsd.port.mk>
diff --git a/math/kktdirect/Makefile b/math/kktdirect/Makefile
index db1b3ca7bd95..abeee5157ff9 100644
--- a/math/kktdirect/Makefile
+++ b/math/kktdirect/Makefile
@@ -1,97 +1,97 @@
 # Created by: bf@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	kktdirect
 PORTVERSION=	0.5
 PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://www.cs.ubc.ca/~rbridson/download/ LOCAL/bf
 DISTNAME=	KKTDirect${PORTVERSION}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Direct solver package for saddle-point (KKT) matrices
 
 USES=		fortran
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-DUSE_FORTRAN_BLAS -DUSE_FORTRAN_LAPACK
 LDFLAGS+=	-L${LOCALBASE}/lib ${LAPACK} ${BLAS} -lm
 PLIST_FILES=	include/kktdirect.h lib/libkktdirect.a lib/libkktdirect_pic.a \
 		lib/libkktdirect.so lib/libkktdirect.so.0
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 .else
 PICFLAG?=	-fpic
 .endif
 
 .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
+LAPACK=		-llapack
 .elif ${WITH_BLAS} == gotoblas
 LIB_DEPENDS+=	libgoto2p.so:${PORTSDIR}/math/gotoblas
-BLAS =		-lgoto2p
-LAPACK =	-lgoto2p
+BLAS=			-lgoto2p
+LAPACK=		-lgoto2p
 .elif ${WITH_BLAS} == atlas
 LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
 BLAS=		-lptf77blas
-LAPACK =	-lalapack -lptcblas
+LAPACK=		-lalapack -lptcblas
 .endif
 
 PORTDOCS=	kktdirect.pdf
 PORTEXAMPLES=	kktsolve.cpp
 
 post-patch:
 	@${REINPLACE_CMD} -E \
 	-e 's@CPP@CXX@g' \
 	-e '\@^(CC|CXX) =@s@^@#@' \
 	-e 's@^(C|CXX|LD)(FLAGS )(=)(.*)@\1\2+\3 $${PICFLAG}@' \
 	-e 's@ar r@${AR} r@' \
 	-e 's@ranlib@${RANLIB}@' \
 		${WRKSRC}/Makefile
 
 pre-build:
 	${CP} -a ${WRKSRC} ${WRKSRC}_shared
 
 do-build:
 	@cd ${WRKSRC}_shared; ${DO_MAKE_BUILD} PICFLAG="${PICFLAG}" libkktdirect.a; \
 	${CXX} ${CXXFLAGS} -shared -Wl,-soname,libkktdirect.so.0 \
 	-o ${WRKDIR}/libkktdirect.so.0 -Wl,--whole-archive libkktdirect.a \
 	-Wl,--no-whole-archive -Wl,--as-needed ${LDFLAGS}; \
 	${CP} -af libkktdirect.a ${WRKDIR}/libkktdirect_pic.a
 	@cd ${WRKSRC}; ${DO_MAKE_BUILD} PICFLAG="" libkktdirect.a; \
 	${CP} -af libkktdirect.a ${WRKDIR}
 
 check regression-test test: build
 	@cd ${WRKSRC}; ${DO_MAKE_BUILD} PICFLAG="" stokes ; \
 	./stokes 3
 
 do-install:
 	@${INSTALL_DATA} ${WRKSRC}/kktdirect.h ${STAGEDIR}${PREFIX}/include
 	@cd ${WRKDIR}; ${INSTALL_LIB} libkktdirect.a libkktdirect_pic.a \
 	libkktdirect.so.0 ${STAGEDIR}${PREFIX}/lib
 	@cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libkktdirect.so.0 libkktdirect.so
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKSRC}; ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 3fa3e1b2c87f..cd31497c28b7 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -1,202 +1,202 @@
 # Created by: jmz
 # $FreeBSD$
 
 PORTNAME?=	lapack
 PORTVERSION=	3.4.2
 PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	NL/lapack/
 DISTFILES=	lapack-${PORTVERSION}.tgz
 .if make(makesum) || !(defined(BLAS_SLAVEPORT) || defined(XLAPACK_SLAVEPORT))
 DISTFILES+=		manpages-${PORTVERSION}.tgz
 .endif
 DIST_SUBDIR=	lapack
 
 MAINTAINER?=	maho@FreeBSD.org
 COMMENT?=	A library of Fortran 77 subroutines for linear algebra
 
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		fortran
 
 OPTIONS_DEFINE=	PROFILE SHARED STATIC
 OPTIONS_DEFAULT=	SHARED STATIC
 PROFILE_DESC=	Build profiling libraries
 SHARED_DESC=	Build shared libraries and PIC archives
 STATIC_DESC=	Build (non-PIC) archives
 
 MAKE_ENV=	BLASLIB="${BLASLIB}"
 PLIST_SUB=	SVERSION="${SVERSION}"
 
-WRKSRC =		${WRKDIR}/lapack-${PORTVERSION}
-WRKSRC_PROFILE =	${WRKSRC}_PROFILE
+WRKSRC=			${WRKDIR}/lapack-${PORTVERSION}
+WRKSRC_PROFILE=		${WRKSRC}_PROFILE
 WRKSRC_SHARED=		${WRKSRC}_SHARED
 WRKSRC_STATIC=		${WRKSRC}
 
 .include <bsd.port.options.mk>
 
 .if defined(BLAS_SLAVEPORT)
 ALL_TARGET=		blaslib
 BLASLIB=		../../libblas.a
 LIBS=			blas
 PLIST_SUB+=		BLAS="" LAPACK="@comment " XLAPACK="@comment "
 SVERSION=		2
 TEST_TARGET=		blas_testing
 .else
 ALL_TARGET=		lib
 BLASLIB?=		-L${LOCALBASE}/lib -lblas
 LIB_DEPENDS+=		libblas.so:${PORTSDIR}/math/blas
 LIBS=			lapack tmglib
 SVERSION=		4
 TEST_TARGET=		lapack_testing
 .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
 S=			${PYTHON_CMD}
 USE_PYTHON_BUILD=	yes
 .else
 S=			\#
 .endif
 .if defined(XLAPACK_SLAVEPORT)
 LIB_DEPENDS+=		libxblas.so:${PORTSDIR}/math/xblas
 MAKE_ENV+=		USEXBLAS=yes XBLASLIB="${XBLASLIB}"
 P=			x
 PLIST_SUB+=		BLAS="@comment " LAPACK="@comment " XLAPACK=""
 XBLASLIB?=		-L${LOCALBASE}/lib -lxblas
 .else
 PLIST_FILES+=		${MAN3L:S|^|man/man3/|:S|$|.gz|}
 PLIST_SUB+=		BLAS="@comment " LAPACK="" XLAPACK="@comment "
 .if defined(MAINTAINER_MODE)
 BUILD_DEPENDS +=	doxygen:${PORTSDIR}/devel/doxygen
 MAN_TARGET=		build-manpages
 .endif
 .endif
 .endif
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 .else
 PICFLAG?=	-fpic
 .endif
 
 FFLAGS_PROFILE?=	-pg
 FFLAGS_SHARED ?=	${PICFLAG}
 
 .if ${PORT_OPTIONS:MPROFILE} && !exists(/usr/lib/libc_p.a)
 IGNORE=	you have chosen WITH_PROFILE, but have not installed the\
 base system profiling libraries
 .endif
 
 .if ${PORT_OPTIONS:MSHARED}
 USE_LDCONFIG=	yes
 .endif
 
 .for o in PROFILE SHARED STATIC
 .if ${PORT_OPTIONS:M${o}}
 PLIST_SUB+=	${o}=""
 .else
 PLIST_SUB+=	${o}="@comment "
 .endif
 .endfor
 
 post-patch:
 	@${SED} -Ee '\
 		s@^(FORTRAN|LOADER)([[:blank:]]*=)(.*)@\1\2 $${FC}@; \
 		s@^(OPTS[[:blank:]]*=)(.*)@\1 $${FFLAGS} $${EXTRAFLAGS}@; \
 		s@^NOOPT[[:blank:]]*=.*@& $${EXTRAFLAGS}@; \
 		s@^(LOADOPTS[[:blank:]]*=)(.*)@\1 $${LDFLAGS} $${EXTRAFLAGS}@; \
 		\@(BLAS|RAN)LIB[[:blank:]]*=@d;' \
 			${WRKSRC}/make.inc.example > ${WRKSRC}/make.inc
 	@${REINPLACE_CMD} -e 's@\./lapack_testing\.py@${S} &@' \
 		${WRKSRC}/Makefile
 .for o in PROFILE SHARED
 .if ${PORT_OPTIONS:M${o}}
 	@${CP} -a ${WRKSRC} ${WRKSRC_${o}}
 .endif
 .endfor
 
 do-build: ${MAN_TARGET} build-profile build-shared build-static
 
 .for o in PROFILE SHARED STATIC
 build-${o:tl}: patch
 .if ${PORT_OPTIONS:M${o}}
 	${PRINTF} "\n\nBuilding ${o:tl} libraries:\n\n\n"
 	cd ${WRKSRC_${o}}; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FFLAGS_${o}}" \
 	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" ${ALL_TARGET}
 
 .endif
 .endfor
 
 .if defined (MAINTAINER_MODE)
 build-manpages: patch
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
 	${MAKE_ARGS} man
 
 .endif
 
 post-build:
 .if ${PORT_OPTIONS:MSHARED}
 .for L in ${LIBS}
 	cd ${WRKSRC_SHARED} ; ${FC} ${FFLAGS} ${FFLAGS_SHARED} ${LDFLAGS} -shared \
 	-o lib${P}${L}.so.${SVERSION} -Wl,-x -Wl,-soname,lib${P}${L}.so.${SVERSION} \
 	-Wl,--whole-archive lib${L}.a -Wl,--no-whole-archive
 .endfor
 .endif
 
 .if ${PORT_OPTIONS:MSHARED}
 TESTS ?=	test-shared
 .elif ${PORT_OPTIONS:MSTATIC}
 TESTS ?=	test-static
 .elif ${PORT_OPTIONS:MPROFILE}
 TESTS ?=	test-profile
 .endif
 
 check regression-test test: ${TESTS}
 
 .for o in PROFILE SHARED STATIC
 test-${o:tl}: build-${o:tl}
 .if ${PORT_OPTIONS:M${o}}
 	@${PRINTF} "\n\nTesting ${o:tl} libraries:\n\n\n"
 	@cd ${WRKSRC_${o}}; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FFLAGS_${o}}" \
 	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" ${TEST_TARGET}
 .if defined(BLAS_SLAVEPORT)
 	@${CAT} ${WRKSRC_${o}}/BLAS/*.out
 .endif
 
 .endif
 .endfor
 
 do-install:
 .for L in ${LIBS}
 .if ${PORT_OPTIONS:MSTATIC}
 	@${INSTALL_DATA} ${WRKSRC}/lib${L}.a ${STAGEDIR}${PREFIX}/lib/lib${P}${L}.a
 .endif
 .if ${PORT_OPTIONS:MSHARED}
 	@${INSTALL_DATA} ${WRKSRC_SHARED}/lib${L}.a ${STAGEDIR}${PREFIX}/lib/lib${P}${L}_pic.a
 	@${INSTALL_DATA} ${WRKSRC_SHARED}/lib${P}${L}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib
 	@${LN} -sf lib${P}${L}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/lib${P}${L}.so
 .endif
 .if ${PORT_OPTIONS:MPROFILE}
 	@${INSTALL_DATA} ${WRKSRC_PROFILE}/lib${L}.a ${STAGEDIR}${PREFIX}/lib/lib${P}${L}_p.a
 .endif
 .endfor
 
 .include  <bsd.port.pre.mk>
 
 .if !(defined(BLAS_SLAVEPORT) || defined(XLAPACK_SLAVEPORT))
 
 .include "${FILESDIR}/manpages"
 
 post-install:
 	@cd ${WRKDIR}/man ; ${ECHO_CMD} ${MAN3L:S|^|man3/|} \
 	| ${XARGS} -J @ ${INSTALL_MAN} @ ${STAGEDIR}${MAN3PREFIX}/man/man3
 
 .if defined(MAINTAINER_MODE)
 package-manpages: build-manpages
 	@${RM} -f ${WRKDIR}/lapack-manpages-${PORTVERSION}.tar.gz ; \
 	cd ${WRKSRC}/DOCS/man; \
 	${TAR} -czvf ${WRKDIR}/lapack-manpages-${PORTVERSION}.tar.gz \
 	${MAN3L:S|^|man3/|}
 
 .endif
 .endif
 .include <bsd.port.post.mk>
diff --git a/math/lapacke/Makefile b/math/lapacke/Makefile
index 1f62c9693527..7636153ffaac 100644
--- a/math/lapacke/Makefile
+++ b/math/lapacke/Makefile
@@ -1,139 +1,139 @@
 # Created by: Eijiro Shibusawa <ej-sib@ice.uec.ac.jp>
 # $FreeBSD$
 
 PORTNAME=	lapacke
 PORTVERSION=	3.4.2
 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=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_LDCONFIG=	yes
 USES=		fortran tar:tgz
 
 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
+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}
 LIB_DEPENDS+=	libgoto2p.so:${PORTSDIR}/math/gotoblas
 BLAS=		-lgoto2p
 LAPACK=		-lgoto2p
 .elif ${WITH_BLAS} == "atlas"
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 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\
+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\
+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>
diff --git a/math/levmar/Makefile b/math/levmar/Makefile
index 281d0384c55e..e442bd1d7ebb 100644
--- a/math/levmar/Makefile
+++ b/math/levmar/Makefile
@@ -1,93 +1,93 @@
 # Created by: Eijiro Shibusawa <ej-sib@ice.uec.ac.jp>
 # $FreeBSD$
 
 PORTNAME=	levmar
 PORTVERSION=	2.6
 PORTREVISION=	2
 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
 
 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
 LIB_DEPENDS+=	libgoto2p.so:${PORTSDIR}/math/gotoblas
 BLAS=		-lgoto2p
 LAPACK=		-lgoto2p
 .elif ${WITH_BLAS} == "atlas"
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS} -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\
+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\
+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>
diff --git a/math/libflame/Makefile b/math/libflame/Makefile
index 378feb641051..49f5b21abf83 100644
--- a/math/libflame/Makefile
+++ b/math/libflame/Makefile
@@ -1,340 +1,340 @@
 # Created by: bf@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	libflame
 DISTVERSION=	r7421
 PORTREVISION=	2
 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
+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
+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
+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
+IGNORE=		: CBLAS yields an incomplete library, and is for testing purposes only
 .if ${PORT_OPTIONS:MGOTOBLAS}
-IGNORE =	: CBLAS is incompatible with GOTOBLAS
+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
+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
+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
+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
+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
+LAPACK=		-lgoto2p
 .elif !empty(WITH_BLAS:Mreference*)
 RUN_DEPENDS +=	${LOCALBASE}/lib/liblapack.so:${PORTSDIR}/math/lapack
-LAPACK =	-llapack
+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
+IGNORE=		OPENMP is incompatible with THREADS
 .endif
 .if !empty(CC:M*clang*)
-IGNORE =	clang does not support OPENMP, use THREADS instead
+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>
diff --git a/math/libmissing/Makefile b/math/libmissing/Makefile
index 97b1126adcd6..96440010b557 100644
--- a/math/libmissing/Makefile
+++ b/math/libmissing/Makefile
@@ -1,85 +1,85 @@
 # $FreeBSD$
 
 PORTNAME=	libmissing
 DISTVERSION=	20130815
 PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	LOCAL/bf
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Standard math functions missing from the FreeBSD libm
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libmpc.so:${PORTSDIR}/math/mpc
 
 USE_LDCONFIG=	yes
 USES=		tar:xz uidfix
 
 MAKE_ENV=	LDADD=-lmpc LIB=missing SHLIB_MAJOR="${SHLIB_MAJOR}" \
 		SRCCONF=/dev/null SRCS="${SRCS}" __MAKE_CONF=/dev/null
 
 OPTIONS_DEFINE=	PROFILE EXAMPLES
 
 PLIST_FILES=	include/missing_complex.h \
 		include/missing_math.h \
 		lib/libmissing.a lib/libmissing.so \
 		lib/libmissing.so.${SHLIB_MAJOR}
 
 SHLIB_MAJOR=	2
 SRCS=		libmissing.c
 
 CFLAGS+=	-fno-builtin -fno-math-errno -I. -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 PORTEXAMPLES=	${SRCS}
 
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} > 1000054
 LDFLAGS+=	-Wl,-z,interpose
 .endif
 
 .if ${PORT_OPTIONS:MPROFILE}
 .if !exists(/usr/lib/libc_p.a)
-IGNORE  =	you have chosen WITH_PROFILE, but have not installed the\
+IGNORE=		you have chosen WITH_PROFILE, but have not installed the\
 base system profiling libraries
 .endif
 PLIST_FILES+=	lib/libmissing_p.a
 .else
 MAKE_ENV+=	NO_PROFILE=yes
 .endif
 
 post-patch:
 	@${PRINTF} "LIBDIR=\t${PREFIX}/lib\n.include <bsd.lib.mk>\n" > \
 	${WRKSRC}/Makefile
 .for t in d q s
 	@cd ${WRKSRC}/c/common; ${CP} initseed.c maxtest.c ${WRKSRC}/c/${t}p/
 .endfor
 	@${REINPLACE_CMD} -E \
 	'/(XCFLAGS|XDEFINES|XINCLUDES|XLDFLAGS|XLIBS|XMFLAGS|XOPT)[[:blank:]]+=/d' \
 		${WRKSRC}/c/Makefile
 	@${REINPLACE_CMD} -e \
 	'/#include <math.h>/{x;s|^.*$$|#include "missing_math.h"|;H;x;}' \
 		${WRKSRC}/c/common/elefunt.h
 	@${REINPLACE_CMD} -e '\|COMMONOBJS[[:blank:]]*=|s|../common/||g' \
 		${WRKSRC}/c/dp/Makefile \
 		${WRKSRC}/c/qp/Makefile \
 		${WRKSRC}/c/sp/Makefile
 
 check regression-test test: build
 	@cd ${WRKSRC}/c; ${SETENV} ${MAKE_ENV} XCFLAGS="${CFLAGS} -frounding-math" \
 	XINCLUDES="-I${WRKSRC}" XLDFLAGS="${LDFLAGS}" XLIBS="-L${WRKSRC} -lmissing" \
 	LD_LIBRARY_PATH="/lib:/usr/lib:${LOCALBASE}/lib:${WRKSRC}" \
 	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} all3
 .for t in d q s
 	@${PRINTF} "\n\n\n\t\t%s\n\n\n" "REPORT OF ${t:tu}. PRECISION TEST RESULTS:"
 	@${CAT} ${WRKSRC}/c/${t}p/tall${t}p.lst-xxx
 .endfor
 
 post-install:
 	@cd ${WRKSRC}; ${INSTALL_DATA} missing_complex.h missing_math.h \
 	${STAGEDIR}${PREFIX}/include
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKSRC}; ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/math/linpack/Makefile b/math/linpack/Makefile
index d7b3e6c81c77..8a2b97ceadc7 100644
--- a/math/linpack/Makefile
+++ b/math/linpack/Makefile
@@ -1,61 +1,61 @@
 # Created by: ljo
 # $FreeBSD$
 
 PORTNAME=	linpack
 PORTVERSION=	1.0
 PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	NL
 DISTFILES=	${SRCS}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Linear Algebra package
 
 LIB_DEPENDS=	libblas.so:${PORTSDIR}/math/blas
 MAKE_ENV=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null
 
 USES=		fortran
 
 .include <bsd.port.pre.mk>
 
 USE_LDCONFIG=	yes
 DIST_SUBDIR=	${PORTNAME}
 NO_WRKSUBDIR=	yes
 
-SRCS =	cchdc.f cchdd.f cchex.f cchud.f cgbco.f cgbdi.f cgbfa.f cgbsl.f \
+SRCS=	cchdc.f cchdd.f cchex.f cchud.f cgbco.f cgbdi.f cgbfa.f cgbsl.f \
 	cgeco.f cgedi.f cgefa.f cgesl.f cgtsl.f chico.f chidi.f chifa.f \
 	chisl.f chpco.f chpdi.f chpfa.f chpsl.f cmach.f cpbco.f cpbdi.f \
 	cpbfa.f cpbsl.f cpoco.f cpodi.f cpofa.f cposl.f cppco.f cppdi.f \
 	cppfa.f cppsl.f cptsl.f cqrdc.f cqrsl.f csico.f csidi.f csifa.f \
 	csisl.f cspco.f cspdi.f cspfa.f cspsl.f csvdc.f ctrco.f ctrdi.f \
 	ctrsl.f dchdc.f dchdd.f dchex.f dchud.f dgbco.f dgbdi.f dgbfa.f \
 	dgbsl.f dgeco.f dgedi.f dgefa.f dgesl.f dgtsl.f dmach.f dpbco.f \
 	dpbdi.f dpbfa.f dpbsl.f dpoco.f dpodi.f dpofa.f dposl.f dppco.f \
 	dppdi.f dppfa.f dppsl.f dptsl.f dqrdc.f dqrsl.f dsico.f dsidi.f \
 	dsifa.f dsisl.f dspco.f dspdi.f dspfa.f dspsl.f dsvdc.f dtrco.f \
 	dtrdi.f dtrsl.f schdc.f schdd.f schex.f schud.f sgbco.f sgbdi.f \
 	sgbfa.f sgbsl.f sgeco.f sgedi.f sgefa.f sgesl.f sgtsl.f smach.f \
 	spbco.f spbdi.f spbfa.f spbsl.f spoco.f spodi.f spofa.f sposl.f \
 	sppco.f sppdi.f sppfa.f sppsl.f sptsl.f sqrdc.f sqrsl.f ssico.f \
 	ssidi.f ssifa.f ssisl.f sspco.f sspdi.f sspfa.f sspsl.f ssvdc.f \
 	strco.f strdi.f strsl.f zchdc.f zchdd.f zchex.f zchud.f zgbco.f \
 	zgbdi.f zgbfa.f zgbsl.f zgeco.f zgedi.f zgefa.f zgesl.f zgtsl.f \
 	zhico.f zhidi.f zhifa.f zhisl.f zhpco.f zhpdi.f zhpfa.f zhpsl.f \
 	zmach.f zpbco.f zpbdi.f zpbfa.f zpbsl.f zpoco.f zpodi.f zpofa.f \
 	zposl.f zppco.f zppdi.f zppfa.f zppsl.f zptsl.f zqrdc.f zqrsl.f \
 	zsico.f zsidi.f zsifa.f zsisl.f zspco.f zspdi.f zspfa.f zspsl.f \
 	zsvdc.f ztrco.f ztrdi.f ztrsl.f
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
 .for file in ${SRCS}
 	@${CP} ${_DISTDIR}/${file} ${WRKSRC}/${file}
 .endfor
 
 do-build:
 	cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE}
 
 pre-build:
 	${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/Makefile
 
 .include <bsd.port.post.mk>
diff --git a/math/lrng/Makefile b/math/lrng/Makefile
index a2175ac5170f..759cbd5a0a9e 100644
--- a/math/lrng/Makefile
+++ b/math/lrng/Makefile
@@ -1,88 +1,88 @@
 # Created by: b.f. <bf@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	lrng
 PORTVERSION=	20130314
 CATEGORIES=	math
 MASTER_SITES=	http://www.iro.umontreal.ca/%SUBDIR%/:1,2 \
 	${MASTER_SITE_LOCAL:S|%SUBDIR%/$|bf/${PORTNAME}/${PORTVERSION}/:1,2|}
 MASTER_SITE_SUBDIR=	~simardr/rng/:1 ~lecuyer/myftp/papers/:2
 DISTFILES=	ex1.c:1 lfsr258.c:1 lfsr113.c:1 WELL1024a.h:1 WELL19937a.h:1 WELL512a.h:1 \
 		WELL44497a.h:1 WELL19937a.c:1 WELL1024a.c:1 WELL512a.c:1 WELL44497a.c:1 \
 		MRG63k3a.c:1 MRG32k3a.c:1 MRG32k5a.c:1 MRG63k3a.h:1 MRG32k5a.h:1 MRG32k3a.h:1 \
 		lfsr258.h:1 lfsr113.h:1
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 EXTRACT_ONLY=
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Uniform random number generators of P. L'Ecuyer and his colleagues
 
 LICENSE=	GPLv3
 
 CLEANFILES=	${SRCS}
 LIB=		${PORTNAME}
-LIBDIR =	${PREFIX}/lib
+LIBDIR=		${PREFIX}/lib
 MAKE_ENV+=	CLEANFILES="${CLEANFILES}" \
 		LIB="${LIB}" LIBDIR="${LIBDIR}" SHLIB_MAJOR="${SHLIB_MAJOR}" \
 		SRCS="${SRCS}" SRCCONF="${SRCCONF}"
 NO_WRKSUBDIR=	yes
 OPTIONS_DEFINE=	PROFILE DOCS EXAMPLES
 PLIST_DIRS=	include/${PORTNAME}
 PLIST_FILES=	${DISTFILES:M*.h\:1:S|:1$||:S|^|include/${PORTNAME}/|:} \
 		lib/lib${LIB}.a lib/lib${LIB}.so \
 		lib/lib${LIB}.so.${SHLIB_MAJOR}
 SHLIB_MAJOR=	0
 SRCCONF=	/dev/null
 SRCS=	${DISTFILES:M*.c\:1:Nex1.c\:1:S|:1$||}
 USE_LDCONFIG=	yes
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS} || make(makesum)
 DISTFILES+=	combmrg2.ps:2 lfsr04.pdf:2 tausme2.ps:2
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	${DISTFILES:M*\:2:S|:2||}
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 PORTEXAMPLES=	ex1.c
 .endif
 
 .if ${PORT_OPTIONS:MPROFILE}
 .if defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE)
-IGNORE =	you have defined WITH_PROFILE, but have also defined\
+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\
+IGNORE=		you have chosen WITH_PROFILE, but have not installed the\
 base system profiling libraries
 .endif
 PLIST_FILES+=	lib/lib${LIB}_p.a
 .else
 MAKE_ENV+=	NO_PROFILE=yes
 .endif
 
 post-extract:
 	@${CP} ${_DISTDIR}/* ${WRKSRC}
 	@${ECHO_CMD} ".include <bsd.lib.mk>" > ${WRKSRC}/Makefile
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 	@${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKSRC}; ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR})
 .endif
 
 check regression-test test: build
 	@${CC} ${CFLAGS} -o ${WRKSRC}/ex1 ${WRKSRC}/ex1.c ${WRKSRC}/lib${LIB}.a
 	@${WRKSRC}/ex1
 	@${CC} ${CFLAGS} ${LDFLAGS} -o ${WRKSRC}/ex1s ${WRKSRC}/ex1.c -L${WRKSRC} -l${LIB}
 	@${SETENV} LD_LIBRARY_PATH=${WRKSRC} ${WRKSRC}/ex1s
 
 .include <bsd.port.mk>
diff --git a/math/mtl/Makefile b/math/mtl/Makefile
index b46e00210f2e..09a3ab3f6d1d 100644
--- a/math/mtl/Makefile
+++ b/math/mtl/Makefile
@@ -1,56 +1,56 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	mtl
 DISTVERSION=	2.1.2-23.tentative
 CATEGORIES=	math devel
 MASTER_SITES=	http://www.osl.iu.edu/download/research/mtl/
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	The Matrix Template Library, Version 2
 
 LICENSE=	MTL
 LICENSE_NAME=	Matrix Template Library License
 LICENSE_FILE=	${WRKSRC}/license.mtl.txt
 LICENSE_PERMS=	auto-accept
 
 CONFIGURE_ENV=	CXXCPP="${CXXCPP}"
 CXXCPP?=	${CXX} -E
 GNU_CONFIGURE=	yes
 NO_BUILD=	yes
 USES=		perl5
 USE_PERL5=	build
-WRKSRC =	${WRKDIR}/${DISTNAME:R}
+WRKSRC=		${WRKDIR}/${DISTNAME:R}
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e '/gnu\*)/,/;;/{/CXX=/d; /CXX_OPTIMIZE_FLAGS=/d; \
 	s/CXXFLAGS="/&$$ac_cv_env_CXXFLAGS_value /; }' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|\./.*\.pl[[:blank:]]|${PERL} &|' \
 		${WRKSRC}/test/Makefile.in
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -m
 
 check regression-test test: build
 	@cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
 	${MAKE_ARGS} QUICK=-qQ test summary
 
 fulltest: build
 	@cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
 	${MAKE_ARGS} QUICK= test summary
 
 .include <bsd.port.pre.mk>
 
 .if defined(USE_GCC) || !empty(CXX:M*g++4*)
 CXXFLAGS+=	-fpermissive
 .endif
 
 PORTEXAMPLES=	*
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/doubledouble
 	@${INSTALL_DATA} ${WRKSRC}/contrib/examples/* ${STAGEDIR}${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/contrib/doubledouble/* ${STAGEDIR}${EXAMPLESDIR}/doubledouble
 
 .include <bsd.port.post.mk>
diff --git a/math/openblas/Makefile b/math/openblas/Makefile
index 730088fd68d0..dc2c8d233d31 100644
--- a/math/openblas/Makefile
+++ b/math/openblas/Makefile
@@ -1,171 +1,171 @@
 # Created by: Eijiro Shibusawa <ej-sib@ice.uec.ac.jp>
 # $FreeBSD$
 
 PORTNAME=	openblas
 PORTVERSION=	0.2.9
 CATEGORIES=	math
 MASTER_SITES=	https://codeload.github.com/${GH_ACCOUNT}/${GH_PROJECT}/legacy.tar.gz/${GH_TAGNAME}?dummy=/:${PORTNAME} \
 		NL:lapack_tmg
 MASTER_SITE_SUBDIR=	lapack/timing/:lapack_tmg
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:${PORTNAME} \
 		large.tgz:lapack_tmg timing.tgz:lapack_tmg
 
 MAINTAINER=	phd_kimberlite@yahoo.co.jp
 COMMENT=	Optimized BLAS library based on GotoBLAS2
 
 LICENSE=	BSD3CLAUSE
 
 DIST_SUBDIR=	openblas
 GH_ACCOUNT=	xianyi
 GH_PROJECT=	OpenBLAS
 GH_TAGNAME=	${GH_COMMIT}
 GH_COMMIT=	f773f49
 LARGE_FILE=	large.tgz
 TIMING_FILE=	timing.tgz
 
 USES=		fortran gmake perl5
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
 OPENBLAS_SUFX=	r${PORTVERSION}
 OPENBLAS_LIBS=	libopenblas libopenblasp
 OPENBLAS_SVER=	0
 OPENBLAS_FILES=	${OPENBLAS_LIBS:S|$|.so|} ${OPENBLAS_LIBS:S|$|.so.${OPENBLAS_SVER}|} ${OPENBLAS_LIBS:S|$|.a|}
 PLIST_FILES=	${OPENBLAS_FILES:S|^|lib/|}
 
 WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}
 
 OPTIONS_DEFINE=		DYNAMIC_ARCH INTERFACE64 OPENMP AVX
 
 DYNAMIC_ARCH_DESC=	Support multiple CPU types on i386 and amd64
 INTERFACE64_DESC=	Use 8 byte integers on 64-bit architectures
 OPENMP_DESC=		Use OpenMP for threading
 AVX_DESC=		Support Advanced Vector Extensions (AVX)
 
 .if defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT=	DYNAMIC_ARCH
 .endif
 
 .include <bsd.port.options.mk>
 
 .if defined(TARGET_CPU_ARCH)
 BUILDFLAGS+=	TARGET=${TARGET_CPU_ARCH}
 .endif
 
 MAXTHREADS?=	8
 
 .if ${ARCH:M*64} == ""
 BUILDFLAGS+=	BINARY32=1
 .else
 BUILDFLAGS+=	BINARY64=1
 .endif
 
 .if ! ( ${PORT_OPTIONS:MDYNAMIC_ARCH} && ( ${ARCH} == "amd64" || ${ARCH} == "i386" ) )
 MANUAL_PACKAGE_BUILD=	Optimizes for the build machine.
 .endif
 
 .if ${PORT_OPTIONS:MDYNAMIC_ARCH}
 BUILDFLAGS+=	DYNAMIC_ARCH=1
 .endif
 
 .if ${PORT_OPTIONS:MINTERFACE64}
 BUILDFLAGS+=	INTERFACE64=1
 .endif
 
 .if ${PORT_OPTIONS:MOPENMP}
 BUILDFLAGS+=	USE_OPENMP=1
 .endif
 
 .if ${PORT_OPTIONS:MQUAD_PRECISION}
-BROKEN =	QUAD_PRECISION is broken; please disable this option
+BROKEN=		QUAD_PRECISION is broken; please disable this option
 BUILDFLAGS+=	QUAD_PRECISION=1
 .endif
 
 .if ! ${PORT_OPTIONS:MAVX}
 BUILDFLAGS+=	NO_AVX=1
 .endif
 
 post-extract:
 	cd ${DISTDIR}/${DIST_SUBDIR} ; \
 	${CP} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC}
 	${MKDIR} ${WRKDIR}/lib
 
 post-patch:
 	${REINPLACE_CMD} -e "s+%%FIND%%+${FIND}+" \
 	-e "s+%%XARGS%%+${XARGS}+" \
 	-e "s+%%REINPLACE_CMD%%+${REINPLACE_CMD}+" \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" -e "s+%%CC%%+${CC}+" \
 		${WRKSRC}/Makefile.rule
 	${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \
 		${WRKSRC}/Makefile.rule \
 		${WRKSRC}/Makefile.tail \
 		${WRKSRC}/driver/level3/Makefile \
 		${WRKSRC}/driver/others/Makefile \
 		${WRKSRC}/exports/Makefile \
 		${WRKSRC}/interface/Makefile \
 		${WRKSRC}/kernel/Makefile \
 		${WRKSRC}/kernel/Makefile.L3 \
 		${WRKSRC}/lapack/laswp/Makefile \
 		${WRKSRC}/lapack-netlib/SRC/Makefile \
 		${WRKSRC}/lapack-netlib/SRC/VARIANTS/Makefile \
 		${WRKSRC}/lapack-netlib/TESTING/MATGEN/Makefile \
 		${WRKSRC}/lapack-netlib/lapacke/src/Makefile \
 		${WRKSRC}/lapack-netlib/lapacke/utils/Makefile \
 		${WRKSRC}/reference/Makefile
 	${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \
 	-e 's+%%LOCALBASE%%+${LOCALBASE}+' \
 	-e 's+%%FIND%%+${FIND}+' \
 	-e 's+%%XARGS%%+${XARGS}+' \
 	-e 's+%%REINPLACE_CMD%%+${REINPLACE_CMD}+' \
 	-e 's+%%_GCC_RUNTIME%%+${_GCC_RUNTIME}+' \
 	-e 's+$$(CROSS_SUFFIX)+${LOCALBASE}/bin/+' \
 		${WRKSRC}/Makefile.system
 .if ${PORT_OPTIONS:MOPENMP}
 	${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \
 		${WRKSRC}/test/Makefile \
 		${WRKSRC}/ctest/Makefile
 .endif
 
 do-build:
 	cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=1 USE_THREAD=0 \
 	${MAKE_CMD} ${MAKE_ARGS}
 	${CP} ${WRKSRC}/libopenblas-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblas.a
 	${CP} ${WRKSRC}/libopenblas-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblas.so.${OPENBLAS_SVER}
 	cd ${WRKSRC} ; ${MAKE_CMD} ${MAKE_ARGS} clean
 	cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=${MAXTHREADS} \
 	USE_THREAD=1 ${MAKE_CMD} ${MAKE_ARGS}
 	${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblasp.a
 	${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblasp.so.${OPENBLAS_SVER}
 .if !${PORT_OPTIONS:MDEBUG}
 	${LOCALBASE}/bin/strip -X ${WRKDIR}/lib/*.so.${OPENBLAS_SVER}
 .endif
 
 BENCHMARK_MAXTHREADS?=	${MAXTHREADS}
 .if ${PORT_OPTIONS:MOPENMP}
-BENCHMARK_THREADS_FLAG =	OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS}
+BENCHMARK_THREADS_FLAG=		OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS}
 .else
-BENCHMARK_THREADS_FLAG =	OPENBLAS_NUM_THREADS=${BENCHMARK_MAXTHREADS}
+BENCHMARK_THREADS_FLAG=		OPENBLAS_NUM_THREADS=${BENCHMARK_MAXTHREADS}
 .endif
 
 benchmark: build
 	cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=${MAXTHREADS} \
 	USE_THREAD=1 ${MAKE_CMD} ${MAKE_ARGS} hpl
 	cd ${WRKSRC}/benchmark ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=${MAXTHREADS} \
 	USE_THREAD=1 ${BENCHMARK_THREADS_FLAG} ${MAKE_CMD} ${MAKE_ARGS}
 
 do-install:
 	cd ${WRKDIR}/lib ; \
 	${INSTALL_DATA} ${OPENBLAS_LIBS:S|$|.a|} ${OPENBLAS_LIBS:S|$|.so.${OPENBLAS_SVER}|} \
 	${STAGEDIR}${PREFIX}/lib/
 	cd ${STAGEDIR}${PREFIX}/lib ; \
 	for i in ${OPENBLAS_LIBS:S|$|.so|}; do \
 		${LN} -sf $$i.${OPENBLAS_SVER} $$i ; \
 	done
 
 post-stage:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopenblas.so.0
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopenblasp.so.0
 
 .include <bsd.port.mk>
diff --git a/math/sfft/Makefile b/math/sfft/Makefile
index 9082a31a2492..87eb82a19dcd 100644
--- a/math/sfft/Makefile
+++ b/math/sfft/Makefile
@@ -1,124 +1,124 @@
 # Created by: bf@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	sfft
 PORTVERSION=	0.1.0
 PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://spiral.net/software/sfft/ LOCAL/bf
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Optimized Sparse Fast Fourier Transform
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
 
 USES=		zip
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		OPTIMIZED_CFLAGS PROFILE DOCS
 OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
 
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 CFLAGS+=	-fopenmp -msse2 -Iflopcount -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 HEADERS=	sfft.h
 HDIR=		include/sfft
 MAKE_ENV=	LDADD="-lfftw3 ${LIBM}" LIB=sfft SHLIB_MAJOR="${SHLIB_MAJOR}" \
 		SRCCONF=/dev/null SRCS="${SRCS}"
 
 PLIST_DIRS=	${HDIR}
 PLIST_FILES=	${HEADERS:S|^|${HDIR}/|} lib/libsfft.a lib/libsfft.so \
 		lib/libsfft.so.${SHLIB_MAJOR}
 
 SHLIB_MAJOR=	1
 SRCS=	common.cc computefourier-1.0-2.0.cc \
 	computefourier-3.0.cc fftw.cc filters.cc parameters.cc \
 	sfft.cc simulation.cc timer.cc utils.cc
 
 .include <bsd.port.options.mk>
 
 .if !${ARCH:Mamd64} && !${MACHINE_CPU:Msse2}
 IGNORE=	this port requires SSE2, and benefits from SSE3 -- set CPUTYPE\
 appropriately
 .endif
 
 LIBM=	-lm
 .if ${OSVERSION} < 1000034
 LIB_DEPENDS+=	libmissing.so:${PORTSDIR}/math/libmissing
 LIBM+=		-lmissing
 .endif
 
 .if ${PORT_OPTIONS:MDOCS} || make(makesum)
 DISTFILES+=	sfft-doc.pdf
 PORTDOCS=	sfft-doc.pdf
 .endif
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O3 -ffast-math
 .endif
 
 .if ${PORT_OPTIONS:MPROFILE}
 .if defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE)
-IGNORE =	you have defined WITH_PROFILE, but have also defined\
+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\
+IGNORE=		you have chosen WITH_PROFILE, but have not installed the\
 base system profiling libraries
 .endif
 PLIST_FILES+=	lib/libsfft_p.a
 .else
 MAKE_ENV+=	NO_PROFILE=yes
 .endif
 
 post-extract:
 	@${CP} /usr/include/complex.h ${BUILD_WRKSRC}/sfftcomplex.h
 	@${PRINTF} "LIBDIR=\t${PREFIX}/lib\n.include <bsd.lib.mk>\n" > \
 		${BUILD_WRKSRC}/Makefile
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/string\.h/cstring/' \
 		${WRKSRC}/src/utils.cc
 .if ${OSVERSION} < 1000034
 	@${REINPLACE_CMD} -e '\|<complex.h>|{x; \
 	s|^.*$$|#include "missing_complex.h"|; H; x;}' \
 		${WRKSRC}/src/fft.h
 .endif
 	@${REINPLACE_CMD} -E -e '/<complex\.h>/ \
 	{s/<complex\.h>/ "sfftcomplex.h"/; x ; \
 	s|^.*$$|#endif|; G; x; \
 	s|^.*$$|extern "C" {|; G; x; \
 	s|^.*$$|#ifdef __cplusplus|; G; x; \
 	s|^.*$$|#ifdef __cplusplus|; H; \
 	s|^.*$$|}|; H; \
 	s|^.*$$|#endif|; H; x;}' \
 		${WRKSRC}/src/computefourier-1.0-2.0.h \
 		${WRKSRC}/src/computefourier-3.0.h \
 		${WRKSRC}/src/fft.h
 
 CORELIMIT?=	/usr/bin/limits -Sc 0
 
 check regression-test test: build
 	@cd ${BUILD_WRKSRC}; \
 	${CXX} ${CXXFLAGS} -o sfft-verification verification.cc \
 	${LDFLAGS} libsfft.a -lfftw3 ${LIBM} ; \
 	for _v in 1 2 3 ; do \
 	for _k in 5 10 50; do \
 	echo "Checking sfft version $${_v} with $${_k} frequency components:"; \
 	${CORELIMIT} ./sfft-verification -k $${_k} -r 3 -v $${_v} || ${TRUE} ; \
 	done ; done
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${HDIR}
 	@cd ${BUILD_WRKSRC}; ${INSTALL_DATA} ${HEADERS} ${STAGEDIR}${PREFIX}/${HDIR}
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${_DISTDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/spblas/Makefile b/math/spblas/Makefile
index a4f7e1c9aaca..e63f2128cdcf 100644
--- a/math/spblas/Makefile
+++ b/math/spblas/Makefile
@@ -1,76 +1,76 @@
 # Created by: bf@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	spblas
 DISTVERSION=	1_02
 CATEGORIES=	math
 MASTER_SITES=	http://math.nist.gov/spblas/:1 LOCAL/bf/:1 NL/blas/blast-forum/:2
 DISTFILES=	nist_spblas_${DISTVERSION}.zip:1
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	NIST Sparse Basic Linear Algebra Subprograms (BLAS)
 
 USES=		dos2unix zip
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 
 HEADERS=	blas_enum.h blas_sparse.h blas_sparse_proto.h
-HDIR =		include/spblas
+HDIR=		include/spblas
 MAKE_ENV=	LIB=spblas SHLIB_MAJOR="${SHLIB_MAJOR}" \
 		SRCCONF=/dev/null SRCS="${SRCS}"
 
 NO_WRKSUBDIR=	yes
 OPTIONS_DEFINE=	PROFILE DOCS EXAMPLES
 
 PLIST_DIRS=	${HDIR}
 PLIST_FILES=	${HEADERS:S|^|${HDIR}/|} lib/libspblas.a lib/libspblas.so \
 		lib/libspblas.so.${SHLIB_MAJOR}
 
 SHLIB_MAJOR=	1
 SRCS=		nist_spblas.cc
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPROFILE}
 .if defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE)
-IGNORE =	you have defined WITH_PROFILE, but have also defined\
+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\
+IGNORE=		you have chosen WITH_PROFILE, but have not installed the\
 base system profiling libraries
 .endif
 PLIST_FILES+=	lib/libspblas_p.a
 .else
 MAKE_ENV+=	NO_PROFILE=yes
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	blas-report.pdf
 .endif
 
 .if ${PORT_OPTIONS:MDOCS} || make(makesum)
 DISTFILES+=	blas-report.pdf:2
 EXTRACT_ONLY=	nist_spblas_${DISTVERSION}.zip
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 PORTEXAMPLES=	${SRCS}
 .endif
 
 post-extract:
 	@${PRINTF} "LIBDIR=\t${PREFIX}/lib\n.include <bsd.lib.mk>\n" > \
 		${WRKSRC}/Makefile
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${HDIR}
 	@cd ${WRKSRC}; ${INSTALL_DATA} ${HEADERS} ${STAGEDIR}${PREFIX}/${HDIR}
 .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}; ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/suitesparse/Makefile b/math/suitesparse/Makefile
index ffe904279c59..80cf4ac4880c 100644
--- a/math/suitesparse/Makefile
+++ b/math/suitesparse/Makefile
@@ -1,130 +1,130 @@
 # Created by: Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	suitesparse
 PORTVERSION=	4.0.2
 PORTREVISION=	3
 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
 
 .if defined (WITH_METIS)
 LIB_DEPENDS=	libmetis.so:${PORTSDIR}/math/metis4
 
 RESTRICTED=	GPL and METIS licenses are contradictory
 .endif
 
 CONFLICTS=	umfpack-*
 
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libopenblas.so)
 WITH_BLAS?=	openblas
 .elif exists(${LOCALBASE}/lib/libgoto2.so)
 WITH_BLAS?=	gotoblas
 .elif exists(${LOCALBASE}/lib/libatlas.so)
 WITH_BLAS?=	atlas
 .else
 WITH_BLAS?=	reference
 .endif
 
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .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} == openblas
 LIB_DEPENDS+=	libopenblas.so:${PORTSDIR}/math/openblas
 BLAS=		-lopenblasp
 LAPACK=		-lopenblasp
 .elif ${WITH_BLAS} == gotoblas
 LIB_DEPENDS+=	libgoto2.so:${PORTSDIR}/math/gotoblas
 LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack
-BLAS =		-lgoto2p
-LAPACK =	-lgoto2p
+BLAS=		-lgoto2p
+LAPACK=		-lgoto2p
 .elif ${WITH_BLAS} == atlas
 LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
 BLAS=		-lptf77blas
-LAPACK =	-lalapack -lptcblas
+LAPACK=		-lalapack -lptcblas
 .endif
 
 .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 =
+CHOLMOD_CONFIG=	
 .else
-CHOLMOD_CONFIG =	-DNPARTITION
+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} ${BLAS}|' \
 			-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} ${LAPACK}|' \
 			-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.post.mk>
diff --git a/math/xblas/Makefile b/math/xblas/Makefile
index f7f663fba1d1..51115dfa37fa 100644
--- a/math/xblas/Makefile
+++ b/math/xblas/Makefile
@@ -1,117 +1,117 @@
 # Created by: bf@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	xblas
 PORTVERSION=	1.0.248
 CATEGORIES=	math
 MASTER_SITES=	NL/xblas LOCAL/bf
 DISTNAME=	xblas
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Extra Precise Basic Linear Algebra Subroutines (BLAS)
 
 LICENSE=	BSD
 
 USE_LDCONFIG=	yes
 
 CFLAGS+=	${MANGLING}
 HDIR=		include/xblas
 HEADERS=	blas_dense_proto.h blas_enum.h blas_extended.h \
 		blas_extended_private.h blas_extended_proto.h blas_fpu.h \
 		blas_malloc.h f2c-bridge.h
 MAKE_ENV=	EXTRA_LIBS="-lm" LINKER="${CC}" M4="${M4}" RANLIB="${RANLIB}"
 OPTIONS_DEFINE=	SHARED STATIC DOCS
 OPTIONS_DEFAULT=	SHARED
 SHARED_DESC=	Build a shared library and PIC archive
 STATIC_DESC=	Build a non-PIC archive
 PLIST_DIRS=	${HDIR}
 PLIST_FILES=	${HEADERS:S|^|${HDIR}/|}
 SHLIB_MAJOR=	0
-WRKSRC =	${WRKDIR}/xblas-${PORTVERSION}
+WRKSRC=		${WRKDIR}/xblas-${PORTVERSION}
 
 .include <bsd.port.options.mk>
 
 M4?=	m4
 M4_OPTS?=	#empty
 MANGLING?=	-DCONFIG_FC_UNDERSCORE
 
 .if ${ARCH} == "i386" || ${ARCH} == "amd64"
 CFLAGS+=	-Dx86
 .endif
 
 .if ${ARCH} == "sparc64"
 PICFLAG=	-fPIC
 .else
 PICFLAG=	-fpic
 .endif
 
 PORTDOCS=	report.ps
 
 .if ${PORT_OPTIONS:MSHARED}
 PLIST_FILES+=	lib/libxblas_pic.a lib/libxblas.so lib/libxblas.so.${SHLIB_MAJOR}
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC}
 PLIST_FILES+=	lib/libxblas.a
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E \
 	-e '/(ARCH|CC|(C|LD)FLAGS|EXTRA_LIBS|M4|M4_OPTS|RANLIB|XBLASLIB)[[:blank:]]*=/d' \
 		${WRKSRC}/make.inc
 .if ${PORT_OPTIONS:MSTATIC}
 	@${CP} -af ${WRKSRC} ${WRKSRC}_STATIC
 .endif
 	@${PRINTF} "\nCFLAGS+=\t${PICFLAG}\n" >> ${WRKSRC}/make.inc
 # Fix parallel (-jX) builds
 	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \
 		-E 's/cd (.+) && (\$$\(MAKE\))/\2 -C \1/'
 
 do-build: build-shared build-static
 
 build-shared: patch
 .if ${PORT_OPTIONS:MSHARED}
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} XBLASLIB="libxblas_pic.a" ${MAKE} \
 	${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" lib ; \
 	${CC} ${CFLAGS} ${PICFLAG} ${LDFLAGS} -shared -Wl,-x \
 	-Wl,-soname,libxblas.so.${SHLIB_MAJOR} -o libxblas.so.${SHLIB_MAJOR} \
 	-Wl,--whole-archive libxblas_pic.a -Wl,--no-whole-archive -Wl,--as-needed -lm
 .endif
 
 build-static: patch
 .if ${PORT_OPTIONS:MSTATIC}
 	@cd ${WRKSRC}_STATIC; ${SETENV} ${MAKE_ENV} XBLASLIB="libxblas.a" ${MAKE} \
 	${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" lib
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${HDIR}
 	@cd ${WRKSRC}/src; ${INSTALL_DATA} ${HEADERS} ${STAGEDIR}${PREFIX}/${HDIR}
 .if ${PORT_OPTIONS:MSHARED}
 	@cd ${WRKSRC}; ${INSTALL_DATA} libxblas_pic.a \
 	libxblas.so.${SHLIB_MAJOR} ${STAGEDIR}${PREFIX}/lib
 	@${LN} -sf libxblas.so.${SHLIB_MAJOR} ${STAGEDIR}${PREFIX}/lib/libxblas.so
 .endif
 .if ${PORT_OPTIONS:MSTATIC}
 	@${INSTALL_DATA} ${WRKSRC}_STATIC/libxblas.a ${STAGEDIR}${PREFIX}/lib
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/report.ps ${STAGEDIR}${DOCSDIR}
 .endif
 
 check regression-test test: test-shared test-static
 
 test-shared: build
 .if ${PORT_OPTIONS:MSHARED}
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} XBLASLIB="libxblas_pic.a" ${MAKE} \
 	${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" tests
 .endif
 
 test-static: build
 .if ${PORT_OPTIONS:MSTATIC}
 	@cd ${WRKSRC}_STATIC; ${SETENV} ${MAKE_ENV} XBLASLIB="libxblas.a" ${MAKE} \
 	${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" tests
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-im/pwytter/Makefile b/net-im/pwytter/Makefile
index 6f961b2b3818..0f12ba0807a2 100644
--- a/net-im/pwytter/Makefile
+++ b/net-im/pwytter/Makefile
@@ -1,51 +1,51 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pwytter
 PORTVERSION=	0.8
 PORTREVISION=	3
 CATEGORIES=	net-im www python
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free multi-platform Twitter client written in Python
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
 		${PYTHON_SITELIBDIR}/PIL/_imaging.so:${PORTSDIR}/graphics/py-imaging \
 		${PYTHON_PKGNAMEPREFIX}simplejson>=1.7.1:${PORTSDIR}/devel/py-simplejson
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gettext zip dos2unix
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-DOS2UNIX_GLOB = *.py
+DOS2UNIX_GLOB=	 *.py
 
 post-patch:
 	@${RM} -rf ${WRKSRC}/twclient/simplejson
 	@${REINPLACE_CMD} -e "s|'simplejson|}, #&|" \
 		-e "s|pwParam|pwCache','&|" \
 		-e "s|d\[p\]|d\['share/'+p\]|g" \
 		-e 's|text",|${DATADIR_REL}/text",|' \
 		-e 's|media",|${DATADIR_REL}/media",|' \
 		-e 's|theme",|${DATADIR_REL}/theme",|' \
 		-e 's|\\\\|/|' \
 		-e "/import ez_setup/d" \
 		-e "/ez_setup.use_setuptools()/d" ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} \
 		-e 's|locale_path = .*|locale_path = "${PREFIX}/share/locale"|' \
 		-e '1,3d' \
 		-e 's|/usr/bin/python|${PYTHON_CMD}|' \
 		${WRKSRC}/pwytter.py
 	@${REINPLACE_CMD} -e 's|media"|${DATADIR}/&|' ${WRKSRC}/pwytter.py \
 		${WRKSRC}/twclient/__init__.py
 	@${REINPLACE_CMD} -e "s|theme'|${DATADIR}/&|" ${WRKSRC}/pwTheme.py
 	@${FIND} ${WRKSRC}/locale -name pwytter.po -delete
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/kismet/Makefile b/net-mgmt/kismet/Makefile
index 98249db5feaf..62d9fd84a0e7 100644
--- a/net-mgmt/kismet/Makefile
+++ b/net-mgmt/kismet/Makefile
@@ -1,102 +1,102 @@
 # Created by: Thomas Spreng <spreng@socket.ch>
 # $FreeBSD$
 
 PORTNAME=	kismet
 DISTVERSION=	2013-03-R1b
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.kismetwireless.net/code/:1 \
 		http://anonsvn.wireshark.org/wireshark/trunk/:2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:1
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	802.11 layer2 wireless network detector, sniffer, and IDS
 
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 USES=		gmake tar:xz
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=		PCRE PLUGINS SETUID DOCS EXAMPLES
 OPTIONS_DEFAULT=	PCRE PLUGINS SETUID
 SETUID_DESC=		Use privilege separation
 
 WRKSRC=	${WRKDIR}/${DISTNAME:S/a$$//}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	README manuf
 DISTFILES+=	manuf:2
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 PORTEXAMPLES=	*
 .endif
 
 .if ${PORT_OPTIONS:MPCRE}
 CONFIGURE_ARGS+=--enable-pcre
 LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
 .else
 CONFIGURE_ARGS+=--disable-pcre
 .endif
 
 .if ${PORT_OPTIONS:MSETUID}
-GROUPS =	kismet
+GROUPS=		kismet
 CONFIGURE_ARGS+=--with-suidgroup=wheel
-INSTALL_TARGET =	suidinstall
+INSTALL_TARGET=		suidinstall
 PLIST_SUB+=	SUID="" SUIDGROUP="${GROUPS}"
 PKGMESSAGE=	${WRKDIR}/suid_pkg-message
 SUB_FILES+=	suid_pkg-message
 .else
-INSTALL_TARGET =	install
+INSTALL_TARGET=		install
 CONFIGURE_ARGS+=--without-suidgroup
 PLIST_SUB+=	SUID="@comment " SUIDGROUP=""
 .endif
 
 .if ${PORT_OPTIONS:MPLUGINS}
 ALL_TARGET=	depend all all-plugins
 INSTALL_TARGET+=	all-plugins-install
 PLIST_SUB+=	PLUGINS=""
 .else
 PLIST_SUB+=	PLUGINS="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "/gps=/s/true/false/" \
 		-e "/ouifile=/{/wireshark/d;s|/etc|${DOCSDIR}|;}" \
 			${WRKSRC}/conf/kismet.conf.in \
 			${WRKSRC}/conf/kismet_drone.conf
 	@${REINPLACE_CMD} -e "s/plugin-/plugin-[aps]/" \
 		-e "s/make/${MAKE_CMD}/" \
 		-e "s/\$$(MAKE)/${MAKE_CMD}/" \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s/CXXFLAGS/CPPFLAGS/" \
 		${WRKSRC}/plugin-alertsyslog/Makefile
 	@${FIND} ${WRKSRC} -type f -name 'Makefile' -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -E \
 		'/C(XX)?FLAGS[[:blank:]]*\+=/s/ -g / /'
 
 post-build:
 	@cd ${WRKSRC}; ${STRIP_CMD} kismet_client kismet_drone kismet_server */*.so
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/manuf ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/ruby/* ${STAGEDIR}${EXAMPLESDIR}
 .endif
 	@${INSTALL_DATA} ${WRKSRC}/conf/kismet.conf \
 		${STAGEDIR}${PREFIX}/etc/kismet.conf.sample
 	@${INSTALL_DATA} ${WRKSRC}/conf/kismet_drone.conf \
 		${STAGEDIR}${PREFIX}/etc/kismet_drone.conf.sample
 
 .include <bsd.port.mk>
diff --git a/net-p2p/gnunet-gtk/Makefile b/net-p2p/gnunet-gtk/Makefile
index 8127b29cd192..631a85e20076 100644
--- a/net-p2p/gnunet-gtk/Makefile
+++ b/net-p2p/gnunet-gtk/Makefile
@@ -1,59 +1,59 @@
 # Created by: bf
 # $FreeBSD$
 
-PORTNAME=		gnunet-gtk
-DISTVERSION=		0.9.3
-CATEGORIES=		net-p2p ipv6 security
-MASTER_SITES=		GNU
+PORTNAME=	gnunet-gtk
+DISTVERSION=	0.9.3
+CATEGORIES=	net-p2p ipv6 security
+MASTER_SITES=	GNU
 MASTER_SITE_SUBDIR=	gnunet
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK interface to GNUnet
 
 BROKEN=		Does not fetch
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libgladeui-1.so:${PORTSDIR}/devel/glade3 \
 		libgnunetutil.so:${PORTSDIR}/net-p2p/gnunet
 
-INSTALLS_ICONS =	yes
-USE_AUTOTOOLS=		libltdl libtool
-USES=			pathfix iconv gmake pkgconfig
-USE_LDCONFIG=		yes
+INSTALLS_ICONS=	yes
+USE_AUTOTOOLS=	libltdl libtool
+USES=		pathfix iconv gmake pkgconfig
+USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS =	--with-extractor=${LOCALBASE} \
-			--with-gnunet=${LOCALBASE} \
-			${ICONV_CONFIGURE_ARG}
+CONFIGURE_ARGS=	--with-extractor=${LOCALBASE} \
+		--with-gnunet=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG}
 
 MAN1=	gnunet-fs-gtk.1
 
 NO_STAGE=	yes
 
 OPTIONS_DEFINE=	DOCS NLS
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 CONFIGURE_ARGS+=	--with-libintl-prefix=${LOCALBASE}
 PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f -name 'Makefile.in' -print0 | \
 	${XARGS} -0 ${REINPLACE_CMD} -e \
 	'/^[[:blank:]]*mkinstalldirs[[:blank:]]*=/s/=.*/= $$(mkdir_p)/'
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 6b4ef3808c7b..e9ff2503a21d 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -1,156 +1,156 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	gnunet
 DISTVERSION=	0.9.3
 PORTREVISION=	8
 CATEGORIES=	net-p2p ipv6 security
 MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Anonymous, distributed, reputation-based network
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libunistring.so:${PORTSDIR}/devel/libunistring \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libglpk.so:${PORTSDIR}/math/glpk \
 		libgmp.so:${PORTSDIR}/math/gmp \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 		libextractor.so:${PORTSDIR}/textproc/libextractor
 
-OPTIONS_DEFINE =	HTTP
+OPTIONS_DEFINE=		HTTP
 
 HTTP_DESC=	Enable HTTP transport via libmicrohttpd
 MYSQL_DESC=	Use MySQL for the data store and cache
 PGSQL_DESC=	Use PostgreSQL for the data store and cache
 SQLITE_DESC=	Use SQLite for the data store and cache
 
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
 
 OPTIONS_DEFAULT=	SQLITE
 
 USE_AUTOTOOLS=	libltdl libtool
 USES=		iconv gmake
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS =	--with-daemon-home-dir=${GNUNET_DAEMON_DIR} \
+CONFIGURE_ARGS=		--with-daemon-home-dir=${GNUNET_DAEMON_DIR} \
 			--with-daemon-config-dir=${PREFIX}/etc \
 			--with-extractor=${LOCALBASE} \
 			--with-libcurl=${LOCALBASE} \
 			--with-libgcrypt-prefix=${LOCALBASE} \
 			--with-libunistring-prefix=${LOCALBASE} \
 			--with-ltdl-include=${LOCALBASE}/include \
 			--with-ltdl-lib=${LOCALBASE}/lib
 
-GROUPS =	gnunet
+GROUPS=		gnunet
 USERS=		gnunet
 
 MAN1=	gnunet-arm.1 gnunet-core.1 gnunet-directory.1 gnunet-download.1 \
 	gnunet-download-manager.1 gnunet-fs.1 gnunet-gns.1 gnunet-namestore.1 \
 	gnunet-nat-server.1 gnunet-peerinfo.1 gnunet-pseudonym.1 \
 	gnunet-publish.1 gnunet-rsa.1 gnunet-search.1 gnunet-statistics.1 \
 	gnunet-transport.1 gnunet-unindex.1 gnunet-vpn.1
 
 #If a non-default GNUNET_DAEMON_DIR is defined, the home directory
 #of the gnunet user may need to be adjusted -- e.g., via:
 #pw usermod gnunet -d $GNUNET_DAEMON_DIR
 GNUNET_DAEMON_DIR?=		/var/lib/gnunet
 PLIST_SUB=	GNUNET_DAEMON_DIR=${GNUNET_DAEMON_DIR}
 SUB_FILES=	pkg-message
 NO_STAGE=	yes
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 PORTEXAMPLES=	gnunet_janitor.py gnunet_pyexpect.py hostlist.cgi hostlist.php \
 report.sh
 .endif
 
 .if ${PORT_OPTIONS:MHTTP}
-BROKEN =	WITH_HTTP requires libmicrohttpd 0.9.18 or higher
+BROKEN=		WITH_HTTP requires libmicrohttpd 0.9.18 or higher
 LIB_DEPENDS+=		libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd
 CONFIGURE_ARGS+=	--with-microhttpd=${LOCALBASE}
 PLIST_SUB+=		HTTP=""
 .else
 CONFIGURE_ARGS+=	--without-microhttpd
 PLIST_SUB+=		HTTP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 PLIST_SUB+=		MYSQL=""
 .else
 CONFIGURE_ARGS+=	--without-mysql
 PLIST_SUB+=		MYSQL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 CONFIGURE_ARGS+=	--with-libintl-prefix=${LOCALBASE}
 PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-postgres=${LOCALBASE}
 PLIST_SUB+=		PGSQL=""
 .else
 CONFIGURE_ARGS+=	--without-postgres
 PLIST_SUB+=		PGSQL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=		yes
 CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 PLIST_SUB+=		SQLITE=""
 .else
 CONFIGURE_ARGS+=	--without-sqlite
 PLIST_SUB+=		SQLITE="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|postgresql/||g' \
 		${WRKSRC}/configure \
 		${WRKSRC}/gnunet_config.h \
 		${WRKSRC}/src/datacache/plugin_datacache_postgres.c \
 		${WRKSRC}/src/datastore/plugin_datastore_postgres.c \
 		${WRKSRC}/src/include/gnunet_postgres_lib.h
 	@${REINPLACE_CMD} \
 	-e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/pkgconfig/Makefile.in
 
 post-install:
 	@${PRINTF} "%s\n%s\n%s\n" "[PATHS]" \
 	"SERVICEHOME = ${GNUNET_DAEMON_DIR}" \
 	"DEFAULTCONFIG = ${PREFIX}/etc/gnunet.conf" \
 	> ${PREFIX}/etc/gnunet.conf.sample
 .if !exists(${PREFIX}/etc/gnunet.conf)
 	@${CP} ${PREFIX}/etc/gnunet.conf.sample ${PREFIX}/etc/gnunet.conf
 .endif
 .if !exists(${GNUNET_DAEMON_DIR})
 	@${INSTALL} -d -o gnunet -g gnunet -m 700 ${GNUNET_DAEMON_DIR}
 .endif
 	@${INSTALL_PROGRAM} ${WRKSRC}/contrib/timeout_watchdog ${PREFIX}/bin
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	@cd ${WRKSRC}/contrib; ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
 .endif
 	@${ECHO_CMD} ""
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD} ""
 
 .include <bsd.port.mk>
diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index df53749607aa..38977e277c50 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -1,190 +1,190 @@
 # Created by: dbader@ece.unm.edu
 # $FreeBSD$
 
 PORTNAME=	mpich2
 DISTVERSION=	1.3.2p1
 PORTREVISION=	3
 PORTEPOCH=	5
 CATEGORIES=	net java parallel
 MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${DISTVERSION}/
 DIST_SUBDIR=	mpich
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Portable implementation of MPI-1 and MPI-2
 
 LICENSE=	MPICH
 LICENSE_NAME=	MPICH
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 GNU_CONFIGURE=	yes
 USES=		fortran perl5 pkgconfig
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 USE_PYTHON=	yes
 
 OPTIONS_DEFINE_i386=	JAVA
 OPTIONS_DEFINE_amd64=	JAVA
 OPTIONS_DEFINE=	SMPD X11 DOCS
 OPTIONS_DEFAULT_i386=	JAVA
 OPTIONS_DEFAULT_amd64=	JAVA
 OPTIONS_DEFAULT=	X11
 JAVA_DESC=	build MPE Jumpshot-4
 SMPD_DESC=	use SMPD instead of MPD, for a mixed-OS cluster
 X11_DESC=	build MPE graphics routines
 
 CONFIGURE_ARGS=	--enable-romio --enable-shared	\
 		--docdir="${DOCSDIR}" \
 		--with-python="${PYTHON_CMD}"
 CONFIGURE_ENV=	FCFLAGS="${FFLAGS}" \
 		PACKAGE=${PORTNAME} \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 .if ${FFLAGS} == "-O"
-FFLAGS =	-O2
+FFLAGS=		-O2
 .endif
 LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}
 
 MAKE_ENV=	CCACHE_DISABLE=yes PACKAGE=${PORTNAME}
 NOCCACHE=	yes
 
 CONFLICTS=	lam-7.* mpd-[0-9]* mpiexec-0.*
 MAKE_JOBS_UNSAFE=	yes
 
 VERSO=		2.2
 VERSOM=		${VERSO:R}
 PLIST_SUB=	VER=${VERSO} VERM=${VERSOM}
 SUB_FILES=	pkg-message
 
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
 MAKE_ENV+=	VERBOSE=1
 .endif
 
 .if ! ${PORT_OPTIONS:MJAVA}
 CONFIGURE_ARGS+=	--without-java
 PLIST_SUB+=	JAVA="@comment "
 PLX11=		"@comment "
 .else
 .if ! ${PORT_OPTIONS:MX11}
-IGNORE =	WITH_JAVA requires WITH_X11
+IGNORE=		WITH_JAVA requires WITH_X11
 .endif
 CONFIGURE_ARGS+=	--with-java="${JAVA_HOME}"
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 BUILD_DEPENDS+=	javavm:${PORTSDIR}/java/javavmwrapper
 RUN_DEPENDS+=	javavm:${PORTSDIR}/java/javavmwrapper
 PLIST_SUB+=	JAVA=""
 PLX11=		""
 .endif
 
 #define WITH_RECV_TIMEOUT to be an appropriate value (>20 for slow machines),
 #in order to set a different default MPIEXEC_RECV_TIMEOUT
 .if defined(MAINTAINER_MODE)
 WITH_RECV_TIMEOUT?=	100
 .else
 WITH_RECV_TIMEOUT?=	20
 .endif
 
 .if ${PORT_OPTIONS:MSMPD}
 CONFIGURE_ARGS+=	--with-pmi=smpd --with-pm=smpd
 PLIST_SUB+=	PM_MPD="@comment " PM_SMPD=""
 .else
 CONFIGURE_ARGS+=	--with-pmi=simple --with-pm=mpd
 PLIST_SUB+=	PM_MPD="" PM_SMPD="@comment "
 .endif
 
 .if ! ${PORT_OPTIONS:MX11}
 CONFIGURE_ARGS+=	--disable-graphics
 PLIST_SUB+=	X11="@comment "
 .else
 CONFIGURE_ARGS+=	--x-includes=${LOCALBASE}/include --x-libraries==${LOCALBASE}/lib
 USE_XORG=	x11 xt
 PLIST_SUB+=	X11=${PLX11}
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 .include "${FILESDIR}/manpages"
 .endif
 
 THREAD2FIX=	configure test/mpi/threads/comm/Makefile.in	\
 		test/mpi/threads/pt2pt/Makefile.in		\
 		src/mpe2/src/logging/configure			\
 		src/mpi/romio/configure src/openpa/configure	\
 		src/pm/hydra/configure
 LOCALBASE2FIX=	src/mpe2/src/slog2sdk/trace_rlog/configure	\
 		src/mpe2/src/slog2sdk/trace_sample/configure	\
 		src/mpe2/src/graphics/configure
 DOC2PATCH=	Makefile.in src/mpe2/sbin/mpeinstall.in		\
 		src/openpa/Makefile.in src/mpi/romio/util/romioinstall.in
 CONFPFX2FIX1=	src/pm/mpd/mpd.py
 CONFPFX2FIX2=	doc/installguide/install.tex.vin		\
 		src/pm/mpd/mpdroot.c
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${THREAD2FIX:S|^|${WRKSRC}/|}
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${LOCALBASE2FIX:S|^|${WRKSRC}/|}
 	${FIND} ${WRKSRC} -name configure | ${XARGS}	\
 		${REINPLACE_CMD} -e 's|doc/$${PACKAGE}|doc/${PORTNAME}|'
 .for fin in ${DOC2PATCH}
 . if ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's|%%PORTDOCS%%||' ${WRKSRC}/${fin}
 . else
 	${REINPLACE_CMD} -e 's|%%PORTDOCS%%|#|' ${WRKSRC}/${fin}
 . endif
 .endfor
 .if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's|lib doc share|lib share|'	\
 		${WRKSRC}/src/mpe2/src/slog2sdk/sbin/install-package.in
 .endif
 	${REINPLACE_CMD} -e '/MPIEXEC_RECV_TIMEOUT/s|20,|${WITH_RECV_TIMEOUT},|' \
 		${WRKSRC}/src/pm/mpd/mpiexec.py
 	${REINPLACE_CMD} -e 's|%%SRCDIR%%|${WRKSRC}|' ${WRKSRC}/${CONFIGURE_SCRIPT}
 .for cnf in ${CONFPFX2FIX1}
 	${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' ${WRKSRC}/${cnf}
 .endfor
 .for cnf in ${CONFPFX2FIX2}
 	${REINPLACE_CMD} -e 's|/etc/mpd.conf|${PREFIX}/etc/mpd.conf|'	\
 		${WRKSRC}/${cnf}
 .endfor
 
 pre-install:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/bin
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py  ${WRKSRC}/bin
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.pyc ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.pyo ${PREFIX}/bin
 	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${WRKDIR}/mpd.conf.dist
 	${INSTALL_DATA} ${WRKDIR}/mpd.conf.dist ${PREFIX}/etc/
 	if [ ! -e ${PREFIX}/etc/mpd.conf ]; then \
 		${INSTALL_DATA} ${WRKDIR}/mpd.conf.dist ${PREFIX}/etc/mpd.conf ; \
 	fi
 	${CHMOD} 600 ${PREFIX}/etc/mpd.conf ${PREFIX}/etc/mpd.conf.dist
 	@${CAT} ${PKGMESSAGE}
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 .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
 	@${ECHO_MSG} "Increase MPIEXEC_RECV_TIMEOUT if needed!"
 	${PREFIX}/bin/mpd &
 	(cd ${WRKSRC} && \
 	PATH=${PATH}:${PREFIX}/bin VERBOSE=1 ${MAKE} testing)
 	${PREFIX}/bin/mpdallexit
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile
index 6b5b05a5313a..670288d72954 100644
--- a/net/nss_ldap/Makefile
+++ b/net/nss_ldap/Makefile
@@ -1,84 +1,84 @@
 # Created by: Jacques Vidrine <nectar@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	nss_ldap
 PORTVERSION=	1.${NSS_LDAP_VERSION}
 PORTREVISION=	11
 CATEGORIES=	net
 MASTER_SITES=	http://www.padl.com/download/ \
 		LOCAL/martymac
 DISTNAME=	${PORTNAME}-${NSS_LDAP_VERSION}
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	RFC 2307 NSS module
 
 LICENSE=	GPLv2
 
 NSS_LDAP_VERSION=265
 
 USES=		gmake perl5
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	automake aclocal autoconf autoheader
 AUTOMAKE_ARGS=	--add-missing
 USE_LDCONFIG=	yes
 USE_OPENLDAP=	yes
 
 OPTIONS_DEFINE=	LCLASS KERBEROS SASL
 OPTIONS_DEFAULT=LCLASS KERBEROS
 
 LCLASS_DESC=	Enable login classes via the loginClass attribute
 
 SASL_DESC=	Use the SASL-enabled version of OpenLDAP
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--with-ldap-conf-file=${PREFIX}/etc/nss_ldap.conf \
 		--with-ldap-secret-file=${PREFIX}/etc/nss_ldap.secret \
 		--enable-rfc2307bis \
 		--enable-paged-results
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MKERBEROS}
 CONFIGURE_ARGS+=--enable-configurable-krb5-ccname-gssapi \
 		--enable-configurable-krb5-keytab
 .endif
 
 .if ${PORT_OPTIONS:MLCLASS}
 CFLAGS+="-DHAVE_LOGIN_CLASSES"
 .endif
 
 .if ${PORT_OPTIONS:MSASL}
-WANT_OPENLDAP_SASL	 = YES
+WANT_OPENLDAP_SASL=	 yes
 .endif
 
 post-extract:
 	${CP} ${FILESDIR}/bsdnss.c ${WRKSRC}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc/ldap\.,${PREFIX}/etc/nss_ldap.,g' \
 		-e 's,/etc/openldap/ldap\.,${PREFIX}/etc/openldap/ldap.,g' \
 		${WRKSRC}/ldap.conf
 	@${REINPLACE_CMD} 's,#!/usr/bin/perl,#!${PERL},' \
 		${WRKSRC}/vers_string
 	@${REINPLACE_CMD} 's,/etc/ldap\.,${PREFIX}/etc/nss_ldap.,g' \
 		${WRKSRC}/nss_ldap.5
 
 # XXX: newer autoconf's rely on the compiler result, not the preprocessor
 #      for checking headers, so the configure.in needs to be fixed upstream
 #      to properly include dependencies
 post-configure:
 	@${ECHO} "#define HAVE_NETINET_IF_ETHER_H 1" >> ${WRKSRC}/config.h
 	@${ECHO} "#define HAVE_NET_ROUTE_H 1" >> ${WRKSRC}/config.h
 	@${ECHO} "#define HAVE_RESOLV_H 1" >> ${WRKSRC}/config.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nss_ldap.so ${STAGEDIR}/${PREFIX}/lib/nss_ldap.so.1
 	${INSTALL_DATA} ${WRKSRC}/ldap.conf ${STAGEDIR}/${PREFIX}/etc/nss_ldap.conf.sample
 	${INSTALL_MAN} ${WRKSRC}/nss_ldap.5 ${STAGEDIR}/${MAN5PREFIX}/man/man5
 
 .include <bsd.port.mk>
diff --git a/science/fastcap/Makefile b/science/fastcap/Makefile
index f23743d64384..cc24e2910433 100644
--- a/science/fastcap/Makefile
+++ b/science/fastcap/Makefile
@@ -1,51 +1,51 @@
 # Created by: Pedro Giffuni <giffunip@asme.org>
 # $FreeBSD$
 
 PORTNAME=	fastcap
 DISTVERSION=	2.0wr-011109
 CATEGORIES=	science cad
 MASTER_SITES=	http://www.wrcad.com/ftp/pub/ LOCAL/bf
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Three-dimensional capacitance extraction program
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config
-WRKSRC =	${WRKDIR}/fastcap-2.0wr
+WRKSRC=		${WRKDIR}/fastcap-2.0wr
 
 BINFILES=	busgen capgen cubegen fastcap pipedgen pyragen
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,TYPE=other,TYPE=4,' \
 		${WRKSRC}/config
 	@${REINPLACE_CMD} -Ee '/CFLAGS =/{s/=/+=/;s/-O[[:digit:]]*//;}' \
 		${WRKSRC}/src/Makefile.4
 # Minimal changes to fix the Clang build (there should be a more thorough
 # clean-up, to correct types of functions, remove implicit declarations, fix
 # formatting, add missing returns, etc.)
 	@${REINPLACE_CMD} -E -e 's,^mul(Up|Down),void &,' \
 		${WRKSRC}/src/mulDo.c
 	@${REINPLACE_CMD} -e 's,^mulMatUp,void &,' \
 		${WRKSRC}/src/mulMats.c
 	@${REINPLACE_CMD} -e 's,^static getnbrs,static void getnbrs,' \
 		${WRKSRC}/src/mulSetup.c
 # Change "cd foo ; $(MAKE)" into "$(MAKE) -C foo" to unbreak parallel builds
 	@${REINPLACE_CMD} -E 's,cd (.+) ; (\$$\(MAKE\)),\2 -C \1,' \
 		${WRKSRC}/Makefile
 # Avoid clashing of generated temporary files, crucial for parallel builds
 	@${REINPLACE_CMD} -e 's,temp\.out,$$@.&,' ${WRKSRC}/src/Makefile*
 
 do-install:
 	${INSTALL_PROGRAM} ${BINFILES:S,^,${WRKSRC}/bin/,} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CAT} ${WRKSRC}/README ${WRKSRC}/README.mit > ${STAGEDIR}${DOCSDIR}/readme
 	${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${STAGEDIR}${DOCSDIR}
 	${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/*
 
 .include <bsd.port.mk>
diff --git a/science/fasthenry/Makefile b/science/fasthenry/Makefile
index cebb866e50ad..28234c633147 100644
--- a/science/fasthenry/Makefile
+++ b/science/fasthenry/Makefile
@@ -1,65 +1,65 @@
 # Created by: Pedro Giffuni <giffunip@asme.org>
 # $FreeBSD$
 
 PORTNAME=	fasthenry
 DISTVERSION=	3.0wr-021113
 CATEGORIES=	science cad
 MASTER_SITES=	http://www.wrcad.com/ftp/pub/ LOCAL/bf
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multipole-accelerated inductance analysis program
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config
-WRKSRC =	${WRKDIR}/fasthenry-3.0wr
+WRKSRC=		${WRKDIR}/fasthenry-3.0wr
 
 NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -Ee '/CFLAGS =/{s/=/+=/;s/-O[[:digit:]]*//;}' \
 		${WRKSRC}/src/fasthenry/Makefile.default \
 		${WRKSRC}/src/fasthenry/sparse/Makefile \
 		${WRKSRC}/src/zbuf/Makefile.default
 #minimal changes to fix the clang build (there should be a more thorough
 #clean-up, to correct types of functions, remove implicit declarations, fix
 #formatting, add missing returns, etc.)
 	@${REINPLACE_CMD} -e 's,return;,return 0;,' \
 		${WRKSRC}/src/fasthenry/barnoldi.c \
 		${WRKSRC}/src/fasthenry/contact.c \
 		${WRKSRC}/src/fasthenry/findpaths.c \
 		${WRKSRC}/src/fasthenry/fillM.c \
 		${WRKSRC}/src/fasthenry/hole.c \
 		${WRKSRC}/src/fasthenry/induct.c \
 		${WRKSRC}/src/fasthenry/joelself.c \
 		${WRKSRC}/src/fasthenry/mulSetup.c \
 		${WRKSRC}/src/fasthenry/read_tree.c
 	@${REINPLACE_CMD} -Ee \
 	'/^(AllocateBlockOfAllocationList|InitializeElementBlocks|RecordAllocation)/,/^\}/s/return;/return 0;/' \
 		${WRKSRC}/src/fasthenry/sparse/spAllocate.c
 	@${REINPLACE_CMD} -Ee \
 	'/^(EnlargeMatrix|ExpandTranslationArrays|spcLinkRows)/,/^\}/s/return;/return 0;/' \
 		${WRKSRC}/src/fasthenry/sparse/spBuild.c
 	@${REINPLACE_CMD} -Ee \
 	'/^(ComplexRowColElimination|CountMarkowitz|CreateInternalVectors|ExchangeColElements|ExchangeRowElements|ExchangeRowsAndCols|MarkowitzProducts|RealRowColElimination|UpdateMarkowitzNumbers|spcColExchange|spcRowExchange)/,/^\}/s/return;/return 0;/' \
 		${WRKSRC}/src/fasthenry/sparse/spFactor.c
 	@${REINPLACE_CMD} -Ee 's,^mul(Up|Down),void &,' \
 		${WRKSRC}/src/fasthenry/mulDo.c
 	@${REINPLACE_CMD} -e 's,^mulMatUp,void &,' \
 		${WRKSRC}/src/fasthenry/mulMats.c
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/bin/fasthenry ${PREFIX}/bin/
 	@${INSTALL_PROGRAM} ${WRKSRC}/bin/zbuf ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${CAT} ${WRKSRC}/README ${WRKSRC}/README.mit > ${DOCSDIR}/readme
 	${CAT} ${WRKSRC}/doc/manual_*.ps > ${DOCSDIR}/manual.ps
 	${CAT} ${WRKSRC}/doc/nonuniform_manual_*.ps > ${DOCSDIR}/nonuniform_manual.ps
 	${INSTALL_DATA} ${WRKSRC}/doc/ms_thesis.ps ${DOCSDIR}
 	${GZIP_CMD} ${DOCSDIR}/*
 .endif
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile
index 293e70b32e83..10bf600faff7 100644
--- a/security/tor-devel/Makefile
+++ b/security/tor-devel/Makefile
@@ -1,143 +1,143 @@
 # Created by: peter.thoenen@yahoo.com
 # $FreeBSD$
 
 PORTNAME=	tor
 DISTVERSION=	0.2.5.5-alpha
 PORTREVISION=	1
 CATEGORIES=	security net ipv6
 MASTER_SITES=	TOR
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Anonymizing overlay network for TCP
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc
 CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \
 		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
 
 OPTIONS_DEFINE=	BUFFEREVENTS BUFFREELISTS INSTR_DOWNLOADS MEMPOOLS \
 		STATIC_TOR TCMALLOC THREADS TOR2WEB TRANSPARENT
 
 BUFFEREVENTS_DESC=	Use libevent's buffered IO
 BUFFREELISTS_DESC=	Freelists for buffer RAM
 INSTR_DOWNLOADS_DESC=	Instrument downloads for analysis
 MEMPOOLS_DESC=		Mempools for relay cells
 STATIC_TOR_DESC=	Build a static tor
 TCMALLOC_DESC=		Use the tcmalloc memory allocation library
 TOR2WEB_DESC=		Faster but non-anonymous hidden services
 TRANSPARENT_DESC=	Transparent proxy support
 
 OPTIONS_DEFAULT=	THREADS TRANSPARENT
 
 USE_OPENSSL=	yes
 
 USE_RC_SUBR=	tor
 SUB_FILES=	pkg-message
 
-GROUPS =	_tor
+GROUPS=		_tor
 USERS=		_tor
 
 CONFLICTS=	tor-[0-9]*
 
 .include <bsd.port.options.mk>
 
 .if ( (${OSVERSION} < 900000) || \
 (${OSVERSION} >= 900003) ) && !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \
 empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64)
 CONFIGURE_ARGS+=	--enable-gcc-hardening
 .else
 CONFIGURE_ARGS+=	--disable-gcc-hardening
 .endif
 
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
 CONFIGURE_ARGS+=	--enable-bufferevents
 BROKEN=	some functions are hidden from the test binaries that use them WITH_BUFFEREVENTS
 .else
 CONFIGURE_ARGS+=	--disable-bufferevents
 .endif
 
 .if ${PORT_OPTIONS:MBUFFREELISTS}
 CONFIGURE_ARGS+=	--enable-buf-freelists
 .else
 CONFIGURE_ARGS+=	--disable-buf-freelists
 .endif
 
 .if ${PORT_OPTIONS:MINSTR_DOWNLOADS}
 CONFIGURE_ARGS+=	--enable-instrument-downloads
 .else
 CONFIGURE_ARGS+=	--disable-instrument-downloads
 .endif
 
 .if ${PORT_OPTIONS:MMEMPOOLS}
 CONFIGURE_ARGS+=	--enable-mempools
 .else
 CONFIGURE_ARGS+=	--disable-mempools
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC_TOR}
 BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
 CONFIGURE_ARGS+=	--enable-static-tor \
 			--with-zlib-dir=/usr/lib --disable-linker-hardening
 TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
 TOR_LIBEVENT_LIBS:=	${LOCALBASE}/lib/libevent_openssl.a ${TOR_LIBEVENT_LIBS}
 .endif
 .else
 CONFIGURE_ARGS+=	--enable-linker-hardening
 LIB_DEPENDS+=		libevent.so:${PORTSDIR}/devel/libevent2
 TOR_LIBEVENT_LIBS=	-levent
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
 TOR_LIBEVENT_LIBS:=	-levent_openssl ${TOR_LIBEVENT_LIBS}
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MTCMALLOC}
 CONFIGURE_ARGS+=	--with-tcmalloc
 .if ${PORT_OPTIONS:MSTATIC_TOR}
 BUILD_DEPENDS +=	${LOCALBASE}/lib/libtcmalloc.so:${PORTSDIR}/devel/google-perftools
 .else
 LIB_DEPENDS+=		libtcmalloc.so:${PORTSDIR}/devel/google-perftools
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=	--enable-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
 .else
 CONFIGURE_ARGS+=	--disable-threads
 .endif
 
 .if ${PORT_OPTIONS:MTOR2WEB}
 CONFIGURE_ARGS+=	--enable-tor2web-mode
 .endif
 
 .if ${PORT_OPTIONS:MTRANSPARENT}
 CONFIGURE_ARGS+=	--enable-transparent
 .else
 CONFIGURE_ARGS+=	--disable-transparent
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
 		-e "s@(-z) (relro|now)@-Wl,\1,\2@g" \
 		${WRKSRC}/configure
 
 post-configure:
 	@${FIND} -X ${WRKSRC} -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
 		"s|-lpthread|${PTHREAD_LIBS}|g"
 	@${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|$$(install_mans:=.1)|' \
 		${WRKSRC}/Makefile
 
 .if ! ${PORT_OPTIONS:MTOR2WEB}
 check regression-test test: build
 	@cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 	${MAKE_ARGS} check
 
 .endif
 .include <bsd.port.mk>
diff --git a/security/tor/Makefile b/security/tor/Makefile
index 976a6cb802f8..a3c0630b490a 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -1,133 +1,133 @@
 # Created by: peter.thoenen@yahoo.com
 # $FreeBSD$
 
 PORTNAME=	tor
 DISTVERSION=	0.2.4.22
 CATEGORIES=	security net ipv6
 MASTER_SITES=	TOR
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Anonymizing overlay network for TCP
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc
 CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \
 		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
 
 OPTIONS_DEFINE=	BUFFEREVENTS BUFFREELISTS INSTR_DOWNLOADS \
 		STATIC_TOR TCMALLOC THREADS TOR2WEB TRANSPARENT
 
 BUFFEREVENTS_DESC=	Use libevent's buffered IO
 BUFFREELISTS_DESC=	Freelists for buffer RAM
 INSTR_DOWNLOADS_DESC=	Instrument downloads for analysis
 STATIC_TOR_DESC=	Build a static tor
 TCMALLOC_DESC=		Use the tcmalloc memory allocation library
 TOR2WEB_DESC=		Faster but non-anonymous hidden services
 TRANSPARENT_DESC=	Transparent proxy support
 
 OPTIONS_DEFAULT=	BUFFREELISTS THREADS TRANSPARENT
 
 USE_OPENSSL=	yes
 
 USE_RC_SUBR=	tor
 SUB_FILES=	pkg-message
 
-GROUPS =	_tor
+GROUPS=		_tor
 USERS=		_tor
 
 CONFLICTS=	tor-devel-[0-9]*
 
 .include <bsd.port.options.mk>
 
 .if ( (${OSVERSION} < 900000) || \
 (${OSVERSION} >= 900003) ) && !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \
 empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64)
 CONFIGURE_ARGS+=	--enable-gcc-hardening
 .else
 CONFIGURE_ARGS+=	--disable-gcc-hardening
 .endif
 
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
 CONFIGURE_ARGS+=	--enable-bufferevents
 .else
 CONFIGURE_ARGS+=	--disable-bufferevents
 .endif
 
 .if ${PORT_OPTIONS:MBUFFREELISTS}
 CONFIGURE_ARGS+=	--enable-buf-freelists
 .else
 CONFIGURE_ARGS+=	--disable-buf-freelists
 .endif
 
 .if ${PORT_OPTIONS:MINSTR_DOWNLOADS}
 CONFIGURE_ARGS+=	--enable-instrument-downloads
 .else
 CONFIGURE_ARGS+=	--disable-instrument-downloads
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC_TOR}
 BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
 CONFIGURE_ARGS+=	--enable-static-tor \
 			--with-zlib-dir=/usr/lib --disable-linker-hardening
 TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
 TOR_LIBEVENT_LIBS:=	${LOCALBASE}/lib/libevent_openssl.a ${TOR_LIBEVENT_LIBS}
 .endif
 .else
 CONFIGURE_ARGS+=	--enable-linker-hardening
 LIB_DEPENDS+=		libevent.so:${PORTSDIR}/devel/libevent2
 TOR_LIBEVENT_LIBS=	-levent
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
 TOR_LIBEVENT_LIBS:=	-levent_openssl ${TOR_LIBEVENT_LIBS}
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MTCMALLOC}
 CONFIGURE_ARGS+=	--with-tcmalloc
 .if ${PORT_OPTIONS:MSTATIC_TOR}
 BUILD_DEPENDS +=	${LOCALBASE}/lib/libtcmalloc.so:${PORTSDIR}/devel/google-perftools
 .else
 LIB_DEPENDS+=		libtcmalloc.so:${PORTSDIR}/devel/google-perftools
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=	--enable-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
 .else
 CONFIGURE_ARGS+=	--disable-threads
 .endif
 
 .if ${PORT_OPTIONS:MTOR2WEB}
 CONFIGURE_ARGS+=	--enable-tor2web-mode
 .endif
 
 .if ${PORT_OPTIONS:MTRANSPARENT}
 CONFIGURE_ARGS+=	--enable-transparent
 .else
 CONFIGURE_ARGS+=	--disable-transparent
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
 		-e "s@(-z) (relro|now)@-Wl,\1,\2@g" \
 		${WRKSRC}/configure
 
 post-configure:
 	@${FIND} -X ${WRKSRC} -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
 		"s|-lpthread|${PTHREAD_LIBS}|g"
 	@${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|$$(regular_mans:=.1)|' \
 		${WRKSRC}/Makefile
 
 .if ! ${PORT_OPTIONS:MTOR2WEB}
 check regression-test test: build
 	@cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 	${MAKE_ARGS} check
 
 .endif
 .include <bsd.port.mk>
diff --git a/textproc/reflex/Makefile b/textproc/reflex/Makefile
index ad594a3ab099..c0284bec47eb 100644
--- a/textproc/reflex/Makefile
+++ b/textproc/reflex/Makefile
@@ -1,31 +1,31 @@
 # Created by: bf@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	reflex
 PORTVERSION=	20131209
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://invisible-island.net/reflex/ LOCAL/bf
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Relocalizable fast lexical scanner
 
 LICENSE=	BSD3CLAUSE
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	YACC="${YACC}"
 PLIST_FILES=	bin/reflex bin/reflex++ include/reFlexLexer.h \
 		lib/librefl.a man/man1/reflex.1.gz
-WRKSRC =	${WRKDIR}/reflex-${PORTVERSION}
+WRKSRC=		${WRKDIR}/reflex-${PORTVERSION}
 
 regression-test test: check
 
 .for t in check bigcheck
 ${t}: build
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-	${MAKE_ARGS} ${t};
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+	${MAKE_ARGS} ${t};)
 
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile
index f8f2c2959937..eeb495cb2741 100644
--- a/x11-toolkits/ocaml-lablgtk2/Makefile
+++ b/x11-toolkits/ocaml-lablgtk2/Makefile
@@ -1,144 +1,144 @@
 # Created by: Rene Ladan
 # $FreeBSD$
 
 PORTNAME=	lablgtk2
 PORTVERSION=	2.16.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/979/ \
 		LOCAL/bf
 PKGNAMEPREFIX=	ocaml-
 DISTNAME=	lablgtk-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Objective Caml interface to GTK+ 2.x
 
 LICENSE=	LGPL21
 
 USES=		gmake pkgconfig
 USE_GNOME=	gtk20
 USE_OCAML=	yes
 USE_OCAML_FINDLIB=	yes
 USE_OCAMLFIND_PLIST=	yes
 USE_OCAML_LDCONFIG=	yes
 USE_OCAML_WASH= 	yes
 
-OPTIONS_DEFINE =	GLADE GNOMECANVAS GNOMEUI GTKGLAREA GTKSOURCEVIEW2 GTKSPELL \
+OPTIONS_DEFINE=		GLADE GNOMECANVAS GNOMEUI GTKGLAREA GTKSOURCEVIEW2 GTKSPELL \
 			LIBRSVG2
-OPTIONS_DEFAULT =	${OPTIONS_DEFINE}
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 GNOMECANVAS_DESC=	GnomeCanvas support
 GNOMEUI_DESC=		GNOME 2 UI support
 GTKGLAREA_DESC=		GtkGLArea support
 GTKSOURCEVIEW2_DESC=	GtkSourceView 2 support
 GTKSPELL_DESC=		GtkSpell support
 #GNOMEPANEL_DESC=	GNOME Panel support
 
 HAS_CONFIGURE=	yes
 ALL_TARGET=	all opt
 MAKE_JOBS_UNSAFE=	yes
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-libdir=${PREFIX}/${OCAML_LIBDIR} \
 		--without-gtksourceview
 CONFIGURE_ENV=	CAMLP4O="camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo"
 
 PATTERN=	[[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]]
 
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
 PORTDOCS=	COPYING README
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
 PORTEXAMPLES=	*
 .endif
 
 .if ${PORT_OPTIONS:MGTKGLAREA}
 CONFIGURE_ARGS+=	--with-gl
 BUILD_DEPENDS+=	lablgl:${PORTSDIR}/graphics/ocaml-lablgl
 RUN_DEPENDS+=	lablgl:${PORTSDIR}/graphics/ocaml-lablgl
 LIB_DEPENDS+=	libgtkgl-2.0.so:${PORTSDIR}/x11-toolkits/gtkglarea2
 EXAMPLES_SUBDIRS+=	GL
 .else
 CONFIGURE_ARGS+=	--without-gl
 .endif
 
 .if ${PORT_OPTIONS:MGLADE}
 CONFIGURE_ARGS+=	--with-glade
 USE_GNOME+=	libglade2
 PLIST_SUB+=	GLADE=""
 EXAMPLES_SUBDIRS+=	glade
 .else
 CONFIGURE_ARGS+=	--without-glade
 PLIST_SUB+=	GLADE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGNOMEUI}
 CONFIGURE_ARGS+=	--with-gnomeui
 USE_GNOME+=	libgnomeui
 .else
 CONFIGURE_ARGS+=	--without-gnomeui
 .endif
 
 .if ${PORT_OPTIONS:MGNOMECANVAS}
 CONFIGURE_ARGS+=	--with-gnomecanvas
 USE_GNOME+=	libgnomecanvas
 EXAMPLES_SUBDIRS+=	canvas
 .else
 CONFIGURE_ARGS+=	--without-gnomecanvas
 .endif
 
 .if ${PORT_OPTIONS:MLIBRSVG2}
 CONFIGURE_ARGS+=	--with-rsvg
 USE_GNOME+=	librsvg2
 EXAMPLES_SUBDIRS+=	rsvg
 .else
 CONFIGURE_ARGS+=	--without-rsvg
 .endif
 
 #.if ${PORT_OPTIONS:MGNOMEPANEL}
 #CONFIGURE_ARGS+=	--with-panel
 #USE_GNOME+=	gnomepanel
 #EXAMPLES_SUBDIRS+=	panel
 #.else
 CONFIGURE_ARGS+=	--without-panel
 #.endif
 
 .if ${PORT_OPTIONS:MGTKSOURCEVIEW2}
 CONFIGURE_ARGS+=	--with-gtksourceview2
 USE_GNOME+=	gtksourceview2
 EXAMPLES_SUBDIRS+=	sourceview
 .else
 CONFIGURE_ARGS+=	--without-gtksourceview2
 .endif
 
 .if ${PORT_OPTIONS:MGTKSPELL}
 LIB_DEPENDS+=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
 CONFIGURE_ARGS+=	--with-gtkspell
 .else
 CONFIGURE_ARGS+=	--without-gtkspell
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's|^(CFLAGS[[:space:]]*\+=[[:space:]]*-O)|\1 ${CFLAGS}|' \
 		-e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \3,' \
 		-e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_SCRIPT} \3,' \
 		-e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \3,' \
 		${WRKSRC}/src/Makefile
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	@cd ${WRKSRC}/examples ; ${COPYTREE_SHARE} \
 	"*.ml *.png *.rgb *.xpm text ${EXAMPLES_SUBDIRS}" ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 8b50184e1cbd..a1ed06763492 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,98 +1,98 @@
 # Created by: gpalmer@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	rxvt
 PORTVERSION=	2.6.4
 PORTREVISION=	6
 CATEGORIES+=	x11
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Low memory usage xterm replacement that supports color
 
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE =	BIG5 GB GREEK HALF_SHADOW KANJI MENUBAR NEXT \
+OPTIONS_DEFINE=		BIG5 GB GREEK HALF_SHADOW KANJI MENUBAR NEXT \
 			TRANSPARENCY XGETDEFAULT XIM XTERM
 BIG5_DESC=		Build with BIG5 support
 GB_DESC=		Build with GB support
 GREEK_DESC=		Build with greek keyboard support
 HALF_SHADOW_DESC=	Build with half shadows support
 KANJI_DESC=		Build with Kanji support
 MENUBAR_DESC=		Build with menubar support
 NEXT_DESC=		Build with NeXT scrollbar
 TRANSPARENCY_DESC=	Build with transparency support
 XGETDEFAULT_DESC=	Build with XGetDefault() support
 XIM_DESC=		Build with XIM support
 XTERM_DESC=		Build with Xterm scrollbar
 
 CONFIGURE_ARGS=	--enable-ttygid \
 		--with-xpm --enable-xpm-background \
 		--with-xpm-includes=${LOCALBASE}/include/X11 \
 		--with-xpm-library=${LOCALBASE}/lib
 PLIST_FILES=	bin/rxvt man/man1/${PORTNAME}.1.gz
 
 .include <bsd.port.pre.mk>
 
 # fails to build with new utmpx
 .if ${OSVERSION} > 900007
 CONFIGURE_ARGS+=	--disable-utmp --disable-wtmp
 .else
 CONFIGURE_ARGS+=	--enable-utmp --enable-wtmp
 .endif
 
 .if ${PORT_OPTIONS:MBIG5}
 CONFIGURE_ARGS+=	--enable-big5
 .endif
 
 .if ${PORT_OPTIONS:MGB}
 CONFIGURE_ARGS+=	--enable-gb
 .endif
 
 .if ${PORT_OPTIONS:MGREEK}
 CONFIGURE_ARGS+=	--enable-greek
 .endif
 
 # enable half width/height shadows scrollbar
 .if ${PORT_OPTIONS:MHALF_SHADOW}
 CONFIGURE_ARGS+=	--enable-half-shadow
 .endif
 
 .if ${PORT_OPTIONS:MKANJI}
 CONFIGURE_ARGS+=	--enable-kanji
 .endif
 
 .if ${PORT_OPTIONS:MMENUBAR}
 CONFIGURE_ARGS+=	--enable-menubar
 .endif
 
 .if ${PORT_OPTIONS:MNEXT}
 CONFIGURE_ARGS+=	--enable-next-scroll
 .endif
 
 .if ${PORT_OPTIONS:MTRANSPARENCY}
 CONFIGURE_ARGS+=	--enable-transparency
 .endif
 
 # make resources checking via XGetDefault()
 .if ${PORT_OPTIONS:MXGETDEFAULT}
 CONFIGURE_ARGS+=	--enable-xgetdefault
 .endif
 
 # XIM (X Input Method) protocol support
 .if ${PORT_OPTIONS:MXIM}
 CONFIGURE_ARGS+=	--enable-xim
 .endif
 
 .if ${PORT_OPTIONS:MXTERM}
 CONFIGURE_ARGS+=	--enable-xterm-scroll
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|getpt()|posix_openpt(0)|' ${WRKSRC}/configure
 
 post-install:
 	@${CHMOD} 4711 ${STAGEDIR}${PREFIX}/bin/rxvt
 
 .include <bsd.port.post.mk>