graphics category: Remove $PTHREAD_LIBS

graphics/zbar didn't pass check-plist (pre-existing), fixed.

approved by:	PTHREAD blanket

35 files changed, 60 insertions, 72 deletions

diff --git a/graphics/Coin/Makefile b/graphics/Coin/Makefile
index 7115cb61b016..2869a84dcea7 100644
--- a/graphics/Coin/Makefile
+++ b/graphics/Coin/Makefile
@@ -26,11 +26,14 @@ USE_LDCONFIG=	yes
 MAKE_ENV=	LANG=C
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|DATA install-data-local|DATA|g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} \( -name \*.cpp -o -name \*.h -a \! -name expat.h \) -a -print0 | ${XARGS} -0 ${REINPLACE_CMD} 's/<stdlib.h>/<cstdlib>/g'
+	@${REINPLACE_CMD} -e 's|DATA install-data-local|DATA|g' \
+		${WRKSRC}/Makefile.in
+	@${FIND} ${WRKSRC} \( -name \*.cpp -o -name \*.h -a \! \
+		-name expat.h \) -a -print0 | ${XARGS} -0 \
+		${REINPLACE_CMD} 's/<stdlib.h>/<cstdlib>/g'
 
 post-build:
-	@${REINPLACE_CMD} -e '/^ldflags=/s|-R|-Wl,-rpath,|' ${WRKSRC}/coin-default.cfg
+	${REINPLACE_CMD} -e '/^ldflags=/s|-R|-Wl,-rpath,|' \
+		${WRKSRC}/coin-default.cfg
 
 .include <bsd.port.mk>
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 72938ba10b02..f02434f29192 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -27,7 +27,7 @@ USES=		iconv libtool tar:bzip2
 USE_GNOME=	libxml2
 USE_GHOSTSCRIPT=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV=	PTHREAD_LIBS="-lpthread"
 CONFIGURE_ARGS=	--without-perl --enable-shared --enable-static \
 		--with-quantum-depth="${QD}" \
 		--with-windows-font-dir="${WINDOWS_FONT_DIR}"
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 84d5b195739c..c9aef94590a1 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -125,9 +125,8 @@ PLIST_SUB+=		WITH_PERL='@comment '
 
 .if ${_IMAGEMAGICK_THREADS} == "yes"
 CONFIGURE_ARGS+=	--with-threads
-CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-			PTHREAD_LIBS="${PTHREAD_LIBS}"
-LDFLAGS+=		${PTHREAD_LIBS}
+CONFIGURE_ENV+=		PTHREAD_LIBS="-lpthread"
+LDFLAGS+=		-lpthread
 .else
 CONFIGURE_ARGS+=	--without-threads
 _IMAGEMAGICK_THREADS=no
diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index 7bbcec99bf01..e0d71a316a03 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -28,7 +28,7 @@ USE_LDCONFIG=	yes
 CPPFLAGS+=	-I. -I../IlmImf
 
 # must be linked with -l{thr|pthread} explicitly
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
diff --git a/graphics/ayam/Makefile b/graphics/ayam/Makefile
index 208d36e660c9..aa14c8dbd481 100644
--- a/graphics/ayam/Makefile
+++ b/graphics/ayam/Makefile
@@ -28,7 +28,6 @@ USE_LDCONFIG=	${PREFIX}/lib/ayam
 USES=		gmake tk:84
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
 MAKEFILE=	Makefile.shared
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 MAKE_JOBS_UNSAFE=	yes
 
 AYAM_PLUGINS=	csphere mfio
diff --git a/graphics/ayam/files/patch-Makefile.shared b/graphics/ayam/files/patch-Makefile.shared
index b3142d2bf05a..443d1d0f2a9b 100644
--- a/graphics/ayam/files/patch-Makefile.shared
+++ b/graphics/ayam/files/patch-Makefile.shared
@@ -163,7 +163,7 @@
 +#AQSISRI2RIB =
  # if you use Aqsis libri2rib (add -DAYUSEAQSISRIB to CFLAGS above!):
 -#AQSISRI2RIB = $(AQSISLIBDIR)/libri2rib.so -L /usr/local/lib -llog4cpp
