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

Approved by: portmgr
svn path=/head/; revision=311829
2013-02-07 12:37:48 +00:00 · 2013-02-07 12:37:48 +00:00 · 2ad92eab94 · 2021-03-31 03:12:20 +00:00
commit 2ad92eab94
parent 48c300ed7f
39 changed files with 53 additions and 134 deletions
--- a/www/apache22/Makefile.modules
+++ b/www/apache22/Makefile.modules
@ -137,8 +137,7 @@ IGNORE=	AUTH_BASIC need at last one AUTHZ provider
 .endif

 .if defined(APR_HAS_THREADS)
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-pthread
 .else
 .  if exists(${APR_CONFIG}) && ${PORT_OPTIONS:MMEM_CACHE}
 IGNORE=	MEM_CACHE requires APR threads. Please rebuild APR with THREAD support
--- a/www/aria/Makefile
+++ b/www/aria/Makefile
@ -37,8 +37,7 @@ post-extract:
 	@${RM} -f ${WRKSRC}/src/getopt*

 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|-lssl|-lcrypto -lssl|g ; \
+	@${REINPLACE_CMD} -e s|-lssl|-lcrypto -lssl|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's| -O2 -Wall | @CXXFLAGS@ |g ; \
 		s|getopt.c getopt1.c getopt.h||g ; \
--- a/www/cacheboy15-devel/Makefile
+++ b/www/cacheboy15-devel/Makefile
@ -236,7 +236,6 @@ storage_schemes+=	aufs
 EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
 # Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
 CONFIGURE_ARGS+=	--with-pthreads
-CFLAGS+=	${PTHREAD_CFLAGS}
 .endif
 .if defined(WITH_SQUID_COSS)
 storage_schemes+=	coss
@ -361,8 +360,6 @@ PLIST_FILES+=	${error_files:S,^,etc/squid/errors/${d}/,}
 PLIST_DIRS+=	etc/squid/errors etc/squid squid/logs squid/cache squid

 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
-	    ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
 	    -e 's|%%SQUID_GID%%|${SQUID_GID}|g' \
 	    -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cf.data.pre
--- a/www/cacheboy16/Makefile
+++ b/www/cacheboy16/Makefile
@ -236,7 +236,6 @@ storage_schemes+=	aufs
 EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
 # Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
 CONFIGURE_ARGS+=	--with-pthreads
-CFLAGS+=	${PTHREAD_CFLAGS}
 .endif
 .if defined(WITH_SQUID_COSS)
 storage_schemes+=	coss
@ -364,8 +363,6 @@ PLIST_FILES+=	${error_files:S,^,etc/squid/errors/${d}/,}
 PLIST_DIRS+=	etc/squid/errors etc/squid squid/logs squid/cache squid

 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
-	    ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
 	    -e 's|%%SQUID_GID%%|${SQUID_GID}|g' \
 	    -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cf.data.pre
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@ -20,8 +20,8 @@ USE_RC_SUBR=	cherokee
 SUB_FILES=	pkg-install pkg-message
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread

 PORTSCOUT=	limit:^1\.2\.102

--- a/www/dillo-i18n/Makefile
+++ b/www/dillo-i18n/Makefile
@ -81,8 +81,6 @@ CONFIGURE_ARGS+=	--enable-ipv6
 .endif

 post-patch:
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
-		 s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|dillorc|dillorc.sample|g' ${WRKSRC}/Makefile.in
 	@${CP} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.sample

--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@ -45,8 +45,6 @@ CONFLICTS=	dillo-i18n-*[0-9]* \
 		dillo-[2-9]*

 post-patch:
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
-		 s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|dillorc|dillorc.sample|g' ${WRKSRC}/Makefile.in
 	@${CP} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.sample

--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@ -65,7 +65,6 @@ CONFIGURE_ARGS+=	--disable-ssl

 .ifdef(WITH_THREADED_DNS)
 CONFIGURE_ARGS+=	--enable-threaded-dns
