12 files changed, 37 insertions, 30 deletions

diff --git a/science/atom/Makefile b/science/atom/Makefile
index 52155c8b1603..1abd29ef67fd 100644
--- a/science/atom/Makefile
+++ b/science/atom/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	atom
 DISTVERSION=	4.2.7-100
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	https://departments.icmab.es/leem/siesta/Pseudopotentials/Code/ \
 		https://departments.icmab.es/leem/siesta/Pseudopotentials/:lic
@@ -17,7 +17,7 @@ COMMENT=	Program for DFT calculations in atoms
 LICENSE=	ATOM_LICENSE
 LICENSE_NAME=	ATOM ACADEMIC LICENCE
 LICENSE_FILE=	${DISTDIR}/${DIST_SUBDIR}/atom_licence.html
-LICENSE_PERMS=	no-dist-mirror no-pkg-mirror no-pkg-sell no-auto-accept
+LICENSE_PERMS=	# none
 
 LIB_DEPENDS=	libGridXC.so:science/libgridxc \
 		libxc.so:science/libxc \
diff --git a/science/bagel/Makefile b/science/bagel/Makefile
index 98d5e6a30216..562f2142a176 100644
--- a/science/bagel/Makefile
+++ b/science/bagel/Makefile
@@ -4,6 +4,7 @@ PORTNAME=	bagel
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.2-21
 DISTVERSIONSUFFIX=	-g2a9472a50
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/science/jdftx/Makefile b/science/jdftx/Makefile
index a82dd51fbdff..60677debe004 100644
--- a/science/jdftx/Makefile
+++ b/science/jdftx/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	jdftx
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.2-74
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-gba743849
 CATEGORIES=	science
 
diff --git a/science/libgridxc/Makefile b/science/libgridxc/Makefile
index 80eedcfde9f3..d76eea24a6f9 100644
--- a/science/libgridxc/Makefile
+++ b/science/libgridxc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libgridxc
 DISTVERSION=	0.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	https://launchpad.net/${PORTNAME}/trunk/${DISTVERSION:R}/+download/
 
diff --git a/science/libxc/Makefile b/science/libxc/Makefile
index 59d0aa659dc2..1ee954a939db 100644
--- a/science/libxc/Makefile
+++ b/science/libxc/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	libxc
-PORTVERSION=	3.0.0
-PORTREVISION=	5
+DISTVERSION=	4.2.3
 CATEGORIES=	science
-MASTER_SITES=	http://www.tddft.org/programs/octopus/download/libxc/
+MASTER_SITES=	http://www.tddft.org/programs/octopus/download/libxc/${DISTVERSION}/
 
 MAINTAINER=	dieterich@ogolem.org
 COMMENT=	Library of exchange-correlation functionals for DFT
@@ -15,13 +14,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		fortran gmake libtool perl5
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared
+CONFIGURE_ARGS=	--enable-shared --disable-static
 USE_LDCONFIG=	yes
 
 INSTALL_TARGET=	install-strip
 
-post-patch:
-	@${REINPLACE_CMD} -e '/^pkgconfigdir =/s,libdir),prefix)/libdata,' \
-		${WRKSRC}/build/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/science/libxc/distinfo b/science/libxc/distinfo
index 7d6ff683860c..33591b3e068f 100644
--- a/science/libxc/distinfo
+++ b/science/libxc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libxc-3.0.0.tar.gz) = 5542b99042c09b2925f2e3700d769cda4fb411b476d446c833ea28c6bfa8792a
-SIZE (libxc-3.0.0.tar.gz) = 8388775
+TIMESTAMP = 1540063598
+SHA256 (libxc-4.2.3.tar.gz) = 02e49e9ba7d21d18df17e9e57eae861e6ce05e65e966e1e832475aa09e344256
+SIZE (libxc-4.2.3.tar.gz) = 15601356
diff --git a/science/libxc/files/patch-src_xc.h b/science/libxc/files/patch-src_xc.h
new file mode 100644
index 000000000000..adf87f550125
--- /dev/null
+++ b/science/libxc/files/patch-src_xc.h
@@ -0,0 +1,11 @@
+--- src/xc.h.orig	2018-10-20 19:30:09 UTC
++++ src/xc.h
+@@ -14,7 +14,7 @@ extern "C" {
+ #endif
+ 
+ #ifdef HAVE_CONFIG_H
+-#include "config.h"
++//#include "config.h" // "config.h" should never be included by the installed package: https://gitlab.com/libxc/libxc/issues/66
+ #endif
+ 
+ #include <xc_version.h>
diff --git a/science/libxc/pkg-descr b/science/libxc/pkg-descr
index 8fa3db40f265..2dfcd7aaa501 100644
--- a/science/libxc/pkg-descr
+++ b/science/libxc/pkg-descr
@@ -1,9 +1,9 @@
 Libxc is library of exchange-correlation functionals for density-functional
-theory.  The aim is to provide a portable, well tested and reliable set of
+theory. The aim is to provide a portable, well tested and reliable set of
 exchange and correlation functionals that can be used by all the ETSF codes
 and also other codes.
 
 In libxc you can find different types of functionals: LDA, GGA, hybrids,
 and mGGA (experimental).
 
-WWW: http://www.tddft.org/programs/octopus/wiki/index.php/Libxc
+WWW: http://www.tddft.org/programs/libxc/
diff --git a/science/libxc/pkg-plist b/science/libxc/pkg-plist
index c0a2df281f49..39f969ce1e4d 100644
--- a/science/libxc/pkg-plist
+++ b/science/libxc/pkg-plist
@@ -1,23 +1,22 @@
 bin/xc-info
+bin/xc-threshold
 include/libxc_funcs_m.mod
 include/xc.h
-include/xc_config.h
 include/xc_f03_lib_m.mod
 include/xc_f90_lib_m.mod
 include/xc_f90_types_m.mod
 include/xc_funcs.h
-include/xc_unconfig.h
+include/xc_funcs_removed.h
 include/xc_version.h
-lib/libxc.a
 lib/libxc.so
-lib/libxc.so.4
-lib/libxc.so.4.0.0
-lib/libxcf03.a
+lib/libxc.so.5
+lib/libxc.so.5.2.3
 lib/libxcf03.so
-lib/libxcf03.so.4
-lib/libxcf03.so.4.0.0
-lib/libxcf90.a
+lib/libxcf03.so.5
+lib/libxcf03.so.5.2.3
 lib/libxcf90.so
-lib/libxcf90.so.4
-lib/libxcf90.so.4.0.0
+lib/libxcf90.so.5
+lib/libxcf90.so.5.2.3
 libdata/pkgconfig/libxc.pc
+libdata/pkgconfig/libxcf03.pc
+libdata/pkgconfig/libxcf90.pc
diff --git a/science/madness/Makefile b/science/madness/Makefile
index 720787ee09d9..dee826ff283b 100644
--- a/science/madness/Makefile
+++ b/science/madness/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	madness
 DISTVERSION=	0.10.1.20180823
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/science/octopus/Makefile b/science/octopus/Makefile
index 3bb81136f5db..b9e3eff9b793 100644
--- a/science/octopus/Makefile
+++ b/science/octopus/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	octopus
 DISTVERSION=	8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	http://www.tddft.org/programs/${PORTNAME}/download/${DISTVERSION}/
 
diff --git a/science/py-gpaw/Makefile b/science/py-gpaw/Makefile
index 13fe5d619ea9..ce685dff24f1 100644
--- a/science/py-gpaw/Makefile
+++ b/science/py-gpaw/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gpaw
 DISTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}