-+AQSISRI2RIB = $(AQSISLIBDIR)/libaqsis_ri2rib.so -L${AQSISLIBDIR} -lstdc++ ${PTHREAD_LIBS}
++AQSISRI2RIB = $(AQSISLIBDIR)/libaqsis_ri2rib.so -L${AQSISLIBDIR} -lstdc++ -lpthread
  
  
  # BMRT
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index a10bb13d9a46..6a5d2c4bb6b7 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -65,7 +65,7 @@ post-patch:
 		-e '/LIBS/s/-lrt//'  -e '/LIBS/s|-ldld||' \
 		-e '/LIBS/s|-ldl||' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-lcairo|-lcairo ${PTHREAD_LIBS}|' \
+	@${REINPLACE_CMD} -e 's|-lcairo|-lcairo -lpthread|' \
 		${WRKSRC}/src/*.pc.in
 	@${REINPLACE_CMD} -e '/@CAIRO_HAS_PNG_FUNCTIONS_TRUE@.*=/d' \
 		${WRKSRC}/Makefile.in
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index d0ac90abb851..de82d7c973e7 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -39,8 +39,8 @@ USES+=		blaslapack
 WRKSRC=		${WRKDIR}/${DISTNAME:C/_/-/}
 BUILD_WRKSRC=	${WRKSRC}/examples
 MAKE_ENV=	X11PATH=${LOCALBASE} LOCALBASE=${LOCALBASE}
