diff options
author | Pietro Cerutti <gahr@FreeBSD.org> | 2013-02-14 09:42:12 +0000 |
---|---|---|
committer | Pietro Cerutti <gahr@FreeBSD.org> | 2013-02-14 09:42:12 +0000 |
commit | 03cceed935615886af3d9551e9fb9b573ce3744a (patch) | |
tree | fefb362514ed477cab8a0c201ef842c790185635 | |
parent | Deprecate ports related to no more support vmware versions (diff) |
- Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS (category: devel)
Approved by: portmgr
Notes
Notes:
svn path=/head/; revision=312209
133 files changed, 259 insertions, 892 deletions
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile index 186028879cff..12936a260646 100644 --- a/devel/allegro/Makefile +++ b/devel/allegro/Makefile @@ -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 diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index 0788069e3a99..342f36fe8b56 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -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 diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile index 4a68012da7cb..7f3cc399fc0c 100644 --- a/devel/apr2/Makefile +++ b/devel/apr2/Makefile @@ -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: diff --git a/devel/bennugd-core/Makefile b/devel/bennugd-core/Makefile index b924b3a61467..5bede4d7196c 100644 --- a/devel/bennugd-core/Makefile +++ b/devel/bennugd-core/Makefile @@ -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: diff --git a/devel/bennugd-modules/Makefile b/devel/bennugd-modules/Makefile index 4374d735e1e2..310a7d34b081 100644 --- a/devel/bennugd-modules/Makefile +++ b/devel/bennugd-modules/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png 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> diff --git a/devel/boost-all/pkg-message.threads b/devel/boost-all/pkg-message.threads index b020ce2b5ae0..a25279cd13f8 100644 --- a/devel/boost-all/pkg-message.threads +++ b/devel/boost-all/pkg-message.threads @@ -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. diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile index 990a9e7e6354..93d70e50a72d 100644 --- a/devel/boost-libs/Makefile +++ b/devel/boost-libs/Makefile @@ -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} diff --git a/devel/boost-python-libs/Makefile b/devel/boost-python-libs/Makefile index b951369a7ac3..ca9e97863a3e 100644 --- a/devel/boost-python-libs/Makefile +++ b/devel/boost-python-libs/Makefile @@ -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} diff --git a/devel/bullet/Makefile b/devel/bullet/Makefile index 4552e2cfc2ad..5f110c595af1 100644 --- a/devel/bullet/Makefile +++ b/devel/bullet/Makefile @@ -23,7 +23,7 @@ MAKE_JOBS_SAFE= yes USE_CMAKE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= -pthread WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/devel/ccons/Makefile b/devel/ccons/Makefile index a9b6416431fe..a9533f86c75b 100644 --- a/devel/ccons/Makefile +++ b/devel/ccons/Makefile @@ -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 diff --git a/devel/cgit/Makefile b/devel/cgit/Makefile index b9d06572fa40..172b1fa18007 100644 --- a/devel/cgit/Makefile +++ b/devel/cgit/Makefile @@ -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: diff --git a/devel/clanlib1/Makefile b/devel/clanlib1/Makefile index c7e22fca1ff0..77bf1e33724e 100644 --- a/devel/clanlib1/Makefile +++ b/devel/clanlib1/Makefile @@ -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 \ diff --git a/devel/clanlib22/Makefile b/devel/clanlib22/Makefile index bf6256b9bb67..18a28d2fd441 100644 --- a/devel/clanlib22/Makefile +++ b/devel/clanlib22/Makefile @@ -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 \ diff --git a/devel/clint/Makefile b/devel/clint/Makefile index 4f31d4f505d6..0474533d9716 100644 --- a/devel/clint/Makefile +++ b/devel/clint/Makefile @@ -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' diff --git a/devel/cocaine-core/Makefile b/devel/cocaine-core/Makefile index 77cf5c88d9e3..2656104762ab 100644 --- a/devel/cocaine-core/Makefile +++ b/devel/cocaine-core/Makefile @@ -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> diff --git a/devel/commoncpp/Makefile b/devel/commoncpp/Makefile index 98fb66b1d909..f9ab18085cac 100644 --- a/devel/commoncpp/Makefile +++ b/devel/commoncpp/Makefile @@ -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> diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile index ffbca6203621..8c3a5ee8218d 100644 --- a/devel/cppcheck/Makefile +++ b/devel/cppcheck/Makefile @@ -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 diff --git a/devel/cxxtools/Makefile b/devel/cxxtools/Makefile index 8c5a2dcef087..6e00646d3329 100644 --- a/devel/cxxtools/Makefile +++ b/devel/cxxtools/Makefile @@ -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> diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile index 7b9ecdf1967d..abb0056aa0a1 100644 --- a/devel/dbus-glib/Makefile +++ b/devel/dbus-glib/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS= --with-test-socket-dir=${WRKDIR} \ --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" diff --git a/devel/dbus-qt3/Makefile b/devel/dbus-qt3/Makefile index 0e095ada4aea..4bdf504bde3d 100644 --- a/devel/dbus-qt3/Makefile +++ b/devel/dbus-qt3/Makefile @@ -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" diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index ec21ae063247..df1a7e8df7a4 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -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 diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index 56d3fb537eb2..eb7ea57a2739 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -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 diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile index 039569c74720..d5ebc83d989a 100644 --- a/devel/directfb/Makefile +++ b/devel/directfb/Makefile @@ -27,8 +27,7 @@ OPTIONS= FREETYPE2 "Enable Freetype support" on \ 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} \ diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile index ea9893d49338..dec7107ebe00 100644 --- a/devel/distcc/Makefile +++ b/devel/distcc/Makefile @@ -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 diff --git a/devel/fga/Makefile b/devel/fga/Makefile index 6c837f3a3689..b421d4b30a46 100644 --- a/devel/fga/Makefile +++ b/devel/fga/Makefile @@ -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 diff --git a/devel/fnccheck/Makefile b/devel/fnccheck/Makefile index 506d52ede85a..8c1b06fc2a98 100644 --- a/devel/fnccheck/Makefile +++ b/devel/fnccheck/Makefile @@ -21,8 +21,8 @@ AUTOMAKE_ARGS= --force-missing --add-missing --foreign 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 diff --git a/devel/g2c/Makefile b/devel/g2c/Makefile index e964dbabe0d0..c040b90c8273 100644 --- a/devel/g2c/Makefile +++ b/devel/g2c/Makefile @@ -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> diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile index 609c7dc1d059..7ca26653ef0a 100644 --- a/devel/gamin/Makefile +++ b/devel/gamin/Makefile @@ -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]* diff --git a/devel/gaul/Makefile b/devel/gaul/Makefile index 7a841e012f3f..3a65c7562264 100644 --- a/devel/gaul/Makefile +++ b/devel/gaul/Makefile @@ -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> diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile index bddc6cc2b6e5..8a7fa526ccdf 100644 --- a/devel/gio-fam-backend/Makefile +++ b/devel/gio-fam-backend/Makefile @@ -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 diff --git a/devel/gio-fam-backend/files/patch-ae b/devel/gio-fam-backend/files/patch-ae index a6d6851b09cf..2e1ead9eaf8c 100644 --- a/devel/gio-fam-backend/files/patch-ae +++ b/devel/gio-fam-backend/files/patch-ae @@ -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 - diff --git a/devel/git/Makefile b/devel/git/Makefile index 3b0ad5515c21..dd2c6eb51f28 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -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 diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile index cfc391ce7a3f..1702b64a48fd 100644 --- a/devel/glib12/Makefile +++ b/devel/glib12/Makefile @@ -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 diff --git a/devel/glib12/files/patch-ae b/devel/glib12/files/patch-ae index 2d7028b6563b..25f89584cd38 100644 --- a/devel/glib12/files/patch-ae +++ b/devel/glib12/files/patch-ae @@ -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 @@ diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 806a1e589d76..540d9c1dbc5c 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -47,8 +47,6 @@ CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \ --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 diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index 80fcb92b20d5..c3e6c139b0e8 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -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 diff --git a/devel/gnome-vfs-monikers/Makefile b/devel/gnome-vfs-monikers/Makefile index 38a945c0c9a6..f0039e617f0e 100644 --- a/devel/gnome-vfs-monikers/Makefile +++ b/devel/gnome-vfs-monikers/Makefile @@ -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> diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index d0e5f1a5a63b..71a93666a3b1 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -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 ; \ diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac index 383987654ef2..a85a1f283b62 100644 --- a/devel/gnome-vfs/files/patch-ac +++ b/devel/gnome-vfs/files/patch-ac @@ -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) \ diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in index eb0f4592025e..b09412624318 100644 --- a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in +++ b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in @@ -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 diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in index 168fba882ca8..98354d83d2de 100644 --- a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in +++ b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in @@ -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 diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile index 127694223136..27837fc71f7b 100644 --- a/devel/gnome-vfs1/Makefile +++ b/devel/gnome-vfs1/Makefile @@ -24,9 +24,8 @@ USE_GNOME= gnomehack gnomeprefix glib12 libxml gtk12 orbit gconf \ 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 diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile index 9d6c0c4fc70b..f9ad901e68a5 100644 --- a/devel/gnustep-make/Makefile +++ b/devel/gnustep-make/Makefile @@ -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) diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile index f5fb16538aef..08274a84abee 100644 --- a/devel/guichan/Makefile +++ b/devel/guichan/Makefile @@ -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 \ diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile index d0faf55f7f69..6a1ecbb1823f 100644 --- a/devel/gwenhywfar/Makefile +++ b/devel/gwenhywfar/Makefile @@ -57,8 +57,8 @@ INSTALL_WRKSRC= ${WRKSRC}/gui/${SLAVEPORT} .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" diff --git a/devel/ice/Makefile b/devel/ice/Makefile index 82f3199c466f..92035bcfc787 100644 --- a/devel/ice/Makefile +++ b/devel/ice/Makefile @@ -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; \ diff --git a/devel/ice/files/Make.rules.FreeBSD b/devel/ice/files/Make.rules.FreeBSD index 00b9543ba1cf..03ca1908b79b 100644 --- a/devel/ice/files/Make.rules.FreeBSD +++ b/devel/ice/files/Make.rules.FreeBSD @@ -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 diff --git a/devel/icu/Makefile b/devel/icu/Makefile index 9fb895beb57f..57f7db43b00a 100644 --- a/devel/icu/Makefile +++ b/devel/icu/Makefile @@ -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 diff --git a/devel/ifd-test/Makefile b/devel/ifd-test/Makefile index 0fa7712b2e5e..54492e10c59d 100644 --- a/devel/ifd-test/Makefile +++ b/devel/ifd-test/Makefile @@ -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; \ diff --git a/devel/jzmq/Makefile b/devel/jzmq/Makefile index 6e5a4711c36e..78e63dce8e20 100644 --- a/devel/jzmq/Makefile +++ b/devel/jzmq/Makefile @@ -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 \ diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 22db88c71e22..db0647223b60 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -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' \ diff --git a/devel/kdevelop/files/kdevelop b/devel/kdevelop/files/kdevelop index a02437512df2..bee3a0341760 100644 --- a/devel/kdevelop/files/kdevelop +++ b/devel/kdevelop/files/kdevelop @@ -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" "$@" diff --git a/devel/kprof/Makefile b/devel/kprof/Makefile index ea7e5d154171..021b8151a096 100644 --- a/devel/kprof/Makefile +++ b/devel/kprof/Makefile @@ -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} diff --git a/devel/kprof/files/patch-configure b/devel/kprof/files/patch-configure deleted file mode 100644 index 295dba1e9f2b..000000000000 --- a/devel/kprof/files/patch-configure +++ /dev/null @@ -1,411 +0,0 @@ ---- configure.orig Tue Jun 18 18:26:05 2002 -+++ configure Sat Feb 18 22:35:41 2006 -@@ -3755,13 +3755,2 @@ - --# Actually configure libtool. ac_aux_dir is where install-sh is found. --AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ --MAGIC="$MAGIC" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ --LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \ --AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ --objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ --deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \ --${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ --$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \ --|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -- - # Reload cache, that may have been modified by ltconfig -@@ -3790,16 +3779,2 @@ - LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh" --lt_save_CC="$CC" --lt_save_CFLAGS="$CFLAGS" --AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \ --MAGIC="$MAGIC" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ --LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \ --AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ --objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ --deplibs_check_method="$deplibs_check_method" \ --file_magic_cmd="$file_magic_cmd" \ --${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \ ----build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \ --|| { echo "configure: error: libtool tag configuration failed" 1>&2; exit 1; } --CC="$lt_save_CC" --CFLAGS="$lt_save_CFLAGS" - -@@ -6099,151 +6074,235 @@ - --echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 --echo "configure:6102: checking for pthread_create in -lpthread" >&5 --ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-lpthread $LIBS" --cat > conftest.$ac_ext <<EOF --#line 6110 "configure" --#include "confdefs.h" --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char pthread_create(); -+ LIBPTHREAD="" - --int main() { --pthread_create() --; return 0; } --EOF --if { (eval echo configure:6121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -+ if test -n "$PTHREAD_LIBS"; then -+ if test "x$PTHREAD_LIBS" = "x-pthread" ; then -+ LIBPTHREAD="PTHREAD" -+ else -+ PTHREAD_LIBS_save="$PTHREAD_LIBS" -+ PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'` -+ echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5 -+echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6 -+ -+ kde_save_LDFLAGS="$LDFLAGS" -+ kde_save_LIBS="$LIBS" -+ LDFLAGS="$LDFLAGS $all_libraries" -+ case $host_os in -+ aix*) LDFLAGS="-brtl $LDFLAGS" -+ test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" -+ ;; -+ esac -+ as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh` -+echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5 -+echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Lib+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-l$PTHREAD_LIBS $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char pthread_create (); -+int -+main () -+{ -+pthread_create (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ eval "$as_ac_Lib=yes" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+eval "$as_ac_Lib=no" -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 -+if test `eval echo '${'$as_ac_Lib'}'` = yes; then -+ LIBPTHREAD="$PTHREAD_LIBS_save" - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- LIBPTHREAD="-lpthread" --else -- echo "$ac_t""no" 1>&6 --fi -- - -+ LDFLAGS="$kde_save_LDFLAGS" -+ LIBS="$kde_save_LIBS" - -+ PTHREAD_LIBS="$PTHREAD_LIBS_save" -+ fi -+ fi - -- # Check whether --enable-kernel-threads or --disable-kernel-threads was given. --if test "${enable_kernel_threads+set}" = set; then -- enableval="$enable_kernel_threads" -- kde_use_kernthreads=$enableval -+ if test -z "$LIBPTHREAD"; then -+ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 -+if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- kde_use_kernthreads=no --fi -- -- -- if test "$kde_use_kernthreads" = "yes"; then -- ac_save_CXXFLAGS="$CXXFLAGS" -- ac_save_CFLAGS="$CFLAGS" -- CXXFLAGS="-I/usr/local/include/pthread/linuxthreads $CXXFLAGS" -- CFLAGS="-I/usr/local/include/pthread/linuxthreads $CFLAGS" -- for ac_hdr in pthread/linuxthreads/pthread.h --do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:6162: checking for $ac_hdr" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext <<EOF --#line 6167 "configure" --#include "confdefs.h" --#include <$ac_hdr> --EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:6172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <<EOF --#define $ac_tr_hdr 1 --EOF -- --else -- echo "$ac_t""no" 1>&6 --fi --done -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lpthread $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -- CXXFLAGS="$ac_save_CXXFLAGS" -- CFLAGS="$ac_save_CFLAGS" -- if test "$ac_cv_header_pthread_linuxthreads_pthread_h" = "no"; then -- kde_use_kernthreads=no -- else -- echo $ac_n "checking for pthread_join in -llthread""... $ac_c" 1>&6 --echo "configure:6204: checking for pthread_join in -llthread" >&5 --ac_lib_var=`echo lthread'_'pthread_join | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-llthread $LIBS" --cat > conftest.$ac_ext <<EOF --#line 6212 "configure" --#include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif - /* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char pthread_join(); -- --int main() { --pthread_join() --; return 0; } --EOF --if { (eval echo configure:6223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" -+ builtin and then its argument prototype would still apply. */ -+char pthread_create (); -+int -+main () -+{ -+pthread_create (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_pthread_pthread_create=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_pthread_pthread_create=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 -+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 -+if test $ac_cv_lib_pthread_pthread_create = yes; then -+ LIBPTHREAD="-lpthread" - fi --rm -f conftest* --LIBS="$ac_save_LIBS" - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- LIBPTHREAD="-llthread -llgcc_r" --else -- echo "$ac_t""no" 1>&6 --fi -- if test "x$LIBPTHREAD" = "x"; then -- kde_use_kernthreads=no -- else -- USE_THREADS="-D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads" -- fi -- fi -- else -- USE_THREADS="" -+ fi -+ -+ if test -z "$LIBPTHREAD" ; then -+ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 -+ kde_safe_libs=$LIBS -+ LIBS="$LIBS -lpthread" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <pthread.h> -+int -+main () -+{ -+(void)pthread_create(0,0,0,0); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ -+ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 -+ LIBPTHREAD="-lpthread" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS=$kde_safe_libs -+ fi -+ -+ if test "x$LIBPTHREAD" = "xPTHREAD" ; then -+ LIBPTHREAD="" -+ fi -+ -+ -+ -+ -+ USE_THREADS="" - if test -z "$LIBPTHREAD"; then -@@ -6308,3 +6367,3 @@ - fi -- fi -+ - diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile index 959563e0e6a0..c9fdd91eb0af 100644 --- a/devel/kscope/Makefile +++ b/devel/kscope/Makefile @@ -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 diff --git a/devel/leaktracer/Makefile b/devel/leaktracer/Makefile index ac6325368fab..c30b301be879 100644 --- a/devel/leaktracer/Makefile +++ b/devel/leaktracer/Makefile @@ -18,8 +18,6 @@ COMMENT= Trace and analyze memory leaks in C++ programs 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 diff --git a/devel/leaktracer/files/patch-Makefile b/devel/leaktracer/files/patch-Makefile index cc9db5de969c..1c2f684a6f25 100644 --- a/devel/leaktracer/files/patch-Makefile +++ b/devel/leaktracer/files/patch-Makefile @@ -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 = . diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 21bb9cb5e720..0742d8a46ee8 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -32,7 +32,7 @@ USE_GNOME= gnomehack intlhack libxml2 orbit2 referencehack 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 diff --git a/devel/libburn/Makefile b/devel/libburn/Makefile index 0d25b68f343b..da6bedb9220f 100644 --- a/devel/libburn/Makefile +++ b/devel/libburn/Makefile @@ -17,7 +17,4 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAN1= cdrskin.1 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/devel/libccid/Makefile b/devel/libccid/Makefile index b92424814873..1cf28db02b86 100644 --- a/devel/libccid/Makefile +++ b/devel/libccid/Makefile @@ -24,8 +24,7 @@ CONFIGURE_ARGS= --enable-usbdropdir=${PREFIX}/lib/pcsc/drivers \ --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} diff --git a/devel/libchipcard/Makefile b/devel/libchipcard/Makefile index 0450a6071c27..ab8b1b099a93 100644 --- a/devel/libchipcard/Makefile +++ b/devel/libchipcard/Makefile @@ -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 diff --git a/devel/libdap/Makefile b/devel/libdap/Makefile index d63ef03be6b9..562421eeb112 100644 --- a/devel/libdap/Makefile +++ b/devel/libdap/Makefile @@ -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 diff --git a/devel/libdlna/Makefile b/devel/libdlna/Makefile index aedf86d42899..7128cced471d 100644 --- a/devel/libdlna/Makefile +++ b/devel/libdlna/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --prefix="${PREFIX}" --disable-optimize \ --libdir=${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e \ diff --git a/devel/libevent2/Makefile b/devel/libevent2/Makefile index 1dfea6521ba4..bfb96792e241 100644 --- a/devel/libevent2/Makefile +++ b/devel/libevent2/Makefile @@ -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 diff --git a/devel/libevent2/files/patch-libevent_pthreads.pc.in b/devel/libevent2/files/patch-libevent_pthreads.pc.in index 8f7735fc581d..3473f4d543b7 100644 --- a/devel/libevent2/files/patch-libevent_pthreads.pc.in +++ b/devel/libevent2/files/patch-libevent_pthreads.pc.in @@ -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} diff --git a/devel/libgii/Makefile b/devel/libgii/Makefile index 90a817774a36..3ad5cef52e7e 100644 --- a/devel/libgii/Makefile +++ b/devel/libgii/Makefile @@ -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 diff --git a/devel/libgiigic/Makefile b/devel/libgiigic/Makefile index 4496cf1b006f..d5b0b2b7efce 100644 --- a/devel/libgiigic/Makefile +++ b/devel/libgiigic/Makefile @@ -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 \ diff --git a/devel/libisofs/Makefile b/devel/libisofs/Makefile index 8c5d93689ddd..3fd576fff217 100644 --- a/devel/libisofs/Makefile +++ b/devel/libisofs/Makefile @@ -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> diff --git a/devel/libnfc/Makefile b/devel/libnfc/Makefile index 7a876a11fb6b..e95bc350713c 100644 --- a/devel/libnfc/Makefile +++ b/devel/libnfc/Makefile @@ -81,8 +81,8 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/lib .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 diff --git a/devel/libopensync022/Makefile b/devel/libopensync022/Makefile index 7f89579ba1f7..7efc8660c7ee 100644 --- a/devel/libopensync022/Makefile +++ b/devel/libopensync022/Makefile @@ -19,7 +19,6 @@ LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 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> diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile index 1a6da0582ad6..ab2a8f6edc3b 100644 --- a/devel/librcc/Makefile +++ b/devel/librcc/Makefile @@ -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 \ diff --git a/devel/librelp/Makefile b/devel/librelp/Makefile index af670f486262..fddb004f9556 100644 --- a/devel/librelp/Makefile +++ b/devel/librelp/Makefile @@ -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> diff --git a/devel/libsigcx/Makefile b/devel/libsigcx/Makefile index bc71bfa57f78..cbf42416df60 100644 --- a/devel/libsigcx/Makefile +++ b/devel/libsigcx/Makefile @@ -22,8 +22,6 @@ USE_GNOME= gnomehack gtk20 USE_GMAKE= yes USE_AUTOTOOLS= libtool CONFIGURE_ENV= ac_cv_path_DOXYGEN="" -CPPFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile index 5d7e6c7fe926..b66a85c45347 100644 --- a/devel/libvirt/Makefile +++ b/devel/libvirt/Makefile @@ -38,7 +38,7 @@ CONFIGURE_ARGS= --without-sasl \ PORTSCOUT= limit:\d+\.\d+\.\d+$$ LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" +CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" USE_GMAKE= yes USE_GNOME= gnomehack diff --git a/devel/libzrtp/Makefile b/devel/libzrtp/Makefile index 47632dc03995..2056b9ee3020 100644 --- a/devel/libzrtp/Makefile +++ b/devel/libzrtp/Makefile @@ -51,7 +51,6 @@ post-patch: @cd ${PATCH_WRKSRC}/src && \ ${FIND} * -type f -exec ${REINPLACE_CMD} -i "" -e "s|<malloc.h>|<stdlib.h>|g" "{}" \; && \ ${FIND} * -type f -exec ${REINPLACE_CMD} -i "" -e "s|<stdint.h>|<inttypes.h>|g" "{}" \; - @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/${CONFIGURE_SCRIPT} test: cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/projects/gnu && make check diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile index 6f1d9c1dbcfa..b416eabbe0d9 100644 --- a/devel/libzvbi/Makefile +++ b/devel/libzvbi/Makefile @@ -29,7 +29,6 @@ CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -L/usr/lib" CFLAGS+= -I${LOCALBASE}/include post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|#cpu (\([^)]*\))|defined(__\1__)|g' \ ${WRKSRC}/src/misc.h \ ${WRKSRC}/src/exp-gfx.c diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile index f94c018a594b..50f2ea56766e 100644 --- a/devel/log4cplus/Makefile +++ b/devel/log4cplus/Makefile @@ -14,20 +14,17 @@ DISTFILES= log4cplus-${PORTVERSION}.tar.bz2 MAINTAINER= reed@reedmedia.net COMMENT= A logging library for C++ +USE_GCC= any USE_AUTOTOOLS= libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes -LDFLAGS+= ${PTHREAD_LIBS} -CFLAGS+= ${PTHREAD_CFLAGS} +CONFIGURE_ARGS+=--enable-threads=yes MAKE_JOBS_UNSAFE= yes .if !defined(NOPORTDOCS) PORTDOCS= * .endif -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure - post-install: ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/include/log4cplus .if !defined(NOPORTDOCS) diff --git a/devel/log4cpp/Makefile b/devel/log4cpp/Makefile index 73b89d4e74a3..292ea52bc83b 100644 --- a/devel/log4cpp/Makefile +++ b/devel/log4cpp/Makefile @@ -12,8 +12,6 @@ COMMENT= A library of C++ classes for flexible logging USE_AUTOTOOLS= libtool USE_GMAKE= yes GNU_CONFIGURE= yes -CPPFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} CONFIGURE_ARGS= --with-pthreads --disable-html-docs USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/devel/log4shib/Makefile b/devel/log4shib/Makefile index e601d5f748bb..a1b9524c62bb 100644 --- a/devel/log4shib/Makefile +++ b/devel/log4shib/Makefile @@ -18,8 +18,6 @@ USE_AUTOTOOLS= libtool USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= pkgconfig gnomehack -CPPFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} CONFIGURE_ARGS= --with-pthreads --disable-html-docs --disable-doxygen USE_LDCONFIG= yes diff --git a/devel/mico/Makefile b/devel/mico/Makefile index 533b1de9b787..2076c217eea5 100644 --- a/devel/mico/Makefile +++ b/devel/mico/Makefile @@ -95,7 +95,7 @@ MAN5= micorc.5 MAN8= ird.8 micod.8 nsd.8 post-patch: - @${REINPLACE_CMD} -e "s#\"-O2\"#\"${CFLAGS}\"#;s#\"-pthread#\"${PTHREAD_LIBS}#" ${WRKSRC}/configure.in + @${REINPLACE_CMD} -e "s#\"-O2\"#\"${CFLAGS}\"#" ${WRKSRC}/configure.in post-configure: @${FIND} ${WRKSRC}/demo -name Makefile | ${XARGS} \ diff --git a/devel/mpatrol/Makefile b/devel/mpatrol/Makefile index 8d4082d948db..65f186201444 100644 --- a/devel/mpatrol/Makefile +++ b/devel/mpatrol/Makefile @@ -22,8 +22,6 @@ ONLY_FOR_ARCHS= i386 amd64 USE_LDCONFIG= yes USE_GMAKE= yes -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" MAN1= hexwords.1 mleak.1 mpatrol.1 mprof.1 \ mpsym.1 mptrace.1 mpedit.1 diff --git a/devel/mpatrol/files/patch-Makefile b/devel/mpatrol/files/patch-Makefile index d25ad3af18dd..cba7c91dcab2 100644 --- a/devel/mpatrol/files/patch-Makefile +++ b/devel/mpatrol/files/patch-Makefile @@ -24,7 +24,7 @@ $FreeBSD$ SFLAGS = -fPIC -TFLAGS = -DMP_THREADS_SUPPORT -LDFLAGS = -shared -+TFLAGS = -DMP_THREADS_SUPPORT $(PTHREAD_CFLAGS) ++TFLAGS = -DMP_THREADS_SUPPORT -pthread +LDFLAGS = -shared -L$(LOCALBASE)/lib -lelf -lintl MPATROL = mpatrol @@ -49,7 +49,7 @@ $FreeBSD$ -$(SHARTS_MPATROL).$(VERSION).$(REVISION): $(SHARTS_MPTOBJS) - $(LD) $(LDFLAGS) -o $@ $(SHARTS_MPTOBJS) +$(SHARTS_MPATROL).$(VERSION): $(SHARTS_MPTOBJS) -+ $(LD) $(LDFLAGS) $(PTHREAD_LIBS) -o $@ $(SHARTS_MPTOBJS) ++ $(LD) $(LDFLAGS) -pthread -o $@ $(SHARTS_MPTOBJS) -$(SHARTS_MPATROL): $(SHARTS_MPATROL).$(VERSION).$(REVISION) +$(SHARTS_MPATROL): $(SHARTS_MPATROL).$(VERSION) diff --git a/devel/npth/Makefile b/devel/npth/Makefile index eed4906fa2cc..cf0bdec42004 100644 --- a/devel/npth/Makefile +++ b/devel/npth/Makefile @@ -20,9 +20,6 @@ LICENSE_COMB= dual USE_BZIP2= yes USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -CONFIGURE_ENV+= ac_cv_search_pthread_create="" -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index 547cb9574e43..f9fd1c569710 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -23,7 +23,6 @@ GNU_CONFIGURE= yes CONFIGURE_SCRIPT=../configure CONFIGURE_ARGS= --srcdir=${WRKSRC:H} \ --with-pthreads -CONFIGURE_ENV= BSD_PTHREAD_LIBS=${PTHREAD_LIBS} MAKE_ENV= DIST=${WRKSRC}/dist @@ -40,7 +39,7 @@ CONFIGURE_ARGS+=--disable-debug .endif post-patch: - @${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g ; s,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT} + @${REINPLACE_CMD} -e 's,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT} do-install: ${MKDIR} ${PREFIX}/include/nspr @@ -64,7 +63,7 @@ do-install: .endfor prtests: - ${SETENV} PTHREAD_LIBS="${PTHREAD_LIBS}" ${GMAKE} -C ${WRKSRC}/pr/tests + ${GMAKE} -C ${WRKSRC}/pr/tests ${LN} -sf libmy.so.1 ${WRKSRC}/pr/tests/dll/libmy.so cd ${WRKSRC}/pr/tests && ../../../pr/tests/runtests.sh diff --git a/devel/nspr/files/patch-..::configure b/devel/nspr/files/patch-..::configure index af7afd6b41ae..0698262753b5 100644 --- a/devel/nspr/files/patch-..::configure +++ b/devel/nspr/files/patch-..::configure @@ -9,16 +9,3 @@ else DLL_SUFFIX=so.1.0 fi -@@ -6271,11 +6271,6 @@ - #define _THREAD_SAFE 1 - EOF - -- if test "$ac_cv_have_dash_pthread" = "yes"; then -- _PTHREAD_LDFLAGS="-pthread" -- else -- _PTHREAD_LDFLAGS="-lc_r" -- fi - ;; - *-netbsd*) - if test "$ac_cv_have_dash_pthread" = "yes"; then - diff --git a/devel/nspr/files/patch-.._pr_tests_Makefile b/devel/nspr/files/patch-.._pr_tests_Makefile deleted file mode 100644 index af796164c9ea..000000000000 --- a/devel/nspr/files/patch-.._pr_tests_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- ../../nsprpub/pr/tests/Makefile.in.orig Mon Apr 26 00:01:02 2004 -+++ ../../nsprpub/pr/tests/Makefile.in Tue Nov 28 11:08:14 2006 -@@ -418,7 +418,7 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifeq ($(USE_PTHREADS),1) --LDOPTS += -pthread -+LDOPTS += ${PTHREAD_LIBS} - endif - LDOPTS += -Xlinker -R $(ABSOLUTE_LIB_DIR) - endif diff --git a/devel/ode/Makefile b/devel/ode/Makefile index 33349b4d75cd..b27f1def391c 100644 --- a/devel/ode/Makefile +++ b/devel/ode/Makefile @@ -65,7 +65,7 @@ post-patch: -e 's|^\( *CPPFLAGS=\)|#\1|' -e 's|^\( *CXXFLAGS=\)|#\1|' \ -e 's|CPPFLAGS+=" |CPPFLAGS="$$CPPFLAGS |' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|__isnanf||g; s|__isnan||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \ + @${REINPLACE_CMD} -e 's|__isnanf||g; s|__isnan||g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e '/^traplib_PROGRAMS / d' ${WRKSRC}/ode/src/Makefile.in @${FIND} ${WRKSRC} -type f -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \ diff --git a/devel/omniNotify/Makefile b/devel/omniNotify/Makefile index 8ccddd759e17..37dbc7daa911 100644 --- a/devel/omniNotify/Makefile +++ b/devel/omniNotify/Makefile @@ -43,7 +43,7 @@ pre-configure: @cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC} post-patch: - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#;s/-O2/${CFLAGS}/' \ + @${REINPLACE_CMD} -Ee 's/-O2/${CFLAGS}/' \ ${WRKSRC}/mk/beforeauto.mk.in post-install: diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile index decd49e8caa9..8c67b7ac9962 100644 --- a/devel/omniORB/Makefile +++ b/devel/omniORB/Makefile @@ -37,8 +37,7 @@ MAN1= catior.1 convertior.1 genior.1 nameclt.1 omniidl.1 MAN8= omniMapper.8 omniNames.8 post-patch: - @${REINPLACE_CMD} -e 's#-pthread|-lc_r#${PTHREAD_LIBS}#' \ - -e 's#-O2#${CFLAGS}#g' ${WRKSRC}/mk/beforeauto.mk.in + @${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#g' ${WRKSRC}/mk/beforeauto.mk.in post-install: @${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${PYTHON_SITELIBDIR}/omniidl')" diff --git a/devel/p5-IO-AIO/Makefile b/devel/p5-IO-AIO/Makefile index a06a6ba08587..fcbf2bfb168c 100644 --- a/devel/p5-IO-AIO/Makefile +++ b/devel/p5-IO-AIO/Makefile @@ -24,7 +24,4 @@ PERL_CONFIGURE= yes MAN3= IO::AIO.3 -post-patch: - @${REINPLACE_CMD} -e 's|-lpthreads*|${PTHREAD_LIBS}|g' ${WRKSRC}/Makefile.PL - .include <bsd.port.mk> diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile index 0d55c34ce2ed..4db988ded073 100644 --- a/devel/pcsc-lite/Makefile +++ b/devel/pcsc-lite/Makefile @@ -25,8 +25,6 @@ USE_GNOME= gnomehack pkgconfig USE_RC_SUBR= pcscd USE_LDCONFIG= yes -CFLAGS+= ${PTHREAD_CFLAGS} -CONFIGURE_ENV= LIBS="${LIBS} ${PTHREAD_LIBS}" CONFIGURE_ARGS= --enable-usbdropdir=${PREFIX}/lib/pcsc/drivers/ PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/devel/pharmacy/Makefile b/devel/pharmacy/Makefile index 1e35ea58eaa1..47d2eb0aa0fa 100644 --- a/devel/pharmacy/Makefile +++ b/devel/pharmacy/Makefile @@ -22,8 +22,7 @@ CONFIGURE_ENV+= CPPCFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|\(DATADIRNAME=\)lib|\1share|g ; \ + @${REINPLACE_CMD} -e 's|\(DATADIRNAME=\)lib|\1share|g ; \ s|USE_INCLUDED_LIBINTL=yes|#&|g ; \ s|\$$(top_builddir)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure diff --git a/devel/php5-ice/Makefile b/devel/php5-ice/Makefile index 856f3415bf5c..71de9ca7fc3e 100644 --- a/devel/php5-ice/Makefile +++ b/devel/php5-ice/Makefile @@ -29,7 +29,7 @@ INSTALL_WRKSRC= ${WRKSRC}/php LIB_VRS= ${PORTVERSION:S|.||g:C|2$||} PHP_MODNAME?= IcePHP -CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS} +CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT .if defined(DEBUG) CFLAGS+= -g .else @@ -50,7 +50,6 @@ MAKE_ENV+= NOPORTDOCS=yes .endif post-patch: - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/php/config/Make.rules.php ${REINPLACE_CMD} 's|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \ s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \ s|%%PREFIX%%|${PREFIX}|g ; \ diff --git a/devel/php5-ice/files/patch-cpp+config+Make.rules.FreeBSD b/devel/php5-ice/files/patch-cpp+config+Make.rules.FreeBSD index 41619d6da981..3a724bb9dcc1 100644 --- a/devel/php5-ice/files/patch-cpp+config+Make.rules.FreeBSD +++ b/devel/php5-ice/files/patch-cpp+config+Make.rules.FreeBSD @@ -19,12 +19,12 @@ mklib = ar cr $(1) $(2) -BASELIBS = -lIceUtil -lc_r -+BASELIBS = -lIceUtil %%PTHREAD_LIBS%% -L$(LOCALBASE)/lib -liconv ++BASELIBS = -lIceUtil -pthread -L$(LOCALBASE)/lib -liconv LIBS = -lIce $(BASELIBS) -ICEUTIL_OS_LIBS = -ICE_OS_LIBS = -+ICEUTIL_OS_LIBS = %%PTHREAD_LIBS%% ++ICEUTIL_OS_LIBS = -pthread +ICE_OS_LIBS = PLATFORM_HAS_READLINE = yes diff --git a/devel/pikdev/Makefile b/devel/pikdev/Makefile index 949f13526711..1da15c5c27b7 100644 --- a/devel/pikdev/Makefile +++ b/devel/pikdev/Makefile @@ -24,7 +24,7 @@ USE_KDEBASE_VER=3 GNU_CONFIGURE= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib -pthread CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --with-pic=yes SUB_FILES= pkg-message diff --git a/devel/poslib/Makefile b/devel/poslib/Makefile index 9c7545af39ef..0acb70980b71 100644 --- a/devel/poslib/Makefile +++ b/devel/poslib/Makefile @@ -16,7 +16,6 @@ COMMENT= Posadis C++ DNS library USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" USE_LDCONFIG= yes PLIST_SUB= VERSION="${PORTVERSION}" diff --git a/devel/present/Makefile b/devel/present/Makefile index a6fcbfe4334e..9ceef4667c8c 100644 --- a/devel/present/Makefile +++ b/devel/present/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib USE_GNOME= gnomehack intlhack ltverhack .include <bsd.port.mk> diff --git a/devel/ptmalloc/Makefile b/devel/ptmalloc/Makefile index 7c67a974e57c..58ad9509a454 100644 --- a/devel/ptmalloc/Makefile +++ b/devel/ptmalloc/Makefile @@ -24,10 +24,6 @@ ALL_TARGET= posix INCDIR= include/${PORTNAME} PLIST_SUB= INCDIR=${INCDIR} -post-patch: - @${REINPLACE_CMD} -e 's+-pthread+${PTHREAD_LIBS}+g ;' \ - ${WRKSRC}/Makefile - do-install: all ${MKDIR} ${PREFIX}/${INCDIR} ${INSTALL_DATA} ${WRKSRC}/malloc-2.8.3.h ${PREFIX}/${INCDIR}/malloc.h diff --git a/devel/ptmalloc2/Makefile b/devel/ptmalloc2/Makefile index ad34f9b440bb..c64200e4eb2c 100644 --- a/devel/ptmalloc2/Makefile +++ b/devel/ptmalloc2/Makefile @@ -23,10 +23,6 @@ ALL_TARGET= posix INCDIR= include/${PORTNAME} PLIST_SUB= INCDIR=${INCDIR} -post-patch: - @${REINPLACE_CMD} -e 's+-pthread+${PTHREAD_LIBS}+g ;' \ - ${WRKSRC}/Makefile - do-install: all ${MKDIR} ${PREFIX}/${INCDIR} ${INSTALL_DATA} ${WRKSRC}/malloc.h ${PREFIX}/${INCDIR}/ diff --git a/devel/ptypes/Makefile b/devel/ptypes/Makefile index fa966a9e6fef..c253f2610223 100644 --- a/devel/ptypes/Makefile +++ b/devel/ptypes/Makefile @@ -34,11 +34,10 @@ BROKEN= Does not install on powerpc DEBUG_FLAGS= "-DDEBUG -g" .endif .if defined(WITH_OPTIMIZED) -PTHREAD_CFLAGS+=-O2 +PTYPES_CFLAGS+=-O2 .endif -MAKE_ARGS+= PTHREAD_LIBS=${PTHREAD_LIBS} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - DEBUG_FLAGS=${DEBUG_FLAGS} PTYPES_CFLAGS="${PTYPES_CFLAGS}" +MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" PTYPES_CFLAGS="${PTYPES_CFLAGS}" do-install: ${MKDIR} ${PREFIX}/include/ptypes diff --git a/devel/ptypes/files/patch-src-Makefile.FreeBSD b/devel/ptypes/files/patch-src-Makefile.FreeBSD index a8ee6218cf62..dc895455e3c4 100644 --- a/devel/ptypes/files/patch-src-Makefile.FreeBSD +++ b/devel/ptypes/files/patch-src-Makefile.FreeBSD @@ -1,5 +1,5 @@ ---- src/Makefile.FreeBSD.orig 2007-06-27 17:05:49.000000000 +0400 -+++ src/Makefile.FreeBSD 2007-12-14 18:43:29.000000000 +0300 +--- src/Makefile.FreeBSD.orig 2012-12-11 17:58:18.000000000 +0100 ++++ src/Makefile.FreeBSD 2012-12-11 17:59:25.000000000 +0100 @@ -12,20 +12,20 @@ # Makefile for FreeBSD, called from ../Makefile # @@ -9,13 +9,12 @@ OS_CXXOPTS_ST = -Wall -OS_CXXOPTS = $(OS_CXXOPTS_ST) -pthread -fPIC -+OS_CXXOPTS = $(OS_CXXOPTS_ST) $(PTHREAD_CFLAGS) -fPIC ++OS_CXXOPTS = $(OS_CXXOPTS_ST) -fPIC -# OS_LDLIBS = -lc_r -+OS_LDLIBS = $(PTHREAD_LIBS) ++OS_LDLIBS = -pthread --LIBTOOL = $(CXX) -shared -pthread -+LIBTOOL = $(CXX) -shared $(PTHREAD_LIBS) + LIBTOOL = $(CXX) -shared -pthread SOSTRIP = strip SOEXT = so diff --git a/devel/ptypes/files/patch-wshare-Makefile.FreeBSD b/devel/ptypes/files/patch-wshare-Makefile.FreeBSD index 3d3b859e633b..130440700799 100644 --- a/devel/ptypes/files/patch-wshare-Makefile.FreeBSD +++ b/devel/ptypes/files/patch-wshare-Makefile.FreeBSD @@ -1,6 +1,6 @@ ---- wshare/Makefile.FreeBSD.orig 2007-06-27 17:05:51.000000000 +0400 -+++ wshare/Makefile.FreeBSD 2007-12-14 18:39:17.000000000 +0300 -@@ -12,9 +12,9 @@ +--- wshare/Makefile.FreeBSD.orig 2012-12-11 18:00:13.000000000 +0100 ++++ wshare/Makefile.FreeBSD 2012-12-11 18:00:32.000000000 +0100 +@@ -12,10 +12,10 @@ # Makefile for FreeBSD, called from ../Makefile # @@ -8,7 +8,9 @@ +#CXX = g++ -OS_CXXOPTS = -Wall -pthread -+OS_CXXOPTS = -Wall $(PTHREAD_LIBS) - # OS_LDLIBS = -lc_r +-# OS_LDLIBS = -lc_r ++OS_CXXOPTS = -Wall ++OS_LDLIBS = -pthread include Makefile.common + diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile index 8d049d3d1aa8..b883096f865b 100644 --- a/devel/pwlib/Makefile +++ b/devel/pwlib/Makefile @@ -39,7 +39,6 @@ BROKEN= Does not install on arm: mtree .endif CFLAGS= -O1 -CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" MAKE_ENV= STDCCFLAGS+="-I${LOCALBASE}" CPPFLAGS+= -O1 -I${WRKSRC}/include -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -148,10 +147,4 @@ CONFIGURE_ARGS+=--disable-v4l PLIST_SUB+= V4L="@comment " .endif -post-patch: -.if ${ARCH} == sparc64 && ${OSVERSION} <= 700003 - @${REINPLACE_CMD} -e 's|P_PTHREADS_XPG6|0|' \ - ${WRKSRC}/src/ptlib/unix/tlibthrd.cxx -.endif - .include <bsd.port.post.mk> diff --git a/devel/pwlib/files/patch-configureac b/devel/pwlib/files/patch-configureac index 43900bd8f98e..1ed4df09595d 100644 --- a/devel/pwlib/files/patch-configureac +++ b/devel/pwlib/files/patch-configureac @@ -101,31 +101,6 @@ AC_TRY_COMPILE([#include <semaphore.h>], [sem_t *s = sem_open("test", O_CREAT)], -@@ -770,18 +772,18 @@ - dnl MSWIN_DISPLAY semaphore,Semaphore Support - dnl MSWIN_DEFINE semaphore,P_HAS_SEMAPHORES - --dnl Linux, Mac OS X use libpthread and -lpthread --dnl FreeBSD uses the -pthread compiler option and uses libc_r -+dnl FreeBSD>=5.x, Linux, Mac OS X use libpthread and -lpthread -+dnl FreeBSD <5.x uses the -pthread compiler option and uses libc_r - - AC_CHECK_LIB(pthread, pthread_create, HAS_PTHREADS=yes, HAS_PTHREADS=no) - if test ${HAS_PTHREADS} = yes ; then -- ENDLDLIBS="$ENDLDLIBS -lpthread" -- STDCCFLAGS="$STDCCFLAGS -D_REENTRANT" -+ ENDLDLIBS="$ENDLDLIBS ${PTHREAD_LIBS}" -+ STDCCFLAGS="$STDCCFLAGS -D_REENTRANT ${PTHREAD_LIBS}" - else - if test ${OSTYPE} = FreeBSD ; then - HAS_PTHREADS=yes -- ENDLDLIBS="$ENDLDLIBS -pthread" -- STDCCFLAGS="$STDCCFLAGS -D_REENTRANT -pthread" -+ ENDLDLIBS="$ENDLDLIBS ${PTHREAD_LIBS}" -+ STDCCFLAGS="$STDCCFLAGS -D_REENTRANT ${PTHREAD_LIBS}" - elif test ${OSTYPE} = FreeBSD ; then - HAS_PTHREADS=yes - ENDLDLIBS="$ENDLDLIBS -pthread" @@ -928,7 +930,7 @@ AC_SUBST(HAS_PLUGINS) diff --git a/devel/py-ice/Makefile b/devel/py-ice/Makefile index c93799e30c9f..aa6b62d10e63 100644 --- a/devel/py-ice/Makefile +++ b/devel/py-ice/Makefile @@ -34,7 +34,7 @@ TESTS_DESC= Run tests .include <bsd.port.options.mk> -CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT ${PTHREAD_CFLAGS} +CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT .if empty(PORT_OPTIONS:MDEBUG) CFLAGS+= -DNDEBUG .endif @@ -52,8 +52,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; \ diff --git a/devel/py-ice/files/Make.rules.FreeBSD b/devel/py-ice/files/Make.rules.FreeBSD index 00b9543ba1cf..03ca1908b79b 100644 --- a/devel/py-ice/files/Make.rules.FreeBSD +++ b/devel/py-ice/files/Make.rules.FreeBSD @@ -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 diff --git a/devel/py-omniorb/Makefile b/devel/py-omniorb/Makefile index 7abb6c0bb8da..0e205afab3ef 100644 --- a/devel/py-omniorb/Makefile +++ b/devel/py-omniorb/Makefile @@ -46,10 +46,6 @@ pre-configure: @${MKDIR} ${CONFIGURE_WRKSRC} @cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC} -post-patch: - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#' \ - ${WRKSRC}/mk/beforeauto.mk.in - pre-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/html diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile index c11841eb56cb..c54a411af6ab 100644 --- a/devel/py-orbit/Makefile +++ b/devel/py-orbit/Makefile @@ -26,6 +26,5 @@ USE_GNOME= gnomehack orbit2 USE_PYTHON= yes GNU_CONFIGURE= yes ORBIT_CONFIG= ${LOCALBASE}/bin/orbit2-config -LDFLAGS+= ${PTHREAD_LIBS} .include <bsd.port.mk> diff --git a/devel/qmake/Makefile b/devel/qmake/Makefile index 5200942e59d7..efd85e021b16 100644 --- a/devel/qmake/Makefile +++ b/devel/qmake/Makefile @@ -47,8 +47,6 @@ post-patch: -e 's|/usr/local|${LOCALBASE}|' \ -e 's|/usr/X11R6|${LOCALBASE}|' \ -e 's|release|release thread|' \ - -e 's|-pthread -D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \ - -e 's|-pthread|${PTHREAD_LIBS}|' \ ${WRKSRC}/../mkspecs/freebsd-g++/qmake.conf @${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile index 5187da05e7f2..fc6b9858b794 100644 --- a/devel/qmake4/Makefile +++ b/devel/qmake4/Makefile @@ -42,8 +42,6 @@ post-patch: -e 's|/usr/local|${LOCALBASE}|' \ -e 's|/usr/X11R6|${LOCALBASE}|' \ -e 's|release|release thread|' \ - -e 's|-pthread -D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \ - -e 's|-pthread|${PTHREAD_LIBS}|' \ -e 's|uic|uic-qt4|' \ -e 's|moc|moc-qt4|' \ ${WRKSRC}/../mkspecs/freebsd-*/qmake.conf diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile index 93969737d947..5665e9812271 100644 --- a/devel/ruby-subversion/Makefile +++ b/devel/ruby-subversion/Makefile @@ -17,8 +17,6 @@ MASTERDIR= ${.CURDIR}/../../devel/subversion .endif PKGDIR= ${.CURDIR} -CONFIGURE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS} - USE_RUBY= yes SVN_BUILD_BINDINGS=yes diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile index 3b109d1d9784..5abe10d3a4fe 100644 --- a/devel/rudiments/Makefile +++ b/devel/rudiments/Makefile @@ -16,8 +16,6 @@ OPTIONS_DEFINE= DOCS USE_OPENSSL= yes USE_PKGCONFIG= build USE_AUTOTOOLS= libtool -CONFIGURE_ENV= PTHREADINCLUDES="${PTHREAD_CFLAGS}" \ - PTHREADLIB="${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-ssl-includes=-I${OPENSSLINC} \ --with-ssl-libs=-L${OPENSSLLIB} \ --disable-pcre diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index 0e0235c9ca94..7abf7504af1d 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -25,11 +25,9 @@ GNU_CONFIGURE= yes WANT_GNOME= yes USE_GNOME= gnomehack pkgconfig USE_ICONV= yes -CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - ac_cv_header_libusbhid_h=no +CONFIGURE_ENV= ac_cv_header_libusbhid_h=no -CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--disable-alsa --disable-alsatest diff --git a/devel/sdl12/files/patch-configure b/devel/sdl12/files/patch-configure deleted file mode 100644 index c775fefec62f..000000000000 --- a/devel/sdl12/files/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.orig 2010-01-02 16:59:06.000000000 +0100 -+++ configure 2010-01-02 17:00:02.000000000 +0100 -@@ -27369,8 +27369,8 @@ - # pthread_cflags="-D_REENTRANT -D_THREAD_SAFE" - ;; - *-*-freebsd*|*-*-dragonfly*) -- pthread_cflags="-D_REENTRANT -D_THREAD_SAFE" -- pthread_lib="-pthread" -+ pthread_cflags="-D_REENTRANT ${PTHREAD_CFLAGS}" -+ pthread_lib="${PTHREAD_LIBS}" - ;; - *-*-netbsd*) - pthread_cflags="-D_REENTRANT -D_THREAD_SAFE" diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile index 3c761cbe7163..42f1633c9ef6 100644 --- a/devel/sfml/Makefile +++ b/devel/sfml/Makefile @@ -25,6 +25,7 @@ USE_OPENAL= al USE_XORG= x11 xrandr USE_GL= gl glu USE_LDCONFIG= yes +USE_DOS2UNIX= Makefile MAKE_JOBS_SAFE= yes WRKSRC= ${WRKDIR}/SFML-${PORTVERSION} diff --git a/devel/sfml/files/patch-src-SFML-Audio-Makefile b/devel/sfml/files/patch-src-SFML-Audio-Makefile index f582c5fdcb51..7b5aa5389369 100644 --- a/devel/sfml/files/patch-src-SFML-Audio-Makefile +++ b/devel/sfml/files/patch-src-SFML-Audio-Makefile @@ -1,19 +1,19 @@ ---- src/SFML/Audio/Makefile.orig 2009-05-28 19:57:04.000000000 +0400 -+++ src/SFML/Audio/Makefile 2009-07-07 19:51:57.000000000 +0400 +--- src/SFML/Audio/Makefile.orig 2010-01-27 15:00:19.000000000 +0100 ++++ src/SFML/Audio/Makefile 2013-02-14 09:39:53.000000000 +0100 @@ -19,13 +19,13 @@ - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS)
-
- libsfml-audio.so: $(OBJ) $(OBJVORBIS)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal
-+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal
-
- $(OBJ): %.o: %.cpp
-- $(CPP) -o $@ -c $< $(CFLAGS)
-+ $(CXX) -o $@ -c $< $(CXXFLAGS)
-
- $(OBJVORBIS): %.o: %.c
-- $(CC) -o $@ -c $< $(CFLAGSEXT)
-+ $(CC) -o $@ -c $< $(CFLAGS)
-
- .PHONY: clean mrproper
-
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS) + + libsfml-audio.so: $(OBJ) $(OBJVORBIS) +- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal ++ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal + + $(OBJ): %.o: %.cpp +- $(CPP) -o $@ -c $< $(CFLAGS) ++ $(CXX) -o $@ -c $< $(CXXFLAGS) + + $(OBJVORBIS): %.o: %.c +- $(CC) -o $@ -c $< $(CFLAGSEXT) ++ $(CC) -o $@ -c $< $(CFLAGS) + + .PHONY: clean mrproper + diff --git a/devel/sfml/files/patch-src-SFML-Graphics-Makefile b/devel/sfml/files/patch-src-SFML-Graphics-Makefile index 40a80caa6645..69fcc9e6bc53 100644 --- a/devel/sfml/files/patch-src-SFML-Graphics-Makefile +++ b/devel/sfml/files/patch-src-SFML-Graphics-Makefile @@ -1,21 +1,21 @@ --- src/SFML/Graphics/Makefile.orig 2010-01-27 17:00:05.000000000 +0300 +++ src/SFML/Graphics/Makefile 2010-08-25 07:07:23.000000000 +0400 @@ -26,14 +26,14 @@ - libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-
--libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
-+libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJSOIL)
-+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJSOIL) -lfreetype -lX11 -lGL -lpng -ljpeg -lz
-
- $(OBJ): %.o: %.cpp
-- $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-+ $(CXX) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-
- $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
-- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
-+ $(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG
-
- .PHONY: clean mrproper
-
+ libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) + $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) + +-libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) +- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL ++libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJSOIL) ++ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJSOIL) -lfreetype -lX11 -lGL -lpng -ljpeg -lz + + $(OBJ): %.o: %.cpp +- $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2 ++ $(CXX) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2 + + $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c +- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG ++ $(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG + + .PHONY: clean mrproper + diff --git a/devel/sfml/files/patch-src-SFML-Makefile b/devel/sfml/files/patch-src-SFML-Makefile index 3c765402c3ce..fff2516c153d 100644 --- a/devel/sfml/files/patch-src-SFML-Makefile +++ b/devel/sfml/files/patch-src-SFML-Makefile @@ -1,40 +1,40 @@ --- src/SFML/Makefile.orig 2010-01-27 17:00:37.000000000 +0300 +++ src/SFML/Makefile 2010-08-25 07:08:45.000000000 +0400 @@ -4,7 +4,7 @@ - ifeq ($(DEBUGBUILD), yes)
- DEBUGFLAGS = -g -DDEBUG
- else
-- DEBUGFLAGS = -O2 -DNDEBUG
-+ DEBUGFLAGS =
- endif
-
- ifeq ($(STATIC), no)
+ ifeq ($(DEBUGBUILD), yes) + DEBUGFLAGS = -g -DDEBUG + else +- DEBUGFLAGS = -O2 -DNDEBUG ++ DEBUGFLAGS = + endif + + ifeq ($(STATIC), no) @@ -15,11 +15,11 @@ - LINKFLAGS =
- endif
-
--export CC = gcc
--export CPP = g++
--export CFLAGS = -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS)
--export CFLAGSEXT = -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS)
--export LDFLAGS = $(LINKFLAGS)
-+export CC ?= gcc
-+export CXX ?= g++
-+export CFLAGS += -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS) -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
-+export CXXFLAGS += -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS) -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
-+export LDFLAGS = -L${LOCALBASE}/lib $(LINKFLAGS)
- export LIBPATH = ../../../lib
- export VERSION = 1.6
- export CP = cp
+ LINKFLAGS = + endif + +-export CC = gcc +-export CPP = g++ +-export CFLAGS = -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS) +-export CFLAGSEXT = -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS) +-export LDFLAGS = $(LINKFLAGS) ++export CC ?= gcc ++export CXX ?= g++ ++export CFLAGS += -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS) -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 ++export CXXFLAGS += -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS) -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 ++export LDFLAGS = -L${LOCALBASE}/lib $(LINKFLAGS) + export LIBPATH = ../../../lib + export VERSION = 1.6 + export CP = cp @@ -27,9 +27,9 @@ - export LNFLAGS = -s -f
- export AR = ar
- export ARFLAGS = rcs
--export DESTDIR = /usr/local
-+export DESTDIR = ${PREFIX}
- export DESTLIBDIR = $(DESTDIR)/lib
--export DESTINCDIR = $(DESTDIR)/include
-+export DESTINCDIR = $(DESTDIR)/include/SFML
-
- all: sfml-system sfml-window sfml-network sfml-graphics sfml-audio
-
+ export LNFLAGS = -s -f + export AR = ar + export ARFLAGS = rcs +-export DESTDIR = /usr/local ++export DESTDIR = ${PREFIX} + export DESTLIBDIR = $(DESTDIR)/lib +-export DESTINCDIR = $(DESTDIR)/include ++export DESTINCDIR = $(DESTDIR)/include/SFML + + all: sfml-system sfml-window sfml-network sfml-graphics sfml-audio + diff --git a/devel/sfml/files/patch-src-SFML-Network-Makefile b/devel/sfml/files/patch-src-SFML-Network-Makefile index 17e30d21b567..041b37b664f4 100644 --- a/devel/sfml/files/patch-src-SFML-Network-Makefile +++ b/devel/sfml/files/patch-src-SFML-Network-Makefile @@ -1,15 +1,15 @@ --- src/SFML/Network/Makefile.orig 2009-05-28 19:57:08.000000000 +0400 +++ src/SFML/Network/Makefile 2009-07-07 20:01:13.000000000 +0400 @@ -17,10 +17,10 @@ - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
-
- libsfml-network.so: $(OBJ)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
-+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
-
- $(OBJ): %.o: %.cpp
-- $(CPP) -o $@ -c $< $(CFLAGS)
-+ $(CXX) -o $@ -c $< $(CXXFLAGS)
-
- .PHONY: clean mrproper
-
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) + + libsfml-network.so: $(OBJ) +- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) ++ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) + + $(OBJ): %.o: %.cpp +- $(CPP) -o $@ -c $< $(CFLAGS) ++ $(CXX) -o $@ -c $< $(CXXFLAGS) + + .PHONY: clean mrproper + diff --git a/devel/sfml/files/patch-src-SFML-System-Makefile b/devel/sfml/files/patch-src-SFML-System-Makefile index 6f05acbccc1f..ab836bf9d993 100644 --- a/devel/sfml/files/patch-src-SFML-System-Makefile +++ b/devel/sfml/files/patch-src-SFML-System-Makefile @@ -1,15 +1,15 @@ ---- src/SFML/System/Makefile.orig 2009-05-28 19:57:04.000000000 +0400 -+++ src/SFML/System/Makefile 2009-07-07 19:51:23.000000000 +0400 +--- src/SFML/System/Makefile.orig 2013-02-08 16:07:21.000000000 +0100 ++++ src/SFML/System/Makefile 2013-02-08 16:07:57.000000000 +0100 @@ -17,10 +17,10 @@ - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
-
- libsfml-system.so: $(OBJ)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lpthread
-+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) ${PTHREAD_LIBS}
-
- $(OBJ): %.o: %.cpp
-- $(CPP) -o $@ -c $< $(CFLAGS)
-+ $(CXX) -o $@ -c $< $(CXXFLAGS)
-
- .PHONY: clean mrproper
-
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) + + libsfml-system.so: $(OBJ) +- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lpthread ++ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -pthread + + $(OBJ): %.o: %.cpp +- $(CPP) -o $@ -c $< $(CFLAGS) ++ $(CXX) -o $@ -c $< $(CXXFLAGS) + + .PHONY: clean mrproper + diff --git a/devel/sfml/files/patch-src-SFML-Window-Makefile b/devel/sfml/files/patch-src-SFML-Window-Makefile index f3b76a19cbfb..7b95a5cc1319 100644 --- a/devel/sfml/files/patch-src-SFML-Window-Makefile +++ b/devel/sfml/files/patch-src-SFML-Window-Makefile @@ -1,15 +1,15 @@ --- src/SFML/Window/Makefile.orig 2009-05-28 19:57:08.000000000 +0400 +++ src/SFML/Window/Makefile 2009-07-07 19:51:46.000000000 +0400 @@ -18,10 +18,10 @@ - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
-
- libsfml-window.so: $(OBJ)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL
-+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL
-
- $(OBJ): %.o: %.cpp
-- $(CPP) -o $@ -c $< $(CFLAGS)
-+ $(CXX) -o $@ -c $< $(CXXFLAGS)
-
- .PHONY: clean mrproper
-
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) + + libsfml-window.so: $(OBJ) +- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL ++ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL + + $(OBJ): %.o: %.cpp +- $(CPP) -o $@ -c $< $(CFLAGS) ++ $(CXX) -o $@ -c $< $(CXXFLAGS) + + .PHONY: clean mrproper + diff --git a/devel/silc-toolkit/Makefile b/devel/silc-toolkit/Makefile index 24881bb9db30..2e75e632d003 100644 --- a/devel/silc-toolkit/Makefile +++ b/devel/silc-toolkit/Makefile @@ -45,8 +45,6 @@ PLIST_SUB+= PORTDOCS="@comment " .ifndef(WITH_PTHREADS) CONFIGURE_ARGS+= --without-pthreads -.else -CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} .endif pre-everything:: diff --git a/devel/stfl/Makefile b/devel/stfl/Makefile index fd06f1ea661c..78e7c1076c88 100644 --- a/devel/stfl/Makefile +++ b/devel/stfl/Makefile @@ -32,7 +32,7 @@ MAKE_ENV= LDLIBS="${LDLIBS}" post-patch: @${REINPLACE_CMD} -e 's|\.a|.so|g;/ranlib/d;\ - s|ar qc|$${CC} $${CFLAGS} ${PTHREAD_LIBS} $${LDLIBS} -shared -fPIC -o|;\ + s|ar qc|$${CC} $${CFLAGS} $${LDLIBS} -pthread -shared -fPIC -o|;\ s|sed -r|sed -E|;s|-Os||;/gcc/d;/-MM/s|-I.|$${CFLAGS}|'\ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|alloca.h|stdlib.h|' ${WRKSRC}/widgets/*.c diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile index ba0b60c7b606..ee5478b9b6b0 100644 --- a/devel/stlport/Makefile +++ b/devel/stlport/Makefile @@ -21,11 +21,11 @@ USE_BZIP2= yes WRKSRC= ${WRKDIR}/STLport-${PORTVERSION:S/.b/b/}/build/lib PATCH_WRKSRC= ${WRKDIR}/STLport-${PORTVERSION:S/.b/b/} USE_GMAKE= yes +USE_GCC= any COMPILER?= gcc MAKEFILE= ${COMPILER}.mak ALL_TARGET= install -MAKE_ARGS+= INSTALLDIR=${PREFIX} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} +MAKE_ARGS+= INSTALLDIR=${PREFIX} PLIST_SUB+= COMPILER=${COMPILER} VER=${PORTVERSION} V2=${PORTVERSION:R} \ V1=${PORTVERSION:R:R} diff --git a/devel/styx/Makefile b/devel/styx/Makefile index 3cef89d5150b..0a05a86ca36f 100644 --- a/devel/styx/Makefile +++ b/devel/styx/Makefile @@ -19,8 +19,8 @@ USE_AUTOTOOLS= libtool USE_ICONV= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -liconv CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME} USE_LDCONFIG= yes diff --git a/devel/styx/files/patch-libbase::sysbase1.c b/devel/styx/files/patch-libbase::sysbase1.c index 0de3821dfb13..098fb470d1ce 100644 --- a/devel/styx/files/patch-libbase::sysbase1.c +++ b/devel/styx/files/patch-libbase::sysbase1.c @@ -1,6 +1,15 @@ ---- libbase/sysbase1.c.orig Sun Feb 25 22:36:20 2001 -+++ libbase/sysbase1.c Tue Apr 17 01:25:49 2001 -@@ -526,7 +526,7 @@ +--- libbase/sysbase1.c.orig 2003-12-09 16:37:07.000000000 +0100 ++++ libbase/sysbase1.c 2013-02-08 15:35:31.000000000 +0100 +@@ -521,7 +521,7 @@ + } + + #else +-#if !defined( MSDOS ) && defined ( __GNUC__ ) && #cpu (i386) ++#if !defined( MSDOS ) && defined ( __GNUC__ ) && defined(__i386__) + #define PUSH_FUN_ARG(arg) __asm__ volatile ( "pushl %0" : : "r" (arg) ) + #define CALL_FUN(f) __asm__ volatile ( "call *%0" : : "r" (f) ) + +@@ -550,7 +550,7 @@ #define DL_LOAD_LAZY 0 /*DOC_INTERFACE*/ @@ -9,7 +18,7 @@ #define DL_LAZY RTLD_LAZY #define DL_NOW RTLD_NOW #define DL_BINDING_MASK RTLD_BINDING_MASK -@@ -570,7 +570,7 @@ +@@ -594,7 +594,7 @@ } #else diff --git a/devel/subcommander/Makefile b/devel/subcommander/Makefile index 8450a5e62ae9..916ff4fafff5 100644 --- a/devel/subcommander/Makefile +++ b/devel/subcommander/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ARGS+=--with-boost=${LOCALBASE} --with-neon=${LOCALBASE} \ --with-subversion=${LOCALBASE} CONFIGURE_ENV= QTDIR=${LOCALBASE} CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib -pthread NO_LATEST_LINK= yes diff --git a/devel/subversion16/files/patch-configure b/devel/subversion16/files/patch-configure index a6615fd633e9..6520191e8a06 100644 --- a/devel/subversion16/files/patch-configure +++ b/devel/subversion16/files/patch-configure @@ -42,15 +42,3 @@ ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -23801,7 +23801,10 @@ - - - if test "$RUBY" != "none"; then -- if "$RUBY" -r mkmf -e 'exit(have_func("rb_hash_foreach") ? 0 : 1)'; then -+ if [ -z "$PTHREAD_LIBS" ]; then -+ PTHREAD_LIBS=-pthread -+ fi -+ if "$RUBY" -r mkmf -e 'with_ldflags("'"$PTHREAD_LIBS"'") { exit(have_func("rb_hash_foreach") ? 0 : 1) }'; then - # Extract the first word of "rdoc", so it can be a program name with args. - set dummy rdoc; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff --git a/devel/tinyq/Makefile b/devel/tinyq/Makefile index ffd896f6bdf5..5b2171e6b39d 100644 --- a/devel/tinyq/Makefile +++ b/devel/tinyq/Makefile @@ -26,8 +26,6 @@ post-patch: -e 's|/usr/local|${LOCALBASE}|' \ -e 's|/usr/X11R6|${LOCALBASE}|' \ -e 's|release|release thread|' \ - -e 's|-pthread -D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \ - -e 's|-pthread|${PTHREAD_LIBS}|' \ ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf .include <bsd.port.mk> diff --git a/devel/upnp/Makefile b/devel/upnp/Makefile index e7f7c0c913ae..7fd880eba5a9 100644 --- a/devel/upnp/Makefile +++ b/devel/upnp/Makefile @@ -19,8 +19,6 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes -CONFIGURE_ENV+= PTHREAD_LIBS="-pthread" - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} diff --git a/devel/upnp/files/patch-libupnp.pc.in b/devel/upnp/files/patch-libupnp.pc.in index 0fd241de8c4a..6ffa0b0f394a 100644 --- a/devel/upnp/files/patch-libupnp.pc.in +++ b/devel/upnp/files/patch-libupnp.pc.in @@ -5,6 +5,7 @@ Description: Linux SDK for UPnP Devices Version: @VERSION@ -Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml -+Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml @LIBS@ - Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp ++Libs: -pthread -L${libdir} -lupnp -lthreadutil -lixml @LIBS@ +-Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp ++Cflags: -I${includedir}/upnp diff --git a/devel/xxl/Makefile b/devel/xxl/Makefile index 52dd090853ca..e95b8b645a71 100644 --- a/devel/xxl/Makefile +++ b/devel/xxl/Makefile @@ -24,10 +24,7 @@ PORTDOCS= xxl.html xxl.pdf .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MTHREADS} -CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" -.else +.if !${PORT_OPTIONS:MTHREADS} CONFIGURE_ARGS+=--without-threads .endif diff --git a/devel/zmq/Makefile b/devel/zmq/Makefile index 2a61688db1c4..28d54f340be7 100644 --- a/devel/zmq/Makefile +++ b/devel/zmq/Makefile @@ -52,6 +52,6 @@ MAN7= zmq.7 \ zmq_tcp.7 post-patch: - ${REINPLACE_CMD} -e '9s|$$| ${PTHREAD_LIBS}|' ${WRKSRC}/src/libzmq.pc.in + ${REINPLACE_CMD} -e '9s|$$| -pthread|' ${WRKSRC}/src/libzmq.pc.in .include <bsd.port.mk> |