-CFLAGS+=	${PTHREAD_CFLAGS}
 .else
 CONFIGURE_ARGS+=	--disable-threaded-dns
 .endif
--- a/www/dpsearch/Makefile
+++ b/www/dpsearch/Makefile
@ -41,8 +41,7 @@ CONFIGURE_ENV+=	PORTNAME="${PORTNAME}"

 .if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=--enable-pthreads
-CFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV+=	LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	LIBS="-pthread"
 .else
 CONFIGURE_ARGS+=--disable-pthreads
 .endif
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@ -27,8 +27,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -pthread"
+CPPFLAGS+=	-I${LOCALBASE}/include

 EPHY_EXTENSIONS=really-all
 EPHY_VERSION=	${PORTVERSION:R}
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@ -41,8 +41,8 @@ USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS+=--enable-introspection \
 		--with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LIBS}"
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS}
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -pthread ${EXTRA_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${EXTRA_CFLAGS}

 GCONF_SCHEMAS=	epiphany-lockdown.schemas epiphany.schemas

@ -84,8 +84,6 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-embed_ephy-embed-prefs.c
 .endif

 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
-		 's|-lpthread|${PTHREAD_LIBS}|g'
 	@${REINPLACE_CMD} -e 's|execinfo.h|#|g ; \
 	    	s|-ldl"$$|"|g' \
 		-e 's|EPIPHANY_API_VERSION=2.29|EPIPHANY_API_VERSION=2.30|g' \
--- a/www/gatling/Makefile
+++ b/www/gatling/Makefile
@ -24,7 +24,6 @@ CFLAGS+=	-I${LOCALBASE}/include/libowfat -I${OPENSSLINC} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -L${OPENSSLLIB}

 MAKEFILE=	GNUmakefile
-MAKE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"

 bin=		dl
 sbin=		gatling
--- a/www/gatling/files/patch-GNUmakefile
+++ b/www/gatling/files/patch-GNUmakefile
@ -53,15 +53,6 @@
 endif
 
 LDLIBS=-lowfat
-@@ -70,7 +64,7 @@
- CC:=$(DIET) $(CC)
- 
- pthreadbench: pthreadbench.o
-	$(CC) $< -o $@ -I. $(CFLAGS) $(LDFLAGS) $(LDLIBS) -lpthread
-+	$(CC) $< -o $@ -I. $(CFLAGS) $(LDFLAGS) $(LDLIBS) $(PTHREAD_LIBS)
- 
- forksbench: forkbench.o
- 	$(CC) -static -o $@ forkbench.o $(LDFLAGS) $(LDLIBS)
@@ -136,11 +130,13 @@
 	rm -f trysocket
 
--- a/www/httpsqs/Makefile
+++ b/www/httpsqs/Makefile
@ -19,7 +19,6 @@ LIB_DEPENDS+=	tokyocabinet:${PORTSDIR}/databases/tokyocabinet \
 	event-2.0:${PORTSDIR}/devel/libevent2

 USE_PKGCONFIG=	yes
-MAKE_ENV=	LIBS="${PTHREAD_LIBS}"

 PLIST_FILES=	bin/${PORTNAME}

--- a/www/httrack/Makefile
+++ b/www/httrack/Makefile
@ -34,7 +34,7 @@ MAN1=		htsserver.1 httrack.1 proxytrack.1 webhttrack.1

 post-patch:
 	@${REINPLACE_CMD} -e '/DEFAULT_CFLAGS=/ s|-O -g3 ||g' \
-		-e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/ install-data-hook/d' ${WRKSRC}/html/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
 		${WRKSRC}/html/server/div/WebHTTrack.desktop \
--- a/www/hydra/Makefile
+++ b/www/hydra/Makefile
@ -33,7 +33,6 @@ PLIST_SUB=	LOGDIR=${LOGDIR}
 SUB_LIST=	LOGDIR=${LOGDIR}

 post-patch:
-	@${REINPLACE_CMD} -e "s,-pthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
 .for f in src/defines.h examples/hydra.conf
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" \
 	                  -e "s,%%LOGDIR%%,${LOGDIR},g" \
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@ -35,8 +35,8 @@ OPTIONS_DEFINE=	MYSQL PGSQL SQLITE3

 .include <bsd.port.options.mk>

-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread

 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
@ -63,11 +63,6 @@ CONFIGURE_ARGS+=--without-sqlite3
 BROKEN=		Does not compile on alpha
 .endif

-post-patch:
-	@${REINPLACE_CMD} -e 's|-pthread||g ; \
-		 s|-lc_r||g ; \
-		 s|-lkse||g' ${WRKSRC}/configure
-
 post-install:
 .for filename in wapkannel.conf smskannel.conf
 	${INSTALL_DATA} ${WRKSRC}/gw/${filename} ${PREFIX}/etc/${filename}.sample
--- a/www/lusca-head/Makefile
+++ b/www/lusca-head/Makefile
@ -236,7 +236,6 @@ libexec+=	squid_kerb_auth
 storage_schemes=	aufs null
 # Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
 CONFIGURE_ARGS+=	--with-pthreads
-CFLAGS+=	${PTHREAD_CFLAGS}

 .if defined(WITH_SQUID_COSS)
 storage_schemes+=	coss
@ -357,8 +356,6 @@ PLIST_FILES+=	${error_files:S,^,etc/squid/errors/${d}/,}
 PLIST_DIRS+=	etc/squid/errors etc/squid squid/logs squid/cache squid

 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
-	    ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
 	    -e 's|%%SQUID_GID%%|${SQUID_GID}|g' \
 	    -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cf.data.pre
--- a/www/middleman/Makefile
+++ b/www/middleman/Makefile
@ -18,8 +18,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes

-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread

 MAN8=		mman.8

--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@ -55,8 +55,7 @@ USE_OPENSSL=	yes

 .if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=	--enable-pthreads
-CFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV+=	LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	LIBS="-pthread"
 .else
 CONFIGURE_ARGS+=	--disable-pthreads
 CFLAGS+=	-DCONSOLE
--- a/www/mod_clamav/Makefile
+++ b/www/mod_clamav/Makefile
@ -36,10 +36,9 @@ LIB_DEPENDS+=	clamav.7:${PORTSDIR}/security/clamav
 CONFIGURE_ARGS=	--with-apxs=${APXS} \
 		--libdir=${PREFIX}/lib/apache2
 CFLAGS+=	-I${LOCALBASE}/include
-CPPFLAGS+=	-I${LOCALBASE}/include \
-		${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib \
-		${PTHREAD_LIBS}
+		-pthread

 post-patch:
 	@${REINPLACE_CMD} -e 's,REG_EXTENDED,AP_REG_EXTENDED,' \
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@ -897,8 +897,6 @@ post-patch:
 		${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_VERSION:S/^0-g//}/config
 .endif
 .if ${PORT_OPTIONS:MPASSENGER}
-	@${REINPLACE_CMD} 's!-lpthread!${PTHREAD_LIBS}!g' \
-		${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx/config
 	@${REINPLACE_CMD} 's!-Wall!!g; \
 		s!#{PlatformInfo.debugging_cflags}!${CFLAGS}!g; \
 		s!-O2!!g; \
@ -909,8 +907,6 @@ post-patch:
 		s!-lev!!; \
 		s!-Iext/libev!!' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/build/common_library.rb
-	@${REINPLACE_CMD} 's!-lpthread!${PTHREAD_LIBS}!g' \
-		${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info/compiler.rb
 .endif
 .if ${PORT_OPTIONS:MPOSTGRES}
 	@${REINPLACE_CMD} \
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@ -898,8 +898,6 @@ post-patch:
 		${WRKDIR}/mdirolf-nginx-gridfs-${GIT_GRIDFS_VERSION:S/^0-g//}/config
 .endif
 .if ${PORT_OPTIONS:MPASSENGER}
-	@${REINPLACE_CMD} 's!-lpthread!${PTHREAD_LIBS}!g' \
-		${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx/config
 	@${REINPLACE_CMD} 's!-Wall!!g; \
 		s!#{PlatformInfo.debugging_cflags}!${CFLAGS}!g; \
 		s!-O2!!g; \
@ -910,8 +908,6 @@ post-patch:
 		s!-lev!!; \
 		s!-Iext/libev!!' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/build/common_library.rb
-	@${REINPLACE_CMD} 's!-lpthread!${PTHREAD_LIBS}!g' \
-		${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info/compiler.rb
 .endif
 .if ${PORT_OPTIONS:MPOSTGRES}
 	@${REINPLACE_CMD} \
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@ -28,8 +28,6 @@ CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
 		--enable-oops-user=${USERS} \
 		--enable-large-files \
 		--with-regexp=system
-CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
 CFLAGS+=	-fPIC
 CXXFLAGS+=	-fPIC

--- a/www/oops/files/patch-configure.in
+++ b/www/oops/files/patch-configure.in
@ -1,30 +1,26 @@
 --- configure.in.orig	2004-11-23 08:20:04.000000000 +0300
 +++ configure.in	2012-02-02 20:33:20.000000000 +0400
-@@ -328,14 +327,17 @@
-           rel=`uname -r`
-           case "$rel" in
-             4*)
+@@ -325,19 +325,7 @@
+ 	  if test "X$LIBGB_NAME" != "X" ; then
+ 		LIBGB_NAME="$LIBGB_NAME -lstdc++"
+ 	  fi
+-          rel=`uname -r`
+-          case "$rel" in
+-            4*)
 -              CFLAGS="$CFLAGS -pthread"
 -              ;;
 -            5*)
 -              LIBS="-lc_r $LEXLIB $LIBS"
-+              CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"
-               ;;
+-              ;;
 -            *)
 -              CFLAGS="$CFLAGS -pthread"
 -              LIBS="-lc_r $LEXLIB $LIBS"
-+ 	    5.[[012]]*)
-+ 	      LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"
-+ 	      ;;
-+ 	    [[56789]]*)
-+ 	      CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"
-+ 	      ;;
-+              *)
-+               CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+               LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"
-               ;;
-           esac
+-              ;;
+-          esac
+	  LIBS="-lpthread $LEXLIB $LIBS"
 	  RPATH_OPTION="-rpath"
+ 	  ;;
+ bsdi*)	  CFLAGS="$CFLAGS -pthread -DBSDOS"
@@ -430,10 +432,10 @@
 esac
 