-CPPFLAGS+=	${CFLAGS} ${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+CPPFLAGS+=	${CFLAGS}
+LDFLAGS+=	-lpthread
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile
index f28fcb252419..e38b4435bfd5 100644
--- a/graphics/clutter-gtk/Makefile
+++ b/graphics/clutter-gtk/Makefile
@@ -18,8 +18,8 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 gnomeprefix
 USE_XORG=	xp x11
 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
 
 post-patch:
diff --git a/graphics/clutter-gtk3/Makefile b/graphics/clutter-gtk3/Makefile
index 65f00801e6b7..f7df72ad6ac2 100644
--- a/graphics/clutter-gtk3/Makefile
+++ b/graphics/clutter-gtk3/Makefile
@@ -18,8 +18,8 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gtk30 introspection
 USE_XORG=	xp x11
 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
 
 .include <bsd.port.mk>
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 36a71ee5434a..afe11e907af2 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -50,10 +50,10 @@ post-patch:
 		${WRKSRC}/tests/test-boundingbox.c
 	@${FIND} ${WRKSRC} -name Makefile.in | \
 		${XARGS} ${REINPLACE_CMD} -e \
-		's,\(^GTK_LIBS.*\),\1 ${PTHREAD_LIBS}, ; \
-		 s,\(^GTK_CFLAGS = \),\1 ${PTHREAD_CFLAGS} ,'
+		's,\(^GTK_LIBS.*\),\1 -lpthread,'
 	@${REINPLACE_CMD} -e 's|http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl|${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl| ; \
-		s|echo aout|echo elf|g ; s|/usr/include/libEMF|${LOCALBASE}/include/libEMF|g ; \
+		s|echo aout|echo elf|g ; \
+		s|/usr/include/libEMF|${LOCALBASE}/include/libEMF|g ; \
 		s|-lstdc++||g'  ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/ffff/Makefile b/graphics/ffff/Makefile
index 074426979be4..c0809493c89d 100644
--- a/graphics/ffff/Makefile
+++ b/graphics/ffff/Makefile
@@ -20,9 +20,9 @@ SOURCE=		FFFF3 FragmentProgram FragmentProgramARB10 GPUProgram \
 		PixelBuffer VertexProgram VertexProgramATI VertexProgramNV \
 		extensions vpext
 
-CXXFLAGS+=	-I${LOCALBASE}/include/GL -D__linux__  -msse -msse2 -m3dnow -I${LOCALBASE}/include/ \
-		${PTHREAD_CFLAGS} 
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lglut -lGL -lXext -lX11 -lXmu \
+CXXFLAGS+=	-I${LOCALBASE}/include/GL -D__linux__  -msse -msse2 -m3dnow \
+		-I${LOCALBASE}/include/
+LDFLAGS+=	-L${LOCALBASE}/lib -lpthread -lglut -lGL -lXext -lX11 -lXmu \
 		 -lGLU -lm
 
 PLIST_FILES=	bin/ffff
diff --git a/graphics/fv/Makefile b/graphics/fv/Makefile
index 9cefacc788e4..261661669c95 100644
--- a/graphics/fv/Makefile
+++ b/graphics/fv/Makefile
@@ -19,11 +19,9 @@ USES=		gmake pkgconfig zip
 USE_GL=		glut
 ALL_TARGET=	${PORTNAME}
 
-CXXFLAGS+=	$$(pkg-config --cflags libpng) \
-		-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	$$(pkg-config --libs libpng) \
-		-L${LOCALBASE}/lib -lglut -lGLU -lGL -lbz2 -lm -lz -llzma \
-		${PTHREAD_LIBS}
+CXXFLAGS+=	$$(pkg-config --cflags libpng) -I${LOCALBASE}/include
+LDFLAGS+=	$$(pkg-config --libs libpng) -L${LOCALBASE}/lib -lglut \
+		-lGLU -lGL -lbz2 -lm -lz -llzma -lpthread
 
 PORTDOCS=	AUTHORS ChangeLog README
 PLIST_FILES=	bin/${PORTNAME}
diff --git a/graphics/gcolor/Makefile b/graphics/gcolor/Makefile
index 9243832e107c..49846d6b2886 100644
--- a/graphics/gcolor/Makefile
+++ b/graphics/gcolor/Makefile
@@ -17,7 +17,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 pre-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 6c453e6f5c8f..87b278228ecc 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -44,7 +44,7 @@ CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc/gimp \
 		--with-desktop-dir=${PREFIX}/share \
 		--docdir=${PREFIX}/share/doc/gimp \
 		--enable-default-binary
-CONFIGURE_ENV=	GIMP_THREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ENV=	GIMP_THREAD_LIBS=-lpthread
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
diff --git a/graphics/glfw2/Makefile b/graphics/glfw2/Makefile
index 94bc5ee5d623..17dd2459d602 100644
--- a/graphics/glfw2/Makefile
+++ b/graphics/glfw2/Makefile
@@ -60,11 +60,8 @@ post-extract:
 	@${CHMOD} ${BINMODE} ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|/usr/X11R6|${LOCALBASE}|; \
-		 /SOFLAGS/s|-soname |-Wl,-soname,|; \
-		 /CFLAGS_THREAD/s|"-pthread"|"${PTHREAD_CFLAGS}"|; \
-		 /LFLAGS_THREAD/s|"-pthread"|"${PTHREAD_LIBS}"|' \
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|; \
+		 /SOFLAGS/s|-soname |-Wl,-soname,|' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} \
 		-e 's|lib/pkgconfig|libdata/pkgconfig|g' \
diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile
index 19f966dace48..174ef013c533 100644
--- a/graphics/glitz/Makefile
+++ b/graphics/glitz/Makefile
@@ -18,7 +18,6 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
-CPPFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread
 
 .include <bsd.port.mk>
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 72499851d643..7dee98752148 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -219,8 +219,7 @@ pre-everything::
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e '/^PTHREAD_[LC][IF]*=/ d; s|-lpthread|${PTHREAD_LIBS}|' \
-		-e '/KDE4_APPSDATADIR=/ s|share/kde4|share|' \
+	${REINPLACE_CMD} -e '/KDE4_APPSDATADIR=/ s|share/kde4|share|' \
 		-e 's|/usr/local|${LOCALBASE}|g; \
 		s|/lib64|/lib|g; \
 		s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure \
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 724c0cefe80f..83d4d8b92c27 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -148,8 +148,7 @@ TK_CPPFLAGS=		-I${TK_INCLUDEDIR}
 TK_CONFIGURE_ON=	--with-wish=${WISH}
 TK_CONFIGURE_ENV=	TKCONFIG="${TK_LIBDIR}/tkConfig.sh"
 GUILE_CONFIGURE_ENABLE=		guile
