Index: head/lang/afnix/Makefile
===================================================================
--- head/lang/afnix/Makefile	(revision 382210)
+++ head/lang/afnix/Makefile	(revision 382211)
@@ -1,55 +1,53 @@
 # Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	afnix
 PORTVERSION=	2.5.1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.afnix.org/ftp/ \
 		ftp://ftp.stack.nl/pub/users/johans/afnix/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Multi-threaded functional programming language
 
 USES=		gmake tar:tgz
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	cnf/bin/afnix-setup
 CONFIGURE_ARGS=		-o --prefix "${PREFIX}" --altdir "${PREFIX}" \
 			--shrdir "${PREFIX}/share" --compiler clang++
-MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 PORTDOCS=	*
 PLIST_SUB=	PORTVER=${PORTVERSION:R}
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "powerpc"
 BROKEN=		Does not configure on powerpc
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(CP)|$$(BSD_INSTALL_PROGRAM)|' \
 		${WRKSRC}/src/*/*/exe/Makefile
 	@${REINPLACE_CMD} -e '/\.rtf/d' ${WRKSRC}/etc/Makefile
 	@${REINPLACE_CMD} -e '/uname -r/s/\\\./[.-]/' \
 		${WRKSRC}/cnf/bin/afnix-guess
 
 post-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} doc
 	@cd ${WRKSRC}/prj && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} doc
 
 post-install:
 .if ! ${PORT_OPTIONS:MDOCS}
 . for i in ${MAN1} ${MAN3} ${MAN7}
 	${INSTALL_MAN} ${WRKSRC}/bld/${PORTNAME}-doc-${PORTVERSION}/man/$i \
 		${STAGEDIR}${MANPREFIX}/man/man${i:E}/
 . endfor
 .else
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} ${MAKE_CMD} publish
 .endif
 
 .include <bsd.port.post.mk>
Index: head/lang/afnix/files/patch-cnf_mak_afnix-clg4.mak
===================================================================
--- head/lang/afnix/files/patch-cnf_mak_afnix-clg4.mak	(revision 382210)
+++ head/lang/afnix/files/patch-cnf_mak_afnix-clg4.mak	(revision 382211)
@@ -1,32 +1,26 @@
---- cnf/mak/afnix-clg4.mak.orig	2015-01-09 13:27:16.000000000 +0100
-+++ cnf/mak/afnix-clg4.mak	2015-01-09 13:28:08.000000000 +0100
-@@ -19,23 +19,23 @@
+--- cnf/mak/afnix-clg4.mak.orig	2015-01-03 13:34:32 UTC
++++ cnf/mak/afnix-clg4.mak
+@@ -19,18 +19,18 @@
  # - compiler and linker section                                              -
  # ----------------------------------------------------------------------------
  
 -CC              = clang++
 -LD              = clang++
 -LK		= clang++
 +CC              = $(CXX)
 +LD              = $(CXX)
 +LK		= $(CXX)
  AR              = ar
  RANLIB		= ranlib
  STDEVFLAGS      =
 -STDCCFLAGS      = -std=c++11 -Wall -Werror -Wno-overloaded-virtual -fno-builtin
 +STDCCFLAGS      = -std=c++11 -Wall -W -Wno-overloaded-virtual -fno-builtin
  STACCFLAGS	=
  DYNCCFLAGS	= -fPIC
  PLTCCFLAGS      = 
  DEBUGFLAGS      = -g
 -OPTCCFLAGS      = -O2
 +OPTCCFLAGS      =
  PFLCCFLAGS      =
  COVCCFLAGS      =
  CPPCCFLAGS      = -nostdinc -nostdinc++
- CXXCCFLAGS      = 
--STDDEFINES      =
-+STDDEFINES      = $(PTHREAD_CFLAGS)
- DBGDEFINES      = -DAFNIX_DEBUG
- OPTDEFINES      =
- PFLDEFINES	=
Index: head/lang/ecl/Makefile
===================================================================
--- head/lang/ecl/Makefile	(revision 382210)
+++ head/lang/ecl/Makefile	(revision 382211)
@@ -1,86 +1,85 @@
 # Created by: Julian Stecklina
 # $FreeBSD$
 
 PORTNAME=	ecl
 PORTVERSION=	15.2.21
 CATEGORIES=	lang lisp
 MASTER_SITES=	SF/${PORTNAME}s/${PORTNAME}s/15.2/
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	ANSI Common Lisp implementation
 
 LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		gmake perl5 tar:tgz
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-system-gmp --with-gmp-prefix=${LOCALBASE} --enable-boehm=system
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	ASDF CLX DFFI SOCKETS THREADS
 OPTIONS_DEFAULT=ASDF DFFI SOCKETS THREADS
 
 ASDF_DESC=	Enable ASDF building facility
 CLX_DESC=	Enable X11 interface
 SOCKETS_DESC=	Enable socket interface
 DFFI_DESC=	Dynamic foreign-function support
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "ia64" || ${ARCH} == "sparc64"
 BROKEN=		Does not compile on ${ARCH}
 .endif
 
 .if ${PORT_OPTIONS:MASDF}
 CONFIGURE_ARGS+=--with-asdf=yes
 PLIST_SUB+=	ASDF=""
 .else
 CONFIGURE_ARGS+=--with-asdf=no
 PLIST_SUB+=	ASDF="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCLX}
 USE_XORG=	x11
 CONFIGURE_ARGS+=--with-clx=yes
 PLIST_SUB+=	CLX=""
 .else
 CONFIGURE_ARGS+=--with-clx=no
 PLIST_SUB+=	CLX="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSOCKETS}
 CONFIGURE_ARGS+=--with-tcp=yes
 PLIST_SUB+=	SOCKETS=""
 .else
 CONFIGURE_ARGS+=--with-tcp=no
 PLIST_SUB+=	SOCKETS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDFFI}
 CONFIGURE_ARGS+=--with-dffi=system
 LIB_DEPENDS+=	libffi.so:${PORTSDIR}/devel/libffi
 .else
 CONFIGURE_ARGS+=--with-dffi=no
 .endif
 
 .if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=--enable-threads=yes
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread
 LIB_DEPENDS+=	libgc-threaded.so:${PORTSDIR}/devel/boehm-gc-threaded
 .else
 CONFIGURE_ARGS+=--enable-threads=no
 LIB_DEPENDS+=	libgc.so:${PORTSDIR}/devel/boehm-gc
 .endif
 
 .if ${PORT_OPTIONS:MTHREADS}
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lgc|-lgc-threaded|' \
- 		-e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/src/configure
+	@${REINPLACE_CMD} -e 's|-lgc|-lgc-threaded|' ${WRKSRC}/src/configure
 .endif
 
 .include <bsd.port.post.mk>
Index: head/lang/ferite/Makefile
===================================================================
--- head/lang/ferite/Makefile	(revision 382210)
+++ head/lang/ferite/Makefile	(revision 382211)
@@ -1,43 +1,43 @@
 # Created by: Jeremy Norris <ishmael27@home.com>
 # $FreeBSD$
 
 PORTNAME=	ferite
 PORTVERSION=	1.0.2
 PORTREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Embeddable scripting language
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 		libxml2.so:${PORTSDIR}/textproc/libxml2
 
 USES=		gmake libtool
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 PLIST_SUB=	MACHINE_ARCH=${MACHINE_ARCH}
 INSTALL_TARGET=	install-strip
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MDOCS}
 MAKE_ENV+=	NOPORTDOCS=1
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|<stdint\.h>|<inttypes.h>|' \
 		${WRKSRC}/src/ferite_scanner.c
 	@${FIND} ${WRKSRC} -name Makefile.in -print | ${XARGS} \
 		${REINPLACE_CMD} -e "s|-lferite|-lferite -L${WRKSRC}/src/.libs|g"
 
 .include <bsd.port.mk>
Index: head/lang/icon/Makefile
===================================================================
--- head/lang/icon/Makefile	(revision 382210)
+++ head/lang/icon/Makefile	(revision 382211)
@@ -1,80 +1,79 @@
 # Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	icon
 PORTVERSION=	9.5.1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.cs.arizona.edu/icon/ftp/packages/unix/
 DISTNAME=	${PORTNAME}-v${PORTVERSION:S/.//g}src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Icon programming language
 
 USE_GCC=	any
 ALL_TARGET=	All
 MAKE_JOBS_UNSAFE=	yes
 ARCH_NAME=	bsd
 ICONDIR=	${PREFIX}/lib/${PORTNAME}
 
 BINS=		icont iconx
 BINXS=		colrbook colrpick fontpick palette vib wevents xgamma
 
 OPTIONS_DEFINE=	DOCS X11
 
 .include <bsd.port.options.mk>
 
 .if empty(PORT_OPTIONS:MX11)
 CONFIG_CMD=	Configure
 PLIST_SUB=	WITHOUT_X11="@comment "
 .else
 USE_XORG=	x11 xpm
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIG_CMD=	X-Configure
 PLIST_SUB=	WITHOUT_X11=
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|^CC.*|CC=${CC}|g ; \
 		 s|^CFLAGS.*|CFLAGS=${CFLAGS}|g ; \
 		 s|/usr/X11R6|${LOCALBASE}|g ; \
-		 s|-lpthread|${PTHREAD_LIBS}| ; \
 		 s|^XLIBS.*|XLIBS=-L${LOCALBASE}/lib -lX11|g" \
 		${WRKSRC}/config/${ARCH_NAME}/Makedefs
 	@${REINPLACE_CMD} -e 's|/opt/icon|${ICONDIR}|g' ${WRKSRC}/ipl/BuildBin
 	@${REINPLACE_CMD} -e 's|ld -Bshareable|\$$CC -shared|g ; \
 		 s|-lc||g' ${WRKSRC}/ipl/cfuncs/mklib.sh
 
 do-configure:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${CONFIG_CMD} name=${ARCH_NAME})
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/man1/icon.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/man1/icont.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${ICONDIR}/bin
 .for file in ${BINS}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${STAGEDIR}${ICONDIR}/bin/${file}
 .endfor
 .for file in icont iconx
 	@${LN} -sf ${ICONDIR}/bin/${file} ${STAGEDIR}${PREFIX}/bin/${file}
 .endfor
 	@${LN} -sf ${ICONDIR}/bin/icont ${STAGEDIR}${PREFIX}/bin/icon
 	@${MKDIR} ${STAGEDIR}${ICONDIR}/lib
 	cd ${WRKSRC}/lib; ${INSTALL_DATA} *.* ${STAGEDIR}${ICONDIR}/lib
 .if ${PORT_OPTIONS:MX11}
 .for file in ${BINXS}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${STAGEDIR}${ICONDIR}/bin/${file}
 .endfor
 	@${LN} -sf ${ICONDIR}/bin/vib ${STAGEDIR}${PREFIX}/bin/vib
 .endif
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.* ${STAGEDIR}${DOCSDIR}
 
 .if defined(MAINTAINER_MODE)
 test:	install
 	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} Test)
 .endif
 
 .include <bsd.port.mk>