--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@ -28,11 +28,10 @@ GNU_CONFIGURE=	yes
 LIBTOOLFILES=	configure
 CONFIGURE_ARGS=	--enable-gecko-rpath \
 		--disable-mozilla-plugin
-CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		LIBS="-lm" BOOST_LIB_SUFFIX=""
+CONFIGURE_ENV=	LIBS="-lm" BOOST_LIB_SUFFIX=""
 CPPFLAGS+=	-I${LOCALBASE}/include -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OPSYS:L} \
 		-I${LOCALBASE}/include/libpng15
-LDFLAGS+=	-L${LOCALBASE}/lib -L${JAVA_HOME}/jre/lib/${ARCH}/client ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib -L${JAVA_HOME}/jre/lib/${ARCH}/client -pthread
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_GECKO=	libxul19
--- a/www/resin3/Makefile
+++ b/www/resin3/Makefile
@ -52,7 +52,7 @@ CONFIGURE_ARGS+=	--with-java-home=${JAVA_HOME} \
 LDFLAGS+=		-L${OPENSSLLIB} -lcrypto -lssl
 # We need to link with cc instead of ld for the FreeBSD specific options used
 # by threading libraries
-CONFIGURE_ENV=		LD=${CC} PTHREAD_LIBS="${PTHREAD_LIBS}" LIBTOOL=${LIBTOOL}
+CONFIGURE_ENV=		LD=${CC} LIBTOOL=${LIBTOOL}

 # Install the Apache plugin if needed
 .if ${PORT_OPTIONS:MAPACHE22}
