games category: Remove $PTHREAD_LIBS

approved by:	PTHREAD blanket

35 files changed, 60 insertions, 62 deletions

diff --git a/games/boswars/Makefile b/games/boswars/Makefile
index deee3b8..394967b 100644
--- a/games/boswars/Makefile
+++ b/games/boswars/Makefile
@@ -34,7 +34,6 @@ OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e '\
-		s|-pthread|${PTHREAD_LIBS}|g; \
 		s|/usr/local|${LOCALBASE}|g; \
 		s|lua51|lua-${LUA_VER}|g;' \
 	${WRKSRC}/SConstruct
diff --git a/games/cleanq3/Makefile b/games/cleanq3/Makefile
index 17b64b1..b3d0331 100644
--- a/games/cleanq3/Makefile
+++ b/games/cleanq3/Makefile
@@ -66,7 +66,7 @@ PLIST_SUB+=	CLIENT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSMP_CLIENT}
-MAKE_ENV+=	SMP=YES PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV+=	SMP=YES
 PLIST_SUB+=	SMP_CLIENT=""
 Q3BIN+=		cleanq3-smp
 .else
diff --git a/games/cleanq3/files/patch-code-unix-Makefile b/games/cleanq3/files/patch-code-unix-Makefile
index ca8955d..e0065e0 100644
--- a/games/cleanq3/files/patch-code-unix-Makefile
+++ b/games/cleanq3/files/patch-code-unix-Makefile
@@ -87,7 +87,7 @@
  RANLIB=ranlib
  
 -THREAD_LDFLAGS=-lpthread
-+THREAD_LDFLAGS=$(PTHREAD_LIBS)
++THREAD_LDFLAGS=-lpthread
  # don't need -ldl (FreeBSD)
 -LDFLAGS=-lm
 +LDFLAGS+=-lm
