3 ports categories: Remove $PTHREAD_LIBS

Categories: editors, x11, x11-toolkits

approved by:	PTHREAD blanket

19 files changed, 27 insertions, 32 deletions

diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index a147212c835..9019fab0f3f 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -17,8 +17,8 @@ USE_LDCONFIG=	yes
 USE_GCC=	any
 INSTALL_TARGET=	install-strip
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 CFLAGS+=	-DHAVE_MBRTOWC
 
 OPTIONS_DEFINE=	NEXT_LOOK
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index e31e79ffeed..06c5c03af96 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -18,8 +18,8 @@ USES=		desktop-file-utils gmake pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-chooser
 INSTALLS_ICONS=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL README
 
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index b888a7221dd..2aab84aa054 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -26,8 +26,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	WXRC="${WXRC_CMD}"
 INSTALLS_ICONS=	yes
 
-CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${BDB_LIB_DIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${BDB_LIB_DIR} -L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=yes
diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index 9a9d6ef7aa0..ba565e971ae 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS=	libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 CPPFLAGS+=	-I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/libxml2 ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${ICONV_LIB}
+		-I${LOCALBASE}/include/libxml2
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib ${ICONV_LIB}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index cb3a01ce5ae..0520e03eb3f 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -102,7 +102,7 @@ post-patch:
 # CXXFLAGS safeness
 	@${REINPLACE_CMD} -E -e \
 		's|-O2|${CXXFLAGS}|g ; \
-		 s|-lc_r|${PTHREAD_LIBS}|g' \
+		 s|-lc_r|-lpthread|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 # doc prefix safeness
 	@${REINPLACE_CMD} -E -e \
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 2d213829126..1868c499495 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -22,7 +22,7 @@ USE_GNOME=	gnomeprefix intlhack \
 		libgnomecanvas libgnome referencehack
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile
index 3fd18dc49d7..a5e4e23035e 100644
--- a/x11-toolkits/plib/Makefile
+++ b/x11-toolkits/plib/Makefile
@@ -19,8 +19,8 @@ USE_GL=		glu
 GNU_CONFIGURE=	yes
 
 CXXFLAGS+=	-fPIC
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-js-jsBSD.cxx
 
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index f9512951c73..c041488180e 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -26,7 +26,7 @@ USES=		gettext gmake libtool:keepla pathfix pkgconfig python:2 tar:bzip2
 USE_LDCONFIG=	yes
 USE_GNOME=	libgnomeui pygtk2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV=	PTHREAD_LIBS="-lpthread"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 0190e1cf012..2e996e1513a 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -52,8 +52,7 @@ CONFIGURE_ARGS+=--disable-numpy
 #
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--enable-thread
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		${PTHREAD_LIBS}
+LDFLAGS+=		-lpthread
 .else
 CONFIGURE_ARGS+=	--disable-thread
 .endif
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index ef339ad9b62..8ef4b65a930 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -20,8 +20,8 @@ CONFIGURE_ARGS=	--enable-opt=no --enable-doc-html=no --enable-testvdk=no
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib -lgnuregex ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -lgnuregex -L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|CXXFLAGS="-s"|CXXFLAGS="$$CXXFLAGS"|g ; \
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index 2b55c510af6..15de67f9bc6 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -33,8 +33,7 @@ CONFIGURE_ARGS=	--with-libpng=sys\
 		--enable-mediactrl\
 		--disable-backtrace\
 		--enable-graphics_ctx
-CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"\
-		X11BASE="${LOCALBASE}"
+CONFIGURE_ENV=	X11BASE="${LOCALBASE}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 PLIST=		${.CURDIR}/pkg-plist
diff --git a/x11-toolkits/wxgtk28/files/patch-configure b/x11-toolkits/wxgtk28/files/patch-configure
index 1fec2d79037..e5b934c300b 100644
--- a/x11-toolkits/wxgtk28/files/patch-configure
+++ b/x11-toolkits/wxgtk28/files/patch-configure
@@ -13,7 +13,7 @@
                  ;;
            *-*-freebsd*)
 -                                                THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
-+                                                THREAD_OPTS="${PTHREAD_LIBS}"
++                                                THREAD_OPTS="-pthread"
                  ;;
            *-*-darwin* | *-*-cygwin* )
                                                  THREAD_OPTS=""
diff --git a/x11/erun/Makefile b/x11/erun/Makefile
index efa89c20eae..b071b073b03 100644
--- a/x11/erun/Makefile
+++ b/x11/erun/Makefile
@@ -19,8 +19,8 @@ PLIST_FILES=	bin/E-Run.epplet
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GL=	gl
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib -lepplet -lImlib2 -lGL ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib -lepplet -lImlib2 -lGL
 
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME}.epplet \
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 3c62e4d170b..952ab736e4b 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -23,8 +23,6 @@ INSTALL_TARGET=	install-strip
 post-patch:
 	@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
 		< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
-	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
-	    	${WRKSRC}/util/Makefile.in
 
 post-install:
 	@${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/xdg/menus/ 
diff --git a/x11/gnome-menus/files/patch-util_Makefile.in b/x11/gnome-menus/files/patch-util_Makefile.in
index bd9515e0181..23b1aebbb3b 100644
--- a/x11/gnome-menus/files/patch-util_Makefile.in
+++ b/x11/gnome-menus/files/patch-util_Makefile.in
@@ -4,7 +4,7 @@
  	test-menu-spec.c
  
  gnome_menu_spec_test_LDADD = \
-+	%%PTHREAD_LIBS%% \
++	-lpthread \
  	$(GIO_UNIX_LIBS)		\
  	../libmenu/libgnome-menu-3.la
  
diff --git a/x11/mate-applets/Makefile b/x11/mate-applets/Makefile
index 5c141b68af4..cf557313ea4 100644
--- a/x11/mate-applets/Makefile
+++ b/x11/mate-applets/Makefile
@@ -33,8 +33,8 @@ GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--disable-networkmanager
 CONFIGURE_ENV=	OS_SYS="/usr/include"
-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
 
 GLIB_SCHEMAS=	org.mate.panel.applet.charpick.gschema.xml \
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 931e6cefe78..e19974b9bb1 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -62,7 +62,7 @@ KRB5LIB=	-L${KRB5_HOME}/lib
 
 .if ${PORT_OPTIONS:MMESAGL}
 CONFIGURE_ARGS+=	--with-mesa
-MESALIB=${PTHREAD_LIBS}
+MESALIB=	-lpthread
 USE_GL=	yes
 CFLAGS+=	-I${LOCALBASE}/include/FTGL
 .else
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index c315620ab7c..f5c89ce3939 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -73,8 +73,7 @@ CFLAGS+=	-O0
 
 DOS2UNIX_FILES=	hacks/glx/topblock.c
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-	    	s|malloc.h|stdlib.h|g ; \
+	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g ; \
 		s|/usr/X11R6|${LOCALBASE}|g' \
 		${WRKSRC}/configure
 .if ${PORT_OPTIONS:MPAM}
diff --git a/x11/xstroke/Makefile b/x11/xstroke/Makefile
index 8f4f5554a62..53252c5dce6 100644
--- a/x11/xstroke/Makefile
+++ b/x11/xstroke/Makefile
@@ -19,8 +19,8 @@ USE_XORG=	xft x11 xext xi xtst
 PLIST_FILES=	bin/xstroke %%ETCDIR%%/alphabet man/man1/xstroke.1.gz
 
 CFLAGS+=	-I.
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/etc/Imakefile