From owner-svn-ports-all@freebsd.org Sun Oct 14 18:30:18 2018 Return-Path: Delivered-To: svn-ports-all@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 1DC0210DE4EF; Sun, 14 Oct 2018 18:30:18 +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 C7D6C95E1B; Sun, 14 Oct 2018 18:30:17 +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 BFAFD21F99; Sun, 14 Oct 2018 18:30:17 +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 w9EIUHOJ073738; Sun, 14 Oct 2018 18:30:17 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9EIUHZr073737; Sun, 14 Oct 2018 18:30:17 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201810141830.w9EIUHZr073737@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sun, 14 Oct 2018 18:30:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482105 - in head/science/gamess-us: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/science/gamess-us: . files X-SVN-Commit-Revision: 482105 X-SVN-Commit-Repository: ports 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.27 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: Sun, 14 Oct 2018 18:30:18 -0000 Author: yuri Date: Sun Oct 14 18:30:17 2018 New Revision: 482105 URL: https://svnweb.freebsd.org/changeset/ports/482105 Log: science/gamess-us: Add math library selection options Modified: head/science/gamess-us/Makefile head/science/gamess-us/files/patch-lked Modified: head/science/gamess-us/Makefile ============================================================================== --- head/science/gamess-us/Makefile Sun Oct 14 18:28:00 2018 (r482104) +++ head/science/gamess-us/Makefile Sun Oct 14 18:30:17 2018 (r482105) @@ -2,6 +2,7 @@ PORTNAME= gamess DISTVERSION= 20181013 +PORTREVISION= 1 CATEGORIES= science PKGNAMESUFFIX= -us # "US" fork DISTNAME= gamess-current @@ -29,13 +30,24 @@ GAMES_ENV= GMS_PATH=${WRKSRC} GMS_BUILD_DIR=${WRKSRC} GMS_FORTRAN=gfortran GMS_GFORTRAN_VERNO=7.3 \ GMS_VERSION=${GAMES_VERNO} GMS_BUILD_PATH=${WRKSRC} \ GMS_OPENMP=false GMS_BG_MODEL="" GMS_SUN_OS_VERNO="" GMS_MAC_OSX_VERNO="" \ - GMS_IFORT_VERNO="" GMS_SUN_FORT_VERNO="" GMS_L64_OPT="" GMS_MATHLIB="" GMS_MATHLIB_PATH="" \ + GMS_IFORT_VERNO="" GMS_SUN_FORT_VERNO="" GMS_L64_OPT="" GMS_MATHLIB="${GMS_MATHLIB}" GMS_MATHLIB_PATH=${LOCALBASE}/lib \ GMS_MKL_VERNO="" GMS_DDI_COMM="sockets" GMS_MPI_LIB="" GMS_MPI_PATH="" GMS_MVAPICH2_VERNO="" \ GMS_OFED_PATH="" GMS_ARMCI_PATH="" GMS_MSUCC="" GMS_LIBCCHEM="" GMS_PHI="" GMS_SHMTYPE="posix" PLIST_SUB+= GAMES_VERNO=${GAMES_VERNO} SUB_LIST+= GAMES_VERNO=${GAMES_VERNO} SUB_FILES= pkg-message + +OPTIONS_RADIO= MATHLIB +OPTIONS_RADIO_MATHLIB= ATLAS OPENBLAS +OPTIONS_DEFAULT= OPENBLAS +MATHLIB_DESC= Math library + +ATLAS_VARS= GMS_MATHLIB=atlas +ATLAS_LIB_DEPENDS= libatlas.so:math/atlas + +OPENBLAS_VARS= GMS_MATHLIB=openblas +OPENBLAS_LIB_DEPENDS= libopenblas.so:math/openblas .include Modified: head/science/gamess-us/files/patch-lked ============================================================================== --- head/science/gamess-us/files/patch-lked Sun Oct 14 18:28:00 2018 (r482104) +++ head/science/gamess-us/files/patch-lked Sun Oct 14 18:30:17 2018 (r482105) @@ -1,5 +1,39 @@ ---- lked.orig 2018-10-13 06:11:50 UTC +--- lked.orig 2018-10-01 03:45:26 UTC +++ lked +@@ -672,12 +672,12 @@ if ($TARGET == linux64) then + # ln -s liblapack_atlas.so.3.0 liblapack.so + # ln -s liblapack.so.3.0 liblapack.so + # It is strange the RPM's don't do these soft links for us. +- if (-e $GMS_MATHLIB_PATH/libf77blas.a) then +- set MATHLIBS="$GMS_MATHLIB_PATH/libf77blas.a" +- set MATHLIBS="$MATHLIBS $GMS_MATHLIB_PATH/libatlas.a" +- else ++ #if (-e $GMS_MATHLIB_PATH/libf77blas.a) then ++ # set MATHLIBS="$GMS_MATHLIB_PATH/libf77blas.a" ++ # set MATHLIBS="$MATHLIBS $GMS_MATHLIB_PATH/libatlas.a" ++ #else + set MATHLIBS="-L$GMS_MATHLIB_PATH -lf77blas -latlas" +- endif ++ #endif + if ($CCHEM == true) then + set MATHLIBS="-L$GMS_MATHLIB_PATH -Wl,--start-group -lf77blas -latlas -lcblas -llapack -Wl,--end-group" + endif +@@ -697,11 +697,11 @@ if ($TARGET == linux64) then + breaksw + + case openblas: +- if (-e $GMS_MATHLIB_PATH/libopenblas.a) then +- set MATHLIBS="$GMS_MATHLIB_PATH/libopenblas.a" +- else ++ #if (-e $GMS_MATHLIB_PATH/libopenblas.a) then ++ # set MATHLIBS="$GMS_MATHLIB_PATH/libopenblas.a" ++ #else + set MATHLIBS="-L$GMS_MATHLIB_PATH -lopenblas" +- endif ++ #endif + set BLAS=' ' + breaksw + @@ -1556,7 +1556,7 @@ if (($TARGET == win32) || ($TARGET == wi endif chdir $GMS_BUILD_DIR/object