svn commit: r481313 - in head/science/nwchem: . files

[Yuri Victorovich]

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 at 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