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

science/dftbplus/Makefile

@@ -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 \

science/dftbplus/files/patch-external_xmlf90_make.dpbuild

@@ -1,11 +0,0 @@
---- external/xmlf90/make.dpbuild.orig	2018-09-12 21:14:34 UTC
-+++ external/xmlf90/make.dpbuild
-@@ -31,7 +31,7 @@ clean:
- 	rm -f *.o _mod_* *.mod
- 
- %.o: %.f90
--	$(FXX) $(FXXOPT) -o $@ -c $<
-+	$(FXX) -c $(FXXOPT) -o $@ -c $<
- 
- _mod_%:
- 	@[ -f $< ] && touch $@

science/dftbplus/files/patch-make.arch

@@ -18,7 +18,7 @@
  
  # ScaLAPACK
 -SCALAPACKDIR = /usr/lib
-+SCALAPACKDIR = $(PREFIX)
++SCALAPACKDIR = $(PREFIX)/lib
  LIB_SCALAPACK = -L$(SCALAPACKDIR) -lscalapack
  
  # LAPACK/BLAS

science/dftbplus/files/patch-make.config

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

science/dftbplus/files/patch-makefile

@@ -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 \