From owner-svn-ports-all@freebsd.org Thu Sep 13 19:16:14 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 6147E10969EC; Thu, 13 Sep 2018 19:16:14 +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 12D4E7E5EA; Thu, 13 Sep 2018 19:16:14 +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 0DBC819B9C; Thu, 13 Sep 2018 19:16:14 +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 w8DJGDFL097242; Thu, 13 Sep 2018 19:16:13 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8DJGDEO097239; Thu, 13 Sep 2018 19:16:13 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201809131916.w8DJGDEO097239@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Thu, 13 Sep 2018 19:16:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479690 - in head/science/dftbplus: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/science/dftbplus: . files X-SVN-Commit-Revision: 479690 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: Thu, 13 Sep 2018 19:16:14 -0000 Author: yuri Date: Thu Sep 13 19:16:12 2018 New Revision: 479690 URL: https://svnweb.freebsd.org/changeset/ports/479690 Log: science/dftbplus: Correct license; Correct patches Port changes: * Change LICENSE to GPLv3: LGPL3+ combined with GPLv1+ yields GPLv3 * Remove some unnecessary patches, also correct patch, binaries don't change Deleted: head/science/dftbplus/files/patch-external_xmlf90_make.dpbuild Modified: head/science/dftbplus/Makefile head/science/dftbplus/files/patch-make.arch head/science/dftbplus/files/patch-make.config head/science/dftbplus/files/patch-makefile Modified: head/science/dftbplus/Makefile ============================================================================== --- head/science/dftbplus/Makefile Thu Sep 13 19:13:08 2018 (r479689) +++ head/science/dftbplus/Makefile Thu Sep 13 19:16:12 2018 (r479690) @@ -8,8 +8,7 @@ CATEGORIES= science MAINTAINER= yuri@FreeBSD.org COMMENT= DFTB+: Package for performing fast atomistic simulations -LICENSE= LGPL3+ GPLv1 # main code is under LGPL3+, the bundled dftd3-lib is under GPLv1 -LICENSE_COMB= multi +LICENSE= GPLv3 # main code is under LGPL3+, the bundled dftd3-lib is under GPLv1+, this makes the result GPLv3 (based on https://www.gnu.org/licenses/gpl-faq.html#AllCompatibility) LIB_DEPENDS= libblas.so:math/blas \ liblapack.so:math/lapack \ Modified: head/science/dftbplus/files/patch-make.arch ============================================================================== --- head/science/dftbplus/files/patch-make.arch Thu Sep 13 19:13:08 2018 (r479689) +++ head/science/dftbplus/files/patch-make.arch Thu Sep 13 19:16:12 2018 (r479690) @@ -18,7 +18,7 @@ # ScaLAPACK -SCALAPACKDIR = /usr/lib -+SCALAPACKDIR = $(PREFIX) ++SCALAPACKDIR = $(PREFIX)/lib LIB_SCALAPACK = -L$(SCALAPACKDIR) -lscalapack # LAPACK/BLAS Modified: head/science/dftbplus/files/patch-make.config ============================================================================== --- head/science/dftbplus/files/patch-make.config Thu Sep 13 19:13:08 2018 (r479689) +++ head/science/dftbplus/files/patch-make.config Thu Sep 13 19:16:12 2018 (r479690) @@ -1,6 +1,6 @@ --- make.config.orig 2018-08-17 17:13:08 UTC +++ make.config -@@ -55,12 +55,12 @@ COMPILE_DFTD3 := 1 +@@ -55,8 +55,8 @@ COMPILE_DFTD3 := 1 # Set the compile time include and the link time library options for # dftd3-lib. Ignored if WITH_DFTD3 has been disabled or COMPILE_DFTD3 enabled. @@ -11,8 +11,3 @@ # Link time library options for linking ARPACK. Ignored if WITH_ARPACK was # disabled. --ARPACK_LIBS := -larpack -+ARPACK_LIBS := $(PREFIX)/lib/libarpack.so - - # Whether ARPACK depends on the external LAPACK and BLAS libraries - ARPACK_NEEDS_LAPACK := 0 Modified: head/science/dftbplus/files/patch-makefile ============================================================================== --- head/science/dftbplus/files/patch-makefile Thu Sep 13 19:13:08 2018 (r479689) +++ head/science/dftbplus/files/patch-makefile Thu Sep 13 19:16:12 2018 (r479690) @@ -11,12 +11,7 @@ .PHONY: install install_misc install_all install: install_dftb+ install_modes install_waveplot install_dptools -@@ -123,11 +125,11 @@ install_misc_skderivs install_misc_slako - ROOT=$(ROOT) BUILDROOT=$(BUILDDIR) install - - --PYTHON := python -+PYTHON ?= python +@@ -127,7 +129,7 @@ PYTHON := python .PHONY: install_dptools install_dptools: cd $(ROOT)/tools/dptools \