Date: Tue, 24 Mar 2015 18:19:24 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382150 - in head: ftp/axel ftp/oftpd ftp/pavuk ftp/pftpd ftp/quftp net-im/freetalk net-im/libpurple net-im/licq net-im/pidgin-skype net-im/telepathy-salut net-mgmt/aircrack-ng net-mgmt... Message-ID: <201503241819.t2OIJOnq015388@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Mar 24 18:19:23 2015 New Revision: 382150 URL: https://svnweb.freebsd.org/changeset/ports/382150 QAT: https://qat.redports.org/buildarchive/r382150/ Log: 4 ports categories: Remove $PTHREAD_LIBS Categories: www, ftp, net-im, net-mgmt approved by: PTHREAD blanket Modified: head/ftp/axel/Makefile head/ftp/oftpd/Makefile head/ftp/pavuk/Makefile head/ftp/pftpd/Makefile head/ftp/quftp/Makefile head/net-im/freetalk/Makefile head/net-im/libpurple/Makefile head/net-im/licq/Makefile head/net-im/pidgin-skype/Makefile head/net-im/telepathy-salut/Makefile head/net-mgmt/aircrack-ng/Makefile head/net-mgmt/driftnet/Makefile head/net-mgmt/driftnet/files/patch-Makefile head/net-mgmt/fprobe/Makefile head/net-mgmt/iftop/Makefile head/net-mgmt/ipcad/Makefile head/www/epiphany/Makefile head/www/nginx-devel/Makefile head/www/nginx/Makefile head/www/rubygem-passenger/Makefile Modified: head/ftp/axel/Makefile ============================================================================== --- head/ftp/axel/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/ftp/axel/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -25,7 +25,6 @@ NLS_CONFIGURE_OFF= --i18n=0 DEBUG_CONFIGURE_ON=--debug=1 --strip=0 post-configure: - @${REINPLACE_CMD} -e 's|gcc|${CC}|; \ - s|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/Makefile.settings + @${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/Makefile.settings .include <bsd.port.mk> Modified: head/ftp/oftpd/Makefile ============================================================================== --- head/ftp/oftpd/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/ftp/oftpd/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -20,8 +20,7 @@ PLIST_FILES= sbin/oftpd man/man8/oftpd.8 OPTIONS_DEFINE= DOCS post-patch: - ${REINPLACE_CMD} -e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g ; \ - s|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + ${REINPLACE_CMD} -e 's|-D_THREAD_SAFE||g' ${WRKSRC}/configure .if defined(MAX_NUM_CLIENTS) ${REINPLACE_CMD} -e 's|MAX_NUM_CLIENTS 300|MAX_NUM_CLIENTS ${MAX_NUM_CLIENTS}|g' ${WRKSRC}/src/oftpd.h .endif Modified: head/ftp/pavuk/Makefile ============================================================================== --- head/ftp/pavuk/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/ftp/pavuk/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -39,10 +39,6 @@ DANTE_CONFIGURE_ON= --with-socks-include DANTE_LIB_DEPENDS= libsocks.so:${PORTSDIR}/net/dante pre-patch: - @${REINPLACE_CMD} -e \ - 's|-pthread -DHAVE_MT|${PTHREAD_CFLAGS} -DHAVE_MT|g ; \ - s|-pthread|${PTHREAD_LIBS}|g ; \ - s|-lpthreads|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|$$(datadir)/icons|$$(pkgdatadir)/icons|g' Modified: head/ftp/pftpd/Makefile ============================================================================== --- head/ftp/pftpd/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/ftp/pftpd/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -16,10 +16,6 @@ PLIST_FILES= sbin/pftpd \ man/man1/pftpd.1.gz \ man/man1/rpad.1.gz -post-patch: - @${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|-lpthread|${PTHREAD_LIBS}|g' - do-install: (cd ${WRKSRC}/src && ${INSTALL_PROGRAM} pftpd ${STAGEDIR}${PREFIX}/sbin) (cd ${WRKSRC}/doc && ${INSTALL_MAN} *.1 ${STAGEDIR}${MANPREFIX}/man/man1) Modified: head/ftp/quftp/Makefile ============================================================================== --- head/ftp/quftp/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/ftp/quftp/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -15,17 +15,14 @@ LICENSE= GPLv2 USES= ncurses readline GNU_CONFIGURE= yes -CPPFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} - +LDFLAGS+= -lpthread PLIST_FILES= bin/quftp man/man1/quftp.1.gz post-patch: - @${REINPLACE_CMD} -e \ - '/^CFLAGS/s|+=.*|= ${CFLAGS} ${CPPFLAGS}|' \ + @${REINPLACE_CMD} -e '/^CFLAGS/s|+=.*|= ${CFLAGS} ${CPPFLAGS}|' \ ${WRKSRC}/Makefile.in post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/quftp + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/quftp .include <bsd.port.mk> Modified: head/net-im/freetalk/Makefile ============================================================================== --- head/net-im/freetalk/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/net-im/freetalk/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -21,7 +21,7 @@ USES= pkgconfig USE_GNOME= glib20 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -lpthread -L${LOCALBASE}/lib OPTIONS_SUB= yes Modified: head/net-im/libpurple/Makefile ============================================================================== --- head/net-im/libpurple/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/net-im/libpurple/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -317,9 +317,8 @@ pre-everything:: post-patch: @${REINPLACE_CMD} \ - -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \ - -e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} $$LIBDL|-lsilc -lsilcclient ${PTHREAD_LIBS} ${ICONV_LIB}|' \ - ${WRKSRC}/configure + -e 's|-lpthread $$LIBDL|-lpthread ${ICONV_LIB}|' \ + ${WRKSRC}/configure .if defined(PIDGIN_SLAVE) @${FIND} ${BUILD_WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|$$(top_builddir)/libpurple/libpurple.la|-lpurple|' Modified: head/net-im/licq/Makefile ============================================================================== --- head/net-im/licq/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/net-im/licq/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} LICQ_PORT?= net-im/licq # workaround for installed autoconf/automake -LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib ${ICONV_LIB} -Wl,--export-dynamic +LDFLAGS+= -lpthread -L${LOCALBASE}/lib ${ICONV_LIB} -Wl,--export-dynamic CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -Wl,--export-dynamic -DGTEST_USE_OWN_TR1_TUPLE Modified: head/net-im/pidgin-skype/Makefile ============================================================================== --- head/net-im/pidgin-skype/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/net-im/pidgin-skype/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -33,14 +33,14 @@ ${DISTFILES}: upload-tarball: build-tarball scp ${DISTFILES} freefall.freebsd.org:public_distfiles/ -mycflags= -shared -fPIC -DPIC ${PTHREAD_CFLAGS} \ +mycflags= -shared -fPIC -DPIC \ -I${LOCALBASE}/include \ -I${LOCALBASE}/include/libpurple \ -I${LOCALBASE}/include/pidgin \ -I${LOCALBASE}/include/glib-2.0 \ -I${LOCALBASE}/lib/glib-2.0/include \ -DPURPLE_PLUGINS -mylibs= ${PTHREAD_LIBS} +mylibs= -lpthread # DBUS: No DBUS here, does not work with Skype 2.1 beta # NLS: While the build works and enables translations, Modified: head/net-im/telepathy-salut/Makefile ============================================================================== --- head/net-im/telepathy-salut/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/net-im/telepathy-salut/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -21,8 +21,7 @@ USE_GNOME= glib20 libxslt:build USE_OPENSSL= yes USE_SQLITE= 3 CONFIGURE_ARGS= --disable-Werror --enable-avahi-tests=no -CPPFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= -lpthread INSTALL_TARGET= install-strip PLIST_SUB+= VERSION=${PORTVERSION} Modified: head/net-mgmt/aircrack-ng/Makefile ============================================================================== --- head/net-mgmt/aircrack-ng/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/net-mgmt/aircrack-ng/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -50,9 +50,6 @@ post-patch: @${REINPLACE_CMD} \ -E 's/air(driver|mon)-ng\.1 //' \ ${WRKSRC}/manpages/Makefile - @${REINPLACE_CMD} \ - -e 's|-lpthread|${PTHREAD_LIBS}|' \ - ${WRKSRC}/src/Makefile post-install: @${STRIP_CMD} ${BIN_FILES:S,^,${STAGEDIR}${PREFIX}/bin/,} \ Modified: head/net-mgmt/driftnet/Makefile ============================================================================== --- head/net-mgmt/driftnet/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/net-mgmt/driftnet/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -22,8 +22,6 @@ USE_GNOME= gtk12 USES= gmake ALL_TARGET= default -MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" - PLIST_FILES= bin/driftnet man/man1/driftnet.1.gz do-install: Modified: head/net-mgmt/driftnet/files/patch-Makefile ============================================================================== --- head/net-mgmt/driftnet/files/patch-Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/net-mgmt/driftnet/files/patch-Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Jul 9 12:26:41 2002 -+++ Makefile Sat Sep 28 22:19:21 2002 +--- Makefile.orig 2002-07-09 19:26:41 UTC ++++ Makefile @@ -16,23 +16,23 @@ #CC = gcc @@ -19,19 +19,18 @@ +#CFLAGS += -D_BSD_SOURCE # We always need the pcap and pthread libraries. --LDLIBS += -lpcap -lpthread -+LDLIBS += -lpcap ${PTHREAD_LIBS} + LDLIBS += -lpcap -lpthread # Optional C compiler and linker flags. Typical driftnet builds have support # for displaying captured images in an X window, and need the following flags: -CFLAGS += `gtk-config --cflags` -LDLIBS += -ljpeg -lungif `gtk-config --libs` -+CFLAGS += ${PTHREAD_CFLAGS} `${GTK_CONFIG} --cflags` ++CFLAGS += `${GTK_CONFIG} --cflags` +LDLIBS += -ljpeg -lgif `${GTK_CONFIG} --libs` # Alternatively, you can build a version of driftnet which can only be used # in `adjunct' mode as the back end for some other image-processing program. To -@@ -43,7 +43,7 @@ +@@ -43,7 +43,7 @@ LDLIBS += -ljpeg -lungif `gtk-config -- # On systems with a C99 compiler, driftnet will use <stdint.h> for the # definitions of types such as uint8_t. On other systems like Solaris, these # are in <sys/types.h>, and you should uncomment this line. @@ -40,7 +39,7 @@ # On Solaris, it is necessary to link against -lposix4 for the definition of # nanosleep; uncomment the below. -@@ -51,7 +51,7 @@ +@@ -51,7 +51,7 @@ LDLIBS += -ljpeg -lungif `gtk-config -- # added 20020604 edobbs # On BSD systems, may need to use /usr/local/include Modified: head/net-mgmt/fprobe/Makefile ============================================================================== --- head/net-mgmt/fprobe/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/net-mgmt/fprobe/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -19,9 +19,6 @@ PORTDOCS= ChangeLog README OPTIONS_DEFINE= DOCS -post-patch: - ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure - post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ChangeLog README Modified: head/net-mgmt/iftop/Makefile ============================================================================== --- head/net-mgmt/iftop/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/net-mgmt/iftop/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -16,10 +16,6 @@ GNU_CONFIGURE= yes PORTDOCS= README PLIST_FILES= sbin/iftop man/man8/iftop.8.gz -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MANPREFIX}/man/man8 Modified: head/net-mgmt/ipcad/Makefile ============================================================================== --- head/net-mgmt/ipcad/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/net-mgmt/ipcad/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -17,8 +17,8 @@ SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message post-patch: - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \ - s|/usr/local|${PREFIX}|g; s|pthread_detach|pthread_create|g'\ + @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g; \ + s|pthread_detach|pthread_create|g'\ ${WRKSRC}/configure post-install: Modified: head/www/epiphany/Makefile ============================================================================== --- head/www/epiphany/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/www/epiphany/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -51,10 +51,7 @@ PLIST_SUB+= EPHY_VERSION=${PORTVERSION:R CONFIGURE_ARGS+= --enable-compile-warnings=no post-patch: - @${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|-lpthread|${PTHREAD_LIBS}|g' - @${REINPLACE_CMD} -e 's|execinfo.h|#|g ; \ - s|-ldl"$$|"|g' \ + @${REINPLACE_CMD} -e 's|execinfo.h|#|g ; s|-ldl"$$|"|g' \ ${WRKSRC}/configure .include <bsd.port.mk> Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/www/nginx-devel/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -909,9 +909,6 @@ post-patch: s!-leio!!; \ s!-Iext/libeio!!' \ ${WRKDIR}/passenger-${PASSENGER_VERSION}/build/common_library.rb - @${REINPLACE_CMD} \ - 's!-lpthread!${PTHREAD_LIBS}!g' \ - ${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info/cxx_portability.rb .endif .if ${PORT_OPTIONS:MPOSTGRES} @${REINPLACE_CMD} \ Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/www/nginx/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -922,9 +922,6 @@ post-patch: s!-leio!!; \ s!-Iext/libeio!!' \ ${WRKDIR}/passenger-${PASSENGER_VERSION}/build/common_library.rb - @${REINPLACE_CMD} \ - 's!-lpthread!${PTHREAD_LIBS}!g' \ - ${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info/cxx_portability.rb .endif .if ${PORT_OPTIONS:MPOSTGRES} @${REINPLACE_CMD} \ Modified: head/www/rubygem-passenger/Makefile ============================================================================== --- head/www/rubygem-passenger/Makefile Tue Mar 24 18:15:17 2015 (r382149) +++ head/www/rubygem-passenger/Makefile Tue Mar 24 18:19:23 2015 (r382150) @@ -101,9 +101,6 @@ pre-patch: s!/usr/include/libeio!${LOCALBASE}/include!; \ s!-leio!-L${LOCALBASE}/lib -leio!' \ ${WRKSRC}/build/common_library.rb - @${REINPLACE_CMD} \ - 's!-lpthread!${PTHREAD_LIBS}!g' \ - ${WRKSRC}/lib/phusion_passenger/platform_info/cxx_portability.rb post-build: .if ${PORT_OPTIONS:MAPACHE22}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503241819.t2OIJOnq015388>