diff --git a/games/cosmosmash/Makefile b/games/cosmosmash/Makefile
index 879f7b2..950328a 100644
--- a/games/cosmosmash/Makefile
+++ b/games/cosmosmash/Makefile
@@ -23,7 +23,7 @@ USE_XORG=	x11 xau xdmcp
 USES=		iconv pkgconfig desktop-file-utils
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs`
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib `${SDL_CONFIG} --libs`
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/games/egl/Makefile b/games/egl/Makefile
index b56f518..0748519 100644
--- a/games/egl/Makefile
+++ b/games/egl/Makefile
@@ -19,7 +19,7 @@ USES=		dos2unix gmake zip
 MAKEFILE=	makefile
 NO_WRKSUBDIR=	yes
 
-MAKE_ENV=	LIBDIR="${LIBDIR}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV=	LIBDIR="${LIBDIR}"
 PLIST_SUB=	LIBDIR="${LIBDIR:S,${PREFIX}/,,}"
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
 
diff --git a/games/egl/files/patch-makefile b/games/egl/files/patch-makefile
index 54716e5..05b5646 100644
--- a/games/egl/files/patch-makefile
+++ b/games/egl/files/patch-makefile
@@ -60,7 +60,7 @@
 +SHARED_FLAGS+=	-I$(LOCALBASE)/include \
 +		-DDATADIR='\"$(Q2DIR)\"' -DLIBDIR='\"$(LIBDIR)\"'
 +LDFLAGS+=	-L$(LOCALBASE)/lib
-+X11_LDFLAGS+=	$(PTHREAD_LIBS)
++X11_LDFLAGS+=	-lpthread
 +endif
  
  ifeq ($(strip $(BUILD_CLIENT)),YES)
diff --git a/games/evq3/Makefile b/games/evq3/Makefile
index 4f6aa51..58ed7c4 100644
--- a/games/evq3/Makefile
+++ b/games/evq3/Makefile
@@ -38,7 +38,7 @@ VOIP_DESC=	Enable Voice Over IP
 OPENAL_USES=	openal:al
 
 MAKE_ENV=	DEFAULT_BASEDIR="${Q3DIR}" LIBDIR="${LIBDIR}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+		PTHREAD_LIBS="-lpthread"
 PLIST_SUB=	LIBDIR="${LIBDIR:S/${PREFIX}\///}"
 
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
diff --git a/games/gl-117/Makefile b/games/gl-117/Makefile
index 141255f..a72024e 100644
--- a/games/gl-117/Makefile
+++ b/games/gl-117/Makefile
@@ -16,7 +16,7 @@ USES=		tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-opengl-dir=${LOCALBASE}
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 DESKTOP_ENTRIES=	"GL-117" \
 			"Action flight simulator" \
diff --git a/games/glest/Makefile b/games/glest/Makefile
index 4d34d81..e241eec 100644
--- a/games/glest/Makefile
+++ b/games/glest/Makefile
@@ -48,30 +48,35 @@ pre-extract:
 	@${MKDIR} ${WRKDIR}/${DISTNAME}
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%ACLOCAL%%|${ACLOCAL}|g" -e "s|%%AUTOCONF%%|${AUTOCONF}|g" \
+	@${REINPLACE_CMD} -e "s|%%ACLOCAL%%|${ACLOCAL}|g" \
+		-e "s|%%AUTOCONF%%|${AUTOCONF}|g" \
 		${WRKSRC}/mk/linux/autogen.sh
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' -e \
-		's|PTHREAD_LIBS="-l[$$]flag"|PTHREAD_LIBS="${PTHREAD_LIBS}"|g' -e \
-		's|pthreads library -l[$$]flag|pthreads library ${PTHREAD_LIBS}|g' -e \
-		's|include/lua5.1|include/lua51|g' -e 's|-llua5.1|-llua-5.1|g' \
-			${WRKSRC}/mk/linux/configure.ac ${WRKSRC}/mk/linux/mk/autoconf/*
-	@${FIND} -E ${WRKDIR} -type f -name '*.bak' -o -name '*.orig' | ${XARGS} ${RM}
+	@${REINPLACE_CMD} \
+		-e 's|PTHREAD_LIBS="-l[$$]flag"|PTHREAD_LIBS="-lpthread"|g' \
+		-e 's|pthreads library -l[$$]flag|pthreads library -lpthread|g' \
+		-e 's|include/lua5.1|include/lua51|g' \
+		-e 's|-llua5.1|-llua-5.1|g' \
+		${WRKSRC}/mk/linux/configure.ac \
+		${WRKSRC}/mk/linux/mk/autoconf/*
+	@${FIND} -E ${WRKDIR} -type f -name '*.bak' -o -name '*.orig' | \
+		${XARGS} ${RM}
 
 pre-configure:
-	@cd ${WRKSRC}/mk/linux && ${SH} autogen.sh && \
+	@(cd ${WRKSRC}/mk/linux && ${SH} autogen.sh && \
 		${REINPLACE_CMD} -e 's|-llua5.1|-llua-5.1|g' -e 's|.lng||g' \
-			${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/mk/linux/glest.ini
+		${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/mk/linux/glest.ini)
 
 do-build:
-	@cd ${WRKSRC} && ${JAM_CMD}
+	@(cd ${WRKSRC} && ${JAM_CMD})
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/code_license.txt ${STAGEDIR}${DOCSDIR}/code_license.txt
-	@${MKDIR} ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/code_license.txt \
+		${STAGEDIR}${DOCSDIR}/code_license.txt
 	${INSTALL_PROGRAM} ${WRKSRC}/glest ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/mk/linux/glest.ini ${STAGEDIR}${DATADIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/glest-wrapper ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKDIR}/glest-wrapper \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .if ${PORT_OPTIONS:MEDITOR}
 	${INSTALL_PROGRAM} ${WRKSRC}/glest_editor ${STAGEDIR}${PREFIX}/bin/
diff --git a/games/glob2/Makefile b/games/glob2/Makefile
index 8d2c1c2..2854e0e 100644
--- a/games/glob2/Makefile
+++ b/games/glob2/Makefile
@@ -33,7 +33,7 @@ MAKE_ARGS=	CCFLAGS="${CFLAGS}" \
 INSTALLS_ICONS=	yes
 
 CFLAGS+=	${PA2_CFLAGS} -I${LOCALBASE}/include -Wno-return-type
-LDFLAGS+=	${PA2_LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread ${PA2_LDFLAGS} -L${LOCALBASE}/lib
 LIBPATH=	${LIBPATH2}${LOCALBASE}/lib
 
 PORTDOCS=	README
diff --git a/games/heretic/Makefile b/games/heretic/Makefile
index 32de99c..bc59531 100644
--- a/games/heretic/Makefile
+++ b/games/heretic/Makefile
@@ -14,7 +14,6 @@ COMMENT=	Unix source-port of the famous Heretic game by id Software
 
 USES=		gmake
 USE_XORG=	x11 xi xpm xau
-MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
 
 OPTIONS_DEFINE=	WAD DOCS
 OPTIONS_SINGLE=	SG1
diff --git a/games/heretic/files/patch-Makefile b/games/heretic/files/patch-Makefile
index 8792e86..a7deddb 100644
--- a/games/heretic/files/patch-Makefile
+++ b/games/heretic/files/patch-Makefile
@@ -72,11 +72,11 @@
  
  X11LIBS = -lXext -lX11
 -GLLIBS  = -lSDL -lpthread
-+GLLIBS  = `${SDL_CONFIG} --libs` ${PTHREAD_LIBS}
++GLLIBS  = `${SDL_CONFIG} --libs` -lpthread
  GGILIBS = -lggi -lm
  VGALIBS = -lvga
 -SDLLIBS = -lSDL -lpthread 
-+SDLLIBS = `${SDL_CONFIG} --libs` ${PTHREAD_LIBS}
++SDLLIBS = `${SDL_CONFIG} --libs` -lpthread
  
  OBJS =	am_map.o ct_chat.o d_main.o d_net.o f_finale.o g_game.o \
  	p_ceilng.o p_doors.o p_enemy.o p_floor.o p_inter.o p_lights.o \
diff --git a/games/heroes/Makefile b/games/heroes/Makefile
index 128aca6..47d4a87 100644
--- a/games/heroes/Makefile
+++ b/games/heroes/Makefile
@@ -42,8 +42,8 @@ OPTIMIZED_CFLAGS_CONFIGURE_ENABLE=	optimizations
 
 INFO=		heroes
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib -lsmpeg -lm ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib -lsmpeg -lm
 
 post-patch:
 	@for dir in ${DATASRC} ${SOUNDSRC} ${MUSICSRC}; do \
diff --git a/games/kuklomenos/Makefile b/games/kuklomenos/Makefile
index 48975fe..6f36c79 100644
--- a/games/kuklomenos/Makefile
+++ b/games/kuklomenos/Makefile
@@ -22,8 +22,8 @@ OPTIONS_SUB=	yes
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHEAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=	sound
diff --git a/games/lincity-ng/Makefile b/games/lincity-ng/Makefile
index 0ee9c8f..3925b30 100644
--- a/games/lincity-ng/Makefile
+++ b/games/lincity-ng/Makefile
@@ -22,7 +22,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libphysfs=${PREFIX} \
 		--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/lincity-ng \
 		share/applications/lincity-ng.desktop \
diff --git a/games/netpanzer/Makefile b/games/netpanzer/Makefile
index e678e4b..a845803 100644
--- a/games/netpanzer/Makefile
+++ b/games/netpanzer/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Real time, isometric view, tank multiplayer strategy game
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LDFLAGS+=	${PTHREAD_LIBS}
-CFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	-lpthreads
 
 USES=		scons tar:bzip2
 USE_SDL=	sdl mixer image
diff --git a/games/openalchemist/Makefile b/games/openalchemist/Makefile
index d02bc1a..b067ed7 100644
--- a/games/openalchemist/Makefile
+++ b/games/openalchemist/Makefile
@@ -26,7 +26,7 @@ USE_AUTOTOOLS=	aclocal automake autoconf
 # Necessary to find pkg.m4 (PKG_CHECK_MODULES)
 ACLOCAL_ARGS+=	-I ${LOCALBASE}/share/aclocal
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 USE_GNOME=	pygtk2
 USE_XORG=	xxf86vm xi x11 xmu xext xdamage xfixes xau xdmcp xt sm ice
diff --git a/games/openjazz/Makefile b/games/openjazz/Makefile
index ecdad8d..e5cd130 100644
--- a/games/openjazz/Makefile
+++ b/games/openjazz/Makefile
@@ -25,7 +25,7 @@ USE_SDL=	sdl
 
 CPPFLAGS+=	-I${LOCALBASE}/include `${SDL_CONFIG} --cflags` \
 		-DDATAPATH=\\\"${DATADIR}/\\\" -DHOMEDIR
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs`
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib `${SDL_CONFIG} --libs`
 
 SUB_FILES=	pkg-message
 
