5 ports categories: Remove $PTHREAD_LIBS

Categories: irc, x11-clocks, benchmarks, misc, textproc

approved by:	PTHREAD blanket

benchmarks/bonnie++/Makefile

@@ -26,8 +26,6 @@ OPTIONS_DEFINE=	DOCS
 post-patch:
 	@${REINPLACE_CMD} \
 		's|/usr/share/|${PREFIX}/share/|g' ${WRKSRC}/bonnie++.8
-	@${REINPLACE_CMD} \
-		's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

benchmarks/hpl/Makefile

@@ -33,7 +33,7 @@ post-patch:
 		s|ARCH[ )]|_&|g ; \
 		s|^HPL_OPTS[ ]*=.*$$|HPL_OPTS =| ; \
 		s|^LAlib[ ]*=.*$$|LAlib = $$\(LAdir\)/lib/libblas.a| ; \
-		s|libpmpich.a|libmpl.a ${PTHREAD_LIBS}|' \
+		s|libpmpich.a|libmpl.a -lpthread|' \
 		${WRKSRC}/setup/Make.${HPL_ARCH}
 	@${REINPLACE_CMD} -e 's|HPL\.dat|${PREFIX}/etc/${PORTNAME}/&|' \
 		${WRKSRC}/testing/ptest/HPL_pdinfo.c

benchmarks/iozone/Makefile

@@ -31,17 +31,16 @@ THREADS_DESC=	Enable threading (uses pthreads)
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTHREADS}
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread
 .else
 CFLAGS+=	-DNO_THREADS
 .endif
 
 post-patch:
 .if ${PORT_OPTIONS:MSSH}
-	@${REINPLACE_CMD} -e 's|shell\,\"rsh\"|shell\,\"ssh\"|' ${WRKSRC}/iozone.c
+	@${REINPLACE_CMD} -e 's|shell\,\"rsh\"|shell\,\"ssh\"|' \
+		${WRKSRC}/iozone.c
 .endif
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/iozone ${STAGEDIR}${PREFIX}/bin

benchmarks/libmicro/Makefile

@@ -12,22 +12,16 @@ COMMENT=	Set of utilities to benchmark productivity of system calls
 
 LICENSE=	CDDL
 
-WRKSRC=		${WRKDIR}/libMicro-${PORTVERSION}
-
 USES=		gmake
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
-
-CFLAGS+=	${PTHREAD_CFLAGS}
-
+WRKSRC=		${WRKDIR}/libMicro-${PORTVERSION}
 STRIP=		 # Do not strip binaries
-
 PLIST_SUB=	ARCH="${ARCH}"
-
 PKGLIBDIR=	${PREFIX}/lib/${PORTNAME}
 
 post-build:
