From owner-svn-ports-head@freebsd.org Sat Oct 6 04:12:13 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8BE2D10C4A2E; Sat, 6 Oct 2018 04:12:13 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3F63D7FE89; Sat, 6 Oct 2018 04:12:13 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3A55F1F679; Sat, 6 Oct 2018 04:12:13 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w964CD16034946; Sat, 6 Oct 2018 04:12:13 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w964CC6x034944; Sat, 6 Oct 2018 04:12:12 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201810060412.w964CC6x034944@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sat, 6 Oct 2018 04:12:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r481313 - in head/science/nwchem: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/science/nwchem: . files X-SVN-Commit-Revision: 481313 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Oct 2018 04:12:13 -0000 Author: yuri Date: Sat Oct 6 04:12:12 2018 New Revision: 481313 URL: https://svnweb.freebsd.org/changeset/ports/481313 Log: science/nwchem: Remove the wrapper script with LD_PRELOAD, achieve the same by properly passing LDFLAGS to the link command Also remove one unnecessary file that comes with the .orig suffix. Modified: head/science/nwchem/Makefile head/science/nwchem/files/patch-config_makefile.h head/science/nwchem/pkg-plist Modified: head/science/nwchem/Makefile ============================================================================== --- head/science/nwchem/Makefile Sat Oct 6 04:09:31 2018 (r481312) +++ head/science/nwchem/Makefile Sat Oct 6 04:12:12 2018 (r481313) @@ -2,8 +2,8 @@ PORTNAME= nwchem DISTVERSION= 6.8.1-release-94 -PORTREVISION= 4 DISTVERSIONSUFFIX= -g1a262862b +PORTREVISION= 5 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -35,8 +35,13 @@ MAKE_ENV= NWCHEM_TOP=${WRKSRC}/.. NWCHEM_MODULES=all N SUB_FILES= nwchemrc WRKSRC_SUBDIR= src + BINARY_ALIAS= gcc=${CC} +MAKE_ARGS= LDFLAGS_FREEBSD="${LDFLAGS}" +post-extract: + @${RM} ${WRKSRC}/atomscf/src.orig + post-patch: @${REINPLACE_CMD} 's|nwchrc="/etc/nwchemrc"|nwchrc="${PREFIX}/etc/nwchemrc"|' ${WRKSRC}/util/util_nwchemrc.F @@ -47,12 +52,7 @@ pre-build: do-install: ${INSTALL_DATA} ${WRKDIR}/nwchemrc ${STAGEDIR}${PREFIX}/etc/nwchemrc - ${INSTALL_PROGRAM} ${WRKSRC}/../bin/LINUX64/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}.shadow - @(echo "#!/bin/sh"; \ - echo ""; \ - echo "LD_PRELOAD=${PREFIX}/lib/gcc${GCC_DEFAULT}/libgcc_s.so ${PREFIX}/bin/${PORTNAME}.shadow \""$$"@\"" \ - ) > ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - @${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/../bin/LINUX64/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} cd ${WRKSRC}/basis && ${COPYTREE_SHARE} libraries ${STAGEDIR}${DATADIR} cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DATADIR}/libraryps Modified: head/science/nwchem/files/patch-config_makefile.h ============================================================================== --- head/science/nwchem/files/patch-config_makefile.h Sat Oct 6 04:09:31 2018 (r481312) +++ head/science/nwchem/files/patch-config_makefile.h Sat Oct 6 04:12:12 2018 (r481313) @@ -1,4 +1,4 @@ ---- config/makefile.h.orig 2018-08-23 07:16:42 UTC +--- config/makefile.h.orig 2018-10-01 05:39:33 UTC +++ config/makefile.h @@ -1758,9 +1758,9 @@ endif ifeq ($(USE_FLANG),1) @@ -12,3 +12,9 @@ GNU_GE_4_6 = $(shell [ $(GNUMAJOR) -gt 4 -o \( $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 6 \) ] && echo true) GNU_GE_4_8 = $(shell [ $(GNUMAJOR) -gt 4 -o \( $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 8 \) ] && echo true) endif +@@ -2985,4 +2985,4 @@ endif + + endif + +- ++LINK.f += $(LDFLAGS_FREEBSD) # ignores LDFLAGS: https://github.com/nwchemgit/nwchem/issues/64 Modified: head/science/nwchem/pkg-plist ============================================================================== --- head/science/nwchem/pkg-plist Sat Oct 6 04:09:31 2018 (r481312) +++ head/science/nwchem/pkg-plist Sat Oct 6 04:12:12 2018 (r481313) @@ -1,5 +1,4 @@ bin/nwchem -bin/nwchem.shadow etc/nwchemrc %%DATADIR%%/data/amber_q/ABE.frg %%DATADIR%%/data/amber_q/BNZ.frg