diff --git a/games/q3cellshading/Makefile b/games/q3cellshading/Makefile
index ae4105e..eba9322 100644
--- a/games/q3cellshading/Makefile
+++ b/games/q3cellshading/Makefile
@@ -76,7 +76,7 @@ MAKE_ENV+=	OPTIMIZED_CFLAGS=YES
 .endif
 
 .if ${PORT_OPTIONS:MSMP_CLIENT}
-MAKE_ENV+=	SMP=YES PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV+=	SMP=YES
 Q3BIN+=		quake3-smp
 .endif
 
diff --git a/games/q3cellshading/files/patch-code-unix-Makefile b/games/q3cellshading/files/patch-code-unix-Makefile
index c3ab9b0..e6d1741 100644
--- a/games/q3cellshading/files/patch-code-unix-Makefile
+++ b/games/q3cellshading/files/patch-code-unix-Makefile
@@ -124,7 +124,7 @@
  RANLIB=ranlib
  
 -THREAD_LDFLAGS=-lpthread
-+THREAD_LDFLAGS=$(PTHREAD_LIBS)
++THREAD_LDFLAGS=-lpthread
  # don't need -ldl (FreeBSD)
 -LDFLAGS=-lm
 +LDFLAGS+=-lm
diff --git a/games/quake3/Makefile b/games/quake3/Makefile
index 39a40b3..c216938 100644
--- a/games/quake3/Makefile
+++ b/games/quake3/Makefile
@@ -87,8 +87,7 @@ MAKE_ENV+=	OPTIMIZED_CFLAGS=YES
 .endif
 
 .if ${PORT_OPTIONS:MTHREADS}