--- a/www/resin3/files/patch-configure
+++ b/www/resin3/files/patch-configure
@ -1,6 +1,6 @@
--- ./configure.orig	2012-03-06 10:02:43.000000000 -0800
-+++ ./configure	2012-03-06 10:05:45.000000000 -0800
-@@ -7030,11 +7030,6 @@
+--- configure.orig	2012-11-08 21:22:27.000000000 +0100
+++ configure	2013-02-07 12:28:12.000000000 +0100
+@@ -7585,11 +7585,6 @@
 
 
 
@ -12,7 +12,7 @@
 
 
 
-@@ -10610,29 +10605,9 @@
+@@ -11464,29 +11459,9 @@
 # Only expand once:
 
 
@ -45,12 +45,9 @@
 
 
 
-@@ -11415,28 +11390,8 @@
- 	;;
- 
+@@ -12271,26 +12246,6 @@
   *freebsd*)
-	PROXY_LIBS='-lpthread'
-+	PROXY_LIBS="${PTHREAD_LIBS}"
+ 	PROXY_LIBS='-lpthread'
         jni_os=freebsd
 -
 -	tmp=`ldd $JAVA_HOME/bin/java | sed 's/.*=>//' | grep -c libc_r`
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@ -28,8 +28,8 @@ PLIST_FILES=	bin/retawq \
 		share/locale/pt_BR/LC_MESSAGES/retawq.mo
 PORTDOCS=	*