-NVTHREADS_CFLAGS+=	${PTHREAD_CFLAGS}
-NVTHREADS_LDFLAGS+=	${PTHREAD_LIBS}
+NVTHREADS_LDFLAGS=	-lpthread
 
 .include <bsd.port.options.mk>
 
diff --git a/graphics/kludge3d/Makefile b/graphics/kludge3d/Makefile
index 4590973319e3..522cfd96cdf2 100644
--- a/graphics/kludge3d/Makefile
+++ b/graphics/kludge3d/Makefile
@@ -21,10 +21,8 @@ CONFIGURE_ARGS=	--with-lib-GL
 
 PLIST_FILES=	bin/kludge3d
 
-CPPFLAGS+=	-I${LOCALBASE}/include \
-		-I${PYTHON_INCLUDEDIR} ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib \
-		-L${PYTHON_LIBDIR}/config -lm ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include -I${PYTHON_INCLUDEDIR}
+LDFLAGS+=	-L${LOCALBASE}/lib -L${PYTHON_LIBDIR}/config -lpthread -lm
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/graphics/lcdtest/Makefile b/graphics/lcdtest/Makefile
index d0ce9e005f6a..1cda88f8ca3c 100644
--- a/graphics/lcdtest/Makefile
+++ b/graphics/lcdtest/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	liberation-fonts-ttf>0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
 USE_SDL=	sdl image ttf
 
 CFLAGS+=	-I${LOCALBASE}/include -DRELEASE=1.18
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lSDL -lSDL_image -lSDL_ttf
+LDFLAGS+=	-L${LOCALBASE}/lib -lpthread -lSDL -lSDL_image -lSDL_ttf
 
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz \
diff --git a/graphics/libqrencode/Makefile b/graphics/libqrencode/Makefile
index 6427e31112a6..ed4373a1d374 100644
--- a/graphics/libqrencode/Makefile
+++ b/graphics/libqrencode/Makefile
@@ -32,6 +32,6 @@ PLIST_FILES=	bin/qrencode \
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,libpng12,libpng,' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '9s|$$| ${PTHREAD_LIBS}|' ${WRKSRC}/libqrencode.pc.in
+	@${REINPLACE_CMD} -e '9s|$$| -lpthread|' ${WRKSRC}/libqrencode.pc.in
 
 .include <bsd.port.mk>
diff --git a/graphics/libvisual04/Makefile b/graphics/libvisual04/Makefile
index 1aa005d06121..0dfd17dc119a 100644
--- a/graphics/libvisual04/Makefile
+++ b/graphics/libvisual04/Makefile
@@ -16,8 +16,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gettext libtool:keepla pathfix pkgconfig
 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
 VER=		-0.4
 PLIST_SUB=	VER=${VER}
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index fca12ef974ac..db35f4d57764 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -15,8 +15,8 @@ USES=		gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GL=		glu glut glew
 USE_XORG=	glproto x11 xext xi xxf86vm xdamage xfixes dri2proto
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 CONFIGURE_ARGS+=--disable-egl --disable-gles2 --disable-wayland \
 		--disable-gbm --disable-vg --disable-osmesa
diff --git a/graphics/meshviewer/Makefile b/graphics/meshviewer/Makefile
index d7c77fb46627..486a9661ae40 100644
--- a/graphics/meshviewer/Makefile
+++ b/graphics/meshviewer/Makefile
@@ -20,8 +20,7 @@ USE_GL=		glu
 USE_QT4=	corelib gui opengl moc_build
 CXXFLAGS+=	-I. -Imesh -Imathvector \
 		`pkg-config --cflags QtOpenGL glu`