-MAKE_ENV+=	SMP=YES \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV+=	SMP=YES
 PLIST_SUB+=	SMP=""
 Q3BIN+=		quake3-smp
 .else
diff --git a/games/quake3/files/patch-code-unix-Makefile b/games/quake3/files/patch-code-unix-Makefile
index d0417f5..21f7925 100644
--- a/games/quake3/files/patch-code-unix-Makefile
+++ b/games/quake3/files/patch-code-unix-Makefile
@@ -121,7 +121,7 @@
  RANLIB=ranlib
  
 -THREAD_LDFLAGS=-lpthread
-+THREAD_LDFLAGS=$(PTHREAD_LIBS)
++THREAD_LDFLAGS=-lpthread
  # don't need -ldl (FreeBSD)
 -LDFLAGS=-lm
 +LDFLAGS+=-lm
diff --git a/games/r1q2/Makefile b/games/r1q2/Makefile
index 63133de..56bca97 100644
--- a/games/r1q2/Makefile
+++ b/games/r1q2/Makefile
@@ -24,7 +24,7 @@ BUILD_WRKSRC=	${WRKSRC}/binaries
 ALL_TARGET=	#
 
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
-MAKE_ENV=	LIBDIR="${LIBDIR}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV=	LIBDIR="${LIBDIR}"
 PLIST_SUB=	LIBDIR="${LIBDIR:S|${PREFIX}/||}"
 
 OPTIONS_DEFINE=	GAME REF_GL DOCS