-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread

 .if defined(WITH_GNUTLS)
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@ -74,9 +74,6 @@ pre-patch:
 .endif

 post-install:
-	@${REINPLACE_CMD} \
-		's!-lpthread!${PTHREAD_LIBS}!g' \
-		${PREFIX}/${GEM_LIB_DIR}/ext/nginx/config
 	@${REINPLACE_CMD} \
 		's!-Wall!!g; \
 		s!gcc!${CC}!g; \
@ -90,9 +87,6 @@ post-install:
 		's!-DPASSENGER_DEBUG!-DNDEBUG!g' \
 		${PREFIX}/${GEM_LIB_DIR}/build/config.rb
 .endif
-	@${REINPLACE_CMD} \
-		's!-lpthread!${PTHREAD_LIBS}!g' \
-		${PREFIX}/${GEM_LIB_DIR}/lib/phusion_passenger/platform_info/compiler.rb
 	@${REINPLACE_CMD} \
 		's!#{LIBEV_LIBS}!-L${LOCALBASE}/lib -lev!g' \
 		${PREFIX}/${GEM_LIB_DIR}/build/agents.rb
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@ -266,7 +266,6 @@ EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
 .endif
 # Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
 CONFIGURE_ARGS+=	--with-pthreads
-CFLAGS+=	${PTHREAD_CFLAGS}
 .endif
 .if defined(WITH_SQUID_COSS)
 storage_schemes+=	coss
@ -398,8 +397,6 @@ PLIST_DIRS+=	%%ETCDIR%%/errors
 PLIST_DIRSTRY+=	%%ETCDIR%%

 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
-	    ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
 	    -e 's|%%SQUID_GID%%|${SQUID_GID}|g' \
 	    -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cf.data.pre
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@ -292,7 +292,6 @@ EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
 .endif
 # Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS,
 # e.g. SQUID_CONFIGURE_ARGS=--with-aufs-threads=N
-CFLAGS+=	${PTHREAD_CFLAGS}
 .else
 CONFIGURE_ARGS+=	--without-pthreads
 .endif
--- a/www/squid32/Makefile
+++ b/www/squid32/Makefile
@ -338,8 +338,7 @@ EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
 .endif
 # Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS,
 # e.g. SQUID_CONFIGURE_ARGS=--with-aufs-threads=N
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-pthread
 .else
 CONFIGURE_ARGS+=	--without-pthreads
 .endif
--- a/www/surf/files/patch-config.mk
+++ b/www/surf/files/patch-config.mk
@ -19,7 +19,7 @@
 -INCS = -I. -I/usr/include ${GTKINC}
 -LIBS = -L/usr/lib -lc ${GTKLIB} -lgthread-2.0
 +INCS = ${GTKINC}