Index: head/lang/ocaml/Makefile
===================================================================
--- head/lang/ocaml/Makefile	(revision 382210)
+++ head/lang/ocaml/Makefile	(revision 382211)
@@ -1,204 +1,202 @@
 # Created by: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 # $FreeBSD$
 
 # for committer: bump PORTREVISION for math/facile whenever ocaml gets updated
 PORTNAME=	ocaml
 PORTVERSION=	4.01.0
 PORTREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ \
 		${MASTER_SITE_GENTOO}
 MASTER_SITE_SUBDIR=	distfiles
 PKGNAMESUFFIX=	${SFX}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	michipili@gmail.com
 COMMENT=	The Objective Caml compiler and programming environment
 
 LICENSE=		QPL10 LGPL20
 LICENSE_COMB=		multi
 LICENSE_NAME_QPL10=	Q Public License, Version 1.0
 LICENSE_FILE_QPL10=	${WRKSRC}/LICENSE
 LICENSE_PERMS_QPL10=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		gmake tar:bzip2
 REINPLACE_ARGS=	-i ""
 HAS_CONFIGURE=	yes
 ALL_TARGET=	world.opt
 STRIP=
 SSP_UNSAFE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 MAKE_ENV+=	STAGEDIR="${STAGEDIR}"
 CONFIGURE_ARGS=	-verbose -prefix "${PREFIX}" \
 		-cc "${CC} ${CFLAGS}" \
 		-as "${AS} ${ASFLAGS}" \
 		-aspp "${CC} -c" \
 		-partialld "${LD} -r"
 
 OPTIONS_DEFINE= X11 TK THREADS DOCS EXAMPLES
 OPTIONS_DEFAULT=X11 TK THREADS
 TK_DESC=	LablTk library (requires X11 support)
 CMP_LIB_DESC=	Install compiler libraries
 PORTDOCS=	htmlman ${DOCSDISTNAME}-refman.ps.gz \
 		${DOCSDISTNAME}-refman.pdf
 
 MODOPT=		camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt
 PATTERN=	[[:space:]]*(do|then)?[[:space:]]*)(\$$\(CP\)|cp)([[:space:]]
 DOCSDISTNAME=	${DISTNAME:C/([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/\1.\2/}
 
 CONFLICTS=	metaocaml-[0-9]*
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${DOCSDISTNAME}-refman-html.tar.gz \
 		${DOCSDISTNAME}-refman.ps.gz \
 		${DOCSDISTNAME}-refman.pdf
 EXTRACT_ONLY+=	${DOCSDISTNAME}-refman-html.tar.gz
 PLIST_SUB+=	DOC=""
 PORTDOCS=	htmlman ${DOCSDISTNAME}-refman.ps.gz ${DOCSDISTNAME}-refman.pdf
 .else
 PLIST_SUB+=	DOC="@comment "
 .endif
 
 .if ${ARCH} == armv6
 CONFIGURE_ARGS+= -as "${AS} ${ASFLAGS} -mfpu=softvfp -meabi=5"
 .else
 CONFIGURE_ARGS+= -as "${AS} ${ASFLAGS}"
 .endif
 
 .if ${PORT_OPTIONS:MTHREADS}
 PLIST_SUB+=	THREADS=""
-THR_CPP=	${PTHREAD_CFLAGS}
-THR_LD=		${PTHREAD_LIBS}
+THR_LD=		-lpthread
 .else
 PLIST_SUB+=	THREADS="@comment "
-THR_CPP=	#empty
 THR_LD=		#empty
 CONFIGURE_ARGS+=-no-pthread
 .endif
 
 .if ${PORT_OPTIONS:MX11}
 PLIST_SUB+=	X11=""
 USE_XORG=	x11
 CONFLICTS+=	ocaml-nox11-[0-9]*
 CONFIGURE_ARGS+=-x11include ${LOCALBASE}/include -x11lib ${LOCALBASE}/lib
 .else
 PLIST_SUB+=	X11="@comment "
 SFX=		-nox11
 CONFLICTS+=	ocaml-[0-9]*
 CONFIGURE_ARGS+=-no-graph
 .endif
 
 .if ${PORT_OPTIONS:MTK}
 . if ${PORT_OPTIONS:MEXAMPLES}
 PORTEXAMPLES=	examples_camltk examples_labltk
 .endif
 . if ! ${PORT_OPTIONS:MX11}
 IGNORE=requires X11 support to build TK bindings
 . endif
 USES+=		tk:84+
 PLIST_SUB+=	TK=""
 CONFIGURE_ARGS+=	-tkdefs \
-			"-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} ${THR_CPP}" \
+			"-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}" \
 			-tklibs "-L${LOCALBASE}/lib -ltk${TK_VER:S|.||} \
 			-ltcl${TCL_VER:S|.||} ${THR_LD}"
 .else
 PLIST_SUB+=	TK="@comment "
 CONFIGURE_ARGS+=-no-tk
 .endif
 
 .include <bsd.port.pre.mk>
 .include "${FILESDIR}/manfiles"
 
 OCAML_ARCH= ${ARCH:S/x86_64/amd64/:S/powerpc/power/:S/armv6/arm/}
 
 .if defined(NO_PROFILE) || ${OCAML_ARCH} == power
 PLIST_SUB+=	PROF="@comment "
 .else
 PLIST_SUB+=	PROF=""
 .endif
 
 .if ${OCAML_ARCH} == sparc64
 BROKEN=	ocamlc.opt seg-faults on ${ARCH}, please try to fix
 .endif
 
 post-extract:
 .if ${PORT_OPTIONS:MDOCS}
 	@if ! (cd ${WRKDIR} && \
 	  ${TAR} xf ${_DISTDIR}${DOCSDISTNAME}-refman-html.tar.gz \
 	) \
 	then \
 	  exit 1; \
 	fi;
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e '\|MKLIB=|s|ar rc|${AR} rc|' \
 		-e '\|RANLIB|s|ranlib|${RANLIB}|' \
 		-e '\|bytecclinkopts=|s|""|"${LDFLAGS}"|' \
 		-e "\|nativecclinkopts=|s|''|\"${LDFLAGS:C/-Wl,//}\"|" \
 		-e '\|mksharedlib=|s|$$bytecc|& $$bytecclinkopts|' \
 		-e 's|-lbfd -ldl|-lbfd $$dllib|' \
 		${WRKSRC}/configure
 # don't hardcode gcc for depend target
 # be aware of staging
 	@${REINPLACE_CMD} -E \
 		-e 's|gcc|$$(CC)|' \
 		-e '/^install/,/^$$/s@\$$\(((INSTALL_)?(BIN|LIB|STUBLIB|COMPLIB|MANO?|INSTALL|INSTALL_CUSTOM)DIR)\)@$$(STAGEDIR)$$(\1)@g' \
 		`find ${WRKSRC} -name 'Makefile*'`
 	@${REINPLACE_CMD} -E -e 's/^DIR=/DIR=$$(STAGEDIR)/' ${WRKSRC}/man/Makefile
 .if ${PORT_OPTIONS:MTK}
 	@${REINPLACE_CMD} -e 's|/usr/bin/wish|${WISH}|' \
 		${WRKSRC}/otherlibs/labltk/examples_labltk/hello.tcl
 .endif
 
 post-configure:
 # CFLAGS safeness
 	@${REINPLACE_CMD} -E \
-		-e 's|(BYTECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS} ${THR_CPP}|' \
-		-e 's|(NATIVECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS} ${THR_CPP}|' \
+		-e 's|(BYTECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS}|' \
+		-e 's|(NATIVECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS}|' \
 		-e '/^PTHREAD_LINK/s,-pthread,${THR_LD},g' \
 		${WRKSRC}/config/Makefile
 
 # INSTALL* safeness (which preserves the correct permissions despite
 # user's umask(1)
 	@${FIND} ${WRKDIR} -type f -name Makefile -print0 | \
 		${XARGS} -0 -n 5 -x ${REINPLACE_CMD} -E \
 		-e 's,\$$\(ARCH\),${OCAML_ARCH},g'	\
 		-e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \4,' \
 		-e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \4,' \
 		-e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \4,' \
 		-e 's,(${PATTERN}+.*(MANDIR|MANODIR|MANEXT)),\1\$${BSD_INSTALL_MAN} \4,'
 
 check test: install
 	@cd ${WRKSRC}/testsuite; ${RM} -f _log; for d in tests/* ; do \
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} one DIR=$${d} \
 	2>&1 | tee -a _log || ${TRUE} ; done ; \
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} report
 
 post-install:
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/ocaml/ocamldoc/custom
 	@${CHMOD} 755 ${STAGEDIR}${PREFIX}/lib/ocaml/expunge
 .if ${PORT_OPTIONS:MTK}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/otherlibs/labltk && \
 		${COPYTREE_SHARE} examples_labltk ${STAGEDIR}${EXAMPLESDIR} \
 		"! -name .ignore" && \
 		${COPYTREE_SHARE} examples_camltk ${STAGEDIR}${EXAMPLESDIR} \
 		"! -name .ignore")
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKDIR} && ${COPYTREE_SHARE} htmlman ${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${STAGEDIR}${DOCSDIR}
 .endif
 
 # Fix permissions for ld.conf
 	@${CHMOD} 644 ${STAGEDIR}${PREFIX}/lib/ocaml/ld.conf
 
 .include <bsd.port.post.mk>
Index: head/lang/ofc/Makefile
===================================================================
--- head/lang/ofc/Makefile	(revision 382210)
+++ head/lang/ofc/Makefile	(revision 382211)
@@ -1,32 +1,32 @@
 # Created by: vanilla
 # $FreeBSD$
 
 PORTNAME=	ofc
 PORTVERSION=	0.8.1
 PORTREVISION=	15
 CATEGORIES=	lang
 MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	The Objective-C Foundation Classes library
 
 LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
 PROJECTHOST=	${PORTNAME}
 USE_SDL=	sdl
 USES=		libtool objc pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	GDBM GMP
 
 GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
 GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
 
 .include <bsd.port.mk>
Index: head/lang/onyx/Makefile
===================================================================
--- head/lang/onyx/Makefile	(revision 382210)
+++ head/lang/onyx/Makefile	(revision 382211)
@@ -1,63 +1,61 @@
 # Created by: jasone
 # $FreeBSD$
 
 PORTNAME=	onyx
 PORTVERSION=	5.1.2
 PORTREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	http://www.canonware.com/download/onyx/
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Embeddable stack-based threaded interpreted language
 
 LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	cook:${PORTSDIR}/devel/cook
 LIB_DEPENDS=	libedit.so:${PORTSDIR}/devel/libedit \
 		libpcre.so:${PORTSDIR}/devel/pcre
 
 USES=		tar:bzip2 shebangfix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libedit-prefix=${LOCALBASE} \
 		--with-pcre-prefix=${LOCALBASE}
 USE_LDCONFIG=	yes
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 PLIST_SUB=	ONYX_VERSION=${PORTVERSION}
 
 BROKEN_ia64=	Coredump during build on ia64
 
 .include <bsd.port.options.mk>
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
 do-build:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} cook)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/onyx/bin/onyx ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/onyx_config/bin/onyx_config ${STAGEDIR}${PREFIX}/bin
 	${LN} -sf bin/onyx ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-${PORTVERSION}
 	${LN} -sf bin/onyx_config ${STAGEDIR}${PREFIX}/bin/${PORTNAME}_config-${PORTVERSION}
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/libonyx
 	${INSTALL_DATA} ${WRKSRC}/lib/libonyx/include/libonyx/*.h ${STAGEDIR}${PREFIX}/include/libonyx
 	${INSTALL_LIB} ${WRKSRC}/lib/libonyx/lib/libonyx.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/lib/libonyx/lib/libonyx.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/lib/libonyx/lib/libonyx.so.13 ${STAGEDIR}${PREFIX}/lib
 	${MKDIR} ${STAGEDIR}${DATADIR}/nx/modclopt
 	${INSTALL_DATA} ${WRKSRC}/mod/modclopt/nx/modclopt/*.nx ${STAGEDIR}${DATADIR}/nx/modclopt
 	${MKDIR} ${STAGEDIR}${DATADIR}/libonyx
 	${INSTALL_DATA} ${WRKSRC}/lib/libonyx/src/libonyx_init.nx ${STAGEDIR}${DATADIR}/libonyx
 	${MKDIR} ${STAGEDIR}${DATADIR}/nx/modprompt
 	${INSTALL_DATA} ${WRKSRC}/mod/modprompt/nx/modprompt/modprompt.nx ${STAGEDIR}${DATADIR}/nx/modprompt
 	${INSTALL_MAN} ${WRKSRC}/bin/onyx/man/man1/onyx.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/bin/onyx_config/man/man1/onyx_config.1 ${STAGEDIR}${PREFIX}/man/man1
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	(cd ${WRKSRC}/doc/html/onyx && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf
 	${INSTALL_DATA} ${WRKSRC}/doc/pdf/onyx/onyx.pdf ${STAGEDIR}${DOCSDIR}/pdf
 .endif
 
 .include <bsd.port.mk>
Index: head/lang/php5/Makefile
===================================================================
--- head/lang/php5/Makefile	(revision 382210)
+++ head/lang/php5/Makefile	(revision 382211)
@@ -1,209 +1,209 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	php5
 PORTVERSION=	5.4.38
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
 DISTNAME=	php-${PORTVERSION}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	PHP Scripting Language
 
 LICENSE=	PHP301
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 USES=		tar:bzip2 cpe
 CPE_PRODUCT=	php
 NO_OPTIONS_SORT=yes
 .if !defined(PKGNAMESUFFIX)
 USE_AUTOTOOLS=	autoconf
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 CONFIGURE_ARGS+=--with-layout=GNU \
 		--localstatedir=/var \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all \
 		--enable-libxml \
 		--enable-mysqlnd \
 		--with-libxml-dir=${LOCALBASE} \
 		--with-pcre-regex=${LOCALBASE} \
 		--with-zlib-dir=/usr \
 		--program-prefix=""
 
 USE_GNOME=	libxml2
 
 OPTIONS_DEFINE+=CLI CGI FPM EMBED DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR
 OPTIONS_SUB=	yes
 
 CLI_DESC=	Build CLI version
 CGI_DESC=	Build CGI version
 FPM_DESC=	Build FPM version
 EMBED_DESC=	Build embedded library
 DEBUG_DESC=	Enable debug
 DTRACE_DESC=	Enable DTrace support
 IPV6_DESC=	Enable ipv6 support
 MAILHEAD_DESC=	Enable mail header patch
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
 CONFLICTS=	php53-5* php55-5* php56-5*
 
 DESTDIRNAME=	INSTALL_ROOT
 
 .include <bsd.port.pre.mk>
 
 PATCH_DIST_STRIP=	-p1
 
 PATCH_SITES+=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	ale
 
 .if ${PORT_OPTIONS:MMAILHEAD}
 PATCHFILES+=	php-5.4.x-mail-header.patch:mail
 PATCH_SITES+=	http://choon.net/opensource/php/:mail
 .endif
 
 .if ${PORT_OPTIONS:MCLI}
 PHP_SAPI+=	cli
 .else
 CONFIGURE_ARGS+=--disable-cli
 .endif
 
 .if ${PORT_OPTIONS:MCGI}
 PHP_SAPI+=	cgi
 .else
 CONFIGURE_ARGS+=--disable-cgi
 .endif
 
 .if ${PORT_OPTIONS:MFPM}
 PHP_SAPI+=	fpm
 USE_RC_SUBR+=	php-fpm
 CONFIGURE_ARGS+=--enable-fpm \
 		--with-fpm-user=${WWWOWN} \
 		--with-fpm-group=${WWWGRP}
 .endif
 
 .if defined(OPTIONS_FILE_SET) && ${OPTIONS_FILE_SET:MAPACHE}
 IGNORE=		doesn't install the Apache module anymore:\
 		update your OPTIONS and build www/mod_php5 port instead
 .endif
 
 .if defined(PKGNAMEPREFIX)
 USE_PHP=	yes
 PHP_DEFAULT=	5.4
 IGNORE_WITH_PHP=53 55
 USE_APACHE=	22+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .if ${PORT_OPTIONS:MAP2FILTER}
 CONFIGURE_ARGS+=--with-apxs2filter=${APXS}
 .else
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 .endif
 PLIST=		${PKGDIR}/pkg-plist.mod
 PKGMESSAGE=	${PKGDIR}/pkg-message.mod
 MODULENAME=	libphp5
 SHORTMODNAME=	php5
 WARNING=	"!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
 .endif
 
 .if ${PORT_OPTIONS:MEMBED}
 PHP_SAPI+=	embed
 CONFIGURE_ARGS+=--enable-embed
 .endif
 
 .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED}
 PLIST_SUB+=	SAPI_INC=""
 .else
 PLIST_SUB+=	SAPI_INC="@comment "
 .endif
 
 .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
 CONFIGURE_ARGS+=--with-regex=php
 .elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system"
 CONFIGURE_ARGS+=--with-regex=system
 .endif
 
 .if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL"
 CONFIGURE_ARGS+=--with-zend-vm=CALL
 .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH"
 CONFIGURE_ARGS+=--with-zend-vm=SWITCH
 .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO"
 CONFIGURE_ARGS+=--with-zend-vm=GOTO
 .endif
 
 CONFIGURE_ENV+=	ac_cv_pthreads_lib="" \
 		ac_cv_pthreads_cflags="" \
 		ac_cv_decimal_fp_supported="no" \
 		pthreads_working="yes" \
 		lt_cv_path_SED="sed"
 
 .if ${PORT_OPTIONS:MLINKTHR}
-LIBS+=		${PTHREAD_LIBS}
+LIBS+=		-lpthread
 .endif
 
 .if ${PORT_OPTIONS:MZTS}
 CONFIGURE_ARGS+=--enable-maintainer-zts
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}
 .if ${OSVERSION} < 900000
 IGNORE=		cannot be built with DTrace support on FreeBSD < 9.x
 .endif
 CONFIGURE_ARGS+=--enable-dtrace
 PLIST_SUB+=	DTRACE=""
 .else
 PLIST_SUB+=	DTRACE="@comment "
 .endif
 
 .if empty(PORT_OPTIONS:MIPV6)
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
 .if ${PORT_OPTIONS:MFPM}
 	@${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \
 		${WRKSRC}/sapi/fpm/php-fpm.conf.in
 .endif
 
 # Work around issues with newer (>=2.64) autoconf
 pre-configure:
 	@${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
 		${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'`
 	@${RM} ${WRKSRC}/configure
 	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
 
 .if !defined(PKGNAMEPREFIX)
 post-build:
 	@${ECHO_CMD} "PHP_VER=5" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf
 
 test: build
 	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
 		${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
 .else
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 .endif
 
 .else
 .include "${MASTERDIR}/Makefile.ext"
 .endif
 .include <bsd.port.post.mk>
Index: head/lang/php53/Makefile
===================================================================
--- head/lang/php53/Makefile	(revision 382210)
+++ head/lang/php53/Makefile	(revision 382211)
@@ -1,191 +1,191 @@
 # Created by: Alex Dupre <sysadmin@alexdupre.com>
 # $FreeBSD$
 
 PORTNAME=	php53
 PORTVERSION=	5.3.29
 PORTREVISION?=	5
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
 DISTNAME=	php-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PHP Scripting Language
 
 DEPRECATED=	security EOL reached 14 Aug 2014
 EXPIRATION_DATE=	2015-04-15
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 USES=		tar:bzip2 cpe
 CPE_PRODUCT=	php
 .if !defined(PKGNAMESUFFIX)
 USE_AUTOTOOLS=	autoconf
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 CONFIGURE_ARGS=	\
 		--with-layout=GNU \
 		--localstatedir=/var \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all \
 		--enable-libxml \
 		--enable-mysqlnd \
 		--with-libxml-dir=${LOCALBASE} \
 		--with-pcre-regex=${LOCALBASE} \
 		--with-zlib-dir=/usr \
 		--program-prefix=""
 
 USE_GNOME=	libxml2
 
 OPTIONS_DEFINE=	CLI CGI FPM APACHE AP2FILTER DEBUG SUHOSIN MULTIBYTE IPV6 \
 		MAILHEAD LINKTHR
 
 OPTIONS_DEFAULT=	CLI CGI SUHOSIN IPV6 LINKTHR
 
 CLI_DESC=	Build CLI version
 CGI_DESC=	Build CGI version
 FPM_DESC=	Build FPM version (experimental)
 APACHE_DESC=	Build Apache module
 AP2FILTER_DESC=	Use Apache 2.x filter interface (experimental)
 SUHOSIN_DESC=	Suhosin protection system
 MULTIBYTE_DESC=	zend multibyte support
 MAILHEAD_DESC=	mail header patch
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 
 CONFLICTS=	php52-5* php5-5*
 
 DESTDIRNAME=	INSTALL_ROOT
 
 .include <bsd.port.pre.mk>
 
 PATCH_DIST_STRIP=	-p1
 
 PATCH_SITES+=	${MASTER_SITE_LOCAL} \
 		http://people.freebsd.org/~flo/
 PATCH_SITE_SUBDIR=	flo
 
 .if ${PORT_OPTIONS:MSUHOSIN}
 PATCHFILES+=	suhosin-patch-5.3.x-0.9.10.5.patch.gz
 PLIST_SUB+=	SUHOSIN=""
 .else
 PLIST_SUB+=	SUHOSIN="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMAILHEAD}
 PATCHFILES+=	php-5.3.x-mail-header.patch:mail
 PATCH_SITES+=	http://choon.net/opensource/php/:mail
 .endif
 
 .if ${PORT_OPTIONS:MCLI}
 PHP_SAPI+=	cli
 PLIST_SUB+=	CLI=""
 .else
 PLIST_SUB+=	CLI="@comment "
 CONFIGURE_ARGS+=--disable-cli
 .endif
 
 .if ${PORT_OPTIONS:MCGI}
 PHP_SAPI+=	cgi
 PLIST_SUB+=	CGI=""
 .else
 PLIST_SUB+=	CGI="@comment "
 CONFIGURE_ARGS+=--disable-cgi
 .endif
 
 .if ${PORT_OPTIONS:MFPM}
 PHP_SAPI+=	fpm
 USE_RC_SUBR+=	php-fpm
 CONFIGURE_ARGS+=--enable-fpm \
 		--with-fpm-user=${WWWOWN} \
 		--with-fpm-group=${WWWGRP}
 PLIST_SUB+=	FPM=""
 .else
 PLIST_SUB+=	FPM="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAPACHE}
 PHP_SAPI+=	mod
 USE_APACHE=	22+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .if ${PORT_OPTIONS:MAP2FILTER}
 CONFIGURE_ARGS+=--with-apxs2filter=${APXS}
 .else
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 .endif
 PKGMESSAGE=	${PKGDIR}/pkg-message.mod
 MODULENAME=	libphp5
 SHORTMODNAME=	php5
 PLIST_SUB+=	APACHE=""
 .else
 PLIST_SUB+=	APACHE="@comment "
 .endif
 
 .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
 CONFIGURE_ARGS+=--with-regex=php
 .elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system"
 CONFIGURE_ARGS+=--with-regex=system
 .endif
 
 .if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL"
 CONFIGURE_ARGS+=--with-zend-vm=CALL
 .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH"
 CONFIGURE_ARGS+=--with-zend-vm=SWITCH
 .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO"
 CONFIGURE_ARGS+=--with-zend-vm=GOTO
 .endif
 
 CONFIGURE_ENV+=	ac_cv_pthreads_lib="" \
 		ac_cv_pthreads_cflags="" \
 		pthreads_working="yes" \
 		lt_cv_path_SED="sed"
 
 .if ${PORT_OPTIONS:MLINKTHR}
-LIBS+=		${PTHREAD_LIBS}
+LIBS+=		-lpthread
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MMULTIBYTE}
 CONFIGURE_ARGS+=--enable-zend-multibyte
 .endif
 
 .if empty(PORT_OPTIONS:MIPV6)
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 	@${REINPLACE_CMD} -e 's|freetype/||g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
 .if ${PORT_OPTIONS:MFPM}
 	@${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \
 		${WRKSRC}/sapi/fpm/php-fpm.conf.in
 .endif
 
 # Work around issues with newer (>=2.64) autoconf
 pre-configure:
 	@${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
 		${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'`
 	@${RM} ${WRKSRC}/configure
 	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
 
 post-build:
 	@${ECHO_CMD} "PHP_VER=53" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf
 
 test: build
 	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
 		${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
 
 .else
 .include "${MASTERDIR}/Makefile.ext"
 .endif
 .include <bsd.port.post.mk>
Index: head/lang/php55/Makefile
===================================================================
--- head/lang/php55/Makefile	(revision 382210)
+++ head/lang/php55/Makefile	(revision 382211)
@@ -1,209 +1,209 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	php55
 PORTVERSION=	5.5.22
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
 DISTNAME=	php-${PORTVERSION}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	PHP Scripting Language
 
 LICENSE=	PHP301
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 USES=		tar:bzip2 cpe
 CPE_PRODUCT=	php
 NO_OPTIONS_SORT=yes
 .if !defined(PKGNAMESUFFIX)
 USE_AUTOTOOLS=	autoconf
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 CONFIGURE_ARGS+=--with-layout=GNU \
 		--localstatedir=/var \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all \
 		--enable-libxml \
 		--enable-mysqlnd \
 		--with-libxml-dir=${LOCALBASE} \
 		--with-pcre-regex=${LOCALBASE} \
 		--with-zlib-dir=/usr \
 		--program-prefix=""
 
 USE_GNOME=	libxml2
 
 OPTIONS_DEFINE+=CLI CGI FPM EMBED DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR
 OPTIONS_SUB=	yes
 
 CLI_DESC=	Build CLI version
 CGI_DESC=	Build CGI version
 FPM_DESC=	Build FPM version
 EMBED_DESC=	Build embedded library
 DEBUG_DESC=	Enable debug
 DTRACE_DESC=	Enable DTrace support
 IPV6_DESC=	Enable ipv6 support
 MAILHEAD_DESC=	Enable mail header patch
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
 CONFLICTS=	php53-5* php54-5* php56-5* php5-5*
 
 DESTDIRNAME=	INSTALL_ROOT
 
 .include <bsd.port.pre.mk>
 
 PATCH_DIST_STRIP=	-p1
 
 PATCH_SITES+=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	ale
 
 .if ${PORT_OPTIONS:MMAILHEAD}
 PATCHFILES+=	php-5.5.x-mail-header.patch:mail
 PATCH_SITES+=	http://choon.net/opensource/php/:mail
 .endif
 
 .if ${PORT_OPTIONS:MCLI}
 PHP_SAPI+=	cli
 .else
 CONFIGURE_ARGS+=--disable-cli
 .endif
 
 .if ${PORT_OPTIONS:MCGI}
 PHP_SAPI+=	cgi
 .else
 CONFIGURE_ARGS+=--disable-cgi
 .endif
 
 .if ${PORT_OPTIONS:MFPM}
 PHP_SAPI+=	fpm
 USE_RC_SUBR+=	php-fpm
 CONFIGURE_ARGS+=--enable-fpm \
 		--with-fpm-user=${WWWOWN} \
 		--with-fpm-group=${WWWGRP}
 .endif
 
 .if defined(OPTIONS_FILE_SET) && ${OPTIONS_FILE_SET:MAPACHE}
 IGNORE=		doesn't install the Apache module anymore:\
 		update your OPTIONS and build www/mod_php55 port instead 
 .endif
 
 .if defined(PKGNAMEPREFIX)
 USE_PHP=	yes
 PHP_DEFAULT=	5.5
 IGNORE_WITH_PHP=53 54 5
 USE_APACHE=	22+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .if ${PORT_OPTIONS:MAP2FILTER}
 CONFIGURE_ARGS+=--with-apxs2filter=${APXS}
 .else
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 .endif
 PLIST=		${PKGDIR}/pkg-plist.mod
 PKGMESSAGE=	${PKGDIR}/pkg-message.mod
 MODULENAME=	libphp5
 SHORTMODNAME=	php5
 WARNING=	"!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
 .endif
 
 .if ${PORT_OPTIONS:MEMBED}
 PHP_SAPI+=	embed
 CONFIGURE_ARGS+=--enable-embed
 .endif
 
 .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED}
 PLIST_SUB+=	SAPI_INC=""
 .else
 PLIST_SUB+=	SAPI_INC="@comment "
 .endif
 
 .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
 CONFIGURE_ARGS+=--with-regex=php
 .elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system"
 CONFIGURE_ARGS+=--with-regex=system
 .endif
 
 .if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL"
 CONFIGURE_ARGS+=--with-zend-vm=CALL
 .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH"
 CONFIGURE_ARGS+=--with-zend-vm=SWITCH
 .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO"
 CONFIGURE_ARGS+=--with-zend-vm=GOTO
 .endif
 
 CONFIGURE_ENV+=	ac_cv_pthreads_lib="" \
 		ac_cv_pthreads_cflags="" \
 		ac_cv_decimal_fp_supported="no" \
 		pthreads_working="yes" \
 		lt_cv_path_SED="sed"
 
 .if ${PORT_OPTIONS:MLINKTHR}
-LIBS+=		${PTHREAD_LIBS}
+LIBS+=		-lpthread
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MZTS}
 CONFIGURE_ARGS+=--enable-maintainer-zts
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}
 .if ${OSVERSION} < 900000
 IGNORE=		cannot be built with DTrace support on FreeBSD < 9.x
 .endif
 CONFIGURE_ARGS+=--enable-dtrace
 PLIST_SUB+=	DTRACE=""
 .else
 PLIST_SUB+=	DTRACE="@comment "
 .endif
 
 .if empty(PORT_OPTIONS:MIPV6)
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
 .if ${PORT_OPTIONS:MFPM}
 	@${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \
 		${WRKSRC}/sapi/fpm/php-fpm.conf.in
 .endif
 
 # Work around issues with newer (>=2.64) autoconf
 pre-configure:
 	@${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
 		${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'`
 	@${RM} ${WRKSRC}/configure
 	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
 
 .if !defined(PKGNAMEPREFIX)
 post-build:
 	@${ECHO_CMD} "PHP_VER=55" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf
 
 test: build
 	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
 		${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
 .else
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 .endif
 
 .else
 .include "${MASTERDIR}/Makefile.ext"
 .endif
 .include <bsd.port.post.mk>
Index: head/lang/php56/Makefile
===================================================================
--- head/lang/php56/Makefile	(revision 382210)
+++ head/lang/php56/Makefile	(revision 382211)
@@ -1,212 +1,212 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	php56
 PORTVERSION=	5.6.6
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
 DISTNAME=	php-${PORTVERSION}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	PHP Scripting Language
 
 LICENSE=	PHP301
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 USES=		tar:bzip2 cpe
 CPE_PRODUCT=	php
 NO_OPTIONS_SORT=yes
 .if !defined(PKGNAMESUFFIX)
 USE_AUTOTOOLS=	autoconf
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 CONFIGURE_ARGS+=--with-layout=GNU \
 		--localstatedir=/var \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all \
 		--enable-libxml \
 		--enable-mysqlnd \
 		--with-libxml-dir=${LOCALBASE} \
 		--with-pcre-regex=${LOCALBASE} \
 		--with-zlib-dir=/usr \
 		--program-prefix=""
 
 USE_GNOME=	libxml2
 
 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR
 OPTIONS_SUB=	yes
 
 CLI_DESC=	Build CLI version
 CGI_DESC=	Build CGI version
 FPM_DESC=	Build FPM version
 EMBED_DESC=	Build embedded library
 DEBUG_DESC=	Enable debug
 DTRACE_DESC=	Enable DTrace support
 IPV6_DESC=	Enable ipv6 support
 MAILHEAD_DESC=	Enable mail header patch
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
 CONFLICTS=	php53-5* php54-5* php55-5* php5-5*
 
 DESTDIRNAME=	INSTALL_ROOT
 
 .include <bsd.port.pre.mk>
 
 PATCH_DIST_STRIP=	-p1
 
 PATCH_SITES+=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	ale
 
 .if ${PORT_OPTIONS:MMAILHEAD}
 PATCHFILES+=	php-5.5.x-mail-header.patch:mail
 PATCH_SITES+=	http://choon.net/opensource/php/:mail
 .endif
 
 .if ${PORT_OPTIONS:MCLI}
 PHP_SAPI+=	cli
 .else
 CONFIGURE_ARGS+=--disable-cli
 .endif
 
 .if ${PORT_OPTIONS:MCGI}
 PHP_SAPI+=	cgi
 .else
 CONFIGURE_ARGS+=--disable-cgi
 .endif
 
 .if ${PORT_OPTIONS:MFPM}
 PHP_SAPI+=	fpm
 USE_RC_SUBR+=	php-fpm
 CONFIGURE_ARGS+=--enable-fpm \
 		--with-fpm-user=${WWWOWN} \
 		--with-fpm-group=${WWWGRP}
 .endif
 
 .if defined(PKGNAMEPREFIX)
 USE_PHP=	yes
 PHP_DEFAULT=	5.6
 IGNORE_WITH_PHP=53 54 5
 USE_APACHE=	22+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .if ${PORT_OPTIONS:MAP2FILTER}
 CONFIGURE_ARGS+=--with-apxs2filter=${APXS}
 .else
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 .endif
 PLIST=		${PKGDIR}/pkg-plist.mod
 PKGMESSAGE=	${PKGDIR}/pkg-message.mod
 MODULENAME=	libphp5
 SHORTMODNAME=	php5
 WARNING=	"!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
 .endif
 
 .if ${PORT_OPTIONS:MEMBED}
 PHP_SAPI+=	embed
 CONFIGURE_ARGS+=--enable-embed
 .endif
 
 .if ${PORT_OPTIONS:MPHPDBG}
 PHP_SAPI+=	phpdbg
 CONFIGURE_ARGS+=--enable-phpdbg
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-phpdbg-debug
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED}
 PLIST_SUB+=	SAPI_INC=""
 .else
 PLIST_SUB+=	SAPI_INC="@comment "
 .endif
 
 .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
 CONFIGURE_ARGS+=--with-regex=php
 .elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system"
 CONFIGURE_ARGS+=--with-regex=system
 .endif
 
 .if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL"
 CONFIGURE_ARGS+=--with-zend-vm=CALL
 .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH"
 CONFIGURE_ARGS+=--with-zend-vm=SWITCH
 .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO"
 CONFIGURE_ARGS+=--with-zend-vm=GOTO
 .endif
 
 CONFIGURE_ENV+=	ac_cv_pthreads_lib="" \
 		ac_cv_pthreads_cflags="" \
 		ac_cv_decimal_fp_supported="no" \
 		pthreads_working="yes" \
 		lt_cv_path_SED="sed"
 
 .if ${PORT_OPTIONS:MLINKTHR}
-LIBS+=		${PTHREAD_LIBS}
+LIBS+=		-lpthread
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MZTS}
 CONFIGURE_ARGS+=--enable-maintainer-zts
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}
 .if ${OSVERSION} < 900000
 IGNORE=		cannot be built with DTrace support on FreeBSD < 9.x
 .endif
 CONFIGURE_ARGS+=--enable-dtrace
 PLIST_SUB+=	DTRACE=""
 .else
 PLIST_SUB+=	DTRACE="@comment "
 .endif
 
 .if empty(PORT_OPTIONS:MIPV6)
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
 .if ${PORT_OPTIONS:MFPM}
 	@${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \
 		${WRKSRC}/sapi/fpm/php-fpm.conf.in
 .endif
 
 # Work around issues with newer (>=2.64) autoconf
 pre-configure:
 	@${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
 		${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'`
 	@${RM} ${WRKSRC}/configure
 	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
 
 .if !defined(PKGNAMEPREFIX)
 post-build:
 	@${ECHO_CMD} "PHP_VER=56" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf
 
 test: build
 	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
 		${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
 .else
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 .endif
 
 .else
 .include "${MASTERDIR}/Makefile.ext"
 .endif
 .include <bsd.port.post.mk>
Index: head/lang/pike78/Makefile
===================================================================
--- head/lang/pike78/Makefile	(revision 382210)
+++ head/lang/pike78/Makefile	(revision 382211)
@@ -1,123 +1,123 @@
 # $FreeBSD$
 
 PORTNAME=	pike78
 PORTVERSION=	${PIKEVERSION}
 PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://pike.ida.liu.se/pub/pike/all/${PORTVERSION}/ \
 		ftp://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \
 		http://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \
 		ftp://ftp.caudium.net/pike/official_releases/${PORTVERSION}/
 DISTNAME=	Pike-v${PORTVERSION}
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Dynamic programming language with a syntax similar to C++
 
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libgdbm.so:${PORTSDIR}/databases/gdbm \
 		libpcre.so:${PORTSDIR}/devel/pcre \
 		libgmp.so:${PORTSDIR}/math/gmp \
 		libnettle.so:${PORTSDIR}/security/nettle
 
 CONFLICTS=	pike7[26]-[0-9]*
 
 OPTIONS_DEFINE=	TTF FREETYPE MYSQL PGSQL
 OPTIONS_DEFAULT=TTF FREETYPE MYSQL
 NO_OPTIONS_SORT=yes
 TTF_DESC?=		Enable FreeType 1 (libttf) font rendering engine
 TTF_LIB_DEPENDS=	libttf.so:${PORTSDIR}/print/freetype
 TTF_CONFIGURE_WITH=	ttflib
 FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 FREETYPE_CONFIGURE_WITH=freetype
 MYSQL_USE=		mysql=yes
 MYSQL_CONFIGURE_WITH=	mysql
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	pgsql
 
 CFLAGS+=	-ffast-math -fomit-frame-pointer
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS+=${PTHREAD_CFLAGS} M4="/usr/bin/m4 -g"
+CONFIGURE_ENV=	M4="/usr/bin/m4 -g"
 CONFIGURE_ARGS+=	--without-debug \
-		 --with-thread-library=${PTHREAD_LIBS} \
+		 --with-thread-library="-lpthread" \
 		 --with-double-precision \
 		 --with-long-double-precision \
 		 --disable-rpath \
 		 --without-rtldebug \
 		 --without-cdebug \
 		 --without-copt \
 		 --without-security \
 		 --with-oob \
 		 --without-poll \
 		 --without-devpoll \
 		 --with-max-fd=60000 \
 		 --with-gmp \
 		 --with-zlib \
 		 --with-threads \
 		 --with-readline \
 		 --with-jpeg \
 		 --with-tiff \
 		 --with-gdbm \
 		 --with-perl \
 		 --with-relocatable-dumped-modules \
 		 --without-GL --without-GLUT \
 		 --without-GTK \
 		 --without-ffmpeg \
 		 --without-fftw \
 		 --without-glade \
 		 --without-gnome \
 		 --without-gssapi \
 		 --without-java \
 		 --without-libglade-config \
 		 --without-libpdf --without-libpanda \
 		 --without-machine-code \
 		 --without-msql \
 		 --without-odbc \
 		 --without-sane \
 		 --without-svg \
 		 --without-sybase \
 		 --prefix=${PREFIX}
 
 USES=		bison gettext gmake perl5
 
 PLIST_FILES=	bin/pike bin/pike78 bin/hilfe \
 		man/man1/pike.1.gz
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 do-configure:
 	@${MAKE} -C ${WRKSRC} configure CONFIGUREARGS="${CONFIGURE_ARGS}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| -lgmp| -L${LOCALBASE}/lib -lgmp|' \
 		${WRKSRC}/src/modules/Gmp/configure ${WRKSRC}/src/modules/_Image_XFace/configure
 	@${REINPLACE_CMD} -e '/memchr_memcmp.*needle/s/^/static /' \
 		${WRKSRC}/src/pike_search_engine2.c
-	@${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|' \
-		-e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
+	@${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%||' \
+		-e 's|%%PTHREAD_LIBS%%|-lpthread|' \
 		-e 's|,-Bshareable|& -shared|' \
 		${WRKSRC}/src/configure
 	@${REINPLACE_CMD} -e '/install.*MANDIR/s|^|//|' \
 		${WRKSRC}/bin/install.pike
 
 do-install:
 	@cd ${WRKSRC} && ${MAKE_CMD} ${INSTALL_TARGET} buildroot=${STAGEDIR}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/pike/${PORTVERSION}/bin/pike
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/hilfe ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/pike.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	@cd ${STAGEDIR}${PREFIX} && \
 		(${FIND} pike/${PORTVERSION} ! -type d && \
 		${FIND} pike/${PORTVERSION} -type d -empty -delete && \
 		${FIND} -d pike/${PORTVERSION} -type d | \
 		${SED} 's,^,@dirrm ,' && \
 		${ECHO_CMD} '@unexec rmdir %D/pike 2>/dev/null || true' \
 		) >> ${TMPPLIST}
 
 verify:
 	cd ${WRKSRC}; ${MAKE_CMD} verify
 
 .include "Makefile.common"
 .include <bsd.port.mk>
Index: head/lang/python27/Makefile
===================================================================
--- head/lang/python27/Makefile	(revision 382210)
+++ head/lang/python27/Makefile	(revision 382211)
@@ -1,129 +1,128 @@
 # $FreeBSD$
 
 PORTNAME=	python27
 PORTVERSION=	2.7.9
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON
 MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Interpreted object-oriented programming language
 
 LICENSE=	PSFL
 
 USES=		cpe ncurses pkgconfig readline tar:xz
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 
 CPE_VENDOR=	python
 CPE_PRODUCT=	${CPE_VENDOR}
 CPE_VERSION=	${PORTVERSION}
 
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ENV+=		ac_cv_opt_olimit_ok=no OPT=""				# Null out OPT to respect user CFLAGS and remove optimizations
 
 INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
 MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
 MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
 
 PLIST_SUB=		ABI=${ABIFLAGS} \
 			PORTVERSION=${PORTVERSION} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
 
 OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC SEM THREADS
 OPTIONS_DEFAULT=	IPV6 LIBFFI NLS PYMALLOC SEM THREADS UCS4
 OPTIONS_SINGLE=		UNICODE
 OPTIONS_SINGLE_UNICODE=	UCS2 UCS4
 OPTIONS_SUB=		yes
 
 LIBFFI_DESC=	Use libffi from ports instead of bundled version
 NLS_DESC=	Enable gettext support for the locale module
 UCS2_DESC=	Enable UCS2 Unicode Strings
 UCS4_DESC=	Enable UCS4 Unicode Strings
 PYMALLOC_DESC=	Enable specialized mallocs
 
 DEBUG_CONFIGURE_WITH=	pydebug
 IPV6_CONFIGURE_ENABLE=	ipv6
 LIBFFI_CONFIGURE_ON=	--with-system-ffi
 LIBFFI_LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
 
 # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
 # to break in Python 2.7, or preprocessor complaints in Python >= 3.3
 # Upstream Issue: http://bugs.python.org/issue6299
 NLS_USES=		gettext
 NLS_CPPFLAGS=		-I${LOCALBASE}/include
 NLS_LIBS=		-L${LOCALBASE}/lib -lintl
 NLS_CONFIGURE_ENV_OFF=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
 
 PYMALLOC_CONFIGURE_WITH=	pymalloc
 
 SEM_CONFIGURE_ENV=	ac_cv_posix_semaphores_enabled=yes
 SEM_CONFIGURE_ENV_OFF=	ac_cv_posix_semaphores_enabled=no
 
 THREADS_CONFIGURE_WITH=	threads
-THREADS_CFLAGS=		${PTHREAD_CFLAGS}
-THREADS_LDFLAGS=	${PTHREAD_LIBS}
+THREADS_LDFLAGS=	-lpthread
 
 UCS2_CONFIGURE_ON=	--enable-unicode=ucs2
 UCS4_CONFIGURE_ON=	--enable-unicode=ucs4
 
 .include <bsd.port.options.mk>
 
 # http://bugs.python.org/issue22521
 # http://bugs.python.org/issue23042
 .if !${PORT_OPTIONS:MLIBFFI} && ${ARCH} == i386
 BROKEN=	You must use libffi from ports on i386. Enable the LIBFFI option
 .endif
 
 .if ${ARCH} == i386
 PLIST_SUB+=	X86_ONLY=""
 .else
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
 
 .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == powerpc64 || ${ARCH} == mips64
 PLIST_SUB+=	32BIT_ONLY="@comment "
 .else
 PLIST_SUB+=	32BIT_ONLY=""
 .endif
 
 .if ${ARCH} == powerpc64
 MAKE_ENV+=	UNAME_m="powerpc64"
 .endif
 
 .if ${ARCH} == sparc64
 CFLAGS+=	-DPYTHON_DEFAULT_RECURSION_LIMIT=900
 .endif
 
 # See http://bugs.freebsd.org/115940 and http://bugs.freebsd.org/193650
 .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
 PLIST_SUB+=	NO_NIS="@comment "
 .else
 PLIST_SUB+=	NO_NIS=""
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
 		${PATCH_WRKSRC}/Lib/pydoc.py
 .if ${PORT_OPTIONS:MSEM}
 	@# do not use SEM_EXTRA_PATCHES here, since patch-setup.py overlaps with this one
 	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-setup.py
 .endif
 
 .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
 	@${REINPLACE_CMD} -e 's/disabled_module_list =[^]]*/&, "nis"/' \
 		${WRKSRC}/setup.py
 .endif
 
 post-install:
 	for i in ${STAGEDIR}${PREFIX}/lib/python2.7/lib-dynload/*.so; do \
 		${STRIP_CMD} $$i; done						# Strip shared extensions
 
 regression-test: build
 	@cd ${WRKSRC} && ${MAKE} TESTOPTS=-j${MAKE_JOBS_NUMBER} buildbottest
 
 .include <bsd.port.mk>
Index: head/lang/python32/Makefile
===================================================================
--- head/lang/python32/Makefile	(revision 382210)
+++ head/lang/python32/Makefile	(revision 382211)
@@ -1,129 +1,128 @@
 # $FreeBSD$
 
 PORTNAME=	python32
 PORTVERSION=	3.2.5
 PORTREVISION=	12
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON
 MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Interpreted object-oriented programming language
 
 LICENSE=	PSFL
 
 USES=		cpe ncurses pkgconfig readline tar:xz
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
 CPE_VENDOR=	python
 CPE_PRODUCT=	${CPE_VENDOR}
 CPE_VERSION=	${PORTVERSION}
 
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ENV+=		OPT=""							# Null out OPT to respect user CFLAGS and remove optimizations
 
 INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
 MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
 MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
 
 PLIST_SUB=		ABI=${ABIFLAGS} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
 
 OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS TSC UCS4
 OPTIONS_DEFAULT=	IPV6 LIBFFI NLS PYMALLOC THREADS UCS4
 OPTIONS_SUB=		yes
 
 LIBFFI_DESC=		Use libffi from ports instead of bundled version
 NLS_DESC=		Enable gettext support for the locale module
 PYMALLOC_DESC=		Enable specialized mallocs
 TSC_DESC=		Enable processor timestamp counter profiling
 
 DEBUG_CONFIGURE_WITH=	pydebug
 IPV6_CONFIGURE_ENABLE=	ipv6
 LIBFFI_CONFIGURE_ON=	--with-system-ffi
 LIBFFI_LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
 
 # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
 # to break in Python 2.7, or preprocessor complaints in Python >= 3.3
 # Upstream Issue: http://bugs.python.org/issue6299
 NLS_USES=		gettext
 NLS_CPPFLAGS=		-I${LOCALBASE}/include
 NLS_LIBS=		-L${LOCALBASE}/lib -lintl
 NLS_CONFIGURE_ENV_OFF=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
 
 PYMALLOC_CONFIGURE_WITH=	pymalloc
 
 THREADS_CONFIGURE_WITH=	threads
-THREADS_CFLAGS=		${PTHREAD_CFLAGS}
-THREADS_LDFLAGS=	${PTHREAD_LIBS}
+THREADS_LDFLAGS=	-lpthread
 TSC_CONFIGURE_WITH=	tsc
 UCS4_CONFIGURE_WITH=	wide-unicode
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MUCS4}
 ABIFLAGS:=	u${ABIFLAGS}
 .endif
 
 .if ${PORT_OPTIONS:MPYMALLOC}
 ABIFLAGS:=	m${ABIFLAGS}
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 ABIFLAGS:=	d${ABIFLAGS}
 .endif
 
 .if !empty(ABIFLAGS)
 PLIST_FILES+=	bin/python3.2%%ABI%%
 PLIST_FILES+=	bin/python3.2%%ABI%%-config
 PLIST_FILES+=	libdata/pkgconfig/python-3.2%%ABI%%.pc
 .endif
 
 .if ${ARCH} == sparc64
 CFLAGS+=	-DPYTHON_DEFAULT_RECURSION_LIMIT=900
 .endif
 
 # See http://bugs.freebsd.org/115940 and http://bugs.freebsd.org/193650
 .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
 PLIST_SUB+=	NO_NIS="@comment "
 .else
 PLIST_SUB+=	NO_NIS=""
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
 		${PATCH_WRKSRC}/Lib/pydoc.py
 # Fix for http://bugs.python.org/issue12852 (especially on 10.x+);
 # not needed for python33+
 	@${REINPLACE_CMD} -e 's|_XOPEN_SOURCE 600|_XOPEN_SOURCE 700|' \
 		${WRKSRC}/configure
 .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
 	@${REINPLACE_CMD} -e 's/disabled_module_list =[^]]*/&, "nis"/' \
 		${WRKSRC}/setup.py
 .endif
 # Fix permissions for keyword.py and token.py - otherwise the cache files
 # can't be properly recreated, since compileall fails with an IOError.
 # This looks like an improper fix in http://bugs.python.org/issue6074
 # for Python3.2
 # Since side effects for other modules can't be foreseen, do not fix
 # it on a source level yet.
 	@${CHMOD} a-x ${WRKSRC}/Lib/keyword.py ${WRKSRC}/Lib/token.py
 
 post-install:
 .if !${PORT_OPTIONS:MDEBUG}
 	# Upstream Issue: http://bugs.python.org/issue17975
 	${RM} -f ${STAGEDIR}${PREFIX}/lib/libpython3.so
 .endif
 	# Strip shared extensions
 	for i in ${STAGEDIR}${PREFIX}/lib/python3.2/lib-dynload/*.so; do \
 		${STRIP_CMD} $$i; done
 
 regression-test: build
 	@cd ${WRKSRC} && ${MAKE} TESTOPTS=-j${MAKE_JOBS_NUMBER} buildbottest
 
 .include <bsd.port.mk>
Index: head/lang/python33/Makefile
===================================================================
--- head/lang/python33/Makefile	(revision 382210)
+++ head/lang/python33/Makefile	(revision 382211)
@@ -1,117 +1,116 @@
 # $FreeBSD$
 
 PORTNAME=	python33
 PORTVERSION=	3.3.5
 PORTREVISION=	5
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON
 MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Interpreted object-oriented programming language
 
 LICENSE=	PSFL
 
 USES=		cpe ncurses pkgconfig readline tar:xz
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
 CPE_VENDOR=	python
 CPE_PRODUCT=	${CPE_VENDOR}
 CPE_VERSION=	${PORTVERSION}
 
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ENV+=		OPT=""							# Null out OPT to respect user CFLAGS and remove optimizations
 
 INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
 MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
 MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
 
 PLIST_SUB=		ABI=${ABIFLAGS} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
 
 OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS TSC
 OPTIONS_DEFAULT=	IPV6 LIBFFI NLS PYMALLOC THREADS
 OPTIONS_SUB=		yes
 
 LIBFFI_DESC=		Use libffi from ports instead of bundled version
 NLS_DESC=		Enable gettext support for the locale module
 PYMALLOC_DESC=		Enable specialized mallocs
 TSC_DESC=		Enable rocessor timestamp counter profiling
 
 DEBUG_CONFIGURE_WITH=	pydebug
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 LIBFFI_CONFIGURE_ON=	--with-system-ffi
 LIBFFI_LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
 
 # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
 # to break in Python 2.7, or preprocessor complaints in Python >= 3.3
 # Upstream Issue: http://bugs.python.org/issue6299
 
 NLS_USES=		gettext
 NLS_CPPFLAGS=		-I${LOCALBASE}/include
 NLS_LIBS=		-L${LOCALBASE}/lib -lintl
 NLS_CONFIGURE_ENV_OFF=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
 
 PYMALLOC_CONFIGURE_WITH=	pymalloc
 
 THREADS_CONFIGURE_WITH=	threads
-THREADS_CFLAGS=		${PTHREAD_CFLAGS}
-THREADS_LDFLAGS=	${PTHREAD_LIBS}
+THREADS_LDFLAGS=	-lpthread
 
 TSC_CONFIGURE_WITH=	tsc
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYMALLOC}
 ABIFLAGS:=	m${ABIFLAGS}
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 ABIFLAGS:=	d${ABIFLAGS}
 .endif
 
 .if !empty(ABIFLAGS)
 PLIST_FILES+=	bin/python3.3%%ABI%%
 PLIST_FILES+=	bin/python3.3%%ABI%%-config
 PLIST_FILES+=	libdata/pkgconfig/python-3.3%%ABI%%.pc
 .endif
 
 # http://bugs.python.org/issue22521
 # http://bugs.python.org/issue23042
 .if ${ARCH} == i386 && !${PORT_OPTIONS:MLIBFFI}
 BROKEN=		You must use libffi from ports on i386. Enable the LIBFFI option
 .endif
 
 .if ${ARCH} == sparc64
 CFLAGS+=	-DPYTHON_DEFAULT_RECURSION_LIMIT=900
 .endif
 
 # See http://bugs.freebsd.org/115940 and http://bugs.freebsd.org/193650
 .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
 PLIST_SUB+=	NO_NIS="@comment "
 .else
 PLIST_SUB+=	NO_NIS=""
 .endif
 
 post-patch:
 .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
 	@${REINPLACE_CMD} -e 's/disabled_module_list =[^]]*/&, "nis"/' \
 		${WRKSRC}/setup.py
 .endif
 
 post-install:
 .if ! ${PORT_OPTIONS:MDEBUG}
 	${RM} -f ${STAGEDIR}${PREFIX}/lib/libpython3.so						# Upstream Issue: http://bugs.python.org/issue17975
 .endif
 	for i in ${STAGEDIR}${PREFIX}/lib/python3.3/lib-dynload/*.so; do \
 		${STRIP_CMD} $$i; done								# Strip shared extensions
 
 regression-test: build
 	@cd ${WRKSRC} && ${MAKE} TESTOPTS=-j${MAKE_JOBS_NUMBER} buildbottest
 
 .include <bsd.port.mk>
Index: head/lang/python34/Makefile
===================================================================
--- head/lang/python34/Makefile	(revision 382210)
+++ head/lang/python34/Makefile	(revision 382211)
@@ -1,122 +1,121 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	python34
 PORTVERSION=	3.4.3
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON
 MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Interpreted object-oriented programming language
 
 LICENSE=	PSFL
 
 USES=		cpe ncurses pkgconfig readline tar:xz
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
 CPE_VENDOR=	python
 CPE_PRODUCT=	${CPE_VENDOR}
 CPE_VERSION=	${PORTVERSION}
 
 DISABLED_EXTENSIONS=	_sqlite3 _tkinter _gdbm
 CONFIGURE_ARGS+=	--enable-shared --without-ensurepip
 CONFIGURE_ENV+=		OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}"	# Null out OPT to respect user CFLAGS and remove optimizations
 
 INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
 MAKE_ARGS+=		INSTALL_SHARED="${INSTALL_LIB}"				# Strip shared library
 MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
 
 PLIST_SUB=		ABI=${ABIFLAGS} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
 
 OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC THREADS TSC
 OPTIONS_DEFAULT=	IPV6 LIBFFI NLS PYMALLOC THREADS
 OPTIONS_RADIO=		HASH
 OPTIONS_RADIO_HASH=	FNV SIPHASH
 OPTIONS_SUB=		yes
 
 LIBFFI_DESC=		Use libffi from ports instead of bundled version
 NLS_DESC=		Enable gettext support for the locale module
 PYMALLOC_DESC=		Enable specialized mallocs
 TSC_DESC=		Enable processor timestamp counter profiling
 
 HASH_DESC=		Hash Algorithm (PEP-456)
 FNV_DESC=		Modified Fowler-Noll-Vo Algorithm
 SIPHASH_DESC=		SipHash24 Algorithm
 
 FNV_CONFIGURE_ON=	--with-hash-algorithm=fnv
 SIPHASH_CONFIGURE_ON=	--with-hash-algorithm=siphash24
 
 DEBUG_CONFIGURE_WITH=	pydebug
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 LIBFFI_CONFIGURE_ON=	--with-system-ffi
 LIBFFI_LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
 
 # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
 # to break in Python 2.7, or preprocessor complaints in Python >= 3.3
 # Upstream Issue: http://bugs.python.org/issue6299
 
 NLS_USES=		gettext
 NLS_CPPFLAGS=		-I${LOCALBASE}/include
 NLS_LIBS=		-L${LOCALBASE}/lib -lintl
 NLS_CONFIGURE_ENV_OFF=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
 
 PYMALLOC_CONFIGURE_WITH=	pymalloc
 
 THREADS_CONFIGURE_WITH=	threads
-THREADS_CFLAGS=		${PTHREAD_CFLAGS}
-THREADS_LDFLAGS=	${PTHREAD_LIBS}
+THREADS_LDFLAGS=	-lpthread
 
 TSC_CONFIGURE_WITH=	tsc
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYMALLOC}
 ABIFLAGS:=	m${ABIFLAGS}
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 ABIFLAGS:=	d${ABIFLAGS}
 .endif
 
 .if !empty(ABIFLAGS)
 PLIST_FILES+=	bin/python3.4%%ABI%%
 PLIST_FILES+=	bin/python3.4%%ABI%%-config
 PLIST_FILES+=	libdata/pkgconfig/python-3.4%%ABI%%.pc
 .endif
 
 # http://bugs.python.org/issue22521
 # http://bugs.python.org/issue23042
 .if ${ARCH} == i386 && !${PORT_OPTIONS:MLIBFFI}
 BROKEN=	You must use libffi from ports on i386. Enable the LIBFFI option
 .endif
 
 .if ${ARCH} == sparc64
 CFLAGS+=	-DPYTHON_DEFAULT_RECURSION_LIMIT=900
 .endif
 
 # See http://bugs.freebsd.org/115940 and http://bugs.freebsd.org/193650
 .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
 PLIST_SUB+=	NO_NIS="@comment "
 DISABLED_EXTENSIONS+=	nis
 .else
 PLIST_SUB+=	NO_NIS=""
 .endif
 
 post-install:
 .if ! ${PORT_OPTIONS:MDEBUG}
 	${RM} -f ${STAGEDIR}${PREFIX}/lib/libpython3.so						# Upstream Issue: http://bugs.python.org/issue17975
 .endif
 	for i in ${STAGEDIR}${PREFIX}/lib/python3.4/lib-dynload/*.so; do \
 		${STRIP_CMD} $$i; done								# Strip shared extensions
 
 regression-test: build
 	@cd ${WRKSRC} && ${MAKE} TESTOPTS=-j${MAKE_JOBS_NUMBER} buildbottest
 
 .include <bsd.port.mk>
Index: head/lang/qore/Makefile
===================================================================
--- head/lang/qore/Makefile	(revision 382210)
+++ head/lang/qore/Makefile	(revision 382211)
@@ -1,41 +1,39 @@
 # $FreeBSD$
 
 PORTNAME=	qore
 PORTVERSION=	0.8.8
 PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	SF/qore/qore/${PORTVERSION}/
 
 MAINTAINER=	estrabd@gmail.com
 COMMENT=	The Qore Programming Language
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 		libmpfr.so:${PORTSDIR}/math/mpfr
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 		${LOCALBASE}/bin/bison:${PORTSDIR}/devel/bison
 
 USES=		gmake iconv libtool pathfix tar:bzip2
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	LEX="${LOCALBASE}/bin/flex" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		PTHREAD_CFLAGS="${PTRHEAD_CFLAGS}"
+CONFIGURE_ENV=	LEX="${LOCALBASE}/bin/flex" PTHREAD_LIBS="-lpthread"
 CONFIGURE_ARGS=	--disable-debug --disable-static --with-doxygen=no
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "powerpc"
 BROKEN=		Does not compile on powerpc
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|; make|; $${MAKE}|g' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.post.mk>
Index: head/lang/ruby20/Makefile
===================================================================
--- head/lang/ruby20/Makefile	(revision 382210)
+++ head/lang/ruby20/Makefile	(revision 382211)
@@ -1,248 +1,248 @@
 # Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
 
 PORTNAME=	ruby
 PORTVERSION=	${RUBY_PORTVERSION}
 PORTREVISION=	${RUBY_PORTREVISION}
 PORTEPOCH=	${RUBY_PORTEPOCH}
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=		${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR_RUBY}
 DISTNAME=	${RUBY_DISTNAME}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT?=	Object-oriented interpreted scripting language
 
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libyaml.so:${PORTSDIR}/textproc/libyaml
 
 # Using LIB_DEPENDS finds the libffi from gcc which causes problems
 BUILD_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
 RUN_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${RUBY_WRKSRC}
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--enable-shared \
 		--enable-pthread \
 		--disable-rpath \
 		--with-ruby-version=minor \
 		--with-sitedir="${PREFIX}/lib/ruby/site_ruby" \
 		--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf
 
 CONFIGURE_ENV+=	LC_ALL=C
 MAKE_ENV+=	LC_ALL=C
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${RUBY_DISTVERSION}
 
 RUBY_VER=		2.0
 USE_RUBY=		yes
 RUBY_NO_BUILD_DEPENDS=	yes
 RUBY_NO_RUN_DEPENDS=	yes
 
 NO_LATEST_LINK=	yes
 
 OPTIONS_DEFINE=		CAPIDOCS DEBUG DOCS EXAMPLES RDOC
 OPTIONS_DEFAULT=	RDOC LIBEDIT
 OPTIONS_SINGLE=		EDIT
 OPTIONS_SINGLE_EDIT=	LIBEDIT READLINE
 OPTIONS_SUB=		yes
 CAPIDOCS_DESC=		Build and install C API documents
 RDOC_DESC=		Build and install Rdoc indexes
 EDIT_DESC=		Which line editing lib to use
 LIBEDIT_DESC=		Use libedit
 READLINE_DESC=		Use libreadline
 CAPIDOCS_BUILD_DEPENDS=	doxygen>0:${PORTSDIR}/devel/doxygen \
 			dot:${PORTSDIR}/graphics/graphviz
 CAPIDOCS_CONFIGURE_OFF=	--disable-install-capi
 RDOC_CONFIGURE_OFF=	--disable-install-rdoc
 
 USES=		execinfo cpe tar:bzip2
 
 CPE_VENDOR=	ruby-lang
 CPE_VERSION=	${RUBY_RELVERSION}
 CPE_UPDATE=	p${RUBY_PATCHLEVEL}
 
 .include <bsd.port.pre.mk>
 
 # PORTEPOCH/PORTREVISION hack
 
 .if ${PORTEPOCH} != 0
 _SUF2=	,${PORTEPOCH}
 .endif
 
 .if ${PORTREVISION} != 0
 _SUF1=	_${PORTREVISION}
 .endif
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 # Keep this, else ruby will fail to load libraries dependent op libpthread.
-LIBS+=		-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LIBS+=		-lpthread -L${LOCALBASE}/lib
 
 .if ${OPSYS} == "FreeBSD"
 .if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032) && (${ARCH} == "amd64" || ${ARCH} == "i386")
 CONFIGURE_ARGS+=	--enable-dtrace
 .else
 CONFIGURE_ARGS+=	--disable-dtrace
 .endif
 .endif
 
 CONFIGURE_ENV=	debugflags=
 
 .if ${PORT_OPTIONS:MCAPIDOCS}
 MAKE_JOBS_UNSAFE=	yes
 .endif
 
 .if ${PORT_OPTIONS:MLIBEDIT}
 BUILD_DEPENDS+=	libedit>=0:${PORTSDIR}/devel/libedit
 RUN_DEPENDS+=	libedit>=0:${PORTSDIR}/devel/libedit
 CONFIGURE_ARGS+=	--enable-libedit --with-libedit-prefix=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MREADLINE}
 BUILD_DEPENDS+=	readline>=0:${PORTSDIR}/devel/readline
 RUN_DEPENDS+=	readline>=0:${PORTSDIR}/devel/readline
 CONFIGURE_ARGS+=	--disable-libedit --with-readline-prefix=${LOCALBASE}
 .endif
 
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 MLINKS=		${RUBY_NAME}.1 ruby.1
 PLIST_SUB+=	IF_DEFAULT=""
 .else
 PKGNAMESUFFIX=	${RUBY_VER:C/\.//}
 PLIST_SUB+=	IF_DEFAULT="@comment "
 .endif
 
 INSTALLED_SCRIPTS=	irb erb rdoc ri ruby testrb
 
 EXTSAMPLES=	bigdecimal/sample/*.rb	\
 		curses/hello.rb		\
 		curses/rain.rb		\
 		curses/view.rb		\
 		curses/view2.rb
 
 EXTDOCS=	readline/README*		\
 		ripper/README			\
 		stringio/README			\
 		syslog/syslog.txt
 
 # Macros to change variables in rbconfig.rb
 RB_SET_CONF_VAR=${SH} -c '${REINPLACE_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]]*=[[:space:]]*)(\(?)(.*)(\)?),\1\2$$1\4," ${WRKSRC}/rbconfig.rb' --
 
 post-patch:
 	@${REINPLACE_CMD} -E \
-		-e 's,-l$$pthread_lib,${PTHREAD_LIBS},g' \
+		-e 's,-l$$pthread_lib,-lpthread,g' \
 		-e '/^RUBY_LIB_PATH/s,\.\$$\{TEENY\},,' \
 		-e '/^RUBY_SITE_LIB_PATH2/s,\.\$$\{TEENY\},,' \
 		-e '/^RUBY_VENDOR_LIB_PATH2/s,\.\$$\{TEENY\},,' \
 		${WRKSRC}/configure
 
 	#
 	# Eliminate all leftovers
 	#
 	@${FIND} ${WRKSRC}/ -name "*.orig" -delete
 
 #
 # Remove modules we don't want
 #
 .for d in win32ole
 	${RM} -rf ${BUILD_WRKSRC}/ext/${d}
 .endfor
 # We get rake from ports.
 .for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb
 	${RM} -rf ${BUILD_WRKSRC}/${d}
 .endfor
 # We get the gem executable from ports.
 	${RM} ${BUILD_WRKSRC}/bin/gem
 
 #
 # Prepare modules we are wanting to build via external ports
 #
 .for d in gdbm tk
 	${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/
 .endfor
 
 post-build:
 #
 # Hack to allow modules to be installed into separate PREFIX and/or under user
 # privilegies
 #
 	@${RB_SET_CONF_VAR} "prefix" "ENV['PREFIX'] || \3"
 	@${RB_SET_CONF_VAR} "INSTALL" "ENV['RB_USER_INSTALL'] ? '/usr/bin/install -c' : '/usr/bin/install -c ${_BINOWNGRP}'"
 	@${RB_SET_CONF_VAR} "INSTALL_PROGRAM" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} ${STRIP} -m ${BINMODE}' : '${INSTALL_PROGRAM}'"
 	@${RB_SET_CONF_VAR} "INSTALL_SCRIPT" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${BINMODE}' : '${INSTALL_SCRIPT}'"
 	@${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'"
 .if ${PORT_OPTIONS:MCAPIDOCS}
 	${FIND} ${WRKSRC}/doc -type d -empty -delete
 .endif
 
 pre-su-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}
 	${MKDIR} ${STAGEDIR}${RUBY_VENDORARCHLIBDIR}
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${RUBY_DOCDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${RUBY_EXAMPLESDIR}
 .endif
 .if ${PORT_OPTIONS:MRDOC}
 	${MKDIR} ${STAGEDIR}${RUBY_RIDIR}
 	${MKDIR} ${STAGEDIR}${RUBY_SITERIDIR}
 .endif
 
 post-install:
 #
 # XXX: hack to strip ruby binary. Ruby uses its own install script that seems
 # bogus to hack.
 #
 .if defined(STRIP) && ${STRIP} == -s && ! ${PORT_OPTIONS:MDEBUG}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${RUBY_NAME}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libruby${RUBY_SHLIBVER}.so.${RUBY_SHLIBVER}
 	${FIND} ${STAGEDIR}${RUBY_ARCHLIBDIR} -type f -name '*\.so' -exec ${STRIP_CMD} {} \;
 .endif
 
 #
 # Link just installed "ruby" to "ruby20", etc.
 #
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 . for FILE in ${INSTALLED_SCRIPTS}
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
 . endfor
 .endif
 
 	# Create all dirs required (":u" isn't avaiable in STABLE yet :-()
 	${MKDIR} ${EXTSAMPLES:C,^([^/]+)/.*,\1,:S,^,${STAGEDIR}${RUBY_EXAMPLESDIR}/,}
 	${MKDIR} ${EXTDOCS:C,^([^/]+)/.*,\1,:S,^,${STAGEDIR}${RUBY_DOCDIR}/,}
 .for FILE in ${EXTSAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
 		${STAGEDIR}${RUBY_EXAMPLESDIR}/${FILE:C,^([^/]+)/.*,\1,}/
 .endfor
 .for FILE in ${EXTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
 		${STAGEDIR}${RUBY_DOCDIR}/${FILE:C,^([^/]+)/.*,\1,}/
 .endfor
 	@(cd ${WRKSRC}/sample/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_EXAMPLESDIR}/)
 	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/)
 	${INSTALL_DATA} ${WRKSRC}/COPYING*	\
 			${WRKSRC}/ChangeLog	\
 			${WRKSRC}/LEGAL		\
 			${WRKSRC}/README*	\
 			${STAGEDIR}${RUBY_DOCDIR}/
 
 test:
 	@(cd ${WRKSRC}; ${MAKE} test)
 
 validate:
 	@${MKDIR} ${WRKSRC}/rubyspec
 	rm -rf ${WRKSRC}/rubyspec/*
 	(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/rubyspec.git)
 	(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/mspec.git)
 	(cd ${WRKSRC}/rubyspec/rubyspec && env PATH=${WRKSRC}/rubyspec/mspec/bin:${PATH} mspec -t ${PREFIX}/bin/ruby${RUBY_SUFFIX} .)
 
 .include <bsd.port.post.mk>
Index: head/lang/ruby21/Makefile
===================================================================
--- head/lang/ruby21/Makefile	(revision 382210)
+++ head/lang/ruby21/Makefile	(revision 382211)
@@ -1,243 +1,243 @@
 # Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
 
 PORTNAME=	ruby
 PORTVERSION=	${RUBY_PORTVERSION}
 PORTREVISION=	${RUBY_PORTREVISION}
 PORTEPOCH=	${RUBY_PORTEPOCH}
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=		${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR_RUBY}
 DISTNAME=	${RUBY_DISTNAME}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT?=	Object-oriented interpreted scripting language
 
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libyaml.so:${PORTSDIR}/textproc/libyaml
 
 # Using LIB_DEPENDS finds the libffi from gcc which causes problems
 BUILD_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
 RUN_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${RUBY_WRKSRC}
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--enable-shared \
 		--enable-pthread \
 		--disable-rpath \
 		--with-ruby-version=minor \
 		--with-sitedir="${PREFIX}/lib/ruby/site_ruby" \
 		--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf
 
 CONFIGURE_ENV+=	LC_ALL=C
 MAKE_ENV+=	LC_ALL=C
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${RUBY_DISTVERSION}
 
 RUBY_VER=		2.1
 USE_RUBY=		yes
 RUBY_NO_BUILD_DEPENDS=	yes
 RUBY_NO_RUN_DEPENDS=	yes
 NO_LATEST_LINK=		yes
 
 OPTIONS_DEFINE=		CAPIDOCS DEBUG DOCS EXAMPLES RDOC
 OPTIONS_DEFAULT=	RDOC LIBEDIT
 OPTIONS_SINGLE=		EDIT
 OPTIONS_SINGLE_EDIT=	LIBEDIT READLINE
 OPTIONS_SUB=		yes
 CAPIDOCS_DESC=		Build and install C API documents
 RDOC_DESC=		Build and install Rdoc indexes
 EDIT_DESC=		Which line editing lib to use
 LIBEDIT_DESC=		Use libedit
 READLINE_DESC=		Use libreadline
 CAPIDOCS_BUILD_DEPENDS=	doxygen>0:${PORTSDIR}/devel/doxygen \
 			dot:${PORTSDIR}/graphics/graphviz
 CAPIDOCS_CONFIGURE_OFF=	--disable-install-capi
 RDOC_CONFIGURE_OFF=	--disable-install-rdoc
 
 USES=		execinfo cpe tar:xz
 
 CPE_VENDOR=	ruby-lang
 CPE_VERSION=	${RUBY_RELVERSION}
 CPE_UPDATE=	p${RUBY_PATCHLEVEL}
 
 .include <bsd.port.pre.mk>
 
 # PORTEPOCH/PORTREVISION hack
 
 .if ${PORTEPOCH} != 0
 _SUF2=	,${PORTEPOCH}
 .endif
 
 .if ${PORTREVISION} != 0
 _SUF1=	_${PORTREVISION}
 .endif
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 # Keep this, else ruby will fail to load libraries dependent op libpthread.
-LIBS+=		-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LIBS+=		-lpthread -L${LOCALBASE}/lib
 
 .if ${OPSYS} == "FreeBSD"
 .if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032)
 CONFIGURE_ARGS+=	--enable-dtrace
 .else
 CONFIGURE_ARGS+=	--disable-dtrace
 .endif
 .endif
 
 CONFIGURE_ENV=	debugflags=
 
 .if ${PORT_OPTIONS:MCAPIDOCS}
 MAKE_JOBS_UNSAFE=	yes
 .endif
 
 .if ${PORT_OPTIONS:MLIBEDIT}
 BUILD_DEPENDS+=	libedit>=0:${PORTSDIR}/devel/libedit
 RUN_DEPENDS+=	libedit>=0:${PORTSDIR}/devel/libedit
 CONFIGURE_ARGS+=	--enable-libedit --with-libedit-prefix=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MREADLINE}
 BUILD_DEPENDS+=	readline>=0:${PORTSDIR}/devel/readline
 RUN_DEPENDS+=	readline>=0:${PORTSDIR}/devel/readline
 CONFIGURE_ARGS+=	--disable-libedit --with-readline-prefix=${LOCALBASE}
 .endif
 
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 MLINKS=		${RUBY_NAME}.1 ruby.1
 PLIST_SUB+=	IF_DEFAULT=""
 .else
 PKGNAMESUFFIX=	${RUBY_VER:C/\.//}
 PLIST_SUB+=	IF_DEFAULT="@comment "
 .endif
 
 INSTALLED_SCRIPTS=	irb erb rdoc ri ruby testrb
 
 EXTSAMPLES=	bigdecimal/sample/*.rb
 
 EXTDOCS=	readline/README*		\
 		ripper/README			\
 		stringio/README			\
 		syslog/syslog.txt
 
 # Macros to change variables in rbconfig.rb
 RB_SET_CONF_VAR=${SH} -c '${REINPLACE_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]]*=[[:space:]]*)(\(?)(.*)(\)?),\1\2$$1\4," ${WRKSRC}/rbconfig.rb' --
 
 post-patch:
 	@${REINPLACE_CMD} -E \
-		-e 's,-l$$pthread_lib,${PTHREAD_LIBS},g' \
+		-e 's,-l$$pthread_lib,-lpthread,g' \
 		-e '/^RUBY_LIB_PATH/s,\.\$$\{TEENY\},,' \
 		-e '/^RUBY_SITE_LIB_PATH2/s,\.\$$\{TEENY\},,' \
 		-e '/^RUBY_VENDOR_LIB_PATH2/s,\.\$$\{TEENY\},,' \
 		${WRKSRC}/configure
 
 	#
 	# Eliminate all leftovers
 	#
 	@${FIND} ${WRKSRC}/ -name "*.orig" -delete
 
 #
 # Remove modules we don't want
 #
 .for d in win32ole
 	${RM} -rf ${BUILD_WRKSRC}/ext/${d}
 .endfor
 # We get rake from ports.
 .for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb
 	${RM} -rf ${BUILD_WRKSRC}/${d}
 .endfor
 # We get the gem executable from ports.
 	${RM} ${BUILD_WRKSRC}/bin/gem
 
 #
 # Prepare modules we are wanting to build via external ports
 #
 .for d in gdbm tk
 	${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/
 .endfor
 
 post-build:
 #
 # Hack to allow modules to be installed into separate PREFIX and/or under user
 # privilegies
 #
 	@${RB_SET_CONF_VAR} "prefix" "ENV['PREFIX'] || \3"
 	@${RB_SET_CONF_VAR} "INSTALL" "ENV['RB_USER_INSTALL'] ? '/usr/bin/install -c' : '/usr/bin/install -c ${_BINOWNGRP}'"
 	@${RB_SET_CONF_VAR} "INSTALL_PROGRAM" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} ${STRIP} -m ${BINMODE}' : '${INSTALL_PROGRAM}'"
 	@${RB_SET_CONF_VAR} "INSTALL_SCRIPT" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${BINMODE}' : '${INSTALL_SCRIPT}'"
 	@${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'"
 .if ${PORT_OPTIONS:MCAPIDOCS}
 	${FIND} ${WRKSRC}/doc -type d -empty -delete
 .endif
 
 pre-su-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}
 	${MKDIR} ${STAGEDIR}${RUBY_VENDORARCHLIBDIR}
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${RUBY_DOCDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${RUBY_EXAMPLESDIR}
 .endif
 .if ${PORT_OPTIONS:MRDOC}
 	${MKDIR} ${STAGEDIR}${RUBY_RIDIR}
 	${MKDIR} ${STAGEDIR}${RUBY_SITERIDIR}
 .endif
 
 post-install:
 #
 # XXX: hack to strip ruby binary. Ruby uses its own install script that seems
 # bogus to hack.
 #
 .if defined(STRIP) && ${STRIP} == -s && ! ${PORT_OPTIONS:MDEBUG}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${RUBY_NAME}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libruby${RUBY_SHLIBVER}.so.${RUBY_SHLIBVER}
 	${FIND} ${STAGEDIR}${RUBY_ARCHLIBDIR} -type f -name '*\.so' -exec ${STRIP_CMD} {} \;
 .endif
 
 #
 # Link just installed "ruby" to "ruby21", etc.
 #
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 . for FILE in ${INSTALLED_SCRIPTS}
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
 . endfor
 .endif
 
 	# Create all dirs required (":u" isn't avaiable in STABLE yet :-()
 	${MKDIR} ${EXTSAMPLES:C,^([^/]+)/.*,\1,:S,^,${STAGEDIR}${RUBY_EXAMPLESDIR}/,}
 	${MKDIR} ${EXTDOCS:C,^([^/]+)/.*,\1,:S,^,${STAGEDIR}${RUBY_DOCDIR}/,}
 .for FILE in ${EXTSAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
 		${STAGEDIR}${RUBY_EXAMPLESDIR}/${FILE:C,^([^/]+)/.*,\1,}/
 .endfor
 .for FILE in ${EXTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
 		${STAGEDIR}${RUBY_DOCDIR}/${FILE:C,^([^/]+)/.*,\1,}/
 .endfor
 	@(cd ${WRKSRC}/sample/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_EXAMPLESDIR}/)
 	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/)
 	${INSTALL_DATA} ${WRKSRC}/COPYING*	\
 			${WRKSRC}/ChangeLog	\
 			${WRKSRC}/LEGAL		\
 			${WRKSRC}/README*	\
 			${STAGEDIR}${RUBY_DOCDIR}/
 
 test:
 	@(cd ${WRKSRC}; ${MAKE} test)
 
 validate:
 	@${MKDIR} ${WRKSRC}/rubyspec
 	rm -rf ${WRKSRC}/rubyspec/*
 	(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/rubyspec.git)
 	(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/mspec.git)
 	(cd ${WRKSRC}/rubyspec/rubyspec && env PATH=${WRKSRC}/rubyspec/mspec/bin:${PATH} mspec -t ${PREFIX}/bin/ruby${RUBY_SUFFIX} .)
 
 .include <bsd.port.post.mk>
Index: head/lang/ruby22/Makefile
===================================================================
--- head/lang/ruby22/Makefile	(revision 382210)
+++ head/lang/ruby22/Makefile	(revision 382211)
@@ -1,243 +1,243 @@
 # Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
 
 PORTNAME=	ruby
 PORTVERSION=	${RUBY_PORTVERSION}
 PORTREVISION=	${RUBY_PORTREVISION}
 PORTEPOCH=	${RUBY_PORTEPOCH}
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=		${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR_RUBY}
 DISTNAME=	${RUBY_DISTNAME}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT?=	Object-oriented interpreted scripting language
 
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libyaml.so:${PORTSDIR}/textproc/libyaml
 
 # Using LIB_DEPENDS finds the libffi from gcc which causes problems
 BUILD_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
 RUN_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${RUBY_WRKSRC}
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--enable-shared \
 		--enable-pthread \
 		--disable-rpath \
 		--with-ruby-version=minor \
 		--with-sitedir="${PREFIX}/lib/ruby/site_ruby" \
 		--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf
 
 CONFIGURE_ENV+=	LC_ALL=C
 MAKE_ENV+=	LC_ALL=C
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${RUBY_DISTVERSION}
 
 RUBY_VER=		2.2
 USE_RUBY=		yes
 RUBY_NO_BUILD_DEPENDS=	yes
 RUBY_NO_RUN_DEPENDS=	yes
 NO_LATEST_LINK=		yes
 
 OPTIONS_DEFINE=		CAPIDOCS DEBUG DOCS EXAMPLES RDOC
 OPTIONS_DEFAULT=	RDOC LIBEDIT
 OPTIONS_SINGLE=		EDIT
 OPTIONS_SINGLE_EDIT=	LIBEDIT READLINE
 OPTIONS_SUB=		yes
 CAPIDOCS_DESC=		Build and install C API documents
 RDOC_DESC=		Build and install Rdoc indexes
 EDIT_DESC=		Which line editing lib to use
 LIBEDIT_DESC=		Use libedit
 READLINE_DESC=		Use libreadline
 CAPIDOCS_BUILD_DEPENDS=	doxygen>0:${PORTSDIR}/devel/doxygen \
 			dot:${PORTSDIR}/graphics/graphviz
 CAPIDOCS_CONFIGURE_ENABLE=	install-capi
 RDOC_CONFIGURE_ENABLE=	install-rdoc
 
 USES=		execinfo cpe tar:xz
 
 CPE_VENDOR=	ruby-lang
 CPE_VERSION=	${RUBY_RELVERSION}
 CPE_UPDATE=	p${RUBY_PATCHLEVEL}
 
 .include <bsd.port.pre.mk>
 
 # PORTEPOCH/PORTREVISION hack
 
 .if ${PORTEPOCH} != 0
 _SUF2=	,${PORTEPOCH}
 .endif
 
 .if ${PORTREVISION} != 0
 _SUF1=	_${PORTREVISION}
 .endif
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 # Keep this, else ruby will fail to load libraries dependent op libpthread.
-LIBS+=		-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LIBS+=		-lpthread -L${LOCALBASE}/lib
 
 .if ${OPSYS} == "FreeBSD"
 .if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032)
 CONFIGURE_ARGS+=	--enable-dtrace
 .else
 CONFIGURE_ARGS+=	--disable-dtrace
 .endif
 .endif
 
 CONFIGURE_ENV=	debugflags=
 
 .if ${PORT_OPTIONS:MCAPIDOCS}
 MAKE_JOBS_UNSAFE=	yes
 .endif
 
 .if ${PORT_OPTIONS:MLIBEDIT}
 BUILD_DEPENDS+=	libedit>=0:${PORTSDIR}/devel/libedit
 RUN_DEPENDS+=	libedit>=0:${PORTSDIR}/devel/libedit
 CONFIGURE_ARGS+=	--enable-libedit --with-libedit-prefix=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MREADLINE}
 BUILD_DEPENDS+=	readline>=0:${PORTSDIR}/devel/readline
 RUN_DEPENDS+=	readline>=0:${PORTSDIR}/devel/readline
 CONFIGURE_ARGS+=	--disable-libedit --with-readline-prefix=${LOCALBASE}
 .endif
 
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 MLINKS=		${RUBY_NAME}.1 ruby.1
 PLIST_SUB+=	IF_DEFAULT=""
 .else
 PKGNAMESUFFIX=	${RUBY_VER:C/\.//}
 PLIST_SUB+=	IF_DEFAULT="@comment "
 .endif
 
 INSTALLED_SCRIPTS=	irb erb rdoc ri ruby
 
 EXTSAMPLES=	bigdecimal/sample/*.rb
 
 EXTDOCS=	readline/README*		\
 		ripper/README			\
 		stringio/README			\
 		syslog/syslog.txt
 
 # Macros to change variables in rbconfig.rb
 RB_SET_CONF_VAR=${SH} -c '${REINPLACE_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]]*=[[:space:]]*)(\(?)(.*)(\)?),\1\2$$1\4," ${WRKSRC}/rbconfig.rb' --
 
 post-patch:
 	@${REINPLACE_CMD} -E \
-		-e 's,-l$$pthread_lib,${PTHREAD_LIBS},g' \
+		-e 's,-l$$pthread_lib,-lpthread,g' \
 		-e '/^RUBY_LIB_PATH/s,\.\$$\{TEENY\},,' \
 		-e '/^RUBY_SITE_LIB_PATH2/s,\.\$$\{TEENY\},,' \
 		-e '/^RUBY_VENDOR_LIB_PATH2/s,\.\$$\{TEENY\},,' \
 		${WRKSRC}/configure
 
 	#
 	# Eliminate all leftovers
 	#
 	@${FIND} ${WRKSRC}/ -name "*.orig" -delete
 
 #
 # Remove modules we don't want
 #
 .for d in win32ole
 	${RM} -rf ${BUILD_WRKSRC}/ext/${d}
 .endfor
 # We get rake from ports.
 .for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb
 	${RM} -rf ${BUILD_WRKSRC}/${d}
 .endfor
 # We get the gem executable from ports.
 	${RM} ${BUILD_WRKSRC}/bin/gem
 
 #
 # Prepare modules we are wanting to build via external ports
 #
 .for d in gdbm tk
 	${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/
 .endfor
 
 post-build:
 #
 # Hack to allow modules to be installed into separate PREFIX and/or under user
 # privilegies
 #
 	@${RB_SET_CONF_VAR} "prefix" "ENV['PREFIX'] || \3"
 	@${RB_SET_CONF_VAR} "INSTALL" "ENV['RB_USER_INSTALL'] ? '/usr/bin/install -c' : '/usr/bin/install -c ${_BINOWNGRP}'"
 	@${RB_SET_CONF_VAR} "INSTALL_PROGRAM" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} ${STRIP} -m ${BINMODE}' : '${INSTALL_PROGRAM}'"
 	@${RB_SET_CONF_VAR} "INSTALL_SCRIPT" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${BINMODE}' : '${INSTALL_SCRIPT}'"
 	@${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'"
 .if ${PORT_OPTIONS:MCAPIDOCS}
 	${FIND} ${WRKSRC}/doc -type d -empty -delete
 .endif
 
 pre-su-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}
 	${MKDIR} ${STAGEDIR}${RUBY_VENDORARCHLIBDIR}
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${RUBY_DOCDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${RUBY_EXAMPLESDIR}
 .endif
 .if ${PORT_OPTIONS:MRDOC}
 	${MKDIR} ${STAGEDIR}${RUBY_RIDIR}
 	${MKDIR} ${STAGEDIR}${RUBY_SITERIDIR}
 .endif
 
 post-install:
 #
 # XXX: hack to strip ruby binary. Ruby uses its own install script that seems
 # bogus to hack.
 #
 .if defined(STRIP) && ${STRIP} == -s && ! ${PORT_OPTIONS:MDEBUG}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${RUBY_NAME}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libruby${RUBY_SHLIBVER}.so.${RUBY_SHLIBVER}
 	${FIND} ${STAGEDIR}${RUBY_ARCHLIBDIR} -type f -name '*\.so' -exec ${STRIP_CMD} {} \;
 .endif
 
 #
 # Link just installed "ruby" to "ruby22", etc.
 #
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 . for FILE in ${INSTALLED_SCRIPTS}
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
 . endfor
 .endif
 
 	# Create all dirs required (":u" isn't avaiable in STABLE yet :-()
 	${MKDIR} ${EXTSAMPLES:C,^([^/]+)/.*,\1,:S,^,${STAGEDIR}${RUBY_EXAMPLESDIR}/,}
 	${MKDIR} ${EXTDOCS:C,^([^/]+)/.*,\1,:S,^,${STAGEDIR}${RUBY_DOCDIR}/,}
 .for FILE in ${EXTSAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
 		${STAGEDIR}${RUBY_EXAMPLESDIR}/${FILE:C,^([^/]+)/.*,\1,}/
 .endfor
 .for FILE in ${EXTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
 		${STAGEDIR}${RUBY_DOCDIR}/${FILE:C,^([^/]+)/.*,\1,}/
 .endfor
 	@(cd ${WRKSRC}/sample/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_EXAMPLESDIR}/)
 	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/)
 	${INSTALL_DATA} ${WRKSRC}/COPYING*	\
 			${WRKSRC}/ChangeLog	\
 			${WRKSRC}/LEGAL		\
 			${WRKSRC}/README*	\
 			${STAGEDIR}${RUBY_DOCDIR}/
 
 test:
 	@(cd ${WRKSRC}; ${MAKE} test)
 
 validate:
 	@${MKDIR} ${WRKSRC}/rubyspec
 	rm -rf ${WRKSRC}/rubyspec/*
 	(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/rubyspec.git)
 	(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/mspec.git)
 	(cd ${WRKSRC}/rubyspec/rubyspec && env PATH=${WRKSRC}/rubyspec/mspec/bin:${PATH} mspec -t ${PREFIX}/bin/ruby${RUBY_SUFFIX} .)
 
 .include <bsd.port.post.mk>
Index: head/lang/scheme48/Makefile
===================================================================
--- head/lang/scheme48/Makefile	(revision 382210)
+++ head/lang/scheme48/Makefile	(revision 382211)
@@ -1,49 +1,49 @@
 # Created by: jmacd
 # $FreeBSD$
 
 PORTNAME=	scheme48
 PORTVERSION=	1.9.2
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://www.s48.org/${PORTVERSION}/
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Scheme Underground's implementation of R5RS
 
 LICENSE=	BSD3CLAUSE MIT
 LICENSE_COMB=	multi
 
 CONFLICTS=	scsh-[0-9]*
 
 ALL_TARGET=	enough
 USES=		gmake tar:tgz
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 PLIST_SUB+=	VER=${PORTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's/-mthreads/${PTHREAD_LIBS}/' \
-		-e 's/-mt/${PTHREAD_LIBS}/' \
+		-e 's/-mthreads/-lpthread/' \
+		-e 's/-mt/-lpthread/' \
 		-e 's/-munaligned-double//' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} \
 		-e '/INSTALL.*COPYING/d' \
 		${WRKSRC}/Makefile.in
 .if ${PORT_OPTIONS:MDOCS}
 USE_TEX=	yes
 CONFIGURE_ARGS+=--docdir="${DOCSDIR}"
 .else
 	@${REINPLACE_CMD} \
 		-e 's/install-doc$$//' \
 		-e 's/go doc$$/go/' \
 		${WRKSRC}/Makefile.in
 .endif
 
 test:
 	${MAKE} -C ${WRKSRC} check
 
 .include <bsd.port.mk>
Index: head/lang/see/Makefile
===================================================================
--- head/lang/see/Makefile	(revision 382210)
+++ head/lang/see/Makefile	(revision 382211)
@@ -1,51 +1,51 @@
 # Created by: Simun Mikecin <numisemis@yahoo.com>
 # $FreeBSD$
 
 PORTNAME=	see
 PORTVERSION=	3.1.1424
 PORTREVISION=	1
 CATEGORIES=	lang devel
 MASTER_SITES=	http://download.openpkg.org/components/cache/see/ \
 		http://lil.fr.distfiles.macports.org/see/ \
 		ftp://ftp.mirrorservice.org/sites/distfiles.macports.org/see/ \
 		ftp://mirror.csclub.uwaterloo.ca/MacPorts/mpdistfiles/see/
 
 MAINTAINER=	numisemis@yahoo.com
 COMMENT=	Simple ECMAScript Engine (SEE)
 
 LICENSE=	BSD
 
 OPTIONS_DEFINE=	GC DEBUG DOCS
 OPTIONS_DEFAULT=	GC
 GC_DESC=	Use Boehm-Weiser garbage collection package
 DEBUG_DESC=	Internal SEE library debugging
 
 CONFLICTS=	see-devel-[0-9]*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_LDCONFIG=	yes
 USES=		libtool pathfix perl5
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 CFLAGS+=	-O3
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 DEBUG_CFLAGS_OFF=	-DNDEBUG
 GC_LIB_DEPENDS=		libgc.so:${PORTSDIR}/devel/boehm-gc
 GC_CONFIGURE_WITH=	boehm-gc
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|PACKAGE_BUGREPORT='leonard@users|PACKAGE_BUGREPORT='leonard\\\@users|" \
 		${WRKSRC}/configure
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in doc/USAGE.html AUTHORS NEWS README TODO COPYING
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/lang/spidermonkey17/Makefile
===================================================================
--- head/lang/spidermonkey17/Makefile	(revision 382210)
+++ head/lang/spidermonkey17/Makefile	(revision 382211)
@@ -1,71 +1,71 @@
 # Created by: Dan Rench <citric@cubicone.tmetic.com>
 # $FreeBSD$
 
 PORTNAME=	spidermonkey17
 DISTVERSION=	1.7.0
 PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	js
 DISTNAME=	js-${DISTVERSION}
 
 MAINTAINER=	citric@cubicone.tmetic.com
 COMMENT=	Standalone JavaScript interpreter from the Mozilla project
 
 LIB_DEPENDS=	libnspr4.so:${PORTSDIR}/devel/nspr
 
 CONFLICTS=	njs-[0-9]*
 
 MAKE_ARGS+=	JS_THREADSAFE=YES \
-		PROG_LIBS="-lreadline -ltermcap -lm ${PTHREAD_LIBS}" \
+		PROG_LIBS="-lreadline -ltermcap -lm -lpthread" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CFLAGS+=	-I${LOCALBASE}/include/nspr
 
 USES=		gmake readline
 MAKEFILE=	Makefile.ref
 ALL_TARGET=	${OPSYS}`${UNAME} -r`_DBG.OBJ/js
 MAKE_ENV+=	CCC="${CXX}"
 USE_LDCONFIG=	yes
 SRC_DIR=	js/src
 
 JSH=		jsapi.h jsarena.h jsarray.h jsatom.h jsautocfg.h jsbool.h \
 		jsclist.h jscntxt.h jscompat.h jsconfig.h jsdate.h jsdhash.h \
 		jsdtoa.h jsemit.h jsexn.h jsfun.h jsgc.h jshash.h jsinterp.h \
 		jsiter.h jslibmath.h jslock.h jslong.h jsmath.h jsnum.h jsobj.h \
 		jsopcode.h jsosdep.h jsotypes.h jsparse.h jsprf.h jsprvtd.h \
 		jspubtd.h jsutil.h jsregexp.h jsscan.h jsscope.h jsscript.h \
 		jsstr.h jstypes.h jsxdrapi.h jsxml.h \
 		js.msg jsproto.tbl
 
 PLIST_FILES=	bin/js lib/libjs.so lib/libjs.so.1 ${JSH:S,^,include/,}
 WRKSRC=		${WRKDIR}/${SRC_DIR}
 EXTRACT_AFTER_ARGS=	--exclude js/jsd
 
 OPTIONS_DEFINE=	UTF8
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MUTF8}
 CFLAGS+=	-DJS_C_STRINGS_ARE_UTF8
 .endif
 
 do-configure:
 	${CP} ${WRKSRC}/config/Linux_All.mk \
 		${WRKSRC}/config/${OPSYS}`${UNAME} -r`.mk
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${OPSYS}`${UNAME} -r`_DBG.OBJ/js \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/${OPSYS}`${UNAME} -r`_DBG.OBJ/libjs.so \
 		${STAGEDIR}${PREFIX}/lib
 	${LN} -sf libjs.so ${STAGEDIR}${PREFIX}/lib/libjs.so.1
 	${CP} ${WRKSRC}/${OPSYS}`${UNAME} -r`_DBG.OBJ/jsautocfg.h ${WRKSRC}
 	@${INSTALL_DATA} ${JSH:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/include/
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64" && ${OSVERSION} > 900000
 BROKEN=		Does not build on sparc64-9: fails to link
 .endif
 
 .include <bsd.port.post.mk>
Index: head/lang/ypsilon/Makefile
===================================================================
--- head/lang/ypsilon/Makefile	(revision 382210)
+++ head/lang/ypsilon/Makefile	(revision 382211)
@@ -1,37 +1,36 @@
 # Created by: Vitaly Magerya <vmagerya@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	ypsilon
 PORTVERSION=	0.9.6.3
 PORTREVISION=	3
 CATEGORIES=	lang scheme
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	${PORTNAME}-0.9.6.update3
 
 MAINTAINER=	vmagerya@gmail.com
 COMMENT=	Scheme implementation for real-time applications
 
 USES=		gmake
 
-MAKE_ARGS=	DATADIR="${DATADIR}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ARGS=	DATADIR="${DATADIR}"
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-patch:
 	${REINPLACE_CMD} 's/-fno-[a-z-]*//g' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "sitelib stdlib" ${STAGEDIR}${DATADIR})
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/example/*.scm ${STAGEDIR}${EXAMPLESDIR}
 
 regression-test: build
 	cd ${WRKSRC} && ${MAKE_CMD} check
 
 .include <bsd.port.mk>
Index: head/lang/ypsilon/files/patch-Makefile
===================================================================
--- head/lang/ypsilon/files/patch-Makefile	(revision 382210)
+++ head/lang/ypsilon/files/patch-Makefile	(revision 382211)
@@ -1,52 +1,43 @@
 --- Makefile.orig	2008-12-23 10:56:02.000000000 +0200
 +++ Makefile	2008-12-27 16:33:07.000000000 +0200
 @@ -1,14 +1,11 @@
 -#   Makefile for Linux, FreeBSD, OpenBSD, and Darwin
  #   Requirements: GNU Make, GCC 4.0 or later
  #   Options: DESTDIR, PREFIX, DATAMODEL(ILP32/LP64)
  
  PROG 	 = ypsilon
  
 -PREFIX 	 = /usr/local
 +CPPFLAGS = -DNDEBUG -DSYSTEM_SHARE_PATH='"$(DESTDIR)$(DATADIR)"'
  
 -CPPFLAGS = -DNDEBUG -DSYSTEM_SHARE_PATH='"$(DESTDIR)$(PREFIX)/share/$(PROG)"'
 -
 -CXXFLAGS = -pipe -x c++ -pthread -O3 -fstrict-aliasing -fomit-frame-pointer -momit-leaf-frame-pointer
 +CXXFLAGS = -x c++ ${CFLAGS}
  
  SRCS 	 = file.cpp main.cpp vm0.cpp object_heap_compact.cpp subr_flonum.cpp vm1.cpp object_set.cpp \
  	   subr_hash.cpp vm2.cpp object_slab.cpp subr_list.cpp interpreter.cpp serialize.cpp \
 @@ -60,15 +57,7 @@
  endif
  
  ifneq (, $(findstring FreeBSD, $(UNAME)))
 -  ifeq ($(shell $(CXX) -dumpspecs | grep 'march=native'), )
 -    ifeq ($(DATAMODEL), ILP32)  
 -      CXXFLAGS += -march=i686
 -    endif
 -  else
 -    CXXFLAGS += -march=native
 -  endif
    CPPFLAGS += -D__LITTLE_ENDIAN__
 -  CXXFLAGS += -msse2 -mfpmath=sse  
    ifeq ($(DATAMODEL), ILP32)  
      CPPFLAGS += -DDEFAULT_HEAP_LIMIT=32
      CXXFLAGS += -m32
-@@ -82,7 +71,7 @@
-     ASFLAGS = --64
-     SRCS += ffi_stub_freebsd64.s
-   endif
--  LDLIBS = -pthread
-+  LDLIBS = ${PTHREAD_LIBS}
- endif
- 
- ifneq (, $(findstring OpenBSD, $(UNAME)))
 @@ -123,7 +112,6 @@
  .PHONY: all install uninstall sitelib stdlib check bench clean distclean
  
  all: $(PROG)
 -	@mkdir -p -m755 $(HOME)/.ypsilon
  
  $(PROG): $(OBJS)
  	$(CXX) $(LDFLAGS) $(LDLIBS) -o $@ $^