6 ports categories: Remove $PTHREAD_LIBS

Categories: cad, devel, java, x11-fm, biology, deskutils

approved by:	PTHREAD blanket

16 files changed, 20 insertions, 47 deletions

diff --git a/biology/ariadne/Makefile b/biology/ariadne/Makefile
index 6009aab161d3..09092dcfe03e 100644
--- a/biology/ariadne/Makefile
+++ b/biology/ariadne/Makefile
@@ -21,9 +21,9 @@ OPTIONS_DEFINE=	DOCS
 MAKE_JOBS_UNSAFE=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}| ; \
-		s|CFLAGS =|CFLAGS +=| ; \
-		s|-c $(OPTIMISE)|-c $(CFLAGS) $(OPTIMIZE)|g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|CFLAGS =|CFLAGS +=| ; \
+		s|-c $(OPTIMISE)|-c $(CFLAGS) $(OPTIMIZE)|g' \
+		${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${OPSYS}/ariadne ${STAGEDIR}${PREFIX}/bin
diff --git a/biology/mafft/Makefile b/biology/mafft/Makefile
index 4800e6a5c667..8b7e67684eac 100644
--- a/biology/mafft/Makefile
+++ b/biology/mafft/Makefile
@@ -40,11 +40,10 @@ BROKEN=		Does not install on sparc64: depends on thread-local storage
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
-	                  -e 's|^MANDIR = .*$$|MANDIR = $$(MANPREFIX)/man/man1|' \
-	                  -e 's|^PREFIX = .*$$||' \
-	                  -e 's|^CC = .*$$||' \
-	                  -e 's|^CFLAGS = .*$$||' \
+	@${REINPLACE_CMD} -e 's|^PREFIX = .*$$||' \
+		-e 's|^MANDIR = .*$$|MANDIR = $$(MANPREFIX)/man/man1|' \
+		-e 's|^CC = .*$$||' \
+		-e 's|^CFLAGS = .*$$||' \
 		${BUILD_WRKSRC}/Makefile
 
 do-install:
diff --git a/biology/migrate/Makefile b/biology/migrate/Makefile
index 81514af379ed..4a4630906c2f 100644
--- a/biology/migrate/Makefile
+++ b/biology/migrate/Makefile
@@ -37,8 +37,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|="-O "|="$$CFLAGS"|g ; \
-		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|="-O "|="$$CFLAGS"|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/PRETTY$$/d' ${WRKSRC}/definitions.h
 	@${REINPLACE_CMD} -e 's|-O3||g' ${WRKSRC}/haru/makefile.gcc
 
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index a57a0fd8c57f..54728c9f8a5d 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -26,7 +26,7 @@ INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	INSTALL_DATA="${BSD_INSTALL_DATA}"
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 PORTDOCS=	\
 	pcb.html pcb.pdf refcard.pdf pad.png puller.png thermal.png	\
diff --git a/cad/tochnog/Makefile b/cad/tochnog/Makefile
index 2e5cb7856d28..d231eeca5b6b 100644
--- a/cad/tochnog/Makefile
+++ b/cad/tochnog/Makefile
@@ -22,7 +22,6 @@ ATLAS_DESC=	Use ATLAS instead of BLAS/LAPACK
 
 WRKSRC=		${WRKDIR}/Sources/Tochnog-Latest-jan-2014
 MAKEFILE=	makefile
-MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS} PTHREAD_CFLAGS=${PTHREAD_CFLAGS}
 USES=		fortran zip dos2unix
 DOS2UNIX_FILES=	time.cc time.h tnlapack.h tnsuplu.h
 
diff --git a/cad/tochnog/files/patch-makefile b/cad/tochnog/files/patch-makefile
index f2633df04ae2..421f11264e38 100644
--- a/cad/tochnog/files/patch-makefile
+++ b/cad/tochnog/files/patch-makefile
@@ -70,9 +70,9 @@
 +	${MAKE} tochnog \
 +	"SYS_FILE=sysposix" \
 +	"OBJ=o" \
-+	"COMPILER_FLAGS= -c ${CFLAGS} ${CPPFLAGS} -D_REENTRANT $(PTHREAD_CFLAGS) $(ALL_INCLUDE)" \
++	"COMPILER_FLAGS= -c ${CFLAGS} ${CPPFLAGS} -D_REENTRANT $(ALL_INCLUDE)" \
 +	"LINK_FLAGS_BEFORE=" \
-+	"LINK_FLAGS_AFTER= $(PROFILE) $(ALL_LIB) ${LDFLAGS} $(PTHREAD_LIBS) -lm -o tochnog"
++	"LINK_FLAGS_AFTER= $(PROFILE) $(ALL_LIB) ${LDFLAGS} -lpthread -lm -o tochnog"
  
  # multi processor linux; gnu gcc compiler
  linux: 
diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile
index 19020761e746..be95e8fe0954 100644
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@@ -24,8 +24,7 @@ USE_GNUSTEP_SYSTEM_LIBS+=	PreferencePanes:${PREFERENCEPANES_PORT}
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 USE_SQLITE=	yes
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread
 
 UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 WRKSRC=		${WRKDIR}/gworkspace-${PORTVERSION}/GWMetadata
diff --git a/deskutils/xchm/Makefile b/deskutils/xchm/Makefile
index 8468e0bdbedb..a3f86465d3ad 100644
--- a/deskutils/xchm/Makefile
+++ b/deskutils/xchm/Makefile
@@ -22,7 +22,7 @@ GNU_CONFIGURE=	yes
 USE_WX=		2.8+
 WX_UNICODE=	yes
 WX_CONF_ARGS=	absolute
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.mk>
diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
index cc95f8c850c9..42826b29e1c0 100644
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@@ -16,8 +16,8 @@ LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
 
 USES=		pathfix pkgconfig iconv tar:bzip2 libtool
 GNU_CONFIGURE=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--disable-static --libdir=${PREFIX}/lib/xneur
 
 USE_LDCONFIG=	yes
diff --git a/devel/stxxl/Makefile b/devel/stxxl/Makefile
index cdd6099259e1..ada17b9ea8d5 100644
--- a/devel/stxxl/Makefile
+++ b/devel/stxxl/Makefile
@@ -13,7 +13,7 @@ USES=		gmake
 ALL_TARGET=	library_g++
 
 MAKE_ENV+=	COMPILER_GCC="${CXX}" OPT="${CXXFLAGS}" \
-		PTHREAD_FLAG="${PTHREAD_LIBS}"
+		PTHREAD_FLAG="-lpthread"
 
 PORTDOCS=	*
 
diff --git a/java/cacao/Makefile b/java/cacao/Makefile
index 95f9e32ec32e..8ec737c90a6b 100644
--- a/java/cacao/Makefile
+++ b/java/cacao/Makefile
@@ -49,10 +49,6 @@ CONFIGURE_ENV+=	JAVACFLAGS="${JAVACFLAGS}"
 MAKE_ENV+=	JAVACFLAGS="${JAVACFLAGS}"
 .endif
 
-post-patch:
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
-	    ${WRKSRC}/configure ${WRKSRC}/src/mm/boehm-gc/configure
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/cacao/cacao \
diff --git a/java/cacao/files/patch-boehm-gc__configure b/java/cacao/files/patch-boehm-gc__configure
index 9c38d11e2bf9..fa6ac04df761 100644
--- a/java/cacao/files/patch-boehm-gc__configure
+++ b/java/cacao/files/patch-boehm-gc__configure
@@ -4,7 +4,7 @@
  	$as_echo "#define GC_FREEBSD_THREADS 1" >>confdefs.h
  
  	INCLUDES="$INCLUDES -pthread"
-+	THREADDLLIBS=%%PTHREAD_LIBS%%
++	THREADDLLIBS=-lpthread
        	;;
       *-*-kfreebsd*-gnu)
  	$as_echo "#define GC_FREEBSD_THREADS 1" >>confdefs.h
diff --git a/java/cacao/files/patch-configure b/java/cacao/files/patch-configure
index 5ef477f50f52..3f19ca642014 100644
--- a/java/cacao/files/patch-configure
+++ b/java/cacao/files/patch-configure
@@ -9,21 +9,3 @@
      ARCH_DIR="x86_64"
      ARCH_FLAGS="-m64 -D__X86_64__"
      JAVA_ARCH="amd64"
-@@ -9731,7 +9731,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="%%PTHREAD_LIBS%% $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -9760,7 +9760,7 @@
- #define HAVE_LIBPTHREAD 1
- _ACEOF
- 
--  LIBS="-lpthread $LIBS"
-+  LIBS="%%PTHREAD_LIBS%% $LIBS"
- 
- fi
- 
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 1c5314033e3c..a879e6f8efb2 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -93,7 +93,7 @@ MAKE_ENV+=	LANG="C" \
 		SKIP_DEBUG_BUILD="true" \
 		ZIP_DEBUGINFO_FILES=0 \
 		ENABLE_FULL_DEBUG_SYMBOLS=0 \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		PTHREAD_LIBS="-lpthread" \
 		MILESTONE="fcs" \
 		JDK_MICRO_VERSION="0_${PORT_MINOR_VERSION}" \
 		BUILD_NUMBER="b${PORT_BUILD_NUMBER}"
diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index 53c6a9076a26..c29b67fe38b7 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -15,8 +15,7 @@ USES=		gmake pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install
 
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread
 MAKE_ENV=	DOC_DIR="${DOCSDIR}/" \
 		WITH_OUTPUTSTYLES=1 \
 		WITH_CUSTOMMOUSE=1
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index 00cabb2113ac..82f5a7447828 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -30,7 +30,7 @@ GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib -lpthread
 INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--enable-static --disable-packagekit