From owner-svn-ports-all@FreeBSD.ORG Tue Mar 24 22:17:52 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8E9637EE; Tue, 24 Mar 2015 22:17:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 77D37CA; Tue, 24 Mar 2015 22:17:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2OMHq0r035756; Tue, 24 Mar 2015 22:17:52 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2OMHg0H035693; Tue, 24 Mar 2015 22:17:42 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201503242217.t2OMHg0H035693@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Tue, 24 Mar 2015 22:17:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382185 - in head: emulators/cingb emulators/dynamips emulators/dynamips-community emulators/dynamips-devel emulators/gngb emulators/mupen64plus-core emulators/o2em emulators/simh emula... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Mar 2015 22:17:52 -0000 Author: marino Date: Tue Mar 24 22:17:41 2015 New Revision: 382185 URL: https://svnweb.freebsd.org/changeset/ports/382185 QAT: https://qat.redports.org/buildarchive/r382185/ Log: 3 ports categories: Remove $PTHREAD_LIBS Categories: print, science, emulators approved by: PTHREAD blanket Modified: head/emulators/cingb/Makefile head/emulators/dynamips-community/Makefile head/emulators/dynamips-devel/Makefile head/emulators/dynamips/Makefile head/emulators/gngb/Makefile head/emulators/mupen64plus-core/Makefile head/emulators/o2em/Makefile head/emulators/simh/Makefile head/emulators/snes9x/Makefile head/print/cups-base/Makefile head/print/flpsed/Makefile head/print/ghostscript7/Makefile head/print/ghostscript8/Makefile head/print/ghostscript9-agpl/Makefile head/print/ghostscript9/Makefile head/print/gsview/Makefile head/print/gsview/files/patch-srcunx_unx.mak head/science/cgnslib/Makefile head/science/cgnslib/files/patch-src_make.defs.in head/science/ecs/Makefile head/science/gnudatalanguage/Makefile head/science/h5utils/Makefile head/science/mpb/Makefile head/science/mpqc/Makefile head/science/ncs/Makefile head/science/vmd/Makefile Modified: head/emulators/cingb/Makefile ============================================================================== --- head/emulators/cingb/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/emulators/cingb/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -19,9 +19,7 @@ ALL_TARGET= standard PORTDOCS= README README.FAQ PLIST_FILES= bin/cingb bin/cingb_conf - -CPPFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= -lpthread OPTIONS_DEFINE= DOCS Modified: head/emulators/dynamips-community/Makefile ============================================================================== --- head/emulators/dynamips-community/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/emulators/dynamips-community/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -28,9 +28,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER LDFLAGS+= -luuid MAKE_ENV= DYNAMIPS_CODE=${DYNAMIPS_CODE} \ - DYNAMIPS_ARCH=${DYNAMIPS_ARCH} \ - PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} + DYNAMIPS_ARCH=${DYNAMIPS_ARCH} .include Modified: head/emulators/dynamips-devel/Makefile ============================================================================== --- head/emulators/dynamips-devel/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/emulators/dynamips-devel/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -19,9 +19,7 @@ CONFLICTS= dynamips-[0-9]* dynamips-comm USES= gmake ALL_TARGET= ${PORTNAME} nvram_export -MAKE_ENV= DYNAMIPS_ARCH=${DYNAMIPS_ARCH}\ - PTHREAD_CFLAGS=${PTHREAD_CFLAGS}\ - PTHREAD_LIBS=${PTHREAD_LIBS} \ +MAKE_ENV= DYNAMIPS_ARCH=${DYNAMIPS_ARCH} \ HAS_POSIX_MEMALIGN=1 MAKE_JOBS_UNSAFE= yes Modified: head/emulators/dynamips/Makefile ============================================================================== --- head/emulators/dynamips/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/emulators/dynamips/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -14,8 +14,7 @@ LIB_DEPENDS= libelf.so:${PORTSDIR}/devel USES= gmake ALL_TARGET= ${PORTNAME} nvram_export -MAKE_ENV= DYNAMIPS_ARCH=${DYNAMIPS_ARCH}\ - PTHREAD_LIBS=${PTHREAD_LIBS} +MAKE_ENV= DYNAMIPS_ARCH=${DYNAMIPS_ARCH} MAKE_JOBS_UNSAFE= yes CONFLICTS= dynamips-community-[0-9]* dynamips-devel-[0-9]* Modified: head/emulators/gngb/Makefile ============================================================================== --- head/emulators/gngb/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/emulators/gngb/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -36,8 +36,8 @@ pre-everything:: .endif post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|"$$SDL_CONFIG" = yes|-n "$$SDL_CONFIG"|g ; \ + @${REINPLACE_CMD} -e \ + 's|"$$SDL_CONFIG" = yes|-n "$$SDL_CONFIG"|g ; \ s|sdl-config |$$SDL_CONFIG |g ; \ s|$$OPT||g' ${WRKSRC}/configure Modified: head/emulators/mupen64plus-core/Makefile ============================================================================== --- head/emulators/mupen64plus-core/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/emulators/mupen64plus-core/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -24,7 +24,7 @@ ONLY_FOR_ARCHS= i386 amd64 OPTFLAGS= # -MAKE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" OPTFLAGS="${OPTFLAGS}" +MAKE_ENV+= OPTFLAGS="${OPTFLAGS}" OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options .include "${.CURDIR}/../mupen64plus-core/Makefile.common" Modified: head/emulators/o2em/Makefile ============================================================================== --- head/emulators/o2em/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/emulators/o2em/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -18,7 +18,7 @@ LIB_DEPENDS= liballeg.so:${PORTSDIR}/dev WRKSRC= ${WRKDIR}/o2em117src MAKEFILE= Makefile.freebsd USES= gmake zip -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= -lpthread OPTIONS_DEFINE= DOCS Modified: head/emulators/simh/Makefile ============================================================================== --- head/emulators/simh/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/emulators/simh/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -34,7 +34,6 @@ pre-patch: post-patch: @${REINPLACE_CMD} -e \ '/shell ldconfig/s|^|#| ; \ - s|-lpthread|${PTHREAD_LIBS}| ; \ /-O2/s| = | ?= |' ${WRKSRC}/makefile @${REINPLACE_CMD} -e \ 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/VAX/vax_sysdev.c Modified: head/emulators/snes9x/Makefile ============================================================================== --- head/emulators/snes9x/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/emulators/snes9x/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -20,8 +20,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-extensions CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ARGS= INCLUDES="-I${WRKSRC}/unzip -I${WRKSRC} -I${LOCALBASE}/include \ - ${PTHREAD_CFLAGS}" LDLIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ +MAKE_ARGS= INCLUDES="-I${WRKSRC}/unzip -I${WRKSRC} -I${LOCALBASE}/include" \ + LDLIBS="-lpthread -L${LOCALBASE}/lib" \ OPTIMISE="${CXXFLAGS}" WRKSRC= ${WRKDIR}/${DISTNAME} Modified: head/print/cups-base/Makefile ============================================================================== --- head/print/cups-base/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/print/cups-base/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -235,8 +235,7 @@ post-patch: .endif @${REINPLACE_CMD} -e '/SILENT/d' ${WRKSRC}/Makedefs.in @${REINPLACE_CMD} -e 's|/etc/cups|${LOCALBASE}/etc/cups|g' ${WRKSRC}/man/*.man* - @${REINPLACE_CMD} -e 's|-lpthreads.*;|${PTHREAD_LIBS};|g' \ - -e 's|/private/etc/pam.d|${LOCALBASE}/etc/pam.d|' \ + @${REINPLACE_CMD} -e 's|/private/etc/pam.d|${LOCALBASE}/etc/pam.d|' \ -e 's|-D_LARGEFILE64_SOURCE||g' \ ${WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|\.default|.sample|'\ Modified: head/print/flpsed/Makefile ============================================================================== --- head/print/flpsed/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/print/flpsed/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -24,10 +24,6 @@ PLIST_FILES= bin/flpsed \ share/icons/flpsed.svg PORTDOCS= README -post-configure: - @${FIND} -X ${WRKSRC} -type f -name Makefile | ${XARGS} \ - ${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" - OPTIONS_DEFINE= DOCS .include Modified: head/print/ghostscript7/Makefile ============================================================================== --- head/print/ghostscript7/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/print/ghostscript7/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -48,8 +48,7 @@ MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ CPPFLAGS+= -fPIC -DUPD_SIGNAL=0 -I. -I${WRKSRC}/gimp-print \ -I${LOCALBASE}/include LDFLAGS+= ${XLDFLAGS} -XCFLAGS= ${PTHREAD_CFLAGS} -XLDFLAGS= -L${LOCALBASE}/lib -L${WRKSRC}/gimp-print ${PTHREAD_LIBS} +XLDFLAGS= -lpthread -L${LOCALBASE}/lib -L${WRKSRC}/gimp-print PLIST_SUB= GS_VERSION="${PORTVERSION}" OPTIONS_DEFINE= X11 DOCS A4SIZE Modified: head/print/ghostscript8/Makefile ============================================================================== --- head/print/ghostscript8/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/print/ghostscript8/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -60,9 +60,8 @@ CPPFLAGS+= -DUPD_SIGNAL=0 -I. \ -I${WRKSRC}/jasper/src/libjasper/include \ -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -XCFLAGS= ${PTHREAD_CFLAGS} \ - -DA4 -XLDFLAGS= ${PTHREAD_LIBS} +XCFLAGS= -DA4 +XLDFLAGS= -lpthread PLIST_SUB= GS_VERSION="${PORTVERSION}" \ CIDFONTDIR="${CIDFONTDIR:S,^${PREFIX}/,,}" Modified: head/print/ghostscript9-agpl/Makefile ============================================================================== --- head/print/ghostscript9-agpl/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/print/ghostscript9-agpl/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -60,9 +60,8 @@ CPPFLAGS+= -DUPD_SIGNAL=0 -I. \ -I${WRKSRC}/openjpeg/src/lib/openjp2 \ -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -XCFLAGS= ${PTHREAD_CFLAGS} \ - -DA4 -XLDFLAGS= ${PTHREAD_LIBS} +XCFLAGS= -DA4 +XLDFLAGS= -lpthread PLIST_SUB= GS_VERSION="${PORTVERSION}" \ X11BITS=${X11BITS} Modified: head/print/ghostscript9/Makefile ============================================================================== --- head/print/ghostscript9/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/print/ghostscript9/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -64,9 +64,8 @@ CPPFLAGS+= -DUPD_SIGNAL=0 -I. \ -I${WRKSRC}/openjpeg \ -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -XCFLAGS= ${PTHREAD_CFLAGS} \ - -DA4 -XLDFLAGS= ${PTHREAD_LIBS} +XCFLAGS= -DA4 +XLDFLAGS= -lpthread PLIST_SUB= GS_VERSION="${PORTVERSION}" \ X11BITS=${X11BITS} Modified: head/print/gsview/Makefile ============================================================================== --- head/print/gsview/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/print/gsview/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -20,8 +20,6 @@ RUN_DEPENDS+= epstool:${PORTSDIR}/graphi NO_CDROM= Can only be distributed for free -MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} - MAKE_JOBS_UNSAFE= yes PLIST_FILES= bin/gsview \ Modified: head/print/gsview/files/patch-srcunx_unx.mak ============================================================================== --- head/print/gsview/files/patch-srcunx_unx.mak Tue Mar 24 22:15:48 2015 (r382184) +++ head/print/gsview/files/patch-srcunx_unx.mak Tue Mar 24 22:17:41 2015 (r382185) @@ -1,5 +1,5 @@ ---- srcunx/unx.mak.orig 2008-07-13 07:39:58.254461217 -0400 -+++ srcunx/unx.mak 2008-07-14 09:22:24.652938045 -0400 +--- srcunx/unx.mak.orig 2004-11-27 05:51:26 UTC ++++ srcunx/unx.mak @@ -19,8 +19,8 @@ # # WARNING: Doesn't install pstotext @@ -11,7 +11,7 @@ GSVIEW_BASE=$(prefix)$(GSVIEW_ROOT) -@@ -38,8 +38,6 @@ +@@ -38,8 +38,6 @@ GSVIEW_DOCPATH=$(GSVIEW_BASE)/share/doc # GSview printer.ini and system wide gsview.ini GSVIEW_ETCPATH=$(prefix)/etc @@ -20,18 +20,16 @@ OBJ=o INSTALL=install -m 644 INSTALL_EXE=install -m 755 -@@ -50,8 +48,8 @@ - +@@ -51,7 +49,7 @@ LDEBUG= # Linux XINCLUDE= --PFLAGS=-DMULTITHREAD + PFLAGS=-DMULTITHREAD -PLINK=-lpthread -lrt -+PFLAGS=-DMULTITHREAD ${PTHREAD_CFLAGS} -+PLINK=${PTHREAD_LIBS} ++PLINK=-lpthread # SunOS 5.7 #XINCLUDE=-I/usr/openwin/share/lib -@@ -77,7 +75,8 @@ +@@ -77,7 +75,8 @@ PLINK=-lpthread -lrt # Other possible options are -Wtraditional # Compiler flags for C and C++ files. @@ -41,7 +39,7 @@ # Linker flags LFLAGS=$(LDEBUG) $(PLINK) `gtk-config --libs` -@@ -152,7 +151,7 @@ +@@ -152,7 +151,7 @@ OBJS=$(OBJCOM1) $(OBJCOM2) $(OBJPLAT1) #all: gsview html pstotext all: $(BD)gsview$(EXE) html Modified: head/science/cgnslib/Makefile ============================================================================== --- head/science/cgnslib/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/science/cgnslib/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -18,7 +18,6 @@ LICENSE_FILE= ${WRKSRC}/license.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= cmake -MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" USE_LDCONFIG= yes OPTIONS_DEFINE= HDF5 SZIP TESTS TOOLS Modified: head/science/cgnslib/files/patch-src_make.defs.in ============================================================================== --- head/science/cgnslib/files/patch-src_make.defs.in Tue Mar 24 22:15:48 2015 (r382184) +++ head/science/cgnslib/files/patch-src_make.defs.in Tue Mar 24 22:17:41 2015 (r382185) @@ -5,7 +5,7 @@ CEOUT = @CEOUT@ LDFLAGS = @LDFLAGS@ -CLIBS = @LIBS@ -+CLIBS = @LIBS@ $(PTHREAD_LIBS) ++CLIBS = @LIBS@ -lpthread #------------------------------------------------------------------------ # SPACE - used to force a space in the compiler executable output flag @@ -14,7 +14,7 @@ FFLAGS = @FFLAGS@ @SYSFFLAGS@ FEOUT = @FEOUT@ -FLIBS = @FLIBS@ -+FLIBS = @FLIBS@ $(PTHREAD_LIBS) ++FLIBS = @FLIBS@ -lpthread #------------------------------------------------------------------------ # strip command for executables - set to true if not used Modified: head/science/ecs/Makefile ============================================================================== --- head/science/ecs/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/science/ecs/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -33,7 +33,7 @@ CONFIGURE_ARGS= --with-bft=${LOCALBASE} --with-med=${LOCALBASE} \ --with-metis=${LOCALBASE} \ --with-metis-include=${LOCALBASE}/include/metis -CONFIGURE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} +CONFIGURE_ENV= PTHREAD_LIBS=-lpthread OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes Modified: head/science/gnudatalanguage/Makefile ============================================================================== --- head/science/gnudatalanguage/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/science/gnudatalanguage/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -34,8 +34,8 @@ CMAKE_ARGS= -DREADLINEDIR:STRING="/usr" -DNCURSESDIR:STRING="/usr" \ -DMPICH:BOOL=NO \ -DMAGICK:BOOL=NO -CPPFLAGS+= ${CFLAGS} -fno-inline ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib +CPPFLAGS+= ${CFLAGS} -fno-inline +LDFLAGS+= -lpthread -L${LOCALBASE}/lib SLAVEDIRS= science/py-gnudatalanguage Modified: head/science/h5utils/Makefile ============================================================================== --- head/science/h5utils/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/science/h5utils/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -15,8 +15,7 @@ LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE GNU_CONFIGURE= YES -CFLAGS += -L${LOCALBASE}/lib -I${LOCALBASE}/include \ - ${PTHREAD_LIBS} +CFLAGS += -L${LOCALBASE}/lib -I${LOCALBASE}/include -lpthread BUILD_DEPENDS+= gawk:${PORTSDIR}/lang/gawk LIB_DEPENDS+= libhdf5.so:${PORTSDIR}/science/hdf5 \ Modified: head/science/mpb/Makefile ============================================================================== --- head/science/mpb/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/science/mpb/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --with-lapack=-llapack .endif post-patch: - @${REINPLACE_CMD} -e 's|-lhdf5 |-lhdf5 ${PTHREAD_LIBS} |g' \ + @${REINPLACE_CMD} -e 's|-lhdf5 |-lhdf5 -lpthread |g' \ ${WRKSRC}/configure @${REINPLACE_CMD} \ -e '/INSTALL/s/$$(prefix)/$$(DESTDIR)$$(prefix)/' \ Modified: head/science/mpqc/Makefile ============================================================================== --- head/science/mpqc/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/science/mpqc/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -75,7 +75,7 @@ CONFIGURE_ARGS+=--with-libs="-lsvml" .if ${PORT_OPTIONS:MMPICH} CONFIGURE_ARGS+=--enable-always-use-mpi -CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" +CONFIGURE_ENV+= PTHREAD_LIBS=-lpthread .endif .if ${PORT_OPTIONS:MOPTIFLAGS} Modified: head/science/ncs/Makefile ============================================================================== --- head/science/ncs/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/science/ncs/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -32,7 +32,7 @@ CONFIGURE_ENV= MPI_LIBS="${MPI_LIBS}" \ PYEXE="${PYTHON_CMD}" CONFIGURE_ARGS= --with-blas-libs="${BLASLIB} ${LAPACKLIB}" MAKE_ENV= NOM_ARCH=${OPSYS} CS_MPI_PATH=${MPI_HOME}/bin \ - PTHREAD_LIBS=${PTHREAD_LIBS} TERM=${TERM} \ + PTHREAD_LIBS=-lpthread TERM=${TERM} \ MPI_HOME=${MPI_HOME} MPI_LIBS="${MPI_LIBS}" USE_LDCONFIG= yes @@ -88,7 +88,7 @@ MPI_LIBS= -lmpi -lorte -lopal MPI_HOME= ${LOCALBASE} BUILD_DEPENDS+= ${MPI_HOME}/bin/mpicc:${PORTSDIR}/net/mpich2 RUN_DEPENDS+= ${MPI_HOME}/bin/mpirun:${PORTSDIR}/net/mpich2 -MPI_LIBS= -lmpich -lmpl ${PTHREAD_LIBS} +MPI_LIBS= -lmpich -lmpl -lpthread .endif .if ${PORT_OPTIONS:MDOCS} Modified: head/science/vmd/Makefile ============================================================================== --- head/science/vmd/Makefile Tue Mar 24 22:15:48 2015 (r382184) +++ head/science/vmd/Makefile Tue Mar 24 22:17:41 2015 (r382185) @@ -65,17 +65,20 @@ do-extract: ${TAR} -xzf ${DISTDIR}/${STRIDE_DIST} -C ${WRKSRC}/lib/stride post-patch: - ${REINPLACE_CMD} "s/-lpthread/${PTHREAD_LIBS}/" ${WRKSRC}/configure - ${REINPLACE_CMD} "s/-ltk8.5/-ltk85/" ${WRKSRC}/configure - ${REINPLACE_CMD} "s/-ltcl8.5/-ltcl85/" ${WRKSRC}/configure - ${REINPLACE_CMD} "s%\$$python_dir/lib_\$$config_arch%${PREFIX}%" ${WRKSRC}/configure - ${REINPLACE_CMD} "s/python2.5/${PYTHON_VERSION}/" ${WRKSRC}/configure - ${REINPLACE_CMD} "s/.SILENT:/#.SILENT:/" ${WRKDIR}/plugins/Makefile + ${REINPLACE_CMD} \ + -e "s|-ltk8.5|-ltk85|" \ + -e "s|-ltcl8.5|-ltcl85|" \ + -e "s%\$$python_dir/lib_\$$config_arch%${PREFIX}%" \ + -e "s|python2.5|${PYTHON_VERSION}|" \ + -e "s|%%PREFIX%%|${PREFIX}|g" \ + -e "s|/usr/local|${LOCALBASE}|g" \ + ${WRKSRC}/configure + ${REINPLACE_CMD} "s/\"gcc\"/\"${CC}\"/;s/\"g++\"/\"${CXX}\"/" \ + ${WRKSRC}/configure + ${REINPLACE_CMD} -e "s/.SILENT:/#.SILENT:/" ${WRKDIR}/plugins/Makefile ${REINPLACE_CMD} "s/.SILENT:/#.SILENT:/" ${WRKDIR}/plugins/*/Makefile - ${REINPLACE_CMD} "s%log2f(\([^ ,]*\))%logf(\1)/(float)M_LN2%g" ${WRKSRC}/src/Orbital.C - ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure - ${REINPLACE_CMD} "s/\"gcc\"/\"${CC}\"/;s/\"g++\"/\"${CXX}\"/" ${WRKSRC}/configure + ${REINPLACE_CMD} "s%log2f(\([^ ,]*\))%logf(\1)/(float)M_LN2%g" \ + ${WRKSRC}/src/Orbital.C ${REINPLACE_CMD} -E "s/(SHLD[[:space:]]*=[[:space:]]*)gcc/\1${CC}/" \ ${WRKDIR}/plugins/Make-arch ${REINPLACE_CMD} -E "s/(CC[[:space:]]*=[[:space:]]*)(gcc|cc)/\1${CC}/" \