26 files changed, 38 insertions, 68 deletions

diff --git a/lang/afnix/Makefile b/lang/afnix/Makefile
index 44dbb4fa2150..ddd92da4edf6 100644
--- a/lang/afnix/Makefile
+++ b/lang/afnix/Makefile
@@ -17,8 +17,6 @@ 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}
diff --git a/lang/afnix/files/patch-cnf_mak_afnix-clg4.mak b/lang/afnix/files/patch-cnf_mak_afnix-clg4.mak
index 2d47a2ad622f..de16de6eaae1 100644
--- a/lang/afnix/files/patch-cnf_mak_afnix-clg4.mak
+++ b/lang/afnix/files/patch-cnf_mak_afnix-clg4.mak
@@ -1,6 +1,6 @@
---- 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                                              -
  # ----------------------------------------------------------------------------
  
@@ -24,9 +24,3 @@
  PFLCCFLAGS      =
  COVCCFLAGS      =
  CPPCCFLAGS      = -nostdinc -nostdinc++
- CXXCCFLAGS      = 
--STDDEFINES      =
-+STDDEFINES      = $(PTHREAD_CFLAGS)
- DBGDEFINES      = -DAFNIX_DEBUG
- OPTDEFINES      =
- PFLDEFINES	=
diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile
index 78e840ce3c80..fc8eaa17b444 100644
--- a/lang/ecl/Makefile
+++ b/lang/ecl/Makefile
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=--with-dffi=no
 
 .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
@@ -79,8 +79,7 @@ LIB_DEPENDS+=	libgc.so:${PORTSDIR}/devel/boehm-gc
 
 .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>
diff --git a/lang/ferite/Makefile b/lang/ferite/Makefile
index 8cb656a4b90c..d4c149e42cca 100644
--- a/lang/ferite/Makefile
+++ b/lang/ferite/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 
 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
diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index 539a06888db9..bb414ae1477b 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -38,7 +38,6 @@ 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
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 507a2361e19b..f4ea0bc107c7 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -71,11 +71,9 @@ CONFIGURE_ARGS+= -as "${AS} ${ASFLAGS}"
 
 .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
@@ -102,7 +100,7 @@ IGNORE=requires X11 support to build TK bindings
 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
@@ -159,8 +157,8 @@ post-patch:
 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
 
diff --git a/lang/ofc/Makefile b/lang/ofc/Makefile
index 93ac3dff39d6..9fa17a6732a1 100644
--- a/lang/ofc/Makefile
+++ b/lang/ofc/Makefile
@@ -20,8 +20,8 @@ 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
diff --git a/lang/onyx/Makefile b/lang/onyx/Makefile
index 5a121c49b4c7..01b7fa406ab0 100644
--- a/lang/onyx/Makefile
+++ b/lang/onyx/Makefile
@@ -29,8 +29,6 @@ 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)
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 8b2048d0fa78..2df3d8e67f3e 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -143,7 +143,7 @@ CONFIGURE_ENV+=	ac_cv_pthreads_lib="" \
 		lt_cv_path_SED="sed"
 
 .if ${PORT_OPTIONS:MLINKTHR}
-LIBS+=		${PTHREAD_LIBS}
+LIBS+=		-lpthread
 .endif
 
 .if ${PORT_OPTIONS:MZTS}
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 6ea28d46c1db..fba43a0b03e0 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -141,7 +141,7 @@ CONFIGURE_ENV+=	ac_cv_pthreads_lib="" \
 		lt_cv_path_SED="sed"
 
 .if ${PORT_OPTIONS:MLINKTHR}
-LIBS+=		${PTHREAD_LIBS}
+LIBS+=		-lpthread
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
diff --git a/lang/php55/Makefile b/lang/php55/Makefile
index 95e8a6b45cd5..03d4c6a7d403 100644
--- a/lang/php55/Makefile
+++ b/lang/php55/Makefile
@@ -143,7 +143,7 @@ CONFIGURE_ENV+=	ac_cv_pthreads_lib="" \
 		lt_cv_path_SED="sed"
 
 .if ${PORT_OPTIONS:MLINKTHR}