-+LIBS = ${PTHREAD_LIBS} ${GTKLIB}
+LIBS = -pthread ${GTKLIB}
 
 # flags
 -CPPFLAGS = -DVERSION=\"${VERSION}\"
--- a/www/swish++/Makefile
+++ b/www/swish++/Makefile
@ -20,8 +20,7 @@ RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 USE_PERL5=	yes
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
-MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS} \
-		PERL=${PERL} PERL_VER=${PERL_VERSION}
+MAKE_ENV=	PERL=${PERL} PERL_VER=${PERL_VERSION}

 MAN1=	extract.1 httpindex.1 index.1 search.1 splitmail.1
 MAN3=	WWW.3
--- a/www/swish++/files/patch-config::config.mk
+++ b/www/swish++/files/patch-config::config.mk
@ -11,15 +11,6 @@
 #MAC_OS_X:=1
 #SOLARIS:=1
 #WIN32:=1
-@@ -118,7 +118,7 @@
- ifdef SEARCH_DAEMON
- 
- ifdef FREE_BSD
-PTHREAD_LINK:=	-pthread
-+PTHREAD_LINK:=	${PTHREAD_LIBS}
- else
- PTHREAD_LINK:=	-lpthread
- endif
@@ -159,7 +159,7 @@
 #		The command to remove files recursively and ignore errors;
 #		usually "rm -fr" for Unix or "erase" for Windows.
--- a/www/tntnet/Makefile
+++ b/www/tntnet/Makefile
@ -21,15 +21,15 @@ USE_ICONV=	yes
 USE_CSTD=	gnu89
 PATCH_STRIP=	-p1
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 CONFIGURE_ARGS+=	--localstatedir=/var

 .if defined(WITH_GNUTLS)
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lgnutls
+LDFLAGS+=	-lgnutls
 CONFIGURE_ARGS+=	--with-ssl=gnutls
 LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
 .else
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS+=	--with-ssl=openssl
 .endif

--- a/www/xombrero/Makefile
+++ b/www/xombrero/Makefile
@ -22,9 +22,7 @@ USE_PERL5_BUILD=yes
 USE_GNOME=	gtk20
 INSTALLS_ICONS=	yes

-MAKE_ENV=	GTK_VERSION="gtk2" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV=	GTK_VERSION="gtk2"

 MAN1=		xombrero.1
 PORTEXAMPLES=	favorites playflash.sh xombrero.conf
--- a/www/xombrero/files/patch-freebsd__Makefile
+++ b/www/xombrero/files/patch-freebsd__Makefile
@ -1,13 +1,11 @@
--- freebsd/Makefile.orig	2012-08-28 19:18:30.000000000 +0100
-+++ freebsd/Makefile	2012-08-31 13:57:54.000000000 +0100
-@@ -9,8 +9,8 @@
+--- freebsd/Makefile.orig	2012-12-11 14:25:00.000000000 +0100
+++ freebsd/Makefile	2012-12-11 14:25:07.000000000 +0100
+@@ -9,7 +9,7 @@
 LDADD= -lutil -lgcrypt
 GTK_CFLAGS!= pkg-config --cflags $(LIBS)
 GTK_LDFLAGS!= pkg-config --libs $(LIBS)
 -CFLAGS+= $(GTK_CFLAGS) -O2 -Wall -pthread -I. -I..
-LDFLAGS+= $(GTK_LDFLAGS) -pthread
-+CFLAGS+= $(GTK_CFLAGS) -Wall ${PTHREAD_CFLAGS} -I. -I..
-+LDFLAGS+= $(GTK_LDFLAGS) ${PTHREAD_LIBS}
+CFLAGS+= $(GTK_CFLAGS) -Wall -I. -I..
+ LDFLAGS+= $(GTK_LDFLAGS) -pthread
 
 PREFIX?= /usr/local
- BINDIR?= $(PREFIX)/bin