Date: Mon, 15 Apr 2013 20:49:37 -0400 From: "Steve Wills" <steve@mouf.net> To: gahr@FreeBSD.org Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org, Steve Wills <steve@mouf.net>, ports-committers@FreeBSD.org Subject: Re: svn commit: r312209 - in head/devel: allegro apr1 apr2 bennugd-core bennugd-modules boost-all boost-libs boost-python-libs bullet ccons cgit clanlib1 clanlib22 clint cocaine-core commoncpp cppcheck... Message-ID: <f309a84e8e7eb05b673a55de7f3d476c.squirrel@mouf.net> In-Reply-To: <20130415074337.GB66552@gahrfit.gahr.ch> References: <201302140942.r1E9gDsw053109@svn.freebsd.org> <eada70bbd61aeb921f015c0a674cd8f6.squirrel@mouf.net> <20130415074337.GB66552@gahrfit.gahr.ch>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 2013-Apr-14, 22:29, Steve Wills wrote: >> I may be wrong, but some of these changes seem wrong. At least for glib >> and any of the others that completely removed PTHREAD_LIBS entirely. I >> think it's fine to replace PTHREAD_LIBS with -pthread, but removing >> PTHREAD_LIBS or -pthread entirely could be problematic. These two PRs: >> >> http://www.freebsd.org/cgi/query-pr.cgi?pr=177800 >> http://www.freebsd.org/cgi/query-pr.cgi?pr=176888 >> >> seem to be caused by this. Am I wrong? If not, we may need to go back >> through these changes and put -pthread back where it was removed >> entirely. > > I would be surprised if they were. glib20 configures fine without the > explicit pthread flags. See config.log. The shlib ends up correctly > linked against the threading library: > >> ldd /usr/local/lib/libglib-2.0.so.0 > libintl.so.9 => /usr/local/lib/libintl.so.9 (0x801702000) > libiconv.so.3 => /usr/local/lib/libiconv.so.3 (0x80190b000) > libpcre.so.3 => /usr/local/lib/libpcre.so.3 (0x801c04000) > libthr.so.3 => /lib/libthr.so.3 (0x801e67000) > libc.so.7 => /lib/libc.so.7 (0x80081c000) > > Moreover, the symptoms aren't quite what I'd expect from an application > missing a pthread link, as they usually die in initialization phase, > even before they reach main. > Good points, thanks, I knew I was missing something. I do indeed see that my ldd output looks like yours above. > Moreover, if glib20 was affected, I'd expect a far larger number of > ports to start behaving strangely ;) > > anyway, I'm building xpra as we speak and I'll let you know what I find > out. I think you're right, it's an upstream issue with xpra and sonata, I'll try to fix what I can. Thanks, Steve > > >> >> Steve >> >> > Author: gahr >> > Date: Thu Feb 14 09:42:12 2013 >> > New Revision: 312209 >> > URL: http://svnweb.freebsd.org/changeset/ports/312209 >> > >> > Log: >> > - Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS (category: devel) >> > >> > Approved by: portmgr >> > >> > Deleted: >> > head/devel/kprof/files/patch-configure >> > head/devel/nspr/files/patch-.._pr_tests_Makefile >> > head/devel/sdl12/files/patch-configure >> > Modified: >> > head/devel/allegro/Makefile (contents, props changed) >> > head/devel/apr1/Makefile >> > head/devel/apr2/Makefile (contents, props changed) >> > head/devel/bennugd-core/Makefile (contents, props changed) >> > head/devel/bennugd-modules/Makefile (contents, props changed) >> > head/devel/boost-all/pkg-message.threads (contents, props changed) >> > head/devel/boost-libs/Makefile (contents, props changed) >> > head/devel/boost-python-libs/Makefile (contents, props changed) >> > head/devel/bullet/Makefile (contents, props changed) >> > head/devel/ccons/Makefile >> > head/devel/cgit/Makefile (contents, props changed) >> > head/devel/clanlib1/Makefile >> > head/devel/clanlib22/Makefile >> > head/devel/clint/Makefile (contents, props changed) >> > head/devel/cocaine-core/Makefile >> > head/devel/commoncpp/Makefile (contents, props changed) >> > head/devel/cppcheck/Makefile >> > head/devel/cxxtools/Makefile >> > head/devel/dbus-glib/Makefile (contents, props changed) >> > head/devel/dbus-qt3/Makefile (contents, props changed) >> > head/devel/dbus/Makefile >> > head/devel/devhelp/Makefile (contents, props changed) >> > head/devel/directfb/Makefile (contents, props changed) >> > head/devel/distcc/Makefile (contents, props changed) >> > head/devel/fga/Makefile (contents, props changed) >> > head/devel/fnccheck/Makefile >> > head/devel/g2c/Makefile (contents, props changed) >> > head/devel/gamin/Makefile >> > head/devel/gaul/Makefile (contents, props changed) >> > head/devel/gio-fam-backend/Makefile (contents, props changed) >> > head/devel/gio-fam-backend/files/patch-ae (contents, props >> changed) >> > head/devel/git/Makefile >> > head/devel/glib12/Makefile (contents, props changed) >> > head/devel/glib12/files/patch-ae (contents, props changed) >> > head/devel/glib20/Makefile (contents, props changed) >> > head/devel/glib20/files/patch-ae (contents, props changed) >> > head/devel/gnome-vfs-monikers/Makefile (contents, props changed) >> > head/devel/gnome-vfs/Makefile >> > head/devel/gnome-vfs/files/patch-ac (contents, props changed) >> > head/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in (contents, >> props >> > changed) >> > head/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in >> (contents, >> > props changed) >> > head/devel/gnome-vfs1/Makefile (contents, props changed) >> > head/devel/gnustep-make/Makefile (contents, props changed) >> > head/devel/guichan/Makefile (contents, props changed) >> > head/devel/gwenhywfar/Makefile >> > head/devel/ice/Makefile (contents, props changed) >> > head/devel/ice/files/Make.rules.FreeBSD (contents, props changed) >> > head/devel/icu/Makefile (contents, props changed) >> > head/devel/ifd-test/Makefile (contents, props changed) >> > head/devel/jzmq/Makefile >> > head/devel/kdevelop/Makefile (contents, props changed) >> > head/devel/kdevelop/files/kdevelop (contents, props changed) >> > head/devel/kprof/Makefile (contents, props changed) >> > head/devel/kscope/Makefile >> > head/devel/leaktracer/Makefile (contents, props changed) >> > head/devel/leaktracer/files/patch-Makefile (contents, props >> changed) >> > head/devel/libbonobo/Makefile (contents, props changed) >> > head/devel/libburn/Makefile (contents, props changed) >> > head/devel/libccid/Makefile (contents, props changed) >> > head/devel/libchipcard/Makefile >> > head/devel/libdap/Makefile >> > head/devel/libdlna/Makefile (contents, props changed) >> > head/devel/libevent2/Makefile (contents, props changed) >> > head/devel/libevent2/files/patch-libevent_pthreads.pc.in >> (contents, >> > props changed) >> > head/devel/libgii/Makefile (contents, props changed) >> > head/devel/libgiigic/Makefile (contents, props changed) >> > head/devel/libisofs/Makefile (contents, props changed) >> > head/devel/libnfc/Makefile (contents, props changed) >> > head/devel/libopensync022/Makefile (contents, props changed) >> > head/devel/librcc/Makefile (contents, props changed) >> > head/devel/librelp/Makefile (contents, props changed) >> > head/devel/libsigcx/Makefile (contents, props changed) >> > head/devel/libvirt/Makefile >> > head/devel/libzrtp/Makefile (contents, props changed) >> > head/devel/libzvbi/Makefile (contents, props changed) >> > head/devel/log4cplus/Makefile (contents, props changed) >> > head/devel/log4cpp/Makefile (contents, props changed) >> > head/devel/log4shib/Makefile (contents, props changed) >> > head/devel/mico/Makefile (contents, props changed) >> > head/devel/mpatrol/Makefile (contents, props changed) >> > head/devel/mpatrol/files/patch-Makefile (contents, props changed) >> > head/devel/npth/Makefile >> > head/devel/nspr/Makefile >> > head/devel/nspr/files/patch-..::configure (contents, props >> changed) >> > head/devel/ode/Makefile (contents, props changed) >> > head/devel/omniNotify/Makefile (contents, props changed) >> > head/devel/omniORB/Makefile (contents, props changed) >> > head/devel/p5-IO-AIO/Makefile (contents, props changed) >> > head/devel/pcsc-lite/Makefile (contents, props changed) >> > head/devel/pharmacy/Makefile (contents, props changed) >> > head/devel/php5-ice/Makefile (contents, props changed) >> > head/devel/php5-ice/files/patch-cpp+config+Make.rules.FreeBSD >> > (contents, props changed) >> > head/devel/pikdev/Makefile (contents, props changed) >> > head/devel/poslib/Makefile (contents, props changed) >> > head/devel/present/Makefile (contents, props changed) >> > head/devel/ptmalloc/Makefile (contents, props changed) >> > head/devel/ptmalloc2/Makefile (contents, props changed) >> > head/devel/ptypes/Makefile (contents, props changed) >> > head/devel/ptypes/files/patch-src-Makefile.FreeBSD (contents, >> props >> > changed) >> > head/devel/ptypes/files/patch-wshare-Makefile.FreeBSD (contents, >> props >> > changed) >> > head/devel/pwlib/Makefile (contents, props changed) >> > head/devel/pwlib/files/patch-configureac (contents, props changed) >> > head/devel/py-ice/Makefile >> > head/devel/py-ice/files/Make.rules.FreeBSD (contents, props >> changed) >> > head/devel/py-omniorb/Makefile (contents, props changed) >> > head/devel/py-orbit/Makefile (contents, props changed) >> > head/devel/qmake/Makefile (contents, props changed) >> > head/devel/qmake4/Makefile >> > head/devel/ruby-subversion/Makefile (contents, props changed) >> > head/devel/rudiments/Makefile >> > head/devel/sdl12/Makefile >> > head/devel/sfml/Makefile (contents, props changed) >> > head/devel/sfml/files/patch-src-SFML-Audio-Makefile (contents, >> props >> > changed) >> > head/devel/sfml/files/patch-src-SFML-Graphics-Makefile (contents, >> > props changed) >> > head/devel/sfml/files/patch-src-SFML-Makefile (contents, props >> > changed) >> > head/devel/sfml/files/patch-src-SFML-Network-Makefile (contents, >> props >> > changed) >> > head/devel/sfml/files/patch-src-SFML-System-Makefile (contents, >> props >> > changed) >> > head/devel/sfml/files/patch-src-SFML-Window-Makefile (contents, >> props >> > changed) >> > head/devel/silc-toolkit/Makefile (contents, props changed) >> > head/devel/stfl/Makefile (contents, props changed) >> > head/devel/stlport/Makefile (contents, props changed) >> > head/devel/styx/Makefile (contents, props changed) >> > head/devel/styx/files/patch-libbase::sysbase1.c (contents, props >> > changed) >> > head/devel/subcommander/Makefile (contents, props changed) >> > head/devel/subversion16/files/patch-configure (contents, props >> > changed) >> > head/devel/tinyq/Makefile (contents, props changed) >> > head/devel/upnp/Makefile (contents, props changed) >> > head/devel/upnp/files/patch-libupnp.pc.in (contents, props >> changed) >> > head/devel/xxl/Makefile >> > head/devel/zmq/Makefile (contents, props changed) >> > >> > Modified: head/devel/allegro/Makefile >> > ============================================================================== >> > --- head/devel/allegro/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/allegro/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -93,8 +93,7 @@ PLIST_SUB+= PROFILE="@comment " >> > >> > .if ${PORT_OPTIONS:MTHREADS} >> > CONFIGURE_ARGS+=--enable-pthreads >> > -CPPFLAGS+= ${PTHREAD_CFLAGS} -DHAVE_LIBPTHREAD >> > -LDFLAGS+= ${PTHREAD_LIBS} >> > +CPPFLAGS+= -DHAVE_LIBPTHREAD >> > .else >> > CONFIGURE_ARGS+=--disable-pthreads >> > .endif >> > >> > Modified: head/devel/apr1/Makefile >> > ============================================================================== >> > --- head/devel/apr1/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/apr1/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -200,9 +200,6 @@ post-patch: .SILENT >> > ${APR_WRKDIR}/build/apr_hints.m4 >> > ${FIND} ${APR_WRKDIR} ${APU_WRKDIR} -name "Makefile.in*" | ${XARGS} >> > ${REINPLACE_CMD} -e \ >> > 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' >> > - ${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \ >> > - ${APR_WRKDIR}/build/apr_threads.m4 ${APR_WRKDIR}/build/apr_hints.m4 >> \ >> > - ${APU_WRKDIR}/build/apu-conf.m4 >> > ${REINPLACE_CMD} -e '1 s/python/${PYTHON_VERSION}/' \ >> > ${APR_WRKDIR}/build/gen-build.py >> > ${REINPLACE_CMD} -e 's/void main/int main/' >> > ${APR_WRKDIR}/build/apr_network.m4 >> > >> > Modified: head/devel/apr2/Makefile >> > ============================================================================== >> > --- head/devel/apr2/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/apr2/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -191,10 +191,6 @@ post-patch: >> > ${REINPLACE_CMD} -e 's/OSVERSION/${OSVERSION}/g' >> > ${WRKSRC}/build/apr_hints.m4 >> > ${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} >> -e \ >> > 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' >> > - ${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \ >> > - ${WRKSRC}/build/apr_threads.m4 \ >> > - ${WRKSRC}/build/apr_hints.m4 \ >> > - ${WRKSRC}/build/apu-conf.m4 >> > ${REINPLACE_CMD} -e '1 s/python/${PYTHON_VERSION}/' >> > ${WRKSRC}/build/gen-build.py >> > >> > run-autotools: >> > >> > Modified: head/devel/bennugd-core/Makefile >> > ============================================================================== >> > --- head/devel/bennugd-core/Makefile Thu Feb 14 09:33:47 >> 2013 (r312208) >> > +++ head/devel/bennugd-core/Makefile Thu Feb 14 09:42:12 >> 2013 (r312209) >> > @@ -34,7 +34,7 @@ post-extract: >> > @${CHMOD} a+x ${WRKSRC}/configure ${WRKSRC}/install-sh >> > >> > post-patch: >> > - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|; >> > s|-lpthread|${PTHREAD_LIBS}|' \ >> > + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ >> > ${WRKSRC}/configure >> > >> > post-install: >> > >> > Modified: head/devel/bennugd-modules/Makefile >> > ============================================================================== >> > --- head/devel/bennugd-modules/Makefile Thu Feb 14 09:33:47 >> 2013 (r312208) >> > +++ head/devel/bennugd-modules/Makefile Thu Feb 14 09:42:12 >> 2013 (r312209) >> > @@ -23,7 +23,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/ >> > USE_SDL= sdl mixer >> > GNU_CONFIGURE= yes >> > CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > +LDFLAGS+= -L${LOCALBASE}/lib >> > CONFIGURE_ARGS= --libdir="${PREFIX}/lib/bennugd" >> > MAKE_JOBS_SAFE= yes >> > >> > @@ -33,7 +33,7 @@ post-extract: >> > @${CHMOD} a+x ${WRKSRC}/configure ${WRKSRC}/install-sh >> > >> > post-patch: >> > - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|; >> > s|-lpthread|${PTHREAD_LIBS}|' \ >> > + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ >> > ${WRKSRC}/configure >> > >> > .include <bsd.port.mk> >> > >> > Modified: head/devel/boost-all/pkg-message.threads >> > ============================================================================== >> > --- head/devel/boost-all/pkg-message.threads Thu Feb 14 09:33:47 >> > 2013 (r312208) >> > +++ head/devel/boost-all/pkg-message.threads Thu Feb 14 09:42:12 >> > 2013 (r312209) >> > @@ -1,4 +1,4 @@ >> > You have built the Boost library with thread support. >> > >> > -Don't forget to add %%PTHREAD_LIBS%% to your linker options when >> > +Don't forget to add -pthread to your linker options when >> > linking your code. >> > >> > Modified: head/devel/boost-libs/Makefile >> > ============================================================================== >> > --- head/devel/boost-libs/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/boost-libs/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -53,7 +53,6 @@ post-install: >> > >> > @${REINPLACE_CMD} \ >> > -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ >> > - -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g" \ >> > -e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \ >> > -e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \ >> > -e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE} >> > >> > Modified: head/devel/boost-python-libs/Makefile >> > ============================================================================== >> > --- head/devel/boost-python-libs/Makefile Thu Feb 14 09:33:47 >> > 2013 (r312208) >> > +++ head/devel/boost-python-libs/Makefile Thu Feb 14 09:42:12 >> > 2013 (r312209) >> > @@ -49,7 +49,6 @@ post-install: >> > @${ECHO_CMD} >> ${PKGMESSAGE} >> > @${REINPLACE_CMD} \ >> > -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ >> > - -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g" \ >> > -e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \ >> > -e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \ >> > -e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE} >> > >> > Modified: head/devel/bullet/Makefile >> > ============================================================================== >> > --- head/devel/bullet/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/bullet/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -23,7 +23,7 @@ MAKE_JOBS_SAFE= yes >> > USE_CMAKE= yes >> > >> > CPPFLAGS+= -I${LOCALBASE}/include >> > -LDFLAGS+= ${PTHREAD_LIBS} >> > +LDFLAGS+= -pthread >> > >> > WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} >> > >> > >> > Modified: head/devel/ccons/Makefile >> > ============================================================================== >> > --- head/devel/ccons/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/ccons/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -25,7 +25,7 @@ CXXFLAGS+= -fno-rtti >> > LDFLAGS+= -lclangFrontendTool -lclangFrontend -lclangDriver >> > -lclangSerialization \ >> > -lclangCodeGen -lclangParse -lclangSema >> -lclangStaticAnalyzerCheckers \ >> > -lclangStaticAnalyzerCore -lclangAnalysis -lclang -lclangAST >> -lclangLex >> > \ >> > - -lclangBasic -ledit -lm ${PTHREAD_LIBS} >> > + -lclangBasic -ledit -lm >> > >> > PLIST_FILES= bin/ccons >> > >> > >> > Modified: head/devel/cgit/Makefile >> > ============================================================================== >> > --- head/devel/cgit/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/cgit/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -39,8 +39,7 @@ post-extract: >> > >> > post-patch: >> > @${REINPLACE_CMD} -e '/^CC =/d' ${WRKSRC}/git/Makefile >> > - @${REINPLACE_CMD} -e 's/-pthread/${PTHREAD_LIBS}/' \ >> > - -e 's,/usr,${PREFIX},g' \ >> > + @${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' \ >> > -e 's,-Igit,-I.,g' ${WRKSRC}/Makefile >> > >> > post-install: >> > >> > Modified: head/devel/clanlib1/Makefile >> > ============================================================================== >> > --- head/devel/clanlib1/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/clanlib1/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -31,8 +31,8 @@ USE_GL= yes >> > USE_PKGCONFIG= yes >> > MAKE_JOBS_SAFE= yes >> > >> > -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 >> > ${PTHREAD_CFLAGS} >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 >> > +LDFLAGS+= -L${LOCALBASE}/lib >> > GNU_CONFIGURE= yes >> > CONFIGURE_ARGS= --disable-docs \ >> > --enable-clanDisplay \ >> > >> > Modified: head/devel/clanlib22/Makefile >> > ============================================================================== >> > --- head/devel/clanlib22/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/clanlib22/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -33,8 +33,8 @@ USE_PKGCONFIG= yes >> > USE_SQLITE= yes >> > MAKE_JOBS_SAFE= yes >> > >> > -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 >> > ${PTHREAD_CFLAGS} >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 >> > +LDFLAGS+= -L${LOCALBASE}/lib >> > GNU_CONFIGURE= yes >> > CONFIGURE_ARGS= --disable-docs \ >> > --enable-clanDisplay \ >> > >> > Modified: head/devel/clint/Makefile >> > ============================================================================== >> > --- head/devel/clint/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/clint/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -25,7 +25,6 @@ USE_LDCONFIG= yes >> > INFO= clint >> > >> > post-patch: >> > - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' >> ${WRKSRC}/configure >> > @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} >> -e \ >> > 's|-pedantic||g ; \ >> > s|-ldl||g' >> > >> > Modified: head/devel/cocaine-core/Makefile >> > ============================================================================== >> > --- head/devel/cocaine-core/Makefile Thu Feb 14 09:33:47 >> 2013 (r312208) >> > +++ head/devel/cocaine-core/Makefile Thu Feb 14 09:42:12 >> 2013 (r312209) >> > @@ -32,7 +32,7 @@ MAKE_JOBS_SAFE= yes >> > CONFLICTS= json-c-[0-9]* >> > >> > post-patch: >> > - @${REINPLACE_CMD} -e "s,boost_thread,boost_thread ${PTHREAD_LIBS},g" >> \ >> > + @${REINPLACE_CMD} -e "s,boost_thread,boost_thread,g" \ >> > ${WRKSRC}/CMakeLists.txt >> > >> > .include <bsd.port.mk> >> > >> > Modified: head/devel/commoncpp/Makefile >> > ============================================================================== >> > --- head/devel/commoncpp/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/commoncpp/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -23,7 +23,7 @@ CONFIGURE_ENV= ac_cv_path_DOXYGEN=no >> > >> > INFO= commoncpp2 >> > >> > -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > +CPPFLAGS+= -I${LOCALBASE}/include >> > +LDFLAGS+= -L${LOCALBASE}/lib >> > >> > .include <bsd.port.mk> >> > >> > Modified: head/devel/cppcheck/Makefile >> > ============================================================================== >> > --- head/devel/cppcheck/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/cppcheck/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -17,7 +17,7 @@ USE_BZIP2= yes >> > USE_GMAKE= yes >> > >> > ALL_TARGET= cppcheck >> > -LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib >> > +LDFLAGS+= -L${LOCALBASE}/lib >> > MAKE_ENV+= TINYXML=-ltinyxml >> > >> > OPTIONS_DEFINE= MATCHCOMPILER RULES >> > >> > Modified: head/devel/cxxtools/Makefile >> > ============================================================================== >> > --- head/devel/cxxtools/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/cxxtools/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -17,8 +17,8 @@ PATCH_STRIP= -p1 >> > USE_ICONV= yes >> > USE_CSTD= gnu89 >> > GNU_CONFIGURE= yes >> > -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > +CPPFLAGS+= -I${LOCALBASE}/include >> > +LDFLAGS+= -L${LOCALBASE}/lib >> > MAKE_JOBS_SAFE= yes >> > >> > .include <bsd.port.pre.mk> >> > >> > Modified: head/devel/dbus-glib/Makefile >> > ============================================================================== >> > --- head/devel/dbus-glib/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/dbus-glib/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -25,7 +25,7 @@ CONFIGURE_ARGS= --with-test-socket-dir=$ >> > --disable-gtk-doc \ >> > --with-html-dir=${PREFIX}/share/doc >> > CPPFLAGS+= -I${LOCALBASE}/include >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > +LDFLAGS+= -L${LOCALBASE}/lib >> > >> > PLIST_SUB= VERSION="1.0" >> > >> > >> > Modified: head/devel/dbus-qt3/Makefile >> > ============================================================================== >> > --- head/devel/dbus-qt3/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/dbus-qt3/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes >> > USE_LDCONFIG= yes >> > CONFIGURE_ENV= QTDIR=${LOCALBASE} >> > CPPFLAGS+= -I${LOCALBASE}/include >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > +LDFLAGS+= -L${LOCALBASE}/lib >> > >> > PLIST_SUB= VERSION="1.0" >> > >> > >> > Modified: head/devel/dbus/Makefile >> > ============================================================================== >> > --- head/devel/dbus/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/dbus/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -28,9 +28,8 @@ CONFIGURE_ARGS=--localstatedir=/var \ >> > --with-session-socket-dir=/tmp \ >> > --disable-doxygen-docs \ >> > --disable-xml-docs >> > -CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" >> > CPPFLAGS+= -I${LOCALBASE}/include >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > +LDFLAGS+= -L${LOCALBASE}/lib >> > >> > USE_RC_SUBR= dbus >> > USE_GNOME_SUBR= yes >> > >> > Modified: head/devel/devhelp/Makefile >> > ============================================================================== >> > --- head/devel/devhelp/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/devhelp/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -29,8 +29,8 @@ GNU_CONFIGURE= yes >> > INSTALLS_ICONS= yes >> > USE_LDCONFIG= yes >> > GCONF_SCHEMAS= devhelp.schemas >> > -CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include >> > -LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib >> > +CPPFLAGS+= -I${LOCALBASE}/include >> > +LDFLAGS+= -L${LOCALBASE}/lib >> > >> > OPTIONS= GEDIT "Enable GEdit plug-in support" off >> > >> > >> > Modified: head/devel/directfb/Makefile >> > ============================================================================== >> > --- head/devel/directfb/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/directfb/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -27,8 +27,7 @@ OPTIONS= FREETYPE2 "Enable Freetype supp >> > UNIQUE "Enable Unique (WM Module)" off \ >> > TESTS "Install test apps" off >> > >> > -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 >> > ${PTHREAD_CFLAGS} >> > -LDFLAGS+= ${PTHREAD_LIBS} >> > +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 >> > USE_AUTOTOOLS= libtool >> > GNU_CONFIGURE= yes >> > USE_GMAKE= yes >> > @@ -128,7 +127,7 @@ PLIST_SUB+= ARCH_POWERPC="@comment " >> > >> > post-patch: >> > @${REINPLACE_CMD} -e \ >> > - 's|-lc_r|${PTHREAD_LIBS}|g ; s|%%LTMAIN%%|${LTMAIN}|g ; \ >> > + 's|-lc_r|-pthread|g ; s|%%LTMAIN%%|${LTMAIN}|g ; \ >> > s|/usr/local|${LOCALBASE}|g ; s|/usr/X11R6|${LOCALBASE}|g' \ >> > ${WRKSRC}/configure >> > @${GREP} -lr alloca\.h ${WRKSRC} | ${XARGS} \ >> > >> > Modified: head/devel/distcc/Makefile >> > ============================================================================== >> > --- head/devel/distcc/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/distcc/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -25,7 +25,6 @@ USE_GMAKE= yes >> > GNU_CONFIGURE= yes >> > CONFIGURE_ARGS= --enable-gprof --disable-Werror >> > WANT_GNOME= yes >> > -CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" >> > CPPFLAGS+= -I${LOCALBASE}/include >> > LDFLAGS+= -L${LOCALBASE}/lib >> > DISTCCD_PIDFILE=/var/run/distccd.pid >> > >> > Modified: head/devel/fga/Makefile >> > ============================================================================== >> > --- head/devel/fga/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/fga/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -17,8 +17,6 @@ COMMENT= Fast Genetic Algorithm library >> > WRKSRC= ${WRKDIR}/${PORTNAME} >> > >> > USE_GMAKE= yes >> > -CFLAGS+= ${PTHREAD_CFLAGS} >> > -LDFLAGS+= ${PTHREAD_LIBS} >> > >> > EXAMPLES= graph_gen maxbit tsp tsp_bf >> > >> > >> > Modified: head/devel/fnccheck/Makefile >> > ============================================================================== >> > --- head/devel/fnccheck/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/fnccheck/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -21,8 +21,8 @@ AUTOMAKE_ARGS= --force-missing --add-mis >> > USE_LDCONFIG= yes >> > MAKE_JOBS_SAFE= yes >> > >> > -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > +CPPFLAGS+= -I${LOCALBASE}/include >> > +LDFLAGS+= -L${LOCALBASE}/lib -pthread >> > >> > STRIP= # none >> > >> > >> > Modified: head/devel/g2c/Makefile >> > ============================================================================== >> > --- head/devel/g2c/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/g2c/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -20,6 +20,7 @@ USE_GNOME= gtk12 gnomehack libxml orbit >> > WANT_GNOME= yes >> > GNU_CONFIGURE= yes >> > USE_GMAKE= yes >> > +CFLAGS+= -O0 -g >> > >> > .include <bsd.port.pre.mk> >> > >> > @@ -30,8 +31,4 @@ PKGNAMESUFFIX+= -gnome >> > CONFIGURE_ARGS= --disable-gnome >> > .endif >> > >> > -post-patch: >> > - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ >> > - s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure >> > - >> > .include <bsd.port.post.mk> >> > >> > Modified: head/devel/gamin/Makefile >> > ============================================================================== >> > --- head/devel/gamin/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/gamin/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -19,8 +19,8 @@ USE_PKGCONFIG= build >> > USE_LDCONFIG= yes >> > CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ >> > --without-python >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > -CPPFLAGS+= -DHAVE_LINUX -I${LOCALBASE}/include ${PTHREAD_CFLAGS} >> > +LDFLAGS+= -L${LOCALBASE}/lib >> > +CPPFLAGS+= -DHAVE_LINUX -I${LOCALBASE}/include >> > >> > CONFLICTS= fam-[0-9]* >> > >> > >> > Modified: head/devel/gaul/Makefile >> > ============================================================================== >> > --- head/devel/gaul/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/gaul/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -24,11 +24,8 @@ USE_AUTOTOOLS= libtool >> > USE_BZIP2= yes >> > USE_GMAKE= yes >> > GNU_CONFIGURE= yes >> > -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} >> > -LDFLAGS+= -L${LOCALBASE}/lib -lcurses ${PTHREAD_LIBS} >> > +CPPFLAGS+= -I${LOCALBASE}/include >> > +LDFLAGS+= -L${LOCALBASE}/lib -lcurses >> > USE_LDCONFIG= yes >> > >> > -post-patch: >> > - @${REINPLACE_CMD} -e 's|-lpthread||g' ${WRKSRC}/configure >> > - >> > .include <bsd.port.mk> >> > >> > Modified: head/devel/gio-fam-backend/Makefile >> > ============================================================================== >> > --- head/devel/gio-fam-backend/Makefile Thu Feb 14 09:33:47 >> 2013 (r312208) >> > +++ head/devel/gio-fam-backend/Makefile Thu Feb 14 09:42:12 >> 2013 (r312209) >> > @@ -32,8 +32,6 @@ USE_FAM= yes >> > USE_GMAKE= yes >> > MAKE_JOBS_SAFE= yes >> > CONFIGURE_ARGS= --enable-static --with-libiconv=gnu >> > -CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ >> > - PTHREAD_LIBS="${PTHREAD_LIBS}" >> > CPPFLAGS+= -I${LOCALBASE}/include >> > LDFLAGS+= -L${LOCALBASE}/lib -lintl >> > >> > >> > Modified: head/devel/gio-fam-backend/files/patch-ae >> > ============================================================================== >> > --- head/devel/gio-fam-backend/files/patch-ae Thu Feb 14 09:33:47 >> > 2013 (r312208) >> > +++ head/devel/gio-fam-backend/files/patch-ae Thu Feb 14 09:42:12 >> > 2013 (r312209) >> > @@ -19,12 +19,3 @@ >> > do : >> > as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` >> > ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" >> > -@@ -25631,6 +25634,8 @@ fi >> > - ;; >> > - esac >> > - fi >> > -+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" >> > -+ G_THREAD_LIBS="${PTHREAD_LIBS}" >> > - >> > - if test x"$G_THREAD_CFLAGS" = x; then >> > - >> > >> > Modified: head/devel/git/Makefile >> > ============================================================================== >> > --- head/devel/git/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/git/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -200,7 +200,7 @@ USE_OPENSSL= yes >> > USE_RC_SUBR= git_daemon >> > WANT_PERL= yes >> > >> > -CONFIGURE_ARGS= --enable-pthreads=${PTHREAD_LIBS} >> > +CONFIGURE_ARGS= --enable-pthreads=-pthread >> > >> > OPTIONS_DEFINE= GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV >> CURL \ >> > ETCSHELLS NLS >> > >> > Modified: head/devel/glib12/Makefile >> > ============================================================================== >> > --- head/devel/glib12/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/glib12/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -20,17 +20,10 @@ USE_GNOME= pkgconfig >> > GNU_CONFIGURE= yes >> > USE_LDCONFIG= yes >> > CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12 >> > -CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ >> > - PTHREAD_LIBS="${PTHREAD_LIBS}" >> > >> > MAN1= glib-config.1 >> > INFO= glib >> > >> > -post-patch: >> > - @${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e >> \ >> > - 's|-lpthread|${PTHREAD_LIBS}|g ; \ >> > - s|-lc_r|${PTHREAD_LIBS}|g' >> > - >> > post-install: >> > ${LN} -sf ${PREFIX}/bin/glib-config ${PREFIX}/bin/glib12-config >> > .for lib in glib gmodule gthread >> > >> > Modified: head/devel/glib12/files/patch-ae >> > ============================================================================== >> > --- head/devel/glib12/files/patch-ae Thu Feb 14 09:33:47 >> 2013 (r312208) >> > +++ head/devel/glib12/files/patch-ae Thu Feb 14 09:42:12 >> 2013 (r312209) >> > @@ -1,5 +1,5 @@ >> > ---- configure.orig Tue May 11 04:55:02 1999 >> > -+++ configure Mon May 17 22:30:32 1999 >> > +--- configure.orig 2001-03-15 16:44:01.000000000 +0100 >> > ++++ configure 2012-12-12 11:10:38.000000000 +0100 >> > @@ -587,10 +587,10 @@ >> > >> > >> > @@ -15,7 +15,7 @@ >> > >> > >> > >> > -@@ -3472,7 +3472,7 @@ >> > +@@ -3496,7 +3496,7 @@ >> > >> > >> > # Check for some functions >> > @@ -23,8 +23,8 @@ >> > +for ac_func in lstat strerror strsignal memmove vsnprintf strcasecmp >> > strncasecmp >> > do >> > echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 >> > - echo "configure:3479: checking for $ac_func" >&5 >> > -@@ -4365,6 +4365,12 @@ >> > + echo "configure:3503: checking for $ac_func" >&5 >> > +@@ -4390,6 +4390,12 @@ >> > linux*) >> > G_MODULE_LDFLAGS='-rdynamic' >> > ;; >> > @@ -37,7 +37,7 @@ >> > esac >> > LIBS_orig="$LIBS" >> > LDFLAGS_orig="$LDFLAGS" >> > -@@ -5057,11 +5063,17 @@ >> > +@@ -5177,11 +5183,8 @@ >> > G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" >> > fi >> > ;; >> > @@ -47,20 +47,11 @@ >> > - # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support >> > - # -mthreads flag. >> > + *-*-freebsd*) >> > -+ if test x"$G_THREAD_LIBS" = x"-lc_r"; then >> > -+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" >> > -+ G_THREAD_LIBS="${PTHREAD_LIBS}" >> > -+ case $host in >> > -+ *-*-freebsd4*) ;; >> > -+ default) have_poll=no ;; >> > -+ esac >> > -+ else >> > -+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS} -DLINUXTHREADS" >> > -+ fi >> > ++ G_THREAD_LIBS="-pthread" >> > ;; >> > esac >> > >> > -@@ -5349,9 +5358,6 @@ >> > +@@ -5469,9 +5472,6 @@ >> > >> > >> > >> > @@ -70,7 +61,7 @@ >> > case "$mutex_has_default" in >> > "yes") >> > echo $ac_n "checking size of >> $mutex_default_type""... >> > $ac_c" 1>&6 >> > -@@ -5448,6 +5454,63 @@ >> > +@@ -5568,6 +5568,63 @@ >> > >> > >> > >> > >> > Modified: head/devel/glib20/Makefile >> > ============================================================================== >> > --- head/devel/glib20/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/glib20/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -47,8 +47,6 @@ CONFIGURE_ARGS= --enable-static --with-l >> > --disable-dtrace \ >> > --with-pcre=system \ >> > --disable-fam >> > -CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ >> > - PTHREAD_LIBS="${PTHREAD_LIBS}" >> > CPPFLAGS+= -I${LOCALBASE}/include >> > LDFLAGS+= -L${LOCALBASE}/lib -lintl >> > >> > >> > Modified: head/devel/glib20/files/patch-ae >> > ============================================================================== >> > --- head/devel/glib20/files/patch-ae Thu Feb 14 09:33:47 >> 2013 (r312208) >> > +++ head/devel/glib20/files/patch-ae Thu Feb 14 09:42:12 >> 2013 (r312209) >> > @@ -1,6 +1,6 @@ >> > ---- configure.orig 2010-09-09 12:18:43.000000000 +0200 >> > -+++ configure 2010-09-09 12:20:56.000000000 +0200 >> > -@@ -575,6 +575,9 @@ >> > +--- configure.orig 2011-06-06 01:24:53.000000000 +0200 >> > ++++ configure 2012-12-12 11:23:28.000000000 +0100 >> > +@@ -583,6 +583,9 @@ >> > #ifdef HAVE_SYS_TYPES_H >> > # include <sys/types.h> >> > #endif >> > @@ -10,7 +10,7 @@ >> > #ifdef HAVE_SYS_STAT_H >> > # include <sys/stat.h> >> > #endif >> > -@@ -5187,7 +5190,7 @@ >> > +@@ -5194,7 +5197,7 @@ >> > fi >> > >> > GLIB_RUNTIME_LIBDIR="$with_runtime_libdir" >> > @@ -19,7 +19,7 @@ >> > >> > >> > if test "x$with_runtime_libdir" != "x"; then >> > -@@ -22212,7 +22215,7 @@ >> > +@@ -23077,7 +23080,7 @@ >> > fi >> > done >> > >> > @@ -28,16 +28,7 @@ >> > do : >> > as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` >> > ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" >> > -@@ -24815,6 +24818,8 @@ >> > - ;; >> > - esac >> > - fi >> > -+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" >> > -+ G_THREAD_LIBS="${PTHREAD_LIBS}" >> > - >> > - if test x"$G_THREAD_CFLAGS" = x; then >> > - >> > -@@ -27415,7 +27420,7 @@ >> > +@@ -28271,7 +28274,7 @@ >> > fi >> > >> > >> > >> > Modified: head/devel/gnome-vfs-monikers/Makefile >> > ============================================================================== >> > --- head/devel/gnome-vfs-monikers/Makefile Thu Feb 14 09:33:47 >> > 2013 (r312208) >> > +++ head/devel/gnome-vfs-monikers/Makefile Thu Feb 14 09:42:12 >> > 2013 (r312209) >> > @@ -18,6 +18,6 @@ USE_GNOME= gnomevfs2 libbonobo >> > USE_GMAKE= yes >> > GNU_CONFIGURE= yes >> > CPPFLAGS+= -I${LOCALBASE}/include >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > +LDFLAGS+= -L${LOCALBASE}/lib #-pthread >> > >> > .include <bsd.port.mk> >> > >> > Modified: head/devel/gnome-vfs/Makefile >> > ============================================================================== >> > --- head/devel/gnome-vfs/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/gnome-vfs/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -34,8 +34,8 @@ CONFIGURE_ARGS= --enable-openssl \ >> > --disable-howl \ >> > --with-hal-mount=/sbin/mount \ >> > --with-hal-umount=/sbin/umount >> > -CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include >> > -DPTHREAD_LIB="${PTHREAD_LIBS}" >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > +CPPFLAGS+= -I${LOCALBASE}/include >> > +LDFLAGS+= -L${LOCALBASE}/lib >> > >> > PKGINSTALL= ${WRKDIR}/pkg-install >> > PKGDEINSTALL= ${WRKDIR}/pkg-deinstall >> > @@ -80,8 +80,6 @@ CONFIGURE_ARGS+=--disable-avahi >> > .endif >> > >> > post-patch: >> > - @${REINPLACE_CMD} -e 's|@PTHREAD_LIB@|${PTHREAD_LIBS}|' \ >> > - ${WRKSRC}/gnome-vfs-2.0.pc.in ${WRKSRC}/gnome-vfs-module-2.0.pc.in >> > @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ >> > ${WRKSRC}/libgnomevfs/Makefile.in >> > @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ >> > >> > Modified: head/devel/gnome-vfs/files/patch-ac >> > ============================================================================== >> > --- head/devel/gnome-vfs/files/patch-ac Thu Feb 14 09:33:47 >> 2013 (r312208) >> > +++ head/devel/gnome-vfs/files/patch-ac Thu Feb 14 09:42:12 >> 2013 (r312209) >> > @@ -5,7 +5,7 @@ >> > @OS_WIN32_FALSE@PLATFROM_SPECIFIC_LTLIBS = libdns-sd.la >> libnetwork.la >> > libnntp.la libsftp.la $(HTTP_LTLIBS) libftp.la >> > @OS_WIN32_TRUE@PLATFROM_SPECIFIC_LTLIBS = >> > -module_flags = -export_dynamic -avoid-version -module -no-undefined >> > -+module_flags = -export_dynamic -avoid-version -module -no-undefined >> > $(PTHREAD_LIB) >> > ++module_flags = -export_dynamic -avoid-version -module -no-undefined >> > modulesdir = $(libdir)/gnome-vfs-2.0/modules >> > modules_LTLIBRARIES = \ >> > $(CDDA_LTLIBS) \ >> > >> > Modified: head/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in >> > ============================================================================== >> > --- head/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in Thu Feb 14 >> > 09:33:47 2013 (r312208) >> > +++ head/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in Thu Feb 14 >> > 09:42:12 2013 (r312209) >> > @@ -5,5 +5,5 @@ >> > Version: @VERSION@ >> > Requires: gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 >> > -Libs: -L${libdir} -lgnomevfs-2 >> > -+Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ >> > ++Libs: -L${libdir} -lgnomevfs-2 -pthread >> > Cflags: -I${includedir}/gnome-vfs-2.0 >> -I${libdir}/gnome-vfs-2.0/include >> > >> > Modified: head/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in >> > ============================================================================== >> > --- head/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in Thu >> Feb 14 >> > 09:33:47 2013 (r312208) >> > +++ head/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in Thu >> Feb 14 >> > 09:42:12 2013 (r312209) >> > @@ -5,5 +5,5 @@ >> > Version: @VERSION@ >> > Requires: gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 >> > -Libs: -L${libdir} -lgnomevfs-2 >> > -+Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ >> > ++Libs: -L${libdir} -lgnomevfs-2 -pthread >> > Cflags: -I${includedir}/gnome-vfs-2.0 >> > -I${includedir}/gnome-vfs-module-2.0 -I${libdir}/gnome-vfs-2.0/include >> > >> > Modified: head/devel/gnome-vfs1/Makefile >> > ============================================================================== >> > --- head/devel/gnome-vfs1/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/gnome-vfs1/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -24,9 +24,8 @@ USE_GNOME= gnomehack gnomeprefix glib12 >> > USE_GETTEXT= yes >> > GNU_CONFIGURE= yes >> > USE_LDCONFIG= yes >> > -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ >> > - BSD_PTHREAD_LIBS=${PTHREAD_LIBS} >> > -CPPFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include >> > +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" >> > +CPPFLAGS+= -I${LOCALBASE}/include >> > >> > LATEST_LINK= gnome-vfs1 >> > >> > >> > Modified: head/devel/gnustep-make/Makefile >> > ============================================================================== >> > --- head/devel/gnustep-make/Makefile Thu Feb 14 09:33:47 >> 2013 (r312208) >> > +++ head/devel/gnustep-make/Makefile Thu Feb 14 09:42:12 >> 2013 (r312209) >> > @@ -20,9 +20,8 @@ USE_GNUSTEP= yes >> > GNU_CONFIGURE= yes >> > >> > MAKE_FLAGS= OPTFLAG="${CFLAGS}" >> > -CFLAGS+= ${PTHREAD_CFLAGS} >> > CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL} -c" >> INSTALL_DATA="${INSTALL} >> > -c" >> > -CONFIGURE_ARGS+= --with-thread-lib="${PTHREAD_LIBS}" >> > +CONFIGURE_ARGS+= --with-thread-lib=-pthread >> > CONFIGURE_ARGS+= --with-config-file=${GNUSTEP_PREFIX}/GNUstep.conf >> > CONFIGURE_ARGS+= --with-layout=gnustep >> > .if defined(GNUSTEP_WITH_LIBOBJC2) || defined(GNUSTEP_WITH_CLANG) >> > >> > Modified: head/devel/guichan/Makefile >> > ============================================================================== >> > --- head/devel/guichan/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/guichan/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -21,7 +21,7 @@ USE_LDCONFIG= yes >> > USE_GNOME= gnomehack >> > >> > CPPFLAGS+= -I${LOCALBASE}/include >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > +LDFLAGS+= -L${LOCALBASE}/lib >> > >> > OPTIONS= SDL "Enable SDL support" On \ >> > ALLEGRO "Enable Allegro support" Off \ >> > >> > Modified: head/devel/gwenhywfar/Makefile >> > ============================================================================== >> > --- head/devel/gwenhywfar/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/gwenhywfar/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -57,8 +57,8 @@ INSTALL_WRKSRC= ${WRKSRC}/gui/${SLAVEPOR >> > >> > .if ${SLAVEPORT}=="fox16" >> > LIB_DEPENDS+= FOX-1.6:${PORTSDIR}/x11-toolkits/fox16 >> > -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > +CPPFLAGS+= -I${LOCALBASE}/include >> > +LDFLAGS+= -L${LOCALBASE}/lib >> > .endif >> > >> > .if ${SLAVEPORT}=="gtk2" >> > >> > Modified: head/devel/ice/Makefile >> > ============================================================================== >> > --- head/devel/ice/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/ice/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -32,7 +32,7 @@ USE_LDCONFIG= yes >> > BUILD_WRKSRC= ${WRKSRC}/cpp >> > INSTALL_WRKSRC= ${WRKSRC}/cpp >> > >> > -CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT >> > ${PTHREAD_CFLAGS} -I${LOCALBASE}/include >> > +CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT >> > -I${LOCALBASE}/include >> > .if !${PORT_OPTIONS:MDEBUG} >> > CFLAGS+= -DNDEBUG >> > .endif >> > @@ -62,8 +62,7 @@ MAKE_ENV+= NOPORTDOCS=yes >> > .endif >> > >> > post-patch: >> > - @${SED} 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \ >> > - s|%%PREFIX%%|${PREFIX}|g; \ >> > + @${SED} 's|%%PREFIX%%|${PREFIX}|g; \ >> > s|%%DATADIR%%|${DATADIR}|g; \ >> > s|%%DOCSDIR%%|${DOCSDIR}|g; \ >> > s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \ >> > >> > Modified: head/devel/ice/files/Make.rules.FreeBSD >> > ============================================================================== >> > --- head/devel/ice/files/Make.rules.FreeBSD Thu Feb 14 09:33:47 >> > 2013 (r312208) >> > +++ head/devel/ice/files/Make.rules.FreeBSD Thu Feb 14 09:42:12 >> > 2013 (r312209) >> > @@ -1,9 +1,9 @@ >> > mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) >> -Wl,-h,$(2) >> > $(3) $(4) >> > >> > -BASELIBS = -lIceUtil %%PTHREAD_LIBS%% -L$(LOCALBASE)/lib -liconv >> > +BASELIBS = -lIceUtil -pthread -L$(LOCALBASE)/lib -liconv >> > LIBS = -lIce $(BASELIBS) >> > >> > -ICEUTIL_OS_LIBS = %%PTHREAD_LIBS%% >> > +ICEUTIL_OS_LIBS = -pthread >> > >> > PLATFORM_HAS_READLINE := yes >> > >> > >> > Modified: head/devel/icu/Makefile >> > ============================================================================== >> > --- head/devel/icu/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/icu/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -73,7 +73,7 @@ post-patch: >> > @${REINPLACE_CMD} -e '/CXXFLAGS=/s/-ansi//' \ >> > ${WRKSRC}/configure >> > .if ! ${PORT_OPTIONS:MTHREADS} >> > - @${REINPLACE_CMD} -e >> 's,\(THREADSC.*FLAGS\).*,\1=${PTHREAD_CFLAGS},g' >> > ${WRKSRC}/config/mh-bsd-gcc >> > + @${REINPLACE_CMD} -e 's,\(THREADSC.*FLAGS\).*,\1=,g' >> > ${WRKSRC}/config/mh-bsd-gcc >> > .endif >> > @${REINPLACE_CMD} -e >> > 's,$$(libdir)/pkgconfig,${PREFIX}/libdata/pkgconfig,g' >> > ${WRKSRC}/Makefile.in >> > >> > >> > Modified: head/devel/ifd-test/Makefile >> > ============================================================================== >> > --- head/devel/ifd-test/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/ifd-test/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -20,8 +20,7 @@ USE_GMAKE= yes >> > >> > NOMAN= >> > PLIST_FILES= sbin/ifdtest >> > -CFLAGS+= ${PTHREAD_CFLAGS} >> > -MAKE_ENV= LIBS="-L${PREFIX}/lib -lpcsclite ${PTHREAD_LIBS}" >> > +MAKE_ENV= LIBS="-L${PREFIX}/lib -lpcsclite" >> > >> > post-patch: >> > ${REINPLACE_CMD} -e "s,LPSTR,LPTSTR,g; s,LPCSTR,LPCTSTR,g; \ >> > >> > Modified: head/devel/jzmq/Makefile >> > ============================================================================== >> > --- head/devel/jzmq/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/jzmq/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -19,7 +19,7 @@ USE_PKGCONFIG= build >> > >> > CONFIGURE_ARGS= --with-zeromq=${LOCALBASE} >> > CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME} >> > -LDFLAGS+= ${PTHREAD_LIBS} >> > +LDFLAGS+= -pthread >> > GNU_CONFIGURE= yes >> > >> > PLIST_FILES= %%JAVAJARDIR%%/zmq.jar \ >> > >> > Modified: head/devel/kdevelop/Makefile >> > ============================================================================== >> > --- head/devel/kdevelop/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/kdevelop/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -85,8 +85,7 @@ post-patch: >> > >> > post-configure: >> > @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \ >> > - s|%%PREFIX%%|${PREFIX}|g ; \ >> > - s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' < ${FILESDIR}/kdevelop \ >> > + s|%%PREFIX%%|${PREFIX}|g' < ${FILESDIR}/kdevelop \ >> > > ${WRKDIR}/kdevelop >> > ${REINPLACE_CMD} -e 's|<gdbpath>.*</gdbpath>|<gdbpath></gdbpath>|g' >> \ >> > -e 's|<dbgshell>.*</dbgshell>|<dbgshell></dbgshell>|g' \ >> > >> > Modified: head/devel/kdevelop/files/kdevelop >> > ============================================================================== >> > --- head/devel/kdevelop/files/kdevelop Thu Feb 14 09:33:47 >> 2013 (r312208) >> > +++ head/devel/kdevelop/files/kdevelop Thu Feb 14 09:42:12 >> 2013 (r312209) >> > @@ -2,6 +2,6 @@ >> > >> > export PATH=%%LOCALBASE%%/gnu-autotools/bin:${PATH} >> > export ACLOCAL_FLAGS="-I %%LOCALBASE%%/share/aclocal >> ${ACLOCAL_FLAGS}" >> > -export PTHREAD_LIBS=%%PTHREAD_LIBS%% >> > +export PTHREAD_LIBS="-pthread" >> > >> > exec "%%PREFIX%%/bin/kdevelop-bin" "$@" >> > >> > Modified: head/devel/kprof/Makefile >> > ============================================================================== >> > --- head/devel/kprof/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/kprof/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -19,7 +19,7 @@ DEPRECATED= Depends on QT3; unmaintained >> > EXPIRATION_DATE= 2013-07-01 >> > >> > USE_KDELIBS_VER=3 >> > -USE_AUTOTOOLS= libtool >> > +GNU_CONFIGURE= yes >> > CONFIGURE_ENV= KDB2HTML=${PREFIX}/bin/kdb2html >> > USE_GMAKE= yes >> > MAKE_ENV= ${CONFIGURE_ENV} >> > >> > Modified: head/devel/kscope/Makefile >> > ============================================================================== >> > --- head/devel/kscope/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/kscope/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -26,8 +26,6 @@ USE_AUTOTOOLS= libtool >> > USE_GMAKE= yes >> > >> > MAKE_ENV= EXTRA_LIBRARIES="-L${LOCALBASE}/lib" >> > -LDFLAGS+= ${PTHREAD_LIBS} >> > -CXXFLAGS+= ${PTHREAD_CFLAGS} >> > CONFIGURE_ARGS+=--with-extra-includes=${LOCALBASE}/include \ >> > --with-extra-libs=${LOCALBASE}/lib >> > >> > >> > Modified: head/devel/leaktracer/Makefile >> > ============================================================================== >> > --- head/devel/leaktracer/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/leaktracer/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -18,8 +18,6 @@ COMMENT= Trace and analyze memory leaks >> > USE_LDCONFIG= yes >> > USE_GMAKE= yes >> > USE_PERL5_RUN= yes >> > -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ >> > - PTHREAD_LIBS="${PTHREAD_LIBS}" >> > PLIST_FILES= bin/LeakCheck bin/leak-analyze lib/LeakTracer.so >> > PORTDOCS= README README.html >> > >> > >> > Modified: head/devel/leaktracer/files/patch-Makefile >> > ============================================================================== >> > --- head/devel/leaktracer/files/patch-Makefile Thu Feb 14 09:33:47 >> > 2013 (r312208) >> > +++ head/devel/leaktracer/files/patch-Makefile Thu Feb 14 09:42:12 >> > 2013 (r312209) >> > @@ -14,8 +14,8 @@ >> > # Common flags >> > -C_FLAGS = -g -pipe -Wall -W $(THREAD) >> > -O_FLAGS = $(C_FLAGS) >> > -+C_FLAGS = $(CFLAGS) -Wall -W $(THREAD) $(PTHREAD_CFLAGS) >> > -+O_FLAGS = $(C_FLAGS) $(PTHREAD_LIBS) >> > ++C_FLAGS = $(CFLAGS) -Wall -W $(THREAD) >> > ++O_FLAGS = $(C_FLAGS) -pthread >> > >> > # Object files >> > OBJ_DIR = . >> > >> > Modified: head/devel/libbonobo/Makefile >> > ============================================================================== >> > --- head/devel/libbonobo/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/libbonobo/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -32,7 +32,7 @@ USE_GNOME= gnomehack intlhack libxml2 or >> > CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ >> > --disable-gtk-doc >> > CPPFLAGS+= -I${LOCALBASE}/include >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > +LDFLAGS+= -L${LOCALBASE}/lib -pthread >> > MAKE_ENV= gnomelocaledir=${PREFIX}/share/locale >> > >> > MAN1= bonobo-activation-server.1 >> > >> > Modified: head/devel/libburn/Makefile >> > ============================================================================== >> > --- head/devel/libburn/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/libburn/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -17,7 +17,4 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER >> > >> > MAN1= cdrskin.1 >> > >> > -post-patch: >> > - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' >> ${WRKSRC}/configure >> > - >> > .include <bsd.port.mk> >> > >> > Modified: head/devel/libccid/Makefile >> > ============================================================================== >> > --- head/devel/libccid/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/libccid/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -24,8 +24,7 @@ CONFIGURE_ARGS= --enable-usbdropdir=${PR >> > --enable-ccidtwindir=${PREFIX}/lib/pcsc/drivers/serial >> > CONFIGURE_ENV= LIBUSB_CFLAGS="-I${LOCALBASE}/include" \ >> > LIBUSB_LIBS="-L${LOCALBASE}/lib -lusb" >> > -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} >> > -LDFLAGS+= ${PTHREAD_LIBS} >> > +CPPFLAGS+= -I${LOCALBASE}/include >> > >> > PLIST_SUB= VER=${PORTVERSION} >> > >> > >> > Modified: head/devel/libchipcard/Makefile >> > ============================================================================== >> > --- head/devel/libchipcard/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/libchipcard/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -24,7 +24,7 @@ OPTIONS_DEFINE= DOXYGEN MEMDEBUG >> > MEMDEBUG_DESC= Enable memory debugger statistic >> > >> > GNU_CONFIGURE= yes >> > -CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" >> aq_distrib_name="FreeBSD" >> > +CONFIGURE_ENV+= aq_distrib_name="FreeBSD" >> > CONFIGURE_ARGS+=--enable-release="yes" \ >> > --with-pcsc-includes=${LOCALBASE}/include \ >> > --with-pcsc-libs=${LOCALBASE}/lib >> > >> > Modified: head/devel/libdap/Makefile >> > ============================================================================== >> > --- head/devel/libdap/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/libdap/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -14,11 +14,10 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ >> > uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \ >> > xml2:${PORTSDIR}/textproc/libxml2 >> > >> > -CFLAGS+= ${PTHREAD_CFLAGS} >> > CONFIGURE_ARGS= --with-zlib=/usr >> > CPPFLAGS+= -I${LOCALBASE}/include >> > GNU_CONFIGURE= yes >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > +LDFLAGS+= -L${LOCALBASE}/lib >> > USE_GMAKE= yes >> > USE_GNOME= gnomehack >> > USE_LDCONFIG= yes >> > >> > Modified: head/devel/libdlna/Makefile >> > ============================================================================== >> > --- head/devel/libdlna/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/libdlna/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --prefix="${PREFIX}" -- >> > --libdir=${LOCALBASE}/lib >> > >> > CFLAGS+= -I${LOCALBASE}/include >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > +LDFLAGS+= -L${LOCALBASE}/lib >> > >> > post-patch: >> > @${REINPLACE_CMD} -e \ >> > >> > Modified: head/devel/libevent2/Makefile >> > ============================================================================== >> > --- head/devel/libevent2/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/libevent2/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -36,8 +36,6 @@ PLIST_SUB+= OPENSSL="@comment " >> > .endif >> > >> > .if ${PORT_OPTIONS:MTHREADS} >> > -CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ >> > - PTHREAD_LIBS="${PTHREAD_LIBS}" >> > PLIST_SUB+= THREADS="" >> > .else >> > CONFIGURE_ARGS+= --disable-thread-support >> > >> > Modified: head/devel/libevent2/files/patch-libevent_pthreads.pc.in >> > ============================================================================== >> > --- head/devel/libevent2/files/patch-libevent_pthreads.pc.in Thu Feb >> 14 >> > 09:33:47 2013 (r312208) >> > +++ head/devel/libevent2/files/patch-libevent_pthreads.pc.in Thu Feb >> 14 >> > 09:42:12 2013 (r312209) >> > @@ -1,12 +1,13 @@ >> > ---- libevent_pthreads.pc.in.orig 2010-08-16 18:56:09.000000000 +0200 >> > -+++ libevent_pthreads.pc.in 2011-03-06 21:15:25.621208481 +0100 >> > +--- libevent_pthreads.pc.in.orig 2013-02-14 10:10:38.000000000 +0100 >> > ++++ libevent_pthreads.pc.in 2013-02-14 10:11:05.000000000 +0100 >> > @@ -10,7 +10,7 @@ >> > Version: @VERSION@ >> > Requires: libevent >> > Conflicts: >> > -Libs: -L${libdir} -levent_pthreads >> > -+Libs: -L${libdir} -levent_pthreads-2.0 >> > - Libs.private: @LIBS@ @PTHREAD_LIBS@ >> > +-Libs.private: @LIBS@ @PTHREAD_LIBS@ >> > -Cflags: -I${includedir} @PTHREAD_CFLAGS@ >> > -+Cflags: -I${includedir}/event2/compat -I${includedir} >> @PTHREAD_CFLAGS@ >> > ++Libs: -L${libdir} -levent_pthreads-2.0 >> > ++Libs.private: @LIBS@ -pthread >> > ++Cflags: -I${includedir} >> > >> > >> > Modified: head/devel/libgii/Makefile >> > ============================================================================== >> > --- head/devel/libgii/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/libgii/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -208,9 +208,6 @@ PLIST_SUB+= VGL="@comment " >> > PLIST_SUB+= VGL="" >> > .endif >> > >> > -pre-configure: >> > - ${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/' >> ${WRKSRC}/configure >> > - >> > post-install: >> > ${INSTALL_DATA} ${WRKSRC}/libgii.conf >> ${PREFIX}/etc/ggi/libgii.conf.dist >> > ${INSTALL_DATA} ${WRKSRC}/filter/mouse/mouse >> > ${PREFIX}/etc/ggi/filter/mouse.dist >> > >> > Modified: head/devel/libgiigic/Makefile >> > ============================================================================== >> > --- head/devel/libgiigic/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/libgiigic/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -24,9 +24,6 @@ USE_BZIP2= yes >> > USE_LDCONFIG= yes >> > GNU_CONFIGURE= yes >> > >> > -CPPFLAGS+= ${PTHREAD_CFLAGS} >> > -LDFLAGS+= ${PTHREAD_LIBS} >> > - >> > MAN3= gicActionLazyAction.3 \ >> > gicActionWrite.3 \ >> > gicContextAllocate.3 \ >> > >> > Modified: head/devel/libisofs/Makefile >> > ============================================================================== >> > --- head/devel/libisofs/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/libisofs/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -17,7 +17,4 @@ GNU_CONFIGURE= yes >> > USE_ICONV= yes >> > USE_LDCONFIG= yes >> > >> > -post-patch: >> > - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' >> ${WRKSRC}/configure >> > - >> > .include <bsd.port.mk> >> > >> > Modified: head/devel/libnfc/Makefile >> > ============================================================================== >> > --- head/devel/libnfc/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/libnfc/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -81,8 +81,8 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/pcsc/driv >> > .if ${PORT_OPTIONS:MPN531USB} || ${PORT_OPTIONS:MPN533USB} >> > .if ${OSVERSION} < 800069 >> > LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb >> > -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} >> > -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} >> > +CPPFLAGS+= -I${LOCALBASE}/include >> > +LDFLAGS+= -L${LOCALBASE}/lib >> > .endif >> > .endif >> > >> > >> > Modified: head/devel/libopensync022/Makefile >> > ============================================================================== >> > --- head/devel/libopensync022/Makefile Thu Feb 14 09:33:47 >> 2013 (r312208) >> > +++ head/devel/libopensync022/Makefile Thu Feb 14 09:42:12 >> 2013 (r312209) >> > @@ -19,7 +19,6 @@ LIB_DEPENDS= sqlite3.8:${PORTSDIR}/datab >> > RUN_DEPENDS= swig1.3:${PORTSDIR}/devel/swig13 >> > >> > USE_BZIP2= yes >> > -LDFLAGS+= ${PTHREAD_LIBS} >> > GNU_CONFIGURE= yes >> > USE_BZIP2= yes >> > USE_PYTHON= yes >> > @@ -37,12 +36,10 @@ pre-everything:: >> > @${ECHO_MSG} >> > >> > post-patch: >> > + @${FIND} ${WRKSRC} -name "Makefile*" | ${XARGS} ${REINPLACE_CMD} \ >> > + -e 's|-Werror||g' >> > @${REINPLACE_CMD} -e >> > 's|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ >> > ${WRKSRC}/Makefile.in >> > - ${REINPLACE_CMD} -e "s,-Werror,," ${WRKSRC}/opensync/Makefile.in \ >> > - ${WRKSRC}/osengine/Makefile.in \ >> > - ${WRKSRC}/formats/vformats-xml/Makefile.in \ >> > - ${WRKSRC}/tools/Makefile.in >> > ${REINPLACE_CMD} -e "s,echo aout, echo elf,g" ${WRKSRC}/configure >> > >> > .include <bsd.port.mk> >> > >> > Modified: head/devel/librcc/Makefile >> > ============================================================================== >> > --- head/devel/librcc/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/librcc/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -33,8 +33,7 @@ USE_AUTOTOOLS= autoheader >> > CPPFLAGS+= -I${LOCALBASE}/include >> > LIBS= -L${LOCALBASE}/lib >> > >> > -CONFIGURE_ENV= LIBS="${LIBS}" \ >> > - PTHREAD_LIBS="${PTHREAD_LIBS}" >> > +CONFIGURE_ENV= LIBS="${LIBS}" >> > >> > OPTIONS= BDB "Translation database support" off \ >> > TRANSLATE "Online translation support" off \ >> > >> > Modified: head/devel/librelp/Makefile >> > ============================================================================== >> > --- head/devel/librelp/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/librelp/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -23,7 +23,5 @@ PORT_VERBS= relp >> > post-patch: >> > @${REINPLACE_CMD} -e '/CFLAGS/s| -g||g' \ >> > ${WRKSRC}/configure >> > - @${REINPLACE_CMD} -e '/^PTHREADS/s|= .*|= ${PTHREAD_LIBS}|g' \ >> > - ${WRKSRC}/src/Makefile.in >> > >> > .include <bsd.port.mk> >> > >> > Modified: head/devel/libsigcx/Makefile >> > ============================================================================== >> > --- head/devel/libsigcx/Makefile Thu Feb 14 09:33:47 2013 (r312208) >> > +++ head/devel/libsigcx/Makefile Thu Feb 14 09:42:12 2013 (r312209) >> > @@ -22,8 +22,6 @@ USE_GNOME= gnomehack gtk20 >> > USE_GMAKE= yes >> > >> > *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** >> > >> > > -- > Pietro Cerutti > The FreeBSD Project > gahr@FreeBSD.org > > PGP Public Key: > http://gahr.ch/pgp >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?f309a84e8e7eb05b673a55de7f3d476c.squirrel>