Date: Thu, 07 Feb 2013 07:03:14 -0600 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Pietro Cerutti <gahr@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r311829 - in head/www: apache22 aria cacheboy15-devel cacheboy16 cherokee dillo dillo-i18n dillo2 dpsearch epiphany epiphany-extensions gatling gatling/files httpsqs httrack hydra kanne... Message-ID: <5113A612.1080504@FreeBSD.org> In-Reply-To: <201302071237.r17CbmTs046459@svn.freebsd.org> References: <201302071237.r17CbmTs046459@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2DIWBPOVXMCNSMPDKCMWV Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 2/7/2013 6:37 AM, Pietro Cerutti wrote: > Author: gahr > Date: Thu Feb 7 12:37:48 2013 > New Revision: 311829 > URL: http://svnweb.freebsd.org/changeset/ports/311829 >=20 > Log: > - Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS (category: www) > =20 > Approved by: portmgr >=20 Perhaps something like this should be documented in CHANGES? > Modified: > head/www/apache22/Makefile.modules > head/www/aria/Makefile (contents, props changed) > head/www/cacheboy15-devel/Makefile (contents, props changed) > head/www/cacheboy16/Makefile (contents, props changed) > head/www/cherokee/Makefile > head/www/dillo-i18n/Makefile (contents, props changed) > head/www/dillo/Makefile (contents, props changed) > head/www/dillo2/Makefile (contents, props changed) > head/www/dpsearch/Makefile (contents, props changed) > head/www/epiphany-extensions/Makefile (contents, props changed) > head/www/epiphany/Makefile (contents, props changed) > head/www/gatling/Makefile (contents, props changed) > head/www/gatling/files/patch-GNUmakefile (contents, props changed) > head/www/httpsqs/Makefile (contents, props changed) > head/www/httrack/Makefile (contents, props changed) > head/www/hydra/Makefile (contents, props changed) > head/www/kannel/Makefile (contents, props changed) > head/www/lusca-head/Makefile (contents, props changed) > head/www/middleman/Makefile (contents, props changed) > head/www/mnogosearch/Makefile (contents, props changed) > head/www/mod_clamav/Makefile (contents, props changed) > head/www/nginx-devel/Makefile > head/www/nginx/Makefile > head/www/oops/Makefile (contents, props changed) > head/www/oops/files/patch-configure.in (contents, props changed) > head/www/openvrml/Makefile (contents, props changed) > head/www/resin3/Makefile > head/www/resin3/files/patch-configure (contents, props changed) > head/www/retawq/Makefile (contents, props changed) > head/www/rubygem-passenger/Makefile (contents, props changed) > head/www/squid/Makefile (contents, props changed) > head/www/squid31/Makefile > head/www/squid32/Makefile > head/www/surf/files/patch-config.mk (contents, props changed) > head/www/swish++/Makefile (contents, props changed) > head/www/swish++/files/patch-config::config.mk (contents, props cha= nged) > head/www/tntnet/Makefile (contents, props changed) > head/www/xombrero/Makefile (contents, props changed) > head/www/xombrero/files/patch-freebsd__Makefile >=20 > Modified: head/www/apache22/Makefile.modules > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/apache22/Makefile.modules Thu Feb 7 12:36:20 2013 (r31182= 8) > +++ head/www/apache22/Makefile.modules Thu Feb 7 12:37:48 2013 (r31182= 9) > @@ -137,8 +137,7 @@ IGNORE=3D AUTH_BASIC need at last one AUTH > .endif > =20 > .if defined(APR_HAS_THREADS) > -CFLAGS+=3D ${PTHREAD_CFLAGS} > -LDFLAGS+=3D ${PTHREAD_LIBS} > +LDFLAGS+=3D -pthread > .else > . if exists(${APR_CONFIG}) && ${PORT_OPTIONS:MMEM_CACHE} > IGNORE=3D MEM_CACHE requires APR threads. Please rebuild APR with THRE= AD support >=20 > Modified: head/www/aria/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/aria/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/aria/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -37,8 +37,7 @@ post-extract: > @${RM} -f ${WRKSRC}/src/getopt* > =20 > 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=3Dlib|DATADIRNAME=3Dshare|g' ${WRKSRC}/configure > @${REINPLACE_CMD} -e 's| -O2 -Wall | @CXXFLAGS@ |g ; \ > s|getopt.c getopt1.c getopt.h||g ; \ >=20 > Modified: head/www/cacheboy15-devel/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/cacheboy15-devel/Makefile Thu Feb 7 12:36:20 2013 (r31182= 8) > +++ head/www/cacheboy15-devel/Makefile Thu Feb 7 12:37:48 2013 (r31182= 9) > @@ -236,7 +236,6 @@ storage_schemes+=3D aufs > EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-src-cf.data.pre.aufs > # Nil aufs threads is default, set any other value via SQUID_CONFIGURE= _ARGS > CONFIGURE_ARGS+=3D --with-pthreads > -CFLAGS+=3D ${PTHREAD_CFLAGS} > .endif > .if defined(WITH_SQUID_COSS) > storage_schemes+=3D coss > @@ -361,8 +360,6 @@ PLIST_FILES+=3D ${error_files:S,^,etc/squi > PLIST_DIRS+=3D etc/squid/errors etc/squid squid/logs squid/cache squid= > =20 > 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 >=20 > Modified: head/www/cacheboy16/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/cacheboy16/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/cacheboy16/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -236,7 +236,6 @@ storage_schemes+=3D aufs > EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-src-cf.data.pre.aufs > # Nil aufs threads is default, set any other value via SQUID_CONFIGURE= _ARGS > CONFIGURE_ARGS+=3D --with-pthreads > -CFLAGS+=3D ${PTHREAD_CFLAGS} > .endif > .if defined(WITH_SQUID_COSS) > storage_schemes+=3D coss > @@ -364,8 +363,6 @@ PLIST_FILES+=3D ${error_files:S,^,etc/squi > PLIST_DIRS+=3D etc/squid/errors etc/squid squid/logs squid/cache squid= > =20 > 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 >=20 > Modified: head/www/cherokee/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/cherokee/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/cherokee/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -20,8 +20,8 @@ USE_RC_SUBR=3D cherokee > SUB_FILES=3D pkg-install pkg-message > USE_GMAKE=3D yes > GNU_CONFIGURE=3D yes > -CPPFLAGS+=3D -I${LOCALBASE}/include ${PTHREAD_CFLAGS} > -LDFLAGS+=3D -L${LOCALBASE}/lib ${PTHREAD_LIBS} > +CPPFLAGS+=3D -I${LOCALBASE}/include > +LDFLAGS+=3D -L${LOCALBASE}/lib -pthread > =20 > PORTSCOUT=3D limit:^1\.2\.102 > =20 >=20 > Modified: head/www/dillo-i18n/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/dillo-i18n/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/dillo-i18n/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -81,8 +81,6 @@ CONFIGURE_ARGS+=3D --enable-ipv6 > .endif > =20 > 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 > =20 >=20 > Modified: head/www/dillo/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/dillo/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/dillo/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -45,8 +45,6 @@ CONFLICTS=3D dillo-i18n-*[0-9]* \ > dillo-[2-9]* > =20 > 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 > =20 >=20 > Modified: head/www/dillo2/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/dillo2/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/dillo2/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -65,7 +65,6 @@ CONFIGURE_ARGS+=3D --disable-ssl > =20 > .ifdef(WITH_THREADED_DNS) > CONFIGURE_ARGS+=3D --enable-threaded-dns > -CFLAGS+=3D ${PTHREAD_CFLAGS} > .else > CONFIGURE_ARGS+=3D --disable-threaded-dns > .endif >=20 > Modified: head/www/dpsearch/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/dpsearch/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/dpsearch/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -41,8 +41,7 @@ CONFIGURE_ENV+=3D PORTNAME=3D"${PORTNAME}" > =20 > .if ${PORT_OPTIONS:MTHREADS} > CONFIGURE_ARGS+=3D--enable-pthreads > -CFLAGS+=3D ${PTHREAD_CFLAGS} > -CONFIGURE_ENV+=3D LIBS=3D"${PTHREAD_LIBS}" > +CONFIGURE_ENV+=3D LIBS=3D"-pthread" > .else > CONFIGURE_ARGS+=3D--disable-pthreads > .endif >=20 > Modified: head/www/epiphany-extensions/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/epiphany-extensions/Makefile Thu Feb 7 12:36:20 2013 (r31= 1828) > +++ head/www/epiphany-extensions/Makefile Thu Feb 7 12:37:48 2013 (r31= 1829) > @@ -27,8 +27,8 @@ USE_GNOME=3D gnomeprefix gnomehack intlhac > INSTALLS_OMF=3D yes > GNU_CONFIGURE=3D yes > USE_GMAKE=3D yes > -CONFIGURE_ENV=3D LIBS=3D"-L${LOCALBASE}/lib ${PTHREAD_LIBS}" > -CPPFLAGS+=3D -I${LOCALBASE}/include ${PTHREAD_CFLAGS} > +CONFIGURE_ENV=3D LIBS=3D"-L${LOCALBASE}/lib -pthread" > +CPPFLAGS+=3D -I${LOCALBASE}/include > =20 > EPHY_EXTENSIONS=3Dreally-all > EPHY_VERSION=3D ${PORTVERSION:R} >=20 > Modified: head/www/epiphany/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/epiphany/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/epiphany/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -41,8 +41,8 @@ USE_GMAKE=3D yes > INSTALLS_OMF=3D yes > CONFIGURE_ARGS+=3D--enable-introspection \ > --with-ca-file=3D${LOCALBASE}/share/certs/ca-root-nss.crt > -CONFIGURE_ENV=3D LIBS=3D"-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LI= BS}" > -CPPFLAGS+=3D -I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS} > +CONFIGURE_ENV=3D LIBS=3D"-L${LOCALBASE}/lib -pthread ${EXTRA_LIBS}" > +CPPFLAGS+=3D -I${LOCALBASE}/include ${EXTRA_CFLAGS} > =20 > GCONF_SCHEMAS=3D epiphany-lockdown.schemas epiphany.schemas > =20 > @@ -84,8 +84,6 @@ EXTRA_PATCHES+=3D ${FILESDIR}/extra-patch- > .endif > =20 > 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=3D2.29|EPIPHANY_API_VERSION=3D2.30|g' \ >=20 > Modified: head/www/gatling/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/gatling/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/gatling/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -24,7 +24,6 @@ CFLAGS+=3D -I${LOCALBASE}/include/libowfat > LDFLAGS+=3D -L${LOCALBASE}/lib -L${OPENSSLLIB} > =20 > MAKEFILE=3D GNUmakefile > -MAKE_ENV+=3D PTHREAD_LIBS=3D"${PTHREAD_LIBS}" > =20 > bin=3D dl > sbin=3D gatling >=20 > Modified: head/www/gatling/files/patch-GNUmakefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/gatling/files/patch-GNUmakefile Thu Feb 7 12:36:20 2013 (= r311828) > +++ head/www/gatling/files/patch-GNUmakefile Thu Feb 7 12:37:48 2013 (= r311829) > @@ -53,15 +53,6 @@ > endif > =20 > LDLIBS=3D-lowfat > -@@ -70,7 +64,7 @@ > - CC:=3D$(DIET) $(CC) > -=20 > - pthreadbench: pthreadbench.o > -- $(CC) $< -o $@ -I. $(CFLAGS) $(LDFLAGS) $(LDLIBS) -lpthread > -+ $(CC) $< -o $@ -I. $(CFLAGS) $(LDFLAGS) $(LDLIBS) $(PTHREAD_LIBS) > -=20 > - forksbench: forkbench.o > - $(CC) -static -o $@ forkbench.o $(LDFLAGS) $(LDLIBS) > @@ -136,11 +130,13 @@ > rm -f trysocket > =20 >=20 > Modified: head/www/httpsqs/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/httpsqs/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/httpsqs/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -19,7 +19,6 @@ LIB_DEPENDS+=3D tokyocabinet:${PORTSDIR}/d > event-2.0:${PORTSDIR}/devel/libevent2 > =20 > USE_PKGCONFIG=3D yes > -MAKE_ENV=3D LIBS=3D"${PTHREAD_LIBS}" > =20 > PLIST_FILES=3D bin/${PORTNAME} > =20 >=20 > Modified: head/www/httrack/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/httrack/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/httrack/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -34,7 +34,7 @@ MAN1=3D htsserver.1 httrack.1 proxytrack. > =20 > post-patch: > @${REINPLACE_CMD} -e '/DEFAULT_CFLAGS=3D/ 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 \ >=20 > Modified: head/www/hydra/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/hydra/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/hydra/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -33,7 +33,6 @@ PLIST_SUB=3D LOGDIR=3D${LOGDIR} > SUB_LIST=3D LOGDIR=3D${LOGDIR} > =20 > post-patch: > - @${REINPLACE_CMD} -e "s,-pthread,${PTHREAD_LIBS},g" ${WRKSRC}/configu= re > .for f in src/defines.h examples/hydra.conf > @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" \ > -e "s,%%LOGDIR%%,${LOGDIR},g" \ >=20 > Modified: head/www/kannel/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/kannel/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/kannel/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -35,8 +35,8 @@ OPTIONS_DEFINE=3D MYSQL PGSQL SQLITE3 > =20 > .include <bsd.port.options.mk> > =20 > -CPPFLAGS+=3D -I${LOCALBASE}/include ${PTHREAD_CFLAGS} > -LDFLAGS+=3D -L${LOCALBASE}/lib ${PTHREAD_LIBS} > +CPPFLAGS+=3D -I${LOCALBASE}/include > +LDFLAGS+=3D -L${LOCALBASE}/lib -pthread > =20 > .if ${PORT_OPTIONS:MMYSQL} > USE_MYSQL=3D yes > @@ -63,11 +63,6 @@ CONFIGURE_ARGS+=3D--without-sqlite3 > BROKEN=3D Does not compile on alpha > .endif > =20 > -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}.sa= mple >=20 > Modified: head/www/lusca-head/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/lusca-head/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/lusca-head/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -236,7 +236,6 @@ libexec+=3D squid_kerb_auth > storage_schemes=3D aufs null > # Nil aufs threads is default, set any other value via SQUID_CONFIGURE= _ARGS > CONFIGURE_ARGS+=3D --with-pthreads > -CFLAGS+=3D ${PTHREAD_CFLAGS} > =20 > .if defined(WITH_SQUID_COSS) > storage_schemes+=3D coss > @@ -357,8 +356,6 @@ PLIST_FILES+=3D ${error_files:S,^,etc/squi > PLIST_DIRS+=3D etc/squid/errors etc/squid squid/logs squid/cache squid= > =20 > 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 >=20 > Modified: head/www/middleman/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/middleman/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/middleman/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -18,8 +18,8 @@ WRKSRC=3D ${WRKDIR}/${PORTNAME} > GNU_CONFIGURE=3D yes > USE_GMAKE=3D yes > =20 > -CPPFLAGS+=3D -I${LOCALBASE}/include ${PTHREAD_CFLAGS} > -LDFLAGS+=3D -L${LOCALBASE}/lib ${PTHREAD_LIBS} > +CPPFLAGS+=3D -I${LOCALBASE}/include > +LDFLAGS+=3D -L${LOCALBASE}/lib -pthread > =20 > MAN8=3D mman.8 > =20 >=20 > Modified: head/www/mnogosearch/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/mnogosearch/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/mnogosearch/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -55,8 +55,7 @@ USE_OPENSSL=3D yes > =20 > .if ${PORT_OPTIONS:MTHREADS} > CONFIGURE_ARGS+=3D --enable-pthreads > -CFLAGS+=3D ${PTHREAD_CFLAGS} > -CONFIGURE_ENV+=3D LIBS=3D"${PTHREAD_LIBS}" > +CONFIGURE_ENV+=3D LIBS=3D"-pthread" > .else > CONFIGURE_ARGS+=3D --disable-pthreads > CFLAGS+=3D -DCONSOLE >=20 > Modified: head/www/mod_clamav/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/mod_clamav/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/mod_clamav/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -36,10 +36,9 @@ LIB_DEPENDS+=3D clamav.7:${PORTSDIR}/secur > CONFIGURE_ARGS=3D --with-apxs=3D${APXS} \ > --libdir=3D${PREFIX}/lib/apache2 > CFLAGS+=3D -I${LOCALBASE}/include > -CPPFLAGS+=3D -I${LOCALBASE}/include \ > - ${PTHREAD_CFLAGS} > +CPPFLAGS+=3D -I${LOCALBASE}/include > LDFLAGS+=3D -L${LOCALBASE}/lib \ > - ${PTHREAD_LIBS} > + -pthread > =20 > post-patch: > @${REINPLACE_CMD} -e 's,REG_EXTENDED,AP_REG_EXTENDED,' \ >=20 > Modified: head/www/nginx-devel/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/nginx-devel/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/nginx-devel/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -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/platf= orm_info/compiler.rb > .endif > .if ${PORT_OPTIONS:MPOSTGRES} > @${REINPLACE_CMD} \ >=20 > Modified: head/www/nginx/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/nginx/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/nginx/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -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/platf= orm_info/compiler.rb > .endif > .if ${PORT_OPTIONS:MPOSTGRES} > @${REINPLACE_CMD} \ >=20 > Modified: head/www/oops/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/oops/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/oops/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -28,8 +28,6 @@ CONFIGURE_ARGS?=3D--sbindir=3D${PREFIX}/sbin > --enable-oops-user=3D${USERS} \ > --enable-large-files \ > --with-regexp=3Dsystem > -CONFIGURE_ENV+=3D PTHREAD_CFLAGS=3D"${PTHREAD_CFLAGS}" \ > - PTHREAD_LIBS=3D"${PTHREAD_LIBS}" > CFLAGS+=3D -fPIC > CXXFLAGS+=3D -fPIC > =20 >=20 > Modified: head/www/oops/files/patch-configure.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/oops/files/patch-configure.in Thu Feb 7 12:36:20 2013 (r3= 11828) > +++ head/www/oops/files/patch-configure.in Thu Feb 7 12:37:48 2013 (r3= 11829) > @@ -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=3D`uname -r` > - case "$rel" in > - 4*) > +@@ -325,19 +325,7 @@ > + if test "X$LIBGB_NAME" !=3D "X" ; then > + LIBGB_NAME=3D"$LIBGB_NAME -lstdc++" > + fi > +- rel=3D`uname -r` > +- case "$rel" in > +- 4*) > - CFLAGS=3D"$CFLAGS -pthread" > - ;; > - 5*) > - LIBS=3D"-lc_r $LEXLIB $LIBS" > -+ CFLAGS=3D"$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS" > - ;; > +- ;; > - *) > - CFLAGS=3D"$CFLAGS -pthread" > - LIBS=3D"-lc_r $LEXLIB $LIBS" > -+ 5.[[012]]*) > -+ LIBS=3D"$PTHREAD_LIBS $LEXLIB $LIBS" > -+ ;; > -+ [[56789]]*) > -+ CFLAGS=3D"$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS" > -+ ;; > -+ *) > -+ CFLAGS=3D"$CFLAGS $PTHREAD_CFLAGS" > -+ LIBS=3D"$PTHREAD_LIBS $LEXLIB $LIBS" > - ;; > - esac > +- ;; > +- esac > ++ LIBS=3D"-lpthread $LEXLIB $LIBS" > RPATH_OPTION=3D"-rpath" > + ;; > + bsdi*) CFLAGS=3D"$CFLAGS -pthread -DBSDOS" > @@ -430,10 +432,10 @@ > esac > =20 >=20 > Modified: head/www/openvrml/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/openvrml/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/openvrml/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -28,11 +28,10 @@ GNU_CONFIGURE=3D yes > LIBTOOLFILES=3D configure > CONFIGURE_ARGS=3D --enable-gecko-rpath \ > --disable-mozilla-plugin > -CONFIGURE_ENV=3D PTHREAD_CFLAGS=3D"${PTHREAD_CFLAGS}" PTHREAD_LIBS=3D"= ${PTHREAD_LIBS}" \ > - LIBS=3D"-lm" BOOST_LIB_SUFFIX=3D"" > +CONFIGURE_ENV=3D LIBS=3D"-lm" BOOST_LIB_SUFFIX=3D"" > CPPFLAGS+=3D -I${LOCALBASE}/include -I${JAVA_HOME}/include -I${JAVA_HO= ME}/include/${OPSYS:L} \ > -I${LOCALBASE}/include/libpng15 > -LDFLAGS+=3D -L${LOCALBASE}/lib -L${JAVA_HOME}/jre/lib/${ARCH}/client $= {PTHREAD_LIBS} > +LDFLAGS+=3D -L${LOCALBASE}/lib -L${JAVA_HOME}/jre/lib/${ARCH}/client -= pthread > USE_GMAKE=3D yes > USE_LDCONFIG=3D yes > USE_GECKO=3D libxul19 >=20 > Modified: head/www/resin3/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/resin3/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/resin3/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -52,7 +52,7 @@ CONFIGURE_ARGS+=3D --with-java-home=3D${JAVA > LDFLAGS+=3D -L${OPENSSLLIB} -lcrypto -lssl > # We need to link with cc instead of ld for the FreeBSD specific optio= ns used > # by threading libraries > -CONFIGURE_ENV=3D LD=3D${CC} PTHREAD_LIBS=3D"${PTHREAD_LIBS}" LIBTOOL=3D= ${LIBTOOL} > +CONFIGURE_ENV=3D LD=3D${CC} LIBTOOL=3D${LIBTOOL} > =20 > # Install the Apache plugin if needed > .if ${PORT_OPTIONS:MAPACHE22} >=20 > Modified: head/www/resin3/files/patch-configure > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/resin3/files/patch-configure Thu Feb 7 12:36:20 2013 (r31= 1828) > +++ head/www/resin3/files/patch-configure Thu Feb 7 12:37:48 2013 (r31= 1829) > @@ -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 @@ > =20 > =20 > =20 > @@ -12,7 +12,7 @@ > =20 > =20 > =20 > -@@ -10610,29 +10605,9 @@ > +@@ -11464,29 +11459,9 @@ > # Only expand once: > =20 > =20 > @@ -45,12 +45,9 @@ > =20 > =20 > =20 > -@@ -11415,28 +11390,8 @@ > - ;; > -=20 > +@@ -12271,26 +12246,6 @@ > *freebsd*) > -- PROXY_LIBS=3D'-lpthread' > -+ PROXY_LIBS=3D"${PTHREAD_LIBS}" > + PROXY_LIBS=3D'-lpthread' > jni_os=3Dfreebsd > - > - tmp=3D`ldd $JAVA_HOME/bin/java | sed 's/.*=3D>//' | grep -c libc_r` >=20 > Modified: head/www/retawq/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/retawq/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/retawq/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -28,8 +28,8 @@ PLIST_FILES=3D bin/retawq \ > share/locale/pt_BR/LC_MESSAGES/retawq.mo > PORTDOCS=3D * > =20 > -CPPFLAGS+=3D -I${LOCALBASE}/include ${PTHREAD_CFLAGS} > -LDFLAGS+=3D -L${LOCALBASE}/lib ${PTHREAD_LIBS} > +CPPFLAGS+=3D -I${LOCALBASE}/include > +LDFLAGS+=3D -L${LOCALBASE}/lib -pthread > =20 > .if defined(WITH_GNUTLS) > LIB_DEPENDS+=3D gnutls.26:${PORTSDIR}/security/gnutls >=20 > Modified: head/www/rubygem-passenger/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/rubygem-passenger/Makefile Thu Feb 7 12:36:20 2013 (r3118= 28) > +++ head/www/rubygem-passenger/Makefile Thu Feb 7 12:37:48 2013 (r3118= 29) > @@ -75,9 +75,6 @@ pre-patch: > =20 > 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; \ > s!g++!${CXX}!g; \ > @@ -91,9 +88,6 @@ post-install: > ${PREFIX}/${GEM_LIB_DIR}/build/config.rb > .endif > @${REINPLACE_CMD} \ > - 's!-lpthread!${PTHREAD_LIBS}!g' \ > - ${PREFIX}/${GEM_LIB_DIR}/lib/phusion_passenger/platform_info/compile= r.rb > - @${REINPLACE_CMD} \ > 's!#{LIBEV_LIBS}!-L${LOCALBASE}/lib -lev!g' \ > ${PREFIX}/${GEM_LIB_DIR}/build/agents.rb > @${REINPLACE_CMD} \ >=20 > Modified: head/www/squid/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/squid/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/squid/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -266,7 +266,6 @@ EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch > .endif > # Nil aufs threads is default, set any other value via SQUID_CONFIGURE= _ARGS > CONFIGURE_ARGS+=3D --with-pthreads > -CFLAGS+=3D ${PTHREAD_CFLAGS} > .endif > .if defined(WITH_SQUID_COSS) > storage_schemes+=3D coss > @@ -398,8 +397,6 @@ PLIST_DIRS+=3D %%ETCDIR%%/errors > PLIST_DIRSTRY+=3D %%ETCDIR%% > =20 > 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 >=20 > Modified: head/www/squid31/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/squid31/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/squid31/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -292,7 +292,6 @@ EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch > .endif > # Nil aufs threads is default, set any other value via SQUID_CONFIGURE= _ARGS, > # e.g. SQUID_CONFIGURE_ARGS=3D--with-aufs-threads=3DN > -CFLAGS+=3D ${PTHREAD_CFLAGS} > .else > CONFIGURE_ARGS+=3D --without-pthreads > .endif >=20 > Modified: head/www/squid32/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/squid32/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/squid32/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -338,8 +338,7 @@ EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch > .endif > # Nil aufs threads is default, set any other value via SQUID_CONFIGURE= _ARGS, > # e.g. SQUID_CONFIGURE_ARGS=3D--with-aufs-threads=3DN > -CFLAGS+=3D ${PTHREAD_CFLAGS} > -LDFLAGS+=3D ${PTHREAD_LIBS} > +LDFLAGS+=3D -pthread > .else > CONFIGURE_ARGS+=3D --without-pthreads > .endif >=20 > Modified: head/www/surf/files/patch-config.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/surf/files/patch-config.mk Thu Feb 7 12:36:20 2013 (r3118= 28) > +++ head/www/surf/files/patch-config.mk Thu Feb 7 12:37:48 2013 (r3118= 29) > @@ -19,7 +19,7 @@ > -INCS =3D -I. -I/usr/include ${GTKINC} > -LIBS =3D -L/usr/lib -lc ${GTKLIB} -lgthread-2.0 > +INCS =3D ${GTKINC} > -+LIBS =3D ${PTHREAD_LIBS} ${GTKLIB} > ++LIBS =3D -pthread ${GTKLIB} > =20 > # flags > -CPPFLAGS =3D -DVERSION=3D\"${VERSION}\" >=20 > Modified: head/www/swish++/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/swish++/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/swish++/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -20,8 +20,7 @@ RUN_DEPENDS=3D wget:${PORTSDIR}/ftp/wget > USE_PERL5=3D yes > USE_GMAKE=3D yes > MAKEFILE=3D GNUmakefile > -MAKE_ENV=3D PTHREAD_LIBS=3D${PTHREAD_LIBS} \ > - PERL=3D${PERL} PERL_VER=3D${PERL_VERSION} > +MAKE_ENV=3D PERL=3D${PERL} PERL_VER=3D${PERL_VERSION} > =20 > MAN1=3D extract.1 httpindex.1 index.1 search.1 splitmail.1 > MAN3=3D WWW.3 >=20 > Modified: head/www/swish++/files/patch-config::config.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/swish++/files/patch-config::config.mk Thu Feb 7 12:36:20 = 2013 (r311828) > +++ head/www/swish++/files/patch-config::config.mk Thu Feb 7 12:37:48 = 2013 (r311829) > @@ -11,15 +11,6 @@ > #MAC_OS_X:=3D1 > #SOLARIS:=3D1 > #WIN32:=3D1 > -@@ -118,7 +118,7 @@ > - ifdef SEARCH_DAEMON > -=20 > - ifdef FREE_BSD > --PTHREAD_LINK:=3D -pthread > -+PTHREAD_LINK:=3D ${PTHREAD_LIBS} > - else > - PTHREAD_LINK:=3D -lpthread > - endif > @@ -159,7 +159,7 @@ > # The command to remove files recursively and ignore errors; > # usually "rm -fr" for Unix or "erase" for Windows. >=20 > Modified: head/www/tntnet/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/tntnet/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/tntnet/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -21,15 +21,15 @@ USE_ICONV=3D yes > USE_CSTD=3D gnu89 > PATCH_STRIP=3D -p1 > GNU_CONFIGURE=3D yes > -CPPFLAGS+=3D -I${LOCALBASE}/include ${PTHREAD_CFLAGS} > +CPPFLAGS+=3D -I${LOCALBASE}/include > +LDFLAGS+=3D -L${LOCALBASE}/lib -pthread > CONFIGURE_ARGS+=3D --localstatedir=3D/var > =20 > .if defined(WITH_GNUTLS) > -LDFLAGS+=3D -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lgnutls > +LDFLAGS+=3D -lgnutls > CONFIGURE_ARGS+=3D --with-ssl=3Dgnutls > LIB_DEPENDS+=3D gnutls:${PORTSDIR}/security/gnutls > .else > -LDFLAGS+=3D -L${LOCALBASE}/lib ${PTHREAD_LIBS} > CONFIGURE_ARGS+=3D --with-ssl=3Dopenssl > .endif > =20 >=20 > Modified: head/www/xombrero/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/xombrero/Makefile Thu Feb 7 12:36:20 2013 (r311828) > +++ head/www/xombrero/Makefile Thu Feb 7 12:37:48 2013 (r311829) > @@ -22,9 +22,7 @@ USE_PERL5_BUILD=3Dyes > USE_GNOME=3D gtk20 > INSTALLS_ICONS=3D yes > =20 > -MAKE_ENV=3D GTK_VERSION=3D"gtk2" \ > - PTHREAD_CFLAGS=3D"${PTHREAD_CFLAGS}" \ > - PTHREAD_LIBS=3D"${PTHREAD_LIBS}" > +MAKE_ENV=3D GTK_VERSION=3D"gtk2" > =20 > MAN1=3D xombrero.1 > PORTEXAMPLES=3D favorites playflash.sh xombrero.conf >=20 > Modified: head/www/xombrero/files/patch-freebsd__Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/xombrero/files/patch-freebsd__Makefile Thu Feb 7 12:36:20= 2013 (r311828) > +++ head/www/xombrero/files/patch-freebsd__Makefile Thu Feb 7 12:37:48= 2013 (r311829) > @@ -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=3D -lutil -lgcrypt > GTK_CFLAGS!=3D pkg-config --cflags $(LIBS) > GTK_LDFLAGS!=3D pkg-config --libs $(LIBS) > -CFLAGS+=3D $(GTK_CFLAGS) -O2 -Wall -pthread -I. -I.. > --LDFLAGS+=3D $(GTK_LDFLAGS) -pthread > -+CFLAGS+=3D $(GTK_CFLAGS) -Wall ${PTHREAD_CFLAGS} -I. -I.. > -+LDFLAGS+=3D $(GTK_LDFLAGS) ${PTHREAD_LIBS} > ++CFLAGS+=3D $(GTK_CFLAGS) -Wall -I. -I.. > + LDFLAGS+=3D $(GTK_LDFLAGS) -pthread > =20 > PREFIX?=3D /usr/local > - BINDIR?=3D $(PREFIX)/bin >=20 --=20 Regards, Bryan Drewery bdrewery@freenode/EFNet ------enig2DIWBPOVXMCNSMPDKCMWV Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIbBAEBAgAGBQJRE6YSAAoJEG54KsA8mwz5XowP+NvfE/CJNSy+AU+Xb57WE/Zm eq5qFJLtbR5jrnZzKmOet7mNOehllNSXErAe+7rUVVZeGchubIJYxjfZ9XOmTNsO BlfZFydKcSdDZtVPuLlSIJusjUYnriOCACadD1UuZSiZA/7w+17fSPyNYxohXlcY SZ4iaJrbxq6wxpE+A7GBnMSdOPdeehhEuihXc+pW/zkGhDt8t/7kIM7TC52ukfZ1 BsvWnlRj+/9GJ1Wbbgo3uw9ymG4tvbjo8x49mYinx+Ry91SWyfH0yBzhYsIqufj/ pUysGNCIf5HcxA3e9qu85lIEQ6haOuZM9SR4WNEi1QRSI7XhBMSdNLz4PwH9i3cl VjLas0Or3hSnwiJJH9HG+n+948CeDLt+59bd6YHZr7QnWCVdEmBKHqDva2EFdp8J 532y14wpvkEVqhLeCWbYP4lFhUxMJYzsmgazhMOAL/6A7PE56k3PYiam1i3INuQY 8ldms+U9q1uJPp/WELtIVPKmRaZTo9Gv0Xldiv2KX7uQmUataHOpzRoDpze1xQx1 U0fKTy/XVR+b+Is4NqI90CuaI1ch8yRPV419w9mcyYjZK2X+rpkGq6DhCs383hZP TETVYyxfebdeNZJkm7MzW4PpdR8ipciRlG77FLR3v5YWlR9XInLl9g9cObKPVOn0 WqZC3c47kNjCxV01A1o= =7wTV -----END PGP SIGNATURE----- ------enig2DIWBPOVXMCNSMPDKCMWV--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5113A612.1080504>