Date: Wed, 25 Mar 2015 23:51:06 +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: r382278 - in head/net: 3proxy 3proxy/files asterisk asterisk11 asterisk13 cvsync cyphesis freevrrpd honeyd hping-devel iplog kissd linuxigd linuxigd/files mad_fcl mediatomb mgen mgen/fi... Message-ID: <201503252351.t2PNp6Xw084580@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Wed Mar 25 23:51:05 2015 New Revision: 382278 URL: https://svnweb.freebsd.org/changeset/ports/382278 QAT: https://qat.redports.org/buildarchive/r382278/ Log: net category: Remove $PTHREAD_LIBS openafs did not pass check-plist (pre-existing) so fixed and bumped. Also, pkg-plist was sorted. mediatomb and spread also fail plist-checks but they weren't fixed. approved by: PTHREAD blanket Modified: head/net/3proxy/Makefile head/net/3proxy/files/patch-Makefile.unix head/net/asterisk/Makefile head/net/asterisk11/Makefile head/net/asterisk13/Makefile head/net/cvsync/Makefile head/net/cyphesis/Makefile head/net/freevrrpd/Makefile head/net/honeyd/Makefile head/net/hping-devel/Makefile head/net/iplog/Makefile head/net/kissd/Makefile head/net/linuxigd/Makefile head/net/linuxigd/files/patch-Makefile head/net/mad_fcl/Makefile head/net/mediatomb/Makefile head/net/mgen/Makefile head/net/mgen/files/patch-protolib_unix_Makefile.freebsd head/net/mgen/files/patch-unix_Makefile.freebsd head/net/morebalance/Makefile head/net/mpich2/Makefile head/net/openafs/Makefile head/net/openafs/pkg-plist head/net/packetdrill/Makefile head/net/packetdrill/files/Makefile.inc head/net/ptunnel/Makefile head/net/remmina-plugins/bsd.plugin.mk head/net/remmina/Makefile head/net/rtg/Makefile head/net/samba36/Makefile head/net/samba4/Makefile head/net/samba41/Makefile head/net/sixxs-aiccu/Makefile head/net/sl2tps/Makefile head/net/spread/Makefile head/net/throttled/Makefile head/net/trafshow/Makefile head/net/ulxmlrpcpp/Makefile head/net/x11vnc/Makefile head/net/xmlrpc-c-devel/Makefile head/net/xmlrpc-c/Makefile head/net/yaph/Makefile Modified: head/net/3proxy/Makefile ============================================================================== --- head/net/3proxy/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/3proxy/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -18,7 +18,6 @@ CONFLICTS_INSTALL= libproxy-[0-9]* OPTIONS_DEFINE= DOCS -MAKE_ENV= PTHREAD_LIBS=-pthread MAKEFILE= Makefile.unix USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} USE_RC_SUBR= 3proxy Modified: head/net/3proxy/files/patch-Makefile.unix ============================================================================== --- head/net/3proxy/files/patch-Makefile.unix Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/3proxy/files/patch-Makefile.unix Wed Mar 25 23:51:05 2015 (r382278) @@ -9,12 +9,12 @@ # you may need -L/usr/pkg/lib for older NetBSD versions -CFLAGS = -Wall -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL -+CFLAGS = -Wall -c %%CFLAGS%% ${PTHREAD_CFLAGS} -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL ++CFLAGS = -Wall -c %%CFLAGS%% -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL COUT = -o -LN = gcc -LDFLAGS = -Wall -O2 -pthread +LN ?= ${CC} -+LDFLAGS = -Wall ${PTHREAD_LIBS} ++LDFLAGS = -Wall -lpthread # -lpthreads may be reuqired on some platforms instead of -pthreads # -ldl or -lld may be required for some platforms DCFLAGS = -fpic Modified: head/net/asterisk/Makefile ============================================================================== --- head/net/asterisk/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/asterisk/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -34,8 +34,7 @@ SHEBANG_FILES= agi/agi-test.agi \ STRIP= USE_RC_SUBR= asterisk -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ +MAKE_ENV= PTHREAD_LIBS="-lpthread" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ Modified: head/net/asterisk11/Makefile ============================================================================== --- head/net/asterisk11/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/asterisk11/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -28,8 +28,7 @@ USE_GNOME= libxml2 USES= bison cpe gmake CPE_VENDOR= digium USE_RC_SUBR= asterisk -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ +MAKE_ENV= PTHREAD_LIBS="-lpthread" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ Modified: head/net/asterisk13/Makefile ============================================================================== --- head/net/asterisk13/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/asterisk13/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -30,8 +30,7 @@ USE_LDCONFIG= yes USES= bison cpe gmake iconv CPE_VENDOR= digium USE_RC_SUBR= asterisk -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ +MAKE_ENV= PTHREAD_LIBS="-lpthread" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ Modified: head/net/cvsync/Makefile ============================================================================== --- head/net/cvsync/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/cvsync/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -22,8 +22,7 @@ PORTEXAMPLES= cvsync.conf cvsyncd-FreeBS cvsyncd-NetBSD.conf cvsyncd-OpenBSD.conf MAKE_ENV+= DESTDIR="${STAGEDIR}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ + PTHREAD_LIBS="-lpthread" \ INSTALL= \ INSTALL_BIN_OPTS="${INSTALL_PROGRAM}" \ INSTALL_MAN_OPTS="${INSTALL_MAN}" Modified: head/net/cyphesis/Makefile ============================================================================== --- head/net/cyphesis/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/cyphesis/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -43,7 +43,7 @@ post-patch: ${WRKSRC}/data/minimal/Makefile.in \ ${WRKSRC}/data/mars/Makefile.in \ ${WRKSRC}/data/Makefile.in - @${REINPLACE_CMD} -e 's|-lpython|${PTHREAD_LIBS} &|' \ + @${REINPLACE_CMD} -e 's|-lpython|-lpthread &|' \ ${WRKSRC}/configure @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ ${REINPLACE_CMD} -e 's|$$(datadir)/cyphesis|${DATADIR}|g ; \ Modified: head/net/freevrrpd/Makefile ============================================================================== --- head/net/freevrrpd/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/freevrrpd/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -9,15 +9,17 @@ MASTER_SITES= http://opensource.kewego.c DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:DEFAULT,freebsd MAINTAINER= spe@phear.org -COMMENT= This a VRRP RFC2338 Compliant implementation under FreeBSD +COMMENT= VRRP RFC2338 Compliant implementation under FreeBSD -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" +MAKE_ENV= PTHREAD_LIBS="-lpthread" do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/freevrrpd ${STAGEDIR}${PREFIX}/sbin - @${INSTALL_DATA} ${WRKSRC}/freevrrpd.conf.sample ${STAGEDIR}${PREFIX}/etc - @${INSTALL_SCRIPT} ${WRKSRC}/rc.d/freevrrpd ${STAGEDIR}${PREFIX}/etc/rc.d - @${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MANPREFIX}/man/man8 + ${INSTALL_PROGRAM} ${WRKSRC}/freevrrpd ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/freevrrpd.conf.sample \ + ${STAGEDIR}${PREFIX}/etc + ${INSTALL_SCRIPT} ${WRKSRC}/rc.d/freevrrpd \ + ${STAGEDIR}${PREFIX}/etc/rc.d + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 \ + ${STAGEDIR}${MANPREFIX}/man/man8 .include <bsd.port.mk> Modified: head/net/honeyd/Makefile ============================================================================== --- head/net/honeyd/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/honeyd/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -43,7 +43,7 @@ pre-everything:: .endif post-configure: - @${REINPLACE_CMD} -e 's|LIBS = |LIBS = ${PTHREAD_LIBS}|' \ + @${REINPLACE_CMD} -e 's|LIBS = |LIBS = -lpthread|' \ ${WRKSRC}/Makefile # Have to make this directory, the Makefile is stupid and tries to Modified: head/net/hping-devel/Makefile ============================================================================== --- head/net/hping-devel/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/hping-devel/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -29,9 +29,6 @@ PORTEXAMPLES= README apd.htcl apd2.htcl passivets.htcl ping.htcl raw.htcl show-tcpseq.htcl \ showled.htcl -pre-configure: - ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hping3 ${STAGEDIR}${PREFIX}/sbin/hping ${INSTALL_MAN} ${WRKSRC}/docs/hping3.8 ${STAGEDIR}${PREFIX}/man/man8/hping.8 Modified: head/net/iplog/Makefile ============================================================================== --- head/net/iplog/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/iplog/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -12,8 +12,8 @@ COMMENT= TCP/IP traffic logging tool USES= gmake GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib USE_RC_SUBR= iplog Modified: head/net/kissd/Makefile ============================================================================== --- head/net/kissd/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/kissd/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -14,9 +14,7 @@ GNU_CONFIGURE= yes PLIST_FILES= bin/kissd post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e '/^AM_CFLAGS/ s|-Werror|${PTHREAD_CFLAGS}|' \ + @${REINPLACE_CMD} -e '/^AM_CFLAGS/ s|-Werror||' \ ${WRKSRC}/src/Makefile.in .include <bsd.port.mk> Modified: head/net/linuxigd/Makefile ============================================================================== --- head/net/linuxigd/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/linuxigd/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -14,7 +14,6 @@ LIB_DEPENDS= libupnp.so:${PORTSDIR}/deve USE_RC_SUBR= linuxigd USES= gmake -MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} post-extract: @${RM} ${WRKSRC}/iptc.? Modified: head/net/linuxigd/files/patch-Makefile ============================================================================== --- head/net/linuxigd/files/patch-Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/linuxigd/files/patch-Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -9,7 +9,7 @@ -CC=gcc INCLUDES= -I$(LIBUPNP_PREFIX)/include -I../include -LIBS= -lpthread -lupnp -lixml -lthreadutil -L$(LIBUPNP_PREFIX)/lib -L../libs -+LIBS= $(PTHREAD_LIBS) -lupnp -lixml -lthreadutil -L$(LIBUPNP_PREFIX)/lib -L../libs ++LIBS= -lpthread -lupnp -lixml -lthreadutil -L$(LIBUPNP_PREFIX)/lib -L../libs FILES= main.o gatedevice.o pmlist.o util.o config.o CFLAGS += -Wall -g -O2 Modified: head/net/mad_fcl/Makefile ============================================================================== --- head/net/mad_fcl/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/mad_fcl/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -16,8 +16,6 @@ LIB_DEPENDS= libexpat.so:${PORTSDIR}/tex USES= gmake USE_OPENSSL= yes -CFLAGS+= ${PTHREAD_CFLAGS} - DOC_FILES= fdt-example.xml flute-sdp-example.sdp PORTDOCS= ${DOC_FILES} README.TXT @@ -34,8 +32,6 @@ pre-patch: ${CAT} $$f.noms > $$f && ${RM} $$f.noms; done post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/flute/Makefile @${FIND} ${WRKSRC} -name Makefile | ${XARGS} \ ${REINPLACE_CMD} -e 's|gcc|${CC}|' Modified: head/net/mediatomb/Makefile ============================================================================== --- head/net/mediatomb/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/mediatomb/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -13,12 +13,10 @@ COMMENT= UPnP AV MediaServer LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 GNU_CONFIGURE= yes -LDFLAGS+= ${PTHREAD_LIBS} -CFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= -lpthread CONFIGURE_ARGS= --with-search="${LOCALBASE}" \ --disable-inotify -CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" +CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" USES= iconv USE_RC_SUBR= mediatomb Modified: head/net/mgen/Makefile ============================================================================== --- head/net/mgen/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/mgen/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -26,12 +26,8 @@ PORTDOCS= README.TXT VERSION.TXT mgen.ht OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/unix/Makefile.common \ - ${WRKSRC}/protolib/unix/Makefile.common - - @${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g; \ - s|g++|${CXX}|; s|gcc|${CC}|; /CFLAGS =/s|$$|${CFLAGS}|' \ + @${REINPLACE_CMD} -e 's|g++|${CXX}|; s|gcc|${CC}|; \ + /CFLAGS =/s|$$|${CFLAGS}|' \ ${WRKSRC}/unix/Makefile.freebsd \ ${WRKSRC}/protolib/unix/Makefile.freebsd Modified: head/net/mgen/files/patch-protolib_unix_Makefile.freebsd ============================================================================== --- head/net/mgen/files/patch-protolib_unix_Makefile.freebsd Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/mgen/files/patch-protolib_unix_Makefile.freebsd Wed Mar 25 23:51:05 2015 (r382278) @@ -5,7 +5,7 @@ # (Where to find X11 libraries, etc) # -SYSTEM_INCLUDES = -+SYSTEM_INCLUDES = %%PTHREAD_CFLAGS%% ++SYSTEM_INCLUDES = SYSTEM_LDFLAGS = -SYSTEM_LIBS = -lc_r +SYSTEM_LIBS = Modified: head/net/mgen/files/patch-unix_Makefile.freebsd ============================================================================== --- head/net/mgen/files/patch-unix_Makefile.freebsd Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/mgen/files/patch-unix_Makefile.freebsd Wed Mar 25 23:51:05 2015 (r382278) @@ -5,7 +5,7 @@ # (Where to find X11 libraries, etc) # -SYSTEM_INCLUDES = -+SYSTEM_INCLUDES = %%PTHREAD_CFLAGS%% ++SYSTEM_INCLUDES = SYSTEM_LDFLAGS = -SYSTEM_LIBS = -lc_r +SYSTEM_LIBS = Modified: head/net/morebalance/Makefile ============================================================================== --- head/net/morebalance/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/morebalance/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -14,11 +14,11 @@ LIB_DEPENDS= libpcre.so:${PORTSDIR}/deve libgnutls.so:${PORTSDIR}/security/gnutls \ libggz.so:${PORTSDIR}/games/libggz -CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include MAKE_ARGS+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" USES= gettext -LDFLAGS+= -lz ${PTHREAD_LIBS} +LDFLAGS+= -lz -lpthread LDFLAGS+= -L${LOCALBASE}/lib -lpcre -lggz -lgnutls -lintl do-install: Modified: head/net/mpich2/Makefile ============================================================================== --- head/net/mpich2/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/mpich2/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -43,15 +43,15 @@ CONFIGURE_ARGS= --enable-romio --enable- --with-python="${PYTHON_CMD}" CONFIGURE_ENV= FCFLAGS="${FFLAGS}" \ MPI_CFLAGS="-I${LOCALBASE}/include" \ - PACKAGE=${PORTNAME} \ - PTHREAD_LIBS="${PTHREAD_LIBS}" + PACKAGE="${PORTNAME}" \ + PTHREAD_LIBS="-lpthread" CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include .if ${FFLAGS} == "-O" FFLAGS= -O2 .endif -LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo ${PTHREAD_LIBS} +LDFLAGS+= -lpthread -L${LOCALBASE}/lib -lexecinfo MAKE_ENV= CCACHE_DISABLE=yes PACKAGE=${PORTNAME} NOCCACHE= yes @@ -133,7 +133,6 @@ PLIST_SUB+= X11=${PLX11} .include <bsd.port.pre.mk> pre-configure: - ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${THREAD2FIX:S|^|${WRKSRC}/|} ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${LOCALBASE2FIX:S|^|${WRKSRC}/|} ${FIND} ${WRKSRC} -name configure | ${XARGS} \ ${REINPLACE_CMD} -e 's|doc/$${PACKAGE}|doc/${PORTNAME}|' Modified: head/net/openafs/Makefile ============================================================================== --- head/net/openafs/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/openafs/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= openafs +PORTREVISION= 1 DISTVERSION= ${AFS_DISTVERSION}.${DBVERSION:S/-//g} CATEGORIES= net MASTER_SITES= http://dl.central.org/dl/openafs/${AFS_DISTVERSION}/:openafs \ @@ -29,7 +30,7 @@ USE_LDCONFIG= yes HAS_CONFIGURE= yes CONFIGURE_ENV= _XCFLAGS="${CFLAGS} -fPIC" \ _PAM_CFLAGS="${CFLAGS} -fPIC" \ - _MT_LIBS="${PTHREAD_LIBS}" + _MT_LIBS="-lpthread" CONFIGURE_ARGS= --prefix=${PREFIX} \ --localstatedir=/var \ --mandir=${MANPREFIX}/man \ Modified: head/net/openafs/pkg-plist ============================================================================== --- head/net/openafs/pkg-plist Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/openafs/pkg-plist Wed Mar 25 23:51:05 2015 (r382278) @@ -1,112 +1,74 @@ -bin/rxgen -bin/sys -bin/pagsh.krb -bin/udebug +bin/afs_compile_et +bin/afsio +bin/afsmonitor +bin/aklog +bin/asetkey +bin/bos +bin/cmdebug +bin/fs +bin/klog.krb5 +bin/livesys bin/pagsh +bin/pagsh.krb bin/pts -bin/tokens.krb +bin/restorevol +bin/rxgen bin/scout -bin/xstat_cm_test -bin/bos -bin/unlog +bin/sys bin/tokens -bin/livesys +bin/tokens.krb +bin/translate_et +bin/udebug +bin/unlog bin/up -bin/fs +bin/xstat_cm_test bin/xstat_fs_test -bin/afsmonitor -bin/cmdebug -bin/translate_et -bin/afs_compile_et -bin/restorevol -bin/klog.krb5 -bin/asetkey -bin/aklog -bin/afsio -include/openafs/afs/param.h -include/openafs/afs/stds.h -include/openafs/afs/afs_sysnames.h +@sample etc/openafs/CellServDB.sample +@sample etc/openafs/ThisCell.sample +@sample etc/openafs/cacheinfo.sample +include/openafs/afs/acl.h +include/openafs/afs/afs.h include/openafs/afs/afs_args.h -include/openafs/afs/icl.h -include/openafs/afs/venus.h -include/openafs/afs/pthread_nosigs.h -include/openafs/afs/procmgmt.h -include/openafs/afs/dirpath.h -include/openafs/afs/fileutil.h -include/openafs/afs/netutils.h -include/openafs/afs/errors.h -include/openafs/afs/vice.h -include/openafs/afs/remote.h -include/openafs/afs/ktime.h -include/openafs/afs/afsutil_prototypes.h -include/openafs/afs/packages.h -include/openafs/afs/afsutil.h -include/openafs/afs/pthread_glock.h -include/openafs/afs/cmd.h +include/openafs/afs/afs_assert.h include/openafs/afs/afs_atomlist.h +include/openafs/afs/afs_consts.h include/openafs/afs/afs_lhash.h -include/openafs/afs/softsig.h -include/openafs/afs/com_err.h -include/openafs/afs/error_table.h -include/openafs/afs/mit-sipb-cr.h -include/openafs/afs/afs.h -include/openafs/afs/afscp.h -include/openafs/afs/osi_inode.h include/openafs/afs/afs_stats.h -include/openafs/afs/exporter.h -include/openafs/afs/nfsclient.h -include/openafs/afs/unified_afs.h -include/openafs/afs/sysctl.h -include/openafs/afs/rxgen_consts.h -include/openafs/afs/afsint.h +include/openafs/afs/afs_sysnames.h +include/openafs/afs/afs_trace.h include/openafs/afs/afscbint.h +include/openafs/afs/afscp.h +include/openafs/afs/afsint.h include/openafs/afs/afssyscalls.h -include/openafs/afs/xfsattrs.h +include/openafs/afs/afsutil.h +include/openafs/afs/afsutil_prototypes.h include/openafs/afs/audit.h -include/openafs/afs/keys.h -include/openafs/afs/cellconfig.h include/openafs/afs/auth.h -include/openafs/afs/ktc.h -include/openafs/afs/prclient.h -include/openafs/afs/prerror.h -include/openafs/afs/print.h -include/openafs/afs/prserver.h -include/openafs/afs/ptclient.h -include/openafs/afs/ptuser.h -include/openafs/afs/pterror.h -include/openafs/afs/ptint.h -include/openafs/afs/ptserver.h -include/openafs/afs/acl.h -include/openafs/afs/prs_fs.h +include/openafs/afs/bnode.h +include/openafs/afs/bosint.h +include/openafs/afs/bubasics.h +include/openafs/afs/budb.h +include/openafs/afs/budb_client.h +include/openafs/afs/budb_errs.h include/openafs/afs/bumon.h include/openafs/afs/butc.h -include/openafs/afs/bubasics.h -include/openafs/afs/tcdata.h include/openafs/afs/butm.h include/openafs/afs/butx.h -include/openafs/afs/usd.h -include/openafs/afs/dir.h -include/openafs/afs/nfs.h -include/openafs/afs/vnode.h -include/openafs/afs/viceinode.h -include/openafs/afs/volume.h -include/openafs/afs/voldefs.h -include/openafs/afs/partition.h -include/openafs/afs/fssync.h -include/openafs/afs/ihandle.h -include/openafs/afs/namei_ops.h -include/openafs/afs/vl_opcodes.h -include/openafs/afs/vlserver.h -include/openafs/afs/vldbint.h +include/openafs/afs/cellconfig.h +include/openafs/afs/cmd.h include/openafs/afs/cnvldb.h +include/openafs/afs/com_err.h +include/openafs/afs/daemon_com.h +include/openafs/afs/dir.h +include/openafs/afs/dirpath.h +include/openafs/afs/error_table.h +include/openafs/afs/errors.h +include/openafs/afs/exporter.h +include/openafs/afs/fileutil.h include/openafs/afs/fs_stats.h -include/openafs/afs/volser.h -include/openafs/afs/volint.h -include/openafs/afs/budb.h -include/openafs/afs/budb_errs.h -include/openafs/afs/budb_client.h -include/openafs/afs/bosint.h -include/openafs/afs/bnode.h +include/openafs/afs/fsprobe.h +include/openafs/afs/fssync.h +include/openafs/afs/gtxX11win.h include/openafs/afs/gtxcurseswin.h include/openafs/afs/gtxdumbwin.h include/openafs/afs/gtxframe.h @@ -118,19 +80,61 @@ include/openafs/afs/gtxobjects.h include/openafs/afs/gtxtextcb.h include/openafs/afs/gtxtextobj.h include/openafs/afs/gtxwindows.h -include/openafs/afs/gtxX11win.h -include/openafs/afs/fsprobe.h -include/openafs/afs/xstat_fs.h -include/openafs/afs/xstat_cm.h -include/openafs/afs/vioc.h -include/openafs/afs/afs_consts.h +include/openafs/afs/icl.h +include/openafs/afs/ihandle.h +include/openafs/afs/keys.h +include/openafs/afs/ktc.h +include/openafs/afs/ktime.h +include/openafs/afs/mit-sipb-cr.h +include/openafs/afs/namei_ops.h +include/openafs/afs/netutils.h +include/openafs/afs/nfs.h +include/openafs/afs/nfsclient.h +include/openafs/afs/osi_inode.h +include/openafs/afs/packages.h include/openafs/afs/pagcb.h +include/openafs/afs/param.h +include/openafs/afs/partition.h +include/openafs/afs/prclient.h +include/openafs/afs/prerror.h +include/openafs/afs/print.h +include/openafs/afs/procmgmt.h +include/openafs/afs/prs_fs.h +include/openafs/afs/prserver.h +include/openafs/afs/ptclient.h +include/openafs/afs/pterror.h +include/openafs/afs/pthread_glock.h +include/openafs/afs/pthread_nosigs.h +include/openafs/afs/ptint.h +include/openafs/afs/ptserver.h +include/openafs/afs/ptuser.h +include/openafs/afs/remote.h +include/openafs/afs/rxgen_consts.h +include/openafs/afs/salvsync.h +include/openafs/afs/softsig.h +include/openafs/afs/stds.h +include/openafs/afs/sysctl.h +include/openafs/afs/tcdata.h +include/openafs/afs/unified_afs.h +include/openafs/afs/usd.h +include/openafs/afs/venus.h +include/openafs/afs/vice.h +include/openafs/afs/viceinode.h +include/openafs/afs/vioc.h +include/openafs/afs/vl_opcodes.h +include/openafs/afs/vldbint.h +include/openafs/afs/vlserver.h +include/openafs/afs/vnode.h include/openafs/afs/vnode_inline.h +include/openafs/afs/voldefs.h +include/openafs/afs/volint.h +include/openafs/afs/volser.h +include/openafs/afs/volume.h include/openafs/afs/volume_inline.h -include/openafs/afs/salvsync.h -include/openafs/afs/daemon_com.h include/openafs/afs/vsutils_prototypes.h -include/openafs/afs/afs_assert.h +include/openafs/afs/xfsattrs.h +include/openafs/afs/xstat_cm.h +include/openafs/afs/xstat_fs.h include/openafs/des.h include/openafs/des_conf.h include/openafs/des_odd.h @@ -138,31 +142,32 @@ include/openafs/des_prototypes.h include/openafs/kopenafs.h include/openafs/lock.h include/openafs/lwp.h -include/openafs/preempt.h include/openafs/mit-cpyright.h -include/openafs/rx/rx_prototypes.h +include/openafs/preempt.h +include/openafs/rx/fcrypt.h include/openafs/rx/rx.h -include/openafs/rx/rx_packet.h -include/openafs/rx/xdr_prototypes.h -include/openafs/rx/rxstat.h -include/openafs/rx/rx_user.h +include/openafs/rx/rx_clock.h include/openafs/rx/rx_event.h -include/openafs/rx/rx_queue.h include/openafs/rx/rx_globals.h -include/openafs/rx/rx_clock.h -include/openafs/rx/rx_multi.h -include/openafs/rx/rx_pthread.h include/openafs/rx/rx_lwp.h include/openafs/rx/rx_misc.h +include/openafs/rx/rx_multi.h include/openafs/rx/rx_null.h -include/openafs/rx/xdr.h -include/openafs/rx/rxkad_prototypes.h -include/openafs/rx/fcrypt.h +include/openafs/rx/rx_packet.h +include/openafs/rx/rx_prototypes.h +include/openafs/rx/rx_pthread.h +include/openafs/rx/rx_queue.h +include/openafs/rx/rx_user.h include/openafs/rx/rxkad.h +include/openafs/rx/rxkad_prototypes.h +include/openafs/rx/rxstat.h +include/openafs/rx/xdr.h +include/openafs/rx/xdr_prototypes.h include/openafs/timer.h include/openafs/ubik.h include/openafs/ubik_int.h lib/afs/libacl.a +lib/afs/libafscom_err.a lib/afs/libafsint.a lib/afs/libafsutil.a lib/afs/libaudit.a @@ -174,7 +179,6 @@ lib/afs/libbudb.a lib/afs/libbutm.a lib/afs/libbxdb.a lib/afs/libcmd.a -lib/afs/libafscom_err.a lib/afs/libdir.a lib/afs/libfsprobe.a lib/afs/libgtx.a @@ -189,68 +193,43 @@ lib/afs/libxstat_cm.a lib/afs/libxstat_fs.a lib/afs/util.a lib/afs/vlib.a -lib/librxstat.a +lib/libafsauthent.a +lib/libafsauthent.so +lib/libafsauthent.so.1 +lib/libafsauthent.so.1.1 +lib/libafsauthent_pic.a +lib/libafscp.a +lib/libafsrpc.a +lib/libafsrpc.so +lib/libafsrpc.so.1 +lib/libafsrpc.so.1.5 +lib/libafsrpc_pic.a lib/libdes.a +lib/libjuafs.a +lib/libkopenafs.a +lib/libkopenafs.so +lib/libkopenafs.so.1 +lib/libkopenafs.so.1.1 lib/liblwp.a lib/librx.a lib/librxkad.a -lib/libafsauthent.a +lib/librxstat.a lib/libuafs.a lib/libubik.a -lib/libafsrpc.a -lib/libafscp.a lib/pam_afs.krb.so.1 -lib/libjuafs.a lib/pam_afs.so.1 -lib/libafsrpc_pic.a -lib/libafsrpc.so.1.5 -lib/libafsrpc.so.1 -lib/libafsrpc.so -lib/libafsauthent_pic.a -lib/libafsauthent.so.1 -lib/libafsauthent.so.1.1 -lib/libafsauthent.so -lib/libkopenafs.so.1.1 -lib/libkopenafs.so.1 -lib/libkopenafs.so -lib/libkopenafs.a libexec/openafs/buserver -libexec/openafs/fileserver libexec/openafs/dafileserver +libexec/openafs/dasalvager +libexec/openafs/davolserver +libexec/openafs/fileserver libexec/openafs/ptserver libexec/openafs/salvager +libexec/openafs/salvageserver libexec/openafs/upclient libexec/openafs/upserver libexec/openafs/vlserver libexec/openafs/volserver -libexec/openafs/davolserver -libexec/openafs/salvageserver -libexec/openafs/dasalvager -%%DATADIR%%/C/afszcm.cat -%%FUSE%%sbin/afsd.fuse -sbin/dafssync-debug -sbin/prdb_check -sbin/rmtsysd -sbin/pt_util -sbin/volinfo -sbin/afsd -sbin/vsys -sbin/vldb_convert -sbin/vldb_check -sbin/read_tape -sbin/bosserver -sbin/voldump -sbin/vos -sbin/uss -sbin/backup -sbin/butc -sbin/rxdebug -sbin/bos_util -sbin/fms -sbin/fstrace -sbin/state_analyzer -sbin/salvsync-debug -sbin/fssync-debug man/man1/afs.1.gz man/man1/afs_compile_et.1.gz man/man1/afsmonitor.1.gz @@ -436,7 +415,6 @@ man/man5/uss.5.gz man/man5/uss_bulk.5.gz man/man5/vldb.DB0.5.gz man/man8/afsd.8.gz -%%FUSE%%man/man8/afsd.fuse.8.gz man/man8/aklog_dynamic_auth.8.gz man/man8/asetkey.8.gz man/man8/backup.8.gz @@ -569,10 +547,34 @@ man/man8/volinfo.8.gz man/man8/volserver.8.gz man/man8/vsys.8.gz man/man8/xfs_size_check.8.gz -@sample etc/openafs/CellServDB.sample -@sample etc/openafs/ThisCell.sample -@sample etc/openafs/cacheinfo.sample +sbin/afsd +sbin/backup +sbin/bos_util +sbin/bosserver +sbin/butc +sbin/dafssync-debug +sbin/fms +sbin/fssync-debug +sbin/fstrace +sbin/prdb_check +sbin/pt_util +sbin/read_tape +sbin/rmtsysd +sbin/rxdebug +sbin/salvsync-debug +sbin/state_analyzer +sbin/uss +sbin/vldb_check +sbin/vldb_convert +sbin/voldump +sbin/volinfo +sbin/volscan +sbin/vos +sbin/vsys +%%DATADIR%%/C/afszcm.cat +%%FUSE%%man/man8/afsd.fuse.8.gz +%%FUSE%%sbin/afsd.fuse /%%KMODDIR%%/libafs.ko -@dir /%%AFSMNTDIR%% @dir /%%AFSCACHEDIR%% +@dir /%%AFSMNTDIR%% @dir /%%AFSSTATEDIR%% Modified: head/net/packetdrill/Makefile ============================================================================== --- head/net/packetdrill/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/packetdrill/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -12,8 +12,6 @@ COMMENT= Network stack testing tool LICENSE= GPLv2 USES= bison uidfix -MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" PORTDATA= packetdrill.el packetdrill.vim PORTDOCS= README PORTEXAMPLES= tests Modified: head/net/packetdrill/files/Makefile.inc ============================================================================== --- head/net/packetdrill/files/Makefile.inc Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/packetdrill/files/Makefile.inc Wed Mar 25 23:51:05 2015 (r382278) @@ -7,6 +7,5 @@ MAN= .PATH: ${.CURDIR}/.. -CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR} ${PTHREAD_CFLAGS} -PTHREAD_LIBS?= -pthread -LDADD= ${.CURDIR}/../libpd/libpd.a ${PTHREAD_LIBS} -lpcap +CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR} +LDADD= ${.CURDIR}/../libpd/libpd.a -lpthread -lpcap Modified: head/net/ptunnel/Makefile ============================================================================== --- head/net/ptunnel/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/ptunnel/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -18,8 +18,7 @@ USES= gmake PLIST_FILES= bin/ptunnel man/man8/ptunnel.8.gz post-patch: - @${REINPLACE_CMD} -e '/^CC/d;s/-lpthread/${PTHREAD_LIBS}/' \ - -e "/^CFLAGS/d" ${WRKSRC}/${MAKEFILE} + @${REINPLACE_CMD} -e '/^CC/d' -e "/^CFLAGS/d" ${WRKSRC}/${MAKEFILE} @${REINPLACE_CMD} -e 's/stdint.h/inttypes.h/' ${WRKSRC}/ptunnel.h do-install: Modified: head/net/remmina-plugins/bsd.plugin.mk ============================================================================== --- head/net/remmina-plugins/bsd.plugin.mk Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/remmina-plugins/bsd.plugin.mk Wed Mar 25 23:51:05 2015 (r382278) @@ -11,9 +11,9 @@ RUN_DEPENDS+= remmina>=${PORTVERSION}:${ USES+= cmake gmake pkgconfig desktop-file-utils USE_GNOME= atk gdkpixbuf2 glib20 gtk20 pango INSTALLS_ICONS= yes -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -CFLAGS+= -I${WRKSRC}/remmina/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC +LDFLAGS+= -lpthread -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${WRKSRC}/remmina/include -I${LOCALBASE}/include -fPIC WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-Remmina-${GH_COMMIT} # disable appindicator as it is new feature of gnome 3 Modified: head/net/remmina/Makefile ============================================================================== --- head/net/remmina/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/remmina/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -14,10 +14,11 @@ LICENSE= GPLv2 USES= cmake gmake pkgconfig USE_GNOME= atk gdkpixbuf2 glib20 gtk20 pango INSTALLS_ICONS= yes -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -Wl,-rpath -Wl,${LOCALBASE}/lib -lX11 \ - -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lgmodule-2.0 -lgtk-x11-2.0 -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -CFLAGS+= -I${WRKSRC}/remmina/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC +LDFLAGS+= -lpthread -L${LOCALBASE}/lib -Wl,-rpath -Wl,${LOCALBASE}/lib \ + -lX11 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lgmodule-2.0 \ + -lgtk-x11-2.0 +CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${WRKSRC}/remmina/include -I${LOCALBASE}/include -fPIC SUB_FILES= pkg-message USE_GITHUB= yes GH_ACCOUNT= FreeRDP Modified: head/net/rtg/Makefile ============================================================================== --- head/net/rtg/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/rtg/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -50,9 +50,6 @@ CFLAGS+= -fstack-protector LDFLAGS+= -fstack-protector .endif -pre-configure: - @${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},g' ${WRKSRC}/configure - post-patch: @${MV} ${WRKSRC}/etc/rtg.conf ${WRKSRC}/etc/rtg.conf.sample @${MV} ${WRKSRC}/etc/routers ${WRKSRC}/etc/routers.sample Modified: head/net/samba36/Makefile ============================================================================== --- head/net/samba36/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/samba36/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -75,8 +75,7 @@ CONFIGURE_ARGS+= --exec-prefix="${PREFIX CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LDFLAGS="${PTHREAD_LIBS}" +CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread" # XXX: Temporary hack for RELENG6 CONFIGURE_ENV+= ac_cv_header_sys_mount_h=yes # XXX: readdir test fails on ZFS, bringing unusable replacement code Modified: head/net/samba4/Makefile ============================================================================== --- head/net/samba4/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/samba4/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -61,8 +61,7 @@ CONFIGURE_ARGS+= --prefix="${PREFIX}" \ # Support staging DESTDIRNAME= --destdir # Flags -CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LDFLAGS="${PTHREAD_LIBS}" +CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread" USES= compiler cpe execinfo iconv perl5 pkgconfig \ python:2 readline shebangfix Modified: head/net/samba41/Makefile ============================================================================== --- head/net/samba41/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/samba41/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -61,8 +61,7 @@ CONFIGURE_ARGS+= --prefix="${PREFIX}" \ # Support staging DESTDIRNAME= --destdir # Flags -CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LDFLAGS="${PTHREAD_LIBS}" +CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread" USES= compiler cpe execinfo iconv perl5 pkgconfig \ python:2 readline shebangfix Modified: head/net/sixxs-aiccu/Makefile ============================================================================== --- head/net/sixxs-aiccu/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/sixxs-aiccu/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -20,8 +20,8 @@ LICENSE_FILE= ${WRKSRC}/doc/LICENSE USE_RC_SUBR= sixxs-aiccu USES= gmake -CFLAGS+= ${PTHREAD_CFLAGS} -D_REENTRANT -DAICCU_GNUTLS -I${LOCALBASE}/include -LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -lgnutls +CFLAGS+= -D_REENTRANT -DAICCU_GNUTLS -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib -lgnutls MAKE_ARGS+= CC="${CC}" LDFLAGS="${LDFLAGS}" WRKSRC= ${WRKDIR}/aiccu BUILD_WRKSRC= ${WRKDIR}/aiccu/unix-console Modified: head/net/sl2tps/Makefile ============================================================================== --- head/net/sl2tps/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/sl2tps/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -20,7 +20,6 @@ USES= uidfix post-patch: @${REINPLACE_CMD} -e \ 's|$${PREFIX}/include|$${LOCALBASE}/include|g ; \ - s|-pthread|${PTHREAD_LIBS}|g ; \ /-g/s|^CFLAGS|#CFLAGS|g ; \ s|$${PREFIX}/lib|$${LOCALBASE}/lib|g' ${WRKSRC}/Makefile Modified: head/net/spread/Makefile ============================================================================== --- head/net/spread/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/spread/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -25,7 +25,7 @@ RUNDIR= /var/run/spread PLIST_SUB+= USERS=${USERS} GROUPS=${GROUPS} RUNDIR=${RUNDIR} -MAKE_ARGS+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} +MAKE_ARGS+= PTHREAD_LIBS="-lpthread" WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION} PKGMESSAGE= ${WRKSRC}/license.txt Modified: head/net/throttled/Makefile ============================================================================== --- head/net/throttled/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/throttled/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -17,8 +17,8 @@ PLIST_FILES= sbin/throttled sbin/throttl post-patch: @${REINPLACE_CMD} -e "s|/usr/local|${STAGEDIR}${PREFIX}|g" \ - ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e "s|c++|${CXX}|;s|-O3|${CXXFLAGS}| \ - ;s|-pthread|${PTHREAD_LIBS}|" ${WRKSRC}/src/Makefile + ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e "s|c++|${CXX}|;s|-O3|${CXXFLAGS}|" \ + ${WRKSRC}/src/Makefile .include <bsd.port.mk> Modified: head/net/trafshow/Makefile ============================================================================== --- head/net/trafshow/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/trafshow/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -16,7 +16,7 @@ COMMENT= Full screen visualization of ne CONFLICTS= trafshow-4.* trafshow3-* GNU_CONFIGURE= yes -CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" +CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" ALL_TARGET= trafshow OPTIONS_DEFINE= IPV6 Modified: head/net/ulxmlrpcpp/Makefile ============================================================================== --- head/net/ulxmlrpcpp/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/ulxmlrpcpp/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -18,8 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER USES= tar:bzip2 pathfix iconv libtool USE_OPENSSL= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" +CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" INSTALL_TARGET= install-strip USE_LDCONFIG= yes Modified: head/net/x11vnc/Makefile ============================================================================== --- head/net/x11vnc/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/x11vnc/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -37,8 +37,6 @@ AVAHI_CONFIGURE_OFF= --without-avahi .include <bsd.port.options.mk> post-patch: - ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure ${REINPLACE_CMD} -e 's|include_HEADERS = |noinst_HEADERS = |' \ -e 's|am__include_HEADERS_DIST|am__noinst_HEADERS_DIST|' \ -e 's|/include/rfb|/include|' ${WRKSRC}/Makefile.in Modified: head/net/xmlrpc-c-devel/Makefile ============================================================================== --- head/net/xmlrpc-c-devel/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/xmlrpc-c-devel/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -54,8 +54,6 @@ post-extract: @${FIND} ${WRKSRC} -type l -name srcdir -delete post-patch: - @${GREP} -lR '\-lpthread' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ - 's|-lpthread|${PTHREAD_LIBS}|g' @${REINPLACE_CMD} -e '/#include.*features.h/ s/features.h/sys\/cdefs.h/' \ ${WRKSRC}/tools/xmlrpc_pstream/xmlrpc_pstream.cpp @${REINPLACE_CMD} -e '/define _XOPEN_SOURCE 600/ s,^,//,' \ Modified: head/net/xmlrpc-c/Makefile ============================================================================== --- head/net/xmlrpc-c/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/xmlrpc-c/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -41,8 +41,6 @@ post-extract: @${FIND} ${WRKSRC} -type l -name srcdir -delete post-patch: - @${GREP} -lR '\-lpthread' ${WRKSRC} 2>/dev/null | \ - ${XARGS} ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' @${REINPLACE_CMD} -e '/#include.*features.h/d' \ ${WRKSRC}/tools/xmlrpc_pstream/xmlrpc_pstream.cpp @${REINPLACE_CMD} -e '/<curl\/types.h>/d' \ @@ -51,6 +49,6 @@ post-patch: ${WRKSRC}/lib/curl_transport/curlmulti.c post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxmlrpc*.so.[37].25 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxmlrpc*.so.[37].25 .include <bsd.port.post.mk> Modified: head/net/yaph/Makefile ============================================================================== --- head/net/yaph/Makefile Wed Mar 25 23:49:36 2015 (r382277) +++ head/net/yaph/Makefile Wed Mar 25 23:51:05 2015 (r382278) @@ -11,10 +11,6 @@ COMMENT= Yaph is a proxy scanner GNU_CONFIGURE= yes -post-extract: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/yaph/Makefile.in - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/yaph/yaph ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/yaph/yaph.conf ${STAGEDIR}${PREFIX}/etc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503252351.t2PNp6Xw084580>