-LDFLAGS+=	${PTHREAD_LIBS} \
-		`pkg-config --libs QtOpenGL glu`
+LDFLAGS+=	-lpthread `pkg-config --libs QtOpenGL glu`
 MAKE_ARGS=	QTDIR="${QT_PREFIX}" CC="${CXX}" MOC="${MOC}" \
 		CXXFLAGS="${CXXFLAGS}" \
 		LIBPATH="" LIBS_QT4="${LDFLAGS}"
diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile
index f35e86bc3eed..851aa2511c39 100644
--- a/graphics/ocaml-lablgl/Makefile
+++ b/graphics/ocaml-lablgl/Makefile
@@ -38,8 +38,7 @@ THREADS_DESC=	Threaded Tcl/Tk (must match lang/ocaml)
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTHREADS}
-THR_CPP=	${PTHREAD_CFLAGS}
-THR_LD=		${PTHREAD_LIBS}
+THR_LD=		-lpthread
 .endif
 
 post-extract:
@@ -53,7 +52,7 @@ post-patch:
 		-e "s,^#\(LIBDIR[ \t]*=\).*,\1${PREFIX}/lib/ocaml,g" \
 		-e "s,^#\(DLLDIR[ \t]*=\).*,\1${STAGEDIR}${PREFIX}/lib/ocaml/stublibs,g" \
 		-e "s,^#\(INSTALLDIR[ \t]*=\).*,\1${STAGEDIR}${PREFIX}/lib/ocaml/lablGL,g" \
-		-e "s!^#\(COPTS[ \t]*=\).*!\1-c ${CFLAGS} ${THR_CPP}!g" \
+		-e "s!^#\(COPTS[ \t]*=\).*!\1-c ${CFLAGS}!g" \
 		-e "/^TKINCLUDES/s,=.*$$,= -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}," \
 		-e "/^TKLIBS/s,=.*$$,= -L${LOCALBASE}/lib -ltk${TK_SHLIB_VER}\
 		-ltcl${TCL_SHLIB_VER} ${THR_LD}," \
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 6620a8eee73d..fa10327c09df 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -22,7 +22,6 @@ USE_GL=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 USE_LDCONFIG=	yes
-CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ENV=	ARCH=freebsd
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -75,8 +74,7 @@ post-patch:
 	@${FIND} ${WRKSRC}/${dir} -type f | ${XARGS} \
 		${REINPLACE_CMD} -e "s;/usr/lpp;${PREFIX};g"
 .endfor
-	@${REINPLACE_CMD} -e "s;-lpthread;${PTHREAD_LIBS};g"	\
-		-e "s;/usr/X11R6;${LOCALBASE};g"			\
+	@${REINPLACE_CMD} -e "s;/usr/X11R6;${LOCALBASE};g" \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s|startserver.bat||" \
 		${WRKSRC}/src/uipp/java/server/Makefile.in
diff --git a/graphics/openrm/Makefile b/graphics/openrm/Makefile
index ee226d6d32be..07f108a2f58c 100644
--- a/graphics/openrm/Makefile
+++ b/graphics/openrm/Makefile
@@ -59,7 +59,6 @@ post-patch:
 		'/^RM/s|/usr|${PREFIX}| ; \
 		 /^OPENGL/s|/usr|${LOCALBASE}| ; \
 		 /^X11/s|/usr/X11R6|${LOCALBASE}| ; \
-		 /^X11/s|-lpthread|${PTHREAD_LIBS}| ; \
 		 /^OPT/s|-g|| ; \
 		 /^ARCH/s|-m32|| ; \
 		 /^JPEG/s|/usr|${LOCALBASE}|' ${DEMO_WRKSRC}/makeinclude
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index 170e2105c384..6188432530fa 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -27,9 +27,9 @@ USES=		cmake:outsource pkgconfig compiler:features desktop-file-utils dos2unix t
 DOS2UNIX_REGEX=	.*\.(cc|h)
 USE_GNOME=	gtk20 glib20
 USE_LDCONFIG=	yes