-	@${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/libmicro-bench
-	@${ECHO_CMD} '(cd ${PKGLIBDIR} && ./bench $$1)' >> ${WRKDIR}/libmicro-bench.sh
+	${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/libmicro-bench
+	${ECHO_CMD} '(cd ${PKGLIBDIR} && ./bench $$1)' \
+		>> ${WRKDIR}/libmicro-bench.sh
 
 do-install:
 	(cd ${WRKDIR} && ${INSTALL_SCRIPT} libmicro-bench.sh \

benchmarks/libmicro/files/patch-Makefile.com

@@ -1,6 +1,6 @@
---- Makefile.com.orig	Sat Aug  6 14:02:15 2005
-+++ Makefile.com	Sat Aug  6 14:05:15 2005
-@@ -44,7 +44,7 @@
+--- Makefile.com.orig	2011-05-11 00:58:23 UTC
++++ Makefile.com
+@@ -42,7 +42,7 @@ COMPILER_VERSION_CMD_cc=cc -V 2>&1 | egr
  COMPILER_VERSION_CMD_gcc=gcc -dumpversion
  COMPILER_VERSION_CMD=$(COMPILER_VERSION_CMD_$(CC))
  
@@ -9,32 +9,25 @@
  
  cstyle:	
  	for file in $(ALL:%=../%.c) $(EXTRA_CFILES:%=../%) ; \
-@@ -56,10 +56,10 @@
+@@ -54,10 +54,10 @@ lint:	libmicro.ln $(ALL:%=%.lint) $(EXTR
  
  
  $(EXTRA_CFILES:%.c=%.lint):
 -	$(LINT) ../$(@:%.lint=%.c) -I. -mu -lc libmicro.ln -lm
-+	$(LINT) ../$(@:%.lint=%.c) -I. -mu -lc libmicro.ln -lm $(PTHREAD_LIBS)
++	$(LINT) ../$(@:%.lint=%.c) -I. -mu -lc libmicro.ln -lm -lpthread
  
  %.lint:	../%.c libmicro.ln
 -	$(LINT) -mu $(CPPFLAGS) $< libmicro.ln -lpthread -lsocket -lnsl -lm
-+	$(LINT) -mu $(CPPFLAGS) $< libmicro.ln -lm $(PTHREAD_LIBS)
++	$(LINT) -mu $(CPPFLAGS) $< libmicro.ln -lpthread -lm
  
  %.o:	../%.c
  	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
-@@ -109,13 +109,13 @@
+@@ -107,7 +107,7 @@ tattle:		../tattle.c	libmicro.a
  	echo "char * compiler_version = \""`$(COMPILER_VERSION_CMD)`"\";" > tattle.h
  	echo "char * CC = \""$(CC)"\";" >> tattle.h
  	echo "char * extra_compiler_flags = \""$(extra_CFLAGS)"\";" >> tattle.h
 -	$(CC) -o tattle $(CFLAGS) -I. ../tattle.c libmicro.a -lrt -lm
-+	$(CC) -o tattle $(CFLAGS) -I. ../tattle.c libmicro.a -lm $(PTHREAD_LIBS)
++	$(CC) -o tattle $(CFLAGS) -I. ../tattle.c libmicro.a -lpthread -lm
  
  $(ELIDED_BENCHMARKS):	../elided.c
  	$(CC) -o $(@) ../elided.c
- 
- %: libmicro.a %.o 
--	$(CC) -o $(@) $(@).o $($(@)_EXTRA_DEPS) $(CFLAGS) libmicro.a $($(@)_EXTRA_LIBS) $(EXTRA_LIBS) -lpthread -lm
-+	$(CC) -o $(@) $(@).o $($(@)_EXTRA_DEPS) $(CFLAGS) libmicro.a $($(@)_EXTRA_LIBS) $(EXTRA_LIBS) -lm $(PTHREAD_LIBS)
- 
- exec:	exec_bin
- 

irc/dxirc/Makefile

@@ -17,8 +17,8 @@ LIB_DEPENDS=	libFOX-1.6.so:${PORTSDIR}/x11-toolkits/fox16
 USE_XORG=	xft
 USES=		gmake 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
 
 OPTIONS_DEFINE=	NLS TRAY IPV6 SSL LUA ENCHANT NOTIFY DOCS
 OPTIONS_DEFAULT=	TRAY SSL LUA

irc/epic5/Makefile

@@ -50,7 +50,7 @@ CONFIGURE_ARGS+=	--without-perl
 .if ${PORT_OPTIONS:MRUBY}
 USE_RUBY=	yes
 CONFIGURE_ARGS+=	--with-ruby
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=		-lpthread
 .else
 CONFIGURE_ARGS+=	--without-ruby
 .endif

irc/netwalker-ircc/Makefile

@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 
 USES=		tar:tgz
 
-LDFLAGS+=	-lncurses ${PTHREAD_LIBS}
+LDFLAGS+=	-lncurses -lpthread
 
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \

misc/mbuffer/Makefile

@@ -41,9 +41,6 @@ CONFIGURE_ARGS+=ac_cv_search_sendfile=no
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},' ${WRKSRC}/configure
-
 post-configure:
 	# Rename variables to make sure they aren't redefined through mhash.h
 	@${REINPLACE_CMD} -E -e 's@(PACKAGE|VERSION)@MBUFFER_\1@' \

misc/posixtestsuite/Makefile

@@ -31,9 +31,9 @@ THEPIPE=	| tee 2>&1
 .endif
 
 .if defined(WITH_THRLIB)
-THRLIB=${WITH_THRLIB}
+THRLIB=	${WITH_THRLIB}
 .else
-THRLIB=	${PTHREAD_LIBS}
+THRLIB=	-lpthread
 .endif
 
 pre-everything::
@@ -48,7 +48,7 @@ pre-everything::
 	@${ECHO} ""
 	@${ECHO} "  * QUIET - don't print progress messages while running"
 	@${ECHO} "  * WITH_THRLIB - choose thread library to run test against"
-	@${ECHO} "    (NB: by default '"${PTHREAD_LIBS}"' is used)"
+	@${ECHO} "    (NB: by default '"-lpthread"' is used)"
 	@${ECHO} ""
 	@${ECHO} "Examples:"
 	@${ECHO} ""

misc/xosd/Makefile

@@ -44,8 +44,7 @@ DELAY_UNITS=	seconds
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS}, ; \
-		s,echo aout,echo elf,' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,echo aout,echo elf,' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's,^\(CFLAGS =\)\(.*\)$$,\1 -I..\2,' \
 		${WRKSRC}/src/libxosd/Makefile.in \
 		${WRKSRC}/src/xmms_plugin/Makefile.in

misc/xsw/Makefile

@@ -19,7 +19,7 @@ USE_SDL=	sdl ttf image gfx
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 DOCS=		AUTHORS \
 		COPYING \

textproc/estraier/Makefile

@@ -23,8 +23,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sysqdbm \
 		--enable-dlfilter \
 		--enable-devel
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/include ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${LOCALBASE}/include
 
 CHASEN_LIB_DEPENDS=	libchasen.so:${PORTSDIR}/japanese/chasen-base
 CHASEN_CONFIGURE_ENABLE=	chasen
@@ -46,8 +46,8 @@ post-patch:
 		's|-O2|@CFLAGS@|g ; \
 		 s|HOME|LOCALBASE|g ; \
 		 s|:/usr/local/lib||g ; \
-		 s|-I/usr/local/include|${PTHREAD_CFLAGS}|g ; \
-		 s|-L/usr/local/lib|${PTHREAD_LIBS}|g' ${WRKSRC}/Makefile.in
+		 s|-I/usr/local/include||g ; \
+		 s|-L/usr/local/lib|-lpthread|g' ${WRKSRC}/Makefile.in
 
 post-install:
 .for file in estindex estmbtomh estserver estsiutil estxview

textproc/hyperestraier/Makefile

@@ -23,7 +23,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-bzip2 --disable-zlib
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	LZO MECAB

textproc/link-grammar/Makefile

@@ -28,10 +28,6 @@ INSTALL_TARGET=	install-strip
 
 DOCS=		AUTHORS LICENSE MAINTAINERS README
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \
-		${WRKSRC}/configure ${WRKSRC}/${PORTNAME}/Makefile.in
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}

textproc/senna/Makefile

@@ -16,8 +16,9 @@ USE_GCC=	any
 USES=		gmake libtool
 USE_LDCONFIG=	YES
 CONFIGURE_ARGS=	--with-sennahome=${SENNA_HOME}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-MAKE_ARGS=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
+MAKE_ARGS=	CFLAGS="${CFLAGS}"
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 SENNA_HOME?=	/var/senna

x11-clocks/alltraxclock/Makefile

@@ -22,7 +22,7 @@ PLIST_FILES=	libexec/gkrellm2/plugins/alltraxclock.so
 WRKSRC=		${WRKDIR}/${PORTNAME}2_0.2/
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|gcc|${CC}|;s|-O2||;s|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|gcc|${CC}|;s|-O2||' ${WRKSRC}/Makefile
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins/

x11-clocks/osdclock/Makefile

@@ -15,8 +15,9 @@ COMMENT=	Small clock which uses libxosd to render text to the root window
 
 LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
 
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lpthread
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		PREFIX="${PREFIX}"
 
 PLIST_FILES=	bin/osd_clock man/man1/osd_clock.1.gz

x11-clocks/wmtimer/Makefile

@@ -20,14 +20,12 @@ USE_CSTD=	gnu89
 USE_XORG=	x11 xau xcomposite xcursor xdamage xdmcp xext xfixes xi \
 		xinerama xpm xrandr xrender
 USE_GNOME=	gtk20
-MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/wmtimer ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/wmtimer ${STAGEDIR}${PREFIX}/bin
 	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/../README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

x11-clocks/wmtimer/files/patch-wmtimer__Makefile

@@ -1,17 +1,16 @@
---- Makefile.orig	Sat Nov 20 18:19:07 2004
-+++ Makefile	Sat Nov 20 18:22:11 2004
+--- Makefile.orig	2004-01-05 00:30:50 UTC
++++ Makefile
 @@ -1,7 +1,6 @@
 -CC     = gcc
 -LIBDIR = -L/usr/X11R6/lib -L/usr/lib
--LIBS   = -lXpm -lXext -lX11 -lpthread `pkg-config --libs gtk+-2.0`
--CFLAGS = `pkg-config --cflags gtk+-2.0`
 +LIBDIR = -L${LOCALBASE}/lib
-+LIBS   = -lXpm -lXext -lX11 `pkg-config --libs gtk+-2.0` ${PTHREAD_LIBS}
-+CFLAGS += `pkg-config --cflags gtk+-2.0` ${PTHREAD_CFLAGS}
+ LIBS   = -lXpm -lXext -lX11 -lpthread `pkg-config --libs gtk+-2.0`
+-CFLAGS = `pkg-config --cflags gtk+-2.0`
++CFLAGS += `pkg-config --cflags gtk+-2.0`
  
  OBJS =	wmtimer.o \
  	../wmgeneral/wmgeneral.o \
-@@ -10,10 +9,10 @@
+@@ -10,10 +9,10 @@ OBJS =	wmtimer.o \
  
  all: wmtimer
  .c.o: