3 ports categories: Remove $PTHREAD_LIBS

Categories: print, science, emulators

approved by:	PTHREAD blanket

8 files changed, 16 insertions, 29 deletions

diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 0f5d0819eba6..2de2214ccb74 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -235,8 +235,7 @@ post-patch:
 .endif
 	@${REINPLACE_CMD} -e '/SILENT/d' ${WRKSRC}/Makedefs.in
 	@${REINPLACE_CMD} -e 's|/etc/cups|${LOCALBASE}/etc/cups|g' ${WRKSRC}/man/*.man*
-	@${REINPLACE_CMD} -e 's|-lpthreads.*;|${PTHREAD_LIBS};|g' \
-		-e 's|/private/etc/pam.d|${LOCALBASE}/etc/pam.d|' \
+	@${REINPLACE_CMD} -e 's|/private/etc/pam.d|${LOCALBASE}/etc/pam.d|' \
 		-e 's|-D_LARGEFILE64_SOURCE||g' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|\.default|.sample|'\
diff --git a/print/flpsed/Makefile b/print/flpsed/Makefile
index 2c181a7c3181..88d8dcd46a96 100644
--- a/print/flpsed/Makefile
+++ b/print/flpsed/Makefile
@@ -24,10 +24,6 @@ PLIST_FILES=	bin/flpsed \
 		share/icons/flpsed.svg
 PORTDOCS=	README
 
-post-configure:
-	@${FIND} -X ${WRKSRC} -type f -name Makefile | ${XARGS} \
-	${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g"
-
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index adb706258bc7..f8f5dca0e6c9 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -48,8 +48,7 @@ MAKE_ENV=	CFLAGS_STANDARD="${CFLAGS}" \
 CPPFLAGS+=	-fPIC -DUPD_SIGNAL=0 -I. -I${WRKSRC}/gimp-print		\
 		-I${LOCALBASE}/include
 LDFLAGS+=	${XLDFLAGS}
-XCFLAGS=	${PTHREAD_CFLAGS}
-XLDFLAGS=	-L${LOCALBASE}/lib -L${WRKSRC}/gimp-print ${PTHREAD_LIBS}
+XLDFLAGS=	-lpthread -L${LOCALBASE}/lib -L${WRKSRC}/gimp-print
 PLIST_SUB=	GS_VERSION="${PORTVERSION}"
 
 OPTIONS_DEFINE=	X11 DOCS A4SIZE
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 97546f18808c..9b29feec2c28 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -60,9 +60,8 @@ CPPFLAGS+=	-DUPD_SIGNAL=0 -I. \
 		-I${WRKSRC}/jasper/src/libjasper/include \
 		-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-XCFLAGS=	${PTHREAD_CFLAGS} \
-		-DA4
-XLDFLAGS=	${PTHREAD_LIBS}
+XCFLAGS=	-DA4
+XLDFLAGS=	-lpthread
 
 PLIST_SUB=	GS_VERSION="${PORTVERSION}" \
 		CIDFONTDIR="${CIDFONTDIR:S,^${PREFIX}/,,}"
diff --git a/print/ghostscript9-agpl/Makefile b/print/ghostscript9-agpl/Makefile
index aae2f5893f3e..a95c28306f33 100644
--- a/print/ghostscript9-agpl/Makefile
+++ b/print/ghostscript9-agpl/Makefile
@@ -60,9 +60,8 @@ CPPFLAGS+=	-DUPD_SIGNAL=0 -I. \
 		-I${WRKSRC}/openjpeg/src/lib/openjp2 \
 		-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-XCFLAGS=	${PTHREAD_CFLAGS} \
-		-DA4
-XLDFLAGS=	${PTHREAD_LIBS}
+XCFLAGS=	-DA4
+XLDFLAGS=	-lpthread
 
 PLIST_SUB=	GS_VERSION="${PORTVERSION}" \
 		X11BITS=${X11BITS}
diff --git a/print/ghostscript9/Makefile b/print/ghostscript9/Makefile
index 1da9ddca552c..8cc82c8f5c50 100644
--- a/print/ghostscript9/Makefile
+++ b/print/ghostscript9/Makefile
@@ -64,9 +64,8 @@ CPPFLAGS+=	-DUPD_SIGNAL=0 -I. \
 		-I${WRKSRC}/openjpeg \
 		-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-XCFLAGS=	${PTHREAD_CFLAGS} \
-		-DA4
-XLDFLAGS=	${PTHREAD_LIBS}
+XCFLAGS=	-DA4
+XLDFLAGS=	-lpthread
 
 PLIST_SUB=	GS_VERSION="${PORTVERSION}" \
 		X11BITS=${X11BITS}
diff --git a/print/gsview/Makefile b/print/gsview/Makefile
index 4e0685792faf..a0d2c7bffaf8 100644
--- a/print/gsview/Makefile
+++ b/print/gsview/Makefile
@@ -20,8 +20,6 @@ RUN_DEPENDS+=	epstool:${PORTSDIR}/graphics/epstool \
 
 NO_CDROM=	Can only be distributed for free
 
-MAKE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS} PTHREAD_CFLAGS=${PTHREAD_CFLAGS}
-
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/gsview \
diff --git a/print/gsview/files/patch-srcunx_unx.mak b/print/gsview/files/patch-srcunx_unx.mak
index 450eba32dbcc..bf7ac83f7678 100644
--- a/print/gsview/files/patch-srcunx_unx.mak
+++ b/print/gsview/files/patch-srcunx_unx.mak
@@ -1,5 +1,5 @@
---- srcunx/unx.mak.orig	2008-07-13 07:39:58.254461217 -0400
-+++ srcunx/unx.mak	2008-07-14 09:22:24.652938045 -0400
+--- srcunx/unx.mak.orig	2004-11-27 05:51:26 UTC
++++ srcunx/unx.mak
 @@ -19,8 +19,8 @@
  #
  # WARNING: Doesn't install pstotext
@@ -11,7 +11,7 @@
  GSVIEW_BASE=$(prefix)$(GSVIEW_ROOT)
  
  
-@@ -38,8 +38,6 @@
+@@ -38,8 +38,6 @@ GSVIEW_DOCPATH=$(GSVIEW_BASE)/share/doc
  # GSview printer.ini and system wide gsview.ini
  GSVIEW_ETCPATH=$(prefix)/etc
  
@@ -20,18 +20,16 @@
  OBJ=o
  INSTALL=install -m 644
  INSTALL_EXE=install -m 755
-@@ -50,8 +48,8 @@
- 
+@@ -51,7 +49,7 @@ LDEBUG=
  # Linux
  XINCLUDE=
--PFLAGS=-DMULTITHREAD
+ PFLAGS=-DMULTITHREAD
 -PLINK=-lpthread -lrt
-+PFLAGS=-DMULTITHREAD ${PTHREAD_CFLAGS}
-+PLINK=${PTHREAD_LIBS}
++PLINK=-lpthread
  
  # SunOS 5.7
  #XINCLUDE=-I/usr/openwin/share/lib
-@@ -77,7 +75,8 @@
+@@ -77,7 +75,8 @@ PLINK=-lpthread -lrt
  
  # Other possible options are -Wtraditional
  # Compiler flags for C and C++ files.
@@ -41,7 +39,7 @@
  
  # Linker flags
  LFLAGS=$(LDEBUG) $(PLINK) `gtk-config --libs`
-@@ -152,7 +151,7 @@
+@@ -152,7 +151,7 @@ OBJS=$(OBJCOM1) $(OBJCOM2) $(OBJPLAT1)
  #all: gsview html pstotext
  all: $(BD)gsview$(EXE) html