-CFLAGS+=	-I${LOCALBASE}/include -fPIC ${PTHREAD_CFLAGS}
-CXXFLAGS+=	-I${LOCALBASE}/include -fPIC ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CFLAGS+=	-I${LOCALBASE}/include -fPIC
+CXXFLAGS+=	-I${LOCALBASE}/include -fPIC
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 CMAKE_ENV=	CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS:C|-Wl,-rpath=${_GCC_RUNTIME}||:C|-L${_GCC_RUNTIME}||}"
 CMAKE_ARGS+=	-DDOCDIR="${DOCSDIR}" \
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index b4e58c1cf2a6..9b597fda8a8b 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -26,7 +26,6 @@ A4SIZE_DESC=	Set default paper size to A4
 USES=		imake
 PORTDOCS=	HISTORY README
 USE_XORG=	x11 xext xt sm ice
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 .include <bsd.port.options.mk>
 
diff --git a/graphics/tgif/files/patch-Tgif.tmpl-freebsd b/graphics/tgif/files/patch-Tgif.tmpl-freebsd
index 2870b41179b3..b4867b93c04c 100644
--- a/graphics/tgif/files/patch-Tgif.tmpl-freebsd
+++ b/graphics/tgif/files/patch-Tgif.tmpl-freebsd
@@ -5,6 +5,6 @@
  XCOMM LOCAL_LIBRARIES	= $(XMULIB) $(XTOOLLIB) $(XLIB)
  XCOMM SYS_LIBRARIES	= -ldl -lm -lz
 -SYS_LIBRARIES	= -lm -lz
-+SYS_LIBRARIES	= -lm -lz ${PTHREAD_LIBS}
++SYS_LIBRARIES	= -lm -lz -lpthread
 +
 +#include "Tgif.tmpl-freebsdports"
diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile
index e468bce5786b..dcb3498698e9 100644
--- a/graphics/ufraw/Makefile
+++ b/graphics/ufraw/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ARGS=	--disable-silent-rules --enable-extras
 USES=		gettext pkgconfig gmake desktop-file-utils
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 PC_FALSE=	cinepaint
 
 OPTIONS_DEFINE=	CONTRAST DST EXIV2 LENSFUN FITS GIMP GTK2 GNOME
diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile
index af82b2b92ee0..45ff6cca0e92 100644
--- a/graphics/xaos/Makefile
+++ b/graphics/xaos/Makefile
@@ -40,7 +40,7 @@ NLS_CONFIGURE_ENABLE=	nls
 
 THREADS_DESC=	Enable SMP support (experimental)
 THREADS_CONFIGURE_WITH=	pthread
-THREADS_LIBS=	${PTHREAD_LIBS}
+THREADS_LIBS=	-lpthread
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
diff --git a/graphics/zathura/Makefile b/graphics/zathura/Makefile
index 110614268a29..0dc6a9e15c58 100644
--- a/graphics/zathura/Makefile
+++ b/graphics/zathura/Makefile
@@ -48,7 +48,6 @@ post-patch:	.SILENT
 		${WRKSRC}/Makefile
 .endif
 	${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \
-		-e 's/-lpthread/${PTHREAD_LIBS}/' \
 		-e 's/-lc//' \
 		-e 's/DL_LIB /#&/' \
 		${WRKSRC}/config.mk
diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index a7b0f60a3dc1..5f4359ab8852 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zbar
 PORTVERSION=	0.10
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -17,6 +17,7 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USES=		iconv libtool gmake pkgconfig
+INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--with-jpeg=yes
 
@@ -56,7 +57,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} 's|^pkgconfigdir = .*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
 .if empty(PORT_OPTIONS:MDOCS)
@@ -64,4 +64,8 @@ post-patch:
 		${WRKSRC}/Makefile.in
 .endif
 
+post-install:
+	# make check-plist happy
+	${RMDIR} ${STAGEDIR}${DATADIR}
+
 .include <bsd.port.mk>