5 files changed, 16 insertions, 32 deletions

diff --git a/benchmarks/bonnie++/Makefile b/benchmarks/bonnie++/Makefile
index 5dab73e1dd2b..a127a8c29bb0 100644
--- a/benchmarks/bonnie++/Makefile
+++ b/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}
diff --git a/benchmarks/hpl/Makefile b/benchmarks/hpl/Makefile
index 3e99a6563a66..f30173a1092a 100644
--- a/benchmarks/hpl/Makefile
+++ b/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
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index cf9f5d8e2ef1..96993cb15fa9 100644
--- a/benchmarks/iozone/Makefile
+++ b/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
diff --git a/benchmarks/libmicro/Makefile b/benchmarks/libmicro/Makefile
index a5fa7100a3e1..ba9c649f7636 100644
--- a/benchmarks/libmicro/Makefile
+++ b/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 \
diff --git a/benchmarks/libmicro/files/patch-Makefile.com b/benchmarks/libmicro/files/patch-Makefile.com
index 7ba3944755e7..759b1be09499 100644
--- a/benchmarks/libmicro/files/patch-Makefile.com
+++ b/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
-