Date: Tue, 24 Mar 2015 16:01:22 +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: r382111 - in head: biology/ariadne biology/mafft biology/migrate cad/pcb cad/tochnog cad/tochnog/files deskutils/gworkspace-gwmetadata deskutils/xchm deskutils/xneur devel/stxxl java/ca... Message-ID: <201503241601.t2OG1MYe046350@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Mar 24 16:01:21 2015 New Revision: 382111 URL: https://svnweb.freebsd.org/changeset/ports/382111 QAT: https://qat.redports.org/buildarchive/r382111/ Log: 6 ports categories: Remove $PTHREAD_LIBS Categories: cad, devel, java, x11-fm, biology, deskutils approved by: PTHREAD blanket Modified: head/biology/ariadne/Makefile head/biology/mafft/Makefile head/biology/migrate/Makefile head/cad/pcb/Makefile head/cad/tochnog/Makefile head/cad/tochnog/files/patch-makefile head/deskutils/gworkspace-gwmetadata/Makefile head/deskutils/xchm/Makefile head/deskutils/xneur/Makefile head/devel/stxxl/Makefile head/java/cacao/Makefile head/java/cacao/files/patch-boehm-gc__configure head/java/cacao/files/patch-configure head/java/openjdk7/Makefile head/x11-fm/emelfm2/Makefile head/x11-fm/nemo/Makefile Modified: head/biology/ariadne/Makefile ============================================================================== --- head/biology/ariadne/Makefile Tue Mar 24 15:31:06 2015 (r382110) +++ head/biology/ariadne/Makefile Tue Mar 24 16:01:21 2015 (r382111) @@ -21,9 +21,9 @@ OPTIONS_DEFINE= DOCS MAKE_JOBS_UNSAFE= yes post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}| ; \ - s|CFLAGS =|CFLAGS +=| ; \ - s|-c $(OPTIMISE)|-c $(CFLAGS) $(OPTIMIZE)|g' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|CFLAGS =|CFLAGS +=| ; \ + s|-c $(OPTIMISE)|-c $(CFLAGS) $(OPTIMIZE)|g' \ + ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${OPSYS}/ariadne ${STAGEDIR}${PREFIX}/bin Modified: head/biology/mafft/Makefile ============================================================================== --- head/biology/mafft/Makefile Tue Mar 24 15:31:06 2015 (r382110) +++ head/biology/mafft/Makefile Tue Mar 24 16:01:21 2015 (r382111) @@ -40,11 +40,10 @@ BROKEN= Does not install on sparc64: de .endif post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ - -e 's|^MANDIR = .*$$|MANDIR = $$(MANPREFIX)/man/man1|' \ - -e 's|^PREFIX = .*$$||' \ - -e 's|^CC = .*$$||' \ - -e 's|^CFLAGS = .*$$||' \ + @${REINPLACE_CMD} -e 's|^PREFIX = .*$$||' \ + -e 's|^MANDIR = .*$$|MANDIR = $$(MANPREFIX)/man/man1|' \ + -e 's|^CC = .*$$||' \ + -e 's|^CFLAGS = .*$$||' \ ${BUILD_WRKSRC}/Makefile do-install: Modified: head/biology/migrate/Makefile ============================================================================== --- head/biology/migrate/Makefile Tue Mar 24 15:31:06 2015 (r382110) +++ head/biology/migrate/Makefile Tue Mar 24 16:01:21 2015 (r382111) @@ -37,8 +37,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES .include <bsd.port.options.mk> post-patch: - @${REINPLACE_CMD} -e 's|="-O "|="$$CFLAGS"|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|="-O "|="$$CFLAGS"|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/PRETTY$$/d' ${WRKSRC}/definitions.h @${REINPLACE_CMD} -e 's|-O3||g' ${WRKSRC}/haru/makefile.gcc Modified: head/cad/pcb/Makefile ============================================================================== --- head/cad/pcb/Makefile Tue Mar 24 15:31:06 2015 (r382110) +++ head/cad/pcb/Makefile Tue Mar 24 16:01:21 2015 (r382111) @@ -26,7 +26,7 @@ INSTALLS_ICONS= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= INSTALL_DATA="${BSD_INSTALL_DATA}" CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib +LDFLAGS+= -lpthread -L${LOCALBASE}/lib PORTDOCS= \ pcb.html pcb.pdf refcard.pdf pad.png puller.png thermal.png \ Modified: head/cad/tochnog/Makefile ============================================================================== --- head/cad/tochnog/Makefile Tue Mar 24 15:31:06 2015 (r382110) +++ head/cad/tochnog/Makefile Tue Mar 24 16:01:21 2015 (r382111) @@ -22,7 +22,6 @@ ATLAS_DESC= Use ATLAS instead of BLAS/LA WRKSRC= ${WRKDIR}/Sources/Tochnog-Latest-jan-2014 MAKEFILE= makefile -MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} USES= fortran zip dos2unix DOS2UNIX_FILES= time.cc time.h tnlapack.h tnsuplu.h Modified: head/cad/tochnog/files/patch-makefile ============================================================================== --- head/cad/tochnog/files/patch-makefile Tue Mar 24 15:31:06 2015 (r382110) +++ head/cad/tochnog/files/patch-makefile Tue Mar 24 16:01:21 2015 (r382111) @@ -70,9 +70,9 @@ + ${MAKE} tochnog \ + "SYS_FILE=sysposix" \ + "OBJ=o" \ -+ "COMPILER_FLAGS= -c ${CFLAGS} ${CPPFLAGS} -D_REENTRANT $(PTHREAD_CFLAGS) $(ALL_INCLUDE)" \ ++ "COMPILER_FLAGS= -c ${CFLAGS} ${CPPFLAGS} -D_REENTRANT $(ALL_INCLUDE)" \ + "LINK_FLAGS_BEFORE=" \ -+ "LINK_FLAGS_AFTER= $(PROFILE) $(ALL_LIB) ${LDFLAGS} $(PTHREAD_LIBS) -lm -o tochnog" ++ "LINK_FLAGS_AFTER= $(PROFILE) $(ALL_LIB) ${LDFLAGS} -lpthread -lm -o tochnog" # multi processor linux; gnu gcc compiler linux: Modified: head/deskutils/gworkspace-gwmetadata/Makefile ============================================================================== --- head/deskutils/gworkspace-gwmetadata/Makefile Tue Mar 24 15:31:06 2015 (r382110) +++ head/deskutils/gworkspace-gwmetadata/Makefile Tue Mar 24 16:01:21 2015 (r382111) @@ -24,8 +24,7 @@ USE_GNUSTEP_SYSTEM_LIBS+= PreferencePane USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} USE_SQLITE= yes -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= -lpthread UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} WRKSRC= ${WRKDIR}/gworkspace-${PORTVERSION}/GWMetadata Modified: head/deskutils/xchm/Makefile ============================================================================== --- head/deskutils/xchm/Makefile Tue Mar 24 15:31:06 2015 (r382110) +++ head/deskutils/xchm/Makefile Tue Mar 24 16:01:21 2015 (r382111) @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes USE_WX= 2.8+ WX_UNICODE= yes WX_CONF_ARGS= absolute -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -lpthread -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include .include <bsd.port.mk> Modified: head/deskutils/xneur/Makefile ============================================================================== --- head/deskutils/xneur/Makefile Tue Mar 24 15:31:06 2015 (r382110) +++ head/deskutils/xneur/Makefile Tue Mar 24 16:01:21 2015 (r382111) @@ -16,8 +16,8 @@ LIB_DEPENDS= libnotify.so:${PORTSDIR}/de USES= pathfix pkgconfig iconv tar:bzip2 libtool GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -lpthread -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --disable-static --libdir=${PREFIX}/lib/xneur USE_LDCONFIG= yes Modified: head/devel/stxxl/Makefile ============================================================================== --- head/devel/stxxl/Makefile Tue Mar 24 15:31:06 2015 (r382110) +++ head/devel/stxxl/Makefile Tue Mar 24 16:01:21 2015 (r382111) @@ -13,7 +13,7 @@ USES= gmake ALL_TARGET= library_g++ MAKE_ENV+= COMPILER_GCC="${CXX}" OPT="${CXXFLAGS}" \ - PTHREAD_FLAG="${PTHREAD_LIBS}" + PTHREAD_FLAG="-lpthread" PORTDOCS= * Modified: head/java/cacao/Makefile ============================================================================== --- head/java/cacao/Makefile Tue Mar 24 15:31:06 2015 (r382110) +++ head/java/cacao/Makefile Tue Mar 24 16:01:21 2015 (r382111) @@ -49,10 +49,6 @@ CONFIGURE_ENV+= JAVACFLAGS="${JAVACFLAGS MAKE_ENV+= JAVACFLAGS="${JAVACFLAGS}" .endif -post-patch: - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure ${WRKSRC}/src/mm/boehm-gc/configure - do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/src/cacao/cacao \ Modified: head/java/cacao/files/patch-boehm-gc__configure ============================================================================== --- head/java/cacao/files/patch-boehm-gc__configure Tue Mar 24 15:31:06 2015 (r382110) +++ head/java/cacao/files/patch-boehm-gc__configure Tue Mar 24 16:01:21 2015 (r382111) @@ -4,7 +4,7 @@ $as_echo "#define GC_FREEBSD_THREADS 1" >>confdefs.h INCLUDES="$INCLUDES -pthread" -+ THREADDLLIBS=%%PTHREAD_LIBS%% ++ THREADDLLIBS=-lpthread ;; *-*-kfreebsd*-gnu) $as_echo "#define GC_FREEBSD_THREADS 1" >>confdefs.h Modified: head/java/cacao/files/patch-configure ============================================================================== --- head/java/cacao/files/patch-configure Tue Mar 24 15:31:06 2015 (r382110) +++ head/java/cacao/files/patch-configure Tue Mar 24 16:01:21 2015 (r382111) @@ -9,21 +9,3 @@ ARCH_DIR="x86_64" ARCH_FLAGS="-m64 -D__X86_64__" JAVA_ARCH="amd64" -@@ -9731,7 +9731,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lpthread $LIBS" -+LIBS="%%PTHREAD_LIBS%% $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -9760,7 +9760,7 @@ - #define HAVE_LIBPTHREAD 1 - _ACEOF - -- LIBS="-lpthread $LIBS" -+ LIBS="%%PTHREAD_LIBS%% $LIBS" - - fi - Modified: head/java/openjdk7/Makefile ============================================================================== --- head/java/openjdk7/Makefile Tue Mar 24 15:31:06 2015 (r382110) +++ head/java/openjdk7/Makefile Tue Mar 24 16:01:21 2015 (r382111) @@ -93,7 +93,7 @@ MAKE_ENV+= LANG="C" \ SKIP_DEBUG_BUILD="true" \ ZIP_DEBUGINFO_FILES=0 \ ENABLE_FULL_DEBUG_SYMBOLS=0 \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ + PTHREAD_LIBS="-lpthread" \ MILESTONE="fcs" \ JDK_MICRO_VERSION="0_${PORT_MINOR_VERSION}" \ BUILD_NUMBER="b${PORT_BUILD_NUMBER}" Modified: head/x11-fm/emelfm2/Makefile ============================================================================== --- head/x11-fm/emelfm2/Makefile Tue Mar 24 15:31:06 2015 (r382110) +++ head/x11-fm/emelfm2/Makefile Tue Mar 24 16:01:21 2015 (r382111) @@ -15,8 +15,7 @@ USES= gmake pkgconfig tar:bzip2 USE_LDCONFIG= yes INSTALL_TARGET= install -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= -lpthread MAKE_ENV= DOC_DIR="${DOCSDIR}/" \ WITH_OUTPUTSTYLES=1 \ WITH_CUSTOMMOUSE=1 Modified: head/x11-fm/nemo/Makefile ============================================================================== --- head/x11-fm/nemo/Makefile Tue Mar 24 15:31:06 2015 (r382110) +++ head/x11-fm/nemo/Makefile Tue Mar 24 16:01:21 2015 (r382111) @@ -30,7 +30,7 @@ GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib -lpthread INSTALL_TARGET= install-strip CONFIGURE_ARGS= --enable-static --disable-packagekit
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503241601.t2OG1MYe046350>