diff --git a/games/r1q2/files/patch-binaries__client__Makefile b/games/r1q2/files/patch-binaries__client__Makefile
index f25cafc..41cd925 100644
--- a/games/r1q2/files/patch-binaries__client__Makefile
+++ b/games/r1q2/files/patch-binaries__client__Makefile
@@ -5,7 +5,7 @@
  include ../make.inc
  
 -LDFLAGS+=-lm -lz
-+LDFLAGS+=-lm -lz $(PTHREAD_LIBS)
++LDFLAGS+=-lm -lz -lpthread
  
  ifeq ($(shell uname),Linux)
  LDFLAGS+=-ldl
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 46fc1a2..0982fb5 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ARGS=	--with-sdl-prefix=${LOCALBASE} \
 		--disable-debug \
 		--disable-nasm \
 		--disable-tremor
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread
 
 OPTIONS_DEFINE=	VORBIS MP3 PNG FLAC FLUIDSYNTH MT32EMU DOCS
 FLUIDSYNTH_DESC=	FluidSynth MIDI synthesizer
diff --git a/games/tank/Makefile b/games/tank/Makefile
index 8ce6175..4d2aba6 100644
--- a/games/tank/Makefile
+++ b/games/tank/Makefile
@@ -14,7 +14,6 @@ COMMENT=	3-D network tank game that uses OpenGL/Mesa
 BUILD_DEPENDS=	libaux>=1.0:${PORTSDIR}/graphics/libaux
 
 USES=		gmake
-MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
 ALL_TARGET=	linux-mesa-elf
 
 do-install:
diff --git a/games/tank/files/patch-Makefile.Linux.Mesa b/games/tank/files/patch-Makefile.Linux.Mesa
index 2f4debb..c9d842a 100644
--- a/games/tank/files/patch-Makefile.Linux.Mesa
+++ b/games/tank/files/patch-Makefile.Linux.Mesa
@@ -14,7 +14,7 @@
  
 -CFLAGS = $(INCLUDE) $(ARCH) -O2 -m486 -Wall -pipe \
 -	-pedantic -funroll-loops -mieee-fp
-+CFLAGS += $(INCLUDE) $(TARCH) -DSOUND -Wall -pipe ${PTHREAD_CFLAGS} \
++CFLAGS += $(INCLUDE) $(TARCH) -DSOUND -Wall -pipe \
 +	-pedantic -funroll-loops
  
 -LDFLAGS = -L/usr/X11R6/lib -L$(MESA)/lib
@@ -36,7 +36,7 @@
  	$(CC) -o $(EXECNAME) $(Obj) $(LDFLAGS) \
 -	-lMesaaux -lMesatk -lMesaGLU -lMesaGL \
 -	-lXext -lX11 -lm
-+	-laux -lGLU -lGL -lXext -lX11 -lm $(PTHREAD_LIBS)
++	-laux -lGLU -lGL -lXext -lX11 -lm -lpthread
  	@echo "****** Done ******"
  
  linux: $(Obj)
diff --git a/games/tenebrae/Makefile b/games/tenebrae/Makefile
index c6c4dd4..3501c6b 100644
--- a/games/tenebrae/Makefile
+++ b/games/tenebrae/Makefile
@@ -22,7 +22,7 @@ USE_XORG=	xxf86dga
 WRKSRC=		${WRKDIR}/${PORTNAME}_0
 BUILD_WRKSRC=	${WRKSRC}/linux
 MAKEFILE=	Makefile.i386linux
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV=	PTHREAD_LIBS="-lpthread"
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_DEFINE_amd64=	ASM
diff --git a/games/tremulous/Makefile b/games/tremulous/Makefile
index 667bc0f..ec0f4e7 100644
--- a/games/tremulous/Makefile
+++ b/games/tremulous/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Free FPS game featuring two opposing teams: humans and aliens
 LICENSE=	GPLv2
 
 USES=		gmake zip
