Remove PTHREAD_CFLAGS and PTHREAD_LIBS from my ports

8 files changed, 13 insertions, 15 deletions

diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 285622c9c182..b1fb7817e049 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	SF
 EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	pawel@FreeBSD.org
-COMMENT=	GUI front end for the efax fax program
+COMMENT=	GUI frontend for efax program
 
 LICENSE=	GPLv2
 
@@ -41,8 +41,8 @@ CONFLICTS=	efax-[0-9]*
 
 MAN1=		efax.1 efix.1 efax-gtk.1
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread -lintl
 
 CONFIGURE_ARGS+=--with-gtk-version=gtk2
 
diff --git a/devel/upnp/Makefile b/devel/upnp/Makefile
index 83287045f424..e7f7c0c913ae 100644
--- a/devel/upnp/Makefile
+++ b/devel/upnp/Makefile
@@ -19,8 +19,7 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	PTHREAD_LIBS="-pthread"
 
 .include <bsd.port.options.mk>
 
diff --git a/finance/homebank/Makefile b/finance/homebank/Makefile
index 818f4654a479..08e1377af300 100644
--- a/finance/homebank/Makefile
+++ b/finance/homebank/Makefile
@@ -29,8 +29,8 @@ USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 USE_GNOME=	desktopfileutils gnomehier gtk20
 INSTALLS_ICONS=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 OPTIONS_DEFINE=	OFX
 OFX_DESC=	Enable libOFX support
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 271c5f98a019..02b99be04861 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -48,12 +48,11 @@ MAKE_JOBS_SAFE=	yes
 
 MAN1=		claws-mail.1
 
-CFLAGS+=	${PTHREAD_CFLAGS}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} --disable-dbus
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -pthread"
 
 OPTIONS_DEFINE=	BOGOFILTER COMPFACE DEBUG DILLO ENCHANT GPGME IPV6 JPILOT LDAP \
 		MANUAL SPAMASSASSIN STARTUP THEMES
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 0c8e1b969da3..f50c99f37974 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -23,8 +23,8 @@ USE_ICONV=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 OPTIONS_DEFINE=		IPV6
 OPTIONS_SINGLE=		CRYPTO
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index 794da207e401..27005d23fb32 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -81,8 +81,8 @@ MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS=	--disable-ldvgrab
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 DOC_FILES=	AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED README \
 		OMC/lives-OMC.txt \
diff --git a/polish/ekg/Makefile b/polish/ekg/Makefile
index 463df5aeed45..0b8353467f5b 100644
--- a/polish/ekg/Makefile
+++ b/polish/ekg/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ARGS= --without-libungif \
 		--disable-ui-gtk
 
 CFLAGS+=	-I/usr/include -I${LOCALBASE}/include
-LDFLAGS+=	-L/usr/lib -lncurses -L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS}
+LDFLAGS+=	-L/usr/lib -lncurses -L${LOCALBASE}/lib -lexecinfo -pthread
 
 MAN1=		ekg.1
 MANLANG=	"" pl
diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile
index 6036156cafc0..75c6181fabf6 100644
--- a/polish/ekg2/Makefile
+++ b/polish/ekg2/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=	--enable-shared \
 			--without-libjpeg \
 			--without-libidn
 
-LDFLAGS+=		-L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}
+LDFLAGS+=		-L${LOCALBASE}/lib -lintl -pthread
 CFLAGS+=		-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=	ASPELL GPG GSM GTK2 PERL PYTHON SQLITE UNICODE XOSD