Date: Tue, 24 Mar 2015 13:51:18 +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: r382100 - in head: archivers/pixz archivers/pixz/files dns/dualserver french/aster japanese/scim-skk news/nzbget ports-mgmt/bpm sysutils/freeipmi x11-wm/libcompizconfig Message-ID: <201503241351.t2ODpIjS082125@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Mar 24 13:51:17 2015 New Revision: 382100 URL: https://svnweb.freebsd.org/changeset/ports/382100 QAT: https://qat.redports.org/buildarchive/r382100/ Log: 8 ports categories: Remove $PTHREAD_LIBS Categories: archivers, dns, french, japanese, news, port-mgmt, x11-wm The sysutils port was setting configure argument, so the text wasn't removed but the value of PTHREAD_LIBS was changed. approved by: PTHREAD blanket Modified: head/archivers/pixz/Makefile head/archivers/pixz/files/Makefile.in head/dns/dualserver/Makefile head/french/aster/Makefile head/japanese/scim-skk/Makefile head/news/nzbget/Makefile head/ports-mgmt/bpm/Makefile head/sysutils/freeipmi/Makefile head/x11-wm/libcompizconfig/Makefile Modified: head/archivers/pixz/Makefile ============================================================================== --- head/archivers/pixz/Makefile Tue Mar 24 13:43:16 2015 (r382099) +++ head/archivers/pixz/Makefile Tue Mar 24 13:51:17 2015 (r382100) @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE SUB_FILES= Makefile PLIST_FILES= bin/${PORTNAME} man/man1/pixz.1.gz USES= uidfix -MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS} post-extract: apply-slist ${INSTALL_DATA} ${WRKDIR}/Makefile ${WRKSRC} Modified: head/archivers/pixz/files/Makefile.in ============================================================================== --- head/archivers/pixz/files/Makefile.in Tue Mar 24 13:43:16 2015 (r382099) +++ head/archivers/pixz/files/Makefile.in Tue Mar 24 13:51:17 2015 (r382100) @@ -6,7 +6,7 @@ MAN= ${PROG}.1 CPPFLAGS+= -I${LOCALBASE}/include -DPIXZ_VERSION='"1.0.2"' CFLAGS+= ${CPPFLAGS} -std=gnu99 -LDADD= ${PTHREAD_LIBS} -lm -llzma -larchive -L${LOCALBASE}/lib \ +LDADD= -lpthread -lm -llzma -larchive -L${LOCALBASE}/lib \ -Wl,-rpath,${LOCALBASE}/lib PREFIX?= /usr/local Modified: head/dns/dualserver/Makefile ============================================================================== --- head/dns/dualserver/Makefile Tue Mar 24 13:43:16 2015 (r382099) +++ head/dns/dualserver/Makefile Tue Mar 24 13:51:17 2015 (r382100) @@ -22,7 +22,7 @@ post-extract: do-build: ${CXX} ${CXXFLAGS} -o ${WRKSRC}/dualserver \ - ${WRKSRC}/dualserverd.cpp ${PTHREAD_LIBS} + ${WRKSRC}/dualserverd.cpp -lpthread do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin Modified: head/french/aster/Makefile ============================================================================== --- head/french/aster/Makefile Tue Mar 24 13:43:16 2015 (r382099) +++ head/french/aster/Makefile Tue Mar 24 13:51:17 2015 (r382100) @@ -252,9 +252,9 @@ pre-configure: ${ECHO_CMD} "F90='${FC}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "MATHLIB='${lib_math} ${LDFLAGS} -lgfortran -lm -lkvm'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "OTHERLIB='-Xlinker -export-dynamic -lutil ${PTHREAD_LIBS} -lz'" \ + ${ECHO_CMD} "OTHERLIB='-Xlinker -export-dynamic -lutil -lpthread -lz'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "SYSLIB='${PTHREAD_LIBS} -lz'" >> ${WRKSRC}/setup.cfg + ${ECHO_CMD} "SYSLIB='-lpthread -lz'" >> ${WRKSRC}/setup.cfg .if defined(WITH_MPI) ${ECHO_CMD} "HOME_MPI = '${HOME_MPI}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "MPIRUN = 'mpirun'" >> ${WRKSRC}/setup.cfg @@ -285,18 +285,18 @@ pre-configure: >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "F90FLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH} -I${HOME_MPI}/include'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${PTHREAD_CFLAGS} ${FLAGARCH} -I${HOME_MPI}/include'" \ + ${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${FLAGARCH} -I${HOME_MPI}/include'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${PTHREAD_CFLAGS} ${FLAGARCH} -I${HOME_MPI}/include'" \ + ${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${FLAGARCH} -I${HOME_MPI}/include'" \ >> ${WRKSRC}/setup.cfg .else ${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "F90FLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${PTHREAD_CFLAGS} ${FLAGARCH}'" \ + ${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${PTHREAD_CFLAGS} ${FLAGARCH}'" \ + ${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg .endif .for is in ${INTERACTIVE_SCRIPTS} Modified: head/japanese/scim-skk/Makefile ============================================================================== --- head/japanese/scim-skk/Makefile Tue Mar 24 13:43:16 2015 (r382099) +++ head/japanese/scim-skk/Makefile Tue Mar 24 13:51:17 2015 (r382100) @@ -18,9 +18,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= gmake iconv libtool pkgconfig GNU_CONFIGURE= yes -CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" - INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__ Modified: head/news/nzbget/Makefile ============================================================================== --- head/news/nzbget/Makefile Tue Mar 24 13:43:16 2015 (r382099) +++ head/news/nzbget/Makefile Tue Mar 24 13:51:17 2015 (r382100) @@ -22,8 +22,7 @@ CONFIGURE_ARGS= --with-libcurses-include CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" MAKE_JOBS_UNSAFE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= ${PTHREAD_LIBS} -CFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= -lpthread BINMODE= 0755 SHEBANG_FILES= scripts/*.py Modified: head/ports-mgmt/bpm/Makefile ============================================================================== --- head/ports-mgmt/bpm/Makefile Tue Mar 24 13:43:16 2015 (r382099) +++ head/ports-mgmt/bpm/Makefile Tue Mar 24 13:51:17 2015 (r382100) @@ -25,8 +25,7 @@ post-patch: @${FIND} ${WRKSRC} -name Makefile | ${XARGS} \ ${REINPLACE_CMD} -e "s|-lintl|-lintl -L${LOCALBASE}/lib|g" # GnomeVFS needs pthread; bpm may use GnomeVFS (via GtkFileChooser) - @${REINPLACE_CMD} -e 's|^CFLAGS+=|& ${PTHREAD_CFLAGS}|; \ - s|^LDLIBS+=|& ${PTHREAD_LIBS}|' ${WRKSRC}/src/Makefile + @${REINPLACE_CMD} -e 's|^LDLIBS+=|& -lpthread|' ${WRKSRC}/src/Makefile @${REINPLACE_CMD} -e 's|<glib/.*.h>|<glib.h>|g' \ ${WRKSRC}/src/*.h Modified: head/sysutils/freeipmi/Makefile ============================================================================== --- head/sysutils/freeipmi/Makefile Tue Mar 24 13:43:16 2015 (r382099) +++ head/sysutils/freeipmi/Makefile Tue Mar 24 13:51:17 2015 (r382100) @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --disable-init-scripts \ --with-ipmi-monitoring-sdr-cache-dir=${CACHE_DIR}/ipmimonitoringsdrcache \ --with-ipmiseld-cache-dir=${CACHE_DIR}/ipmiseld \ --with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig -CONFIGURE_ENV= PTHREAD_LIBS=-pthread ac_cv_path_CPP=${CPP} +CONFIGURE_ENV= PTHREAD_LIBS=-lpthread ac_cv_path_CPP=${CPP} CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib Modified: head/x11-wm/libcompizconfig/Makefile ============================================================================== --- head/x11-wm/libcompizconfig/Makefile Tue Mar 24 13:43:16 2015 (r382099) +++ head/x11-wm/libcompizconfig/Makefile Tue Mar 24 13:51:17 2015 (r382100) @@ -18,7 +18,7 @@ USES= gettext gmake libtool:keepla path USE_GNOME= intltool libxml2 CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib -lpthread OPTIONS_DEFINE= INOTIFY OPTIONS_DEFAULT= INOTIFY
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503241351.t2ODpIjS082125>