- Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS (category: archivers)

Approved by:	portmgr

archivers/p7zip/Makefile

@@ -61,12 +61,11 @@ CFLAGS+=	-fPIC
 .endif
 
 post-patch:
-	${SED} -e 's!-O!${CFLAGS} ${PTHREAD_CFLAGS}!' \
+	${SED} -e 's!-O!${CFLAGS}!' \
 	       -e 's!g\+\+!${CXX}!' \
 	       -e 's!gcc!${CC}!' \
 	       -e 's/-D_LARGEFILE_SOURCE//' \
 	       -e 's/-D_FILE_OFFSET_BITS=64//' \
-	       -e 's/-lpthread/${PTHREAD_LIBS}/' \
 	       ${WRKSRC}/makefile.freebsd6 > ${WRKSRC}/makefile.machine
 	${REINPLACE_CMD} -e 's|{DEST_SHARE_DOC}|${DOCSDIR}|' \
 		${WRKSRC}/man1/*

archivers/paq/Makefile

@@ -69,7 +69,7 @@ PORTDATA=	${WDATA} ${DDATA} zpsfx
 .endif
 
 .if ${PORT_OPTIONS:MOPENMP}
-PTHREAD_CFLAGS+=	-fopenmp
+OPENMP_CFLAGS+=	-fopenmp
 USE_GCC=		any
 .endif
 
@@ -98,8 +98,8 @@ do-build:
 .endif
 	@cd ${WRKSRC}; \
 	${CXX} ${CXXFLAGS} -o wbpe wbpe.cpp; \
-	${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} ${ZPAQFLAGS} \
-	-o zpaq zpaq.cpp libzpaq.cpp divsufsort.c ${LDFLAGS} ${PTHREAD_LIBS}; \
+	${CXX} ${CXXFLAGS} ${OPENMP_CFLAGS} ${ZPAQFLAGS} \
+	-o zpaq zpaq.cpp libzpaq.cpp divsufsort.c ${LDFLAGS} -pthread; \
 	${CXX} ${CXXFLAGS} ${ZPAQFLAGS} \
 	-o zpaqd zpaqd.cpp libzpaq.cpp ${LDFLAGS}; \
 	${CXX} ${CXXFLAGS} ${ZPAQFLAGS} -o zpipe zpipe.cpp libzpaq.cpp

archivers/par2cmdline-tbb/Makefile

@@ -22,7 +22,7 @@ LIB_DEPENDS=	tbb:${PORTSDIR}/devel/tbb
 ONLY_FOR_ARCHS=	i386 amd64 ia64
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 USE_AUTOTOOLS=	aclocal automake autoconf
 USE_GCC=	4.2+
 

archivers/pbzip2/Makefile

@@ -28,8 +28,7 @@ PLIST_FILES=	bin/pbzip2 bin/pbunzip2
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's,-pthread -lpthread,${PTHREAD_LIBS},g; \
-		s,-O2,${CXXFLAGS},; \
+		-e 's,-O2,${CXXFLAGS},; \
 		s,^CC,#CC,; \
 		s,CC,CXX,' ${WRKSRC}/Makefile
 

archivers/ppmd-7z/Makefile

@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/p7zip_${DISTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/CPP/7zip/Compress/PPMD_Alone
 MAKEFILE=	makefile
 PLIST_FILES=	bin/${PKGBASE}
-MAKE_ARGS=	PROG=${PORTNAME} CXX="${CXX}" LIB="${PTHREAD_LIBS}"
+MAKE_ARGS=	PROG=${PORTNAME} CXX="${CXX}" LIB="-pthread"
 
 post-patch:
 	@${REINPLACE_CMD} -e '/bool Open(LPCTSTR fileName, DWORD creationDisposition)/,/}/d'\