-LIBS+=		${PTHREAD_LIBS}
+LIBS+=		-lpthread
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
diff --git a/lang/php56/Makefile b/lang/php56/Makefile
index fe6375473e08..db34d826d0f8 100644
--- a/lang/php56/Makefile
+++ b/lang/php56/Makefile
@@ -146,7 +146,7 @@ CONFIGURE_ENV+=	ac_cv_pthreads_lib="" \
 		lt_cv_path_SED="sed"
 
 .if ${PORT_OPTIONS:MLINKTHR}
-LIBS+=		${PTHREAD_LIBS}
+LIBS+=		-lpthread
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
diff --git a/lang/pike78/Makefile b/lang/pike78/Makefile
index 0ed7797e69f6..08d227307cf0 100644
--- a/lang/pike78/Makefile
+++ b/lang/pike78/Makefile
@@ -38,9 +38,9 @@ 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 \
@@ -94,8 +94,8 @@ post-patch:
 		${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|^|//|' \
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 070a532811a0..9c29d2ee3f59 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -64,8 +64,7 @@ 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
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 7135bdb5cca1..43f09d72c87e 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -58,8 +58,7 @@ 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
 
diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index 00df7018a249..a31b3ceafde1 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -60,8 +60,7 @@ 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
 
diff --git a/lang/python34/Makefile b/lang/python34/Makefile
index fab86180d8e8..4244a87f4925 100644
--- a/lang/python34/Makefile
+++ b/lang/python34/Makefile
@@ -70,8 +70,7 @@ 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
 
diff --git a/lang/qore/Makefile b/lang/qore/Makefile
index 944aafa7dd35..117e5bc01436 100644
--- a/lang/qore/Makefile
+++ b/lang/qore/Makefile
@@ -21,9 +21,7 @@ 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
 
diff --git a/lang/ruby20/Makefile b/lang/ruby20/Makefile
index 5740c8968843..077cc07deab9 100644
--- a/lang/ruby20/Makefile
+++ b/lang/ruby20/Makefile
@@ -83,7 +83,7 @@ _SUF1=	_${PORTREVISION}
 
 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")
@@ -137,7 +137,7 @@ RB_SET_CONF_VAR=${SH} -c '${REINPLACE_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]
 
 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\},,' \
diff --git a/lang/ruby21/Makefile b/lang/ruby21/Makefile
index 380d0f079092..4026cb9a5d55 100644
--- a/lang/ruby21/Makefile
+++ b/lang/ruby21/Makefile
@@ -82,7 +82,7 @@ _SUF1=	_${PORTREVISION}
 
 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)
@@ -132,7 +132,7 @@ RB_SET_CONF_VAR=${SH} -c '${REINPLACE_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]
 
 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\},,' \
diff --git a/lang/ruby22/Makefile b/lang/ruby22/Makefile
index ba57e6772a6a..55f6ec165c55 100644
--- a/lang/ruby22/Makefile
+++ b/lang/ruby22/Makefile
@@ -82,7 +82,7 @@ _SUF1=	_${PORTREVISION}
 
 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)
@@ -132,7 +132,7 @@ RB_SET_CONF_VAR=${SH} -c '${REINPLACE_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]
 
 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\},,' \
diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile
index 582278ff43b9..d14712a6fb9c 100644
--- a/lang/scheme48/Makefile
+++ b/lang/scheme48/Makefile
@@ -26,8 +26,8 @@ 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} \
diff --git a/lang/see/Makefile b/lang/see/Makefile
index d40ca2d1331f..8868bbd0b073 100644
--- a/lang/see/Makefile
+++ b/lang/see/Makefile
@@ -31,8 +31,8 @@ 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
diff --git a/lang/spidermonkey17/Makefile b/lang/spidermonkey17/Makefile
index 73331961ce3f..4394ed9296ae 100644
--- a/lang/spidermonkey17/Makefile
+++ b/lang/spidermonkey17/Makefile
@@ -17,7 +17,7 @@ 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
 
diff --git a/lang/ypsilon/Makefile b/lang/ypsilon/Makefile
index 5c28ff2cf0c5..6cd9bc3a967e 100644
--- a/lang/ypsilon/Makefile
+++ b/lang/ypsilon/Makefile
@@ -13,8 +13,7 @@ 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
 
diff --git a/lang/ypsilon/files/patch-Makefile b/lang/ypsilon/files/patch-Makefile
index 177634ab1ac2..5b1afa787178 100644
--- a/lang/ypsilon/files/patch-Makefile
+++ b/lang/ypsilon/files/patch-Makefile
@@ -33,15 +33,6 @@
    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