-MAKE_ENV=	DEFAULT_BASEDIR="${DATADIR}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV=	DEFAULT_BASEDIR="${DATADIR}" PTHREAD_LIBS="-lpthread"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/${DISTNAME}-src
diff --git a/games/tuxkart/Makefile b/games/tuxkart/Makefile
index 2a75b41..0089101 100644
--- a/games/tuxkart/Makefile
+++ b/games/tuxkart/Makefile
@@ -34,11 +34,10 @@ DESKTOP_ENTRIES="TuxKart" "" ${PORTNAME} \
 		"${PORTNAME}" "Game;SportsGame;" ""
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O6|${PTHREAD_CFLAGS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|datadir/games|datadir|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|$$(prefix)/games|@bindir@|g ; \
+	@${REINPLACE_CMD} -e 's|-O6||g ; s|datadir/games|datadir|g' \
+		${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|$$(prefix)/games|@bindir@|g ; \
 		 s|$$(datadir)/games|$$(datadir)|g'
 	@${REINPLACE_CMD} -e 's|doc contrib| contrib|' \
 		${WRKSRC}/Makefile.in
diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile
index fc116c3..de4f457 100644
--- a/games/ufoai/Makefile
+++ b/games/ufoai/Makefile
@@ -29,8 +29,8 @@ USES=		compiler:c++11-lang execinfo gettext gmake openal:soft pkgconfig \
 		python:build tar:bzip2
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-release --target-os=freebsd
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lexecinfo
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib -lexecinfo
 CFLAGS+=	-I${LOCALBASE}/include
 
 DATADIR=	share/${PORTNAME}
diff --git a/games/uhexen2/Makefile b/games/uhexen2/Makefile
index 940ef52..b9078d6 100644
--- a/games/uhexen2/Makefile
+++ b/games/uhexen2/Makefile
@@ -110,8 +110,7 @@ post-patch:
 		'/^USE_X86_ASM/s|^|#| ; \
 		 /^CPU_X86/s|^|#| ; \
 		 /^CFLAGS/s| -g | | ; \
-		 /^CFLAGS/s| -O2 | | ; \
-		 /^PTHREAD_LIBS/s|-lpthread|-pthread|' ${WRKSRC}/${f}
+		 /^CFLAGS/s| -O2 | | ;' ${WRKSRC}/${f}
 .endfor
 .for f in engine/h2shared/cd_bsd.c
 	@${REINPLACE_CMD} -e \
diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index 3dbd547..c9c422a 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -28,8 +28,8 @@ CONFIGURE_ARGS=	ac_cv_lib_freeglut_glutGetModifiers=no \
 		--disable-unit-tests
 USE_LDCONFIG=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 INFO=		vamos
 PORTDOCS=	*
diff --git a/games/worldofpadman/Makefile b/games/worldofpadman/Makefile
index d597e0b..3c108f8 100644
--- a/games/worldofpadman/Makefile
+++ b/games/worldofpadman/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Open source FPS game inspired by the Padman comic strip
 MANUAL_PACKAGE_BUILD=	huge (~600MB)
 
 USES=		gmake makeself
-MAKE_ENV=	DEFAULT_BASEDIR="${DATADIR}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV=	DEFAULT_BASEDIR="${DATADIR}" PTHREAD_LIBS="-lpthread"
 ALL_TARGET=	release
 
 SRC_FILE=	${PORTNAME}-${PORTVERSION}
diff --git a/games/xrally/Makefile b/games/xrally/Makefile
index a292c50..8a842ee 100644
--- a/games/xrally/Makefile
+++ b/games/xrally/Makefile
@@ -16,8 +16,8 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 USE_XORG=	x11 xi xpm
 USES=		gmake tar:bzip2
-CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 MAKE_ENV=	INCLUDES="-I${LOCALBASE}/include"
 
 .include <bsd.port.mk>