- Upgrade to 5.6.5;

- Install libabinit;

- Handle NOPORTDOCS and NOPORTEXAMPLES;

- s/test/regression-test/;

- Don't install under a versionned $PREFIX.

Approved by:	maho (maintainer)

science/abinit/Makefile

@@ -1,45 +1,70 @@
-# New ports collection makefile for:   abinit
+# New ports collection makefile for:	abinit
-# Date Created:                18 March 2004
+# Date Created:				18 March 2004
-# Whom:                        NAKATA Maho <maho@FreeBSD.org>
+# Whom:					NAKATA Maho <maho@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	abinit
-PORTVERSION=	5.2.4
+PORTVERSION=	5.6.5
-PORTREVISION=	3
 CATEGORIES=	science
-MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|maho/abinit|} \
+MASTER_SITES=	ftp://ftp.abinit.org/pub/abinitio/ABINIT_v${PORTVERSION}/
-		ftp://ftp.abinit.org/pub/abinitio/ABINIT_v${PORTVERSION}/
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Abinit calculates electronic structure of systems
 
+LIB_DEPENDS=	netcdff.4:${PORTSDIR}/science/netcdf-ftn
+
 USE_FORTRAN=	yes
 USE_GMAKE=	yes
+USE_PYTHON=	yes
+USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:262
+CONFIGURE_ENV=	WGET=${TRUE}
+CONFIGURE_ARGS=	--disable-wannier90 --disable-bigdft --disable-etsf-io	\
+		--with-plugins-tardir=/dev/null				\
+		--with-netcdf-includes="-I${LOCALBASE}/include"		\
+		--with-netcdf-libs="-L${LOCALBASE}/lib -lnetcdff -lnetcdf"
+ALL_TARGET=	all libabinit
+
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX-base	\
+		dvips:${PORTSDIR}/print/dvipsk-tetex	\
+		markdown:${PORTSDIR}/textproc/markdown
+USE_GHOSTSCRIPT_BUILD=	yes
+.endif
 
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
-WITH_ATLAS=     yes
+WITH_ATLAS=	yes
 .endif
 .if defined(WITH_ATLAS)
-LIB_DEPENDS+=   atlas.2:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
 BLAS=		-lf77blas -latlas
 LAPACK=		-lalapack
 .else
-LIB_DEPENDS+=   blas.2:${PORTSDIR}/math/blas
+LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
-LIB_DEPENDS+=   lapack.4:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
 BLAS=		-lblas
 LAPACK=		-llapack
 .endif
 
 pre-configure:
-	@(cd ${WRKSRC} && config/scripts/makemake)
+.if defined(NOPORTDOCS)
+	${REINPLACE_CMD} -e '/^SUBDIRS =/s| doc||' ${WRKSRC}/Makefile.in
+.endif
+.if defined(NOPORTEXAMPLES)
+	${REINPLACE_CMD} -e '/^SUBDIRS =/s| tests||' ${WRKSRC}/Makefile.in
+.endif
 
-test:
+post-install:
-	cd ${WRKSRC}/tests ; ${GMAKE} tests
+	${MKDIR} ${PREFIX}/lib
+.for lf in libabinip.a libabinis.a
+	${INSTALL_DATA} ${WRKSRC}/${lf} ${PREFIX}/lib
+.endfor
+
+regression-test:
+	cd ${WRKSRC}/tests ; ${GMAKE} tests_min
 
 .include <bsd.port.post.mk>

science/abinit/distinfo

@@ -1,3 +1,3 @@
-MD5 (abinit-5.2.4.tar.gz) = ec6a91c77f425eda921e8d4280a7740c
+MD5 (abinit-5.6.5.tar.gz) = 167ef71a21c27e52ef82d284a9835c91
-SHA256 (abinit-5.2.4.tar.gz) = 8f13a3af020fa4be9e0d6eada24c82c68612d24635ab880a4ccd7a2528e1b153
+SHA256 (abinit-5.6.5.tar.gz) = 20b9cfcecb2fa238363e88b9b719e755e7bf2dd156c2216f43ec0c4b7be25fa0
-SIZE (abinit-5.2.4.tar.gz) = 20979917
+SIZE (abinit-5.6.5.tar.gz) = 30213023

science/abinit/files/patch-config+m4+init.m4

@@ -1,104 +0,0 @@
---- config/m4/init.m4.orig	Tue Nov 28 15:12:04 2006
-+++ config/m4/init.m4	Sun Feb 25 16:51:02 2007
-@@ -142,6 +142,101 @@
-    abi_cpu_bits="64"
-    ;;
- 
-+   i386-*freebsd*)
-+   dnl Pentium 3 ?
-+   if test "${abi_cpu_model}" = ""; then
-+    abi_cpu_model=`sysctl hw.model | grep 'Pentium III'`
-+    if test "${abi_cpu_model}" != ""; then
-+     abi_cpu_model="pentium3"
-+     abi_cpu_64bits="no"
-+     abi_cpu_bits="32"
-+    fi
-+   fi
-+   dnl Pentium 4 ?
-+   if test "${abi_cpu_model}" = ""; then
-+    abi_cpu_model=`sysctl hw.model | grep 'Intel(R) Pentium(R) 4'`
-+    if test "${abi_cpu_model}" != ""; then
-+     abi_cpu_model="pentium4"
-+     abi_cpu_64bits="no"
-+     abi_cpu_bits="32"
-+    fi
-+   fi
-+   dnl Pentium 4M ?
-+   if test "${abi_cpu_model}" = ""; then
-+    abi_cpu_model=`sysctl hw.model | grep 'Intel(R) Pentium(R) M'`
-+    if test "${abi_cpu_model}" != ""; then
-+     abi_cpu_model="pentium4"
-+     abi_cpu_64bits="no"
-+     abi_cpu_bits="32"
-+    fi
-+   fi
-+   dnl Unknown
-+   if test "${abi_cpu_model}" = ""; then
-+    abi_cpu_model="unknown"
-+   fi
-+   dnl The processor is anyway 32-bit
-+   abi_cpu_64bits="no"
-+   abi_cpu_bits="32"
-+   ;;
-+
-+   amd64-*freebsd*)
-+   dnl Opteron ?
-+   if test "${abi_cpu_model}" = ""; then
-+    abi_cpu_model=`sysctl hw.model | grep 'Opteron'`
-+    if test "${abi_cpu_model}" != ""; then
-+     abi_cpu_model="opteron"
-+     abi_cpu_64bits="yes"
-+     abi_cpu_bits="64"
-+    fi
-+   fi
-+   dnl Xeon ?
-+   if test "${abi_cpu_model}" = ""; then
-+    abi_cpu_model=`sysctl hw.model | grep 'Intel(R) XEON(TM)'`
-+    if test "${abi_cpu_model}" != ""; then
-+     abi_cpu_model="xeon"
-+     abi_cpu_64bits="yes"
-+     abi_cpu_bits="64"
-+    fi
-+   fi
-+   dnl Unknown
-+   if test "${abi_cpu_model}" = ""; then
-+    abi_cpu_model="unknown"
-+   fi
-+   dnl The processor is anyway 64-bit
-+   abi_cpu_64bits="yes"
-+   abi_cpu_bits="64"
-+   ;;
-+
-+  ia64-*freebsd*)
-+   dnl Itanium 1 ?
-+   if test "${abi_cpu_model}" = ""; then
-+    abi_cpu_model=`sysctl hw.model | grep 'Itanium 1'`
-+    if test "${abi_cpu_model}" = ""; then
-+     abi_cpu_model="itanium1"
-+    fi
-+   fi
-+   dnl Itanium 2 ?
-+   if test "${abi_cpu_model}" = ""; then
-+    abi_cpu_model=`sysctl hw.model | grep 'Itanium 2'`
-+    if test "${abi_cpu_model}" != ""; then
-+     abi_cpu_model="itanium2"
-+    fi
-+   fi
-+   dnl Unknown
-+   if test "${abi_cpu_model}" = ""; then
-+    abi_cpu_model="unknown"
-+   fi
-+   dnl The processor is anyway 64-bit
-+   abi_cpu_64bits="yes"
-+   abi_cpu_bits="64"
-+   ;;
-+
-+   sparc64-*freebsd*)
-+    abi_cpu_model="unknown"
-+    abi_cpu_64bits="yes"
-+    abi_cpu_bits="64"
-+   ;;
-+
-  esac
- 
-  AC_SUBST(abi_cpu_model)

science/abinit/files/patch-config.mk.in

@@ -0,0 +1,11 @@
+--- config.mk.in.orig	2009-02-22 07:08:32.000000000 +0100
++++ config.mk.in	2009-03-08 09:54:35.000000000 +0100
+@@ -41,7 +41,7 @@
+ PYTHON  = @PYTHON@
+ LN_S    = @LN_S@
+ EGREP   = @EGREP@
+-MKDIR_P = @MKDIR_P@
++MKDIR_P = @abinit_builddir@/@MKDIR_P@
+ 
+ # Architecture
+ target          = @target@

science/abinit/files/patch-configure

@@ -0,0 +1,27 @@
+--- configure.orig	2009-02-22 08:32:10.000000000 +0100
++++ configure	2009-03-09 20:01:48.000000000 +0100
+@@ -5151,15 +5151,15 @@
+   abinit_prefix="${prefix}"
+  fi
+ 
+-  abinit_bindir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/bin"
+- abinit_chkdir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/tests"
+- abinit_datdir="${abinit_prefix}/abinit"
+- abinit_docdir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/doc"
+- abinit_incdir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/include"
+- abinit_libdir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/lib"
+- abinit_mandir="${abinit_prefix}/abinit/man"
+- abinit_rundir="${abinit_prefix}/abinit/bin"
+- abinit_wwwdir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/www"
++ abinit_bindir="${abinit_prefix}/bin"
++ abinit_chkdir="${abinit_prefix}/share/examples/abinit/tests"
++ abinit_datdir="${abinit_prefix}/share/abinit"
++ abinit_docdir="${abinit_prefix}/share/doc/abinit/"
++ abinit_incdir="${abinit_prefix}/include/abinit"
++ abinit_libdir="${abinit_prefix}/lib"
++ abinit_mandir="${abinit_prefix}/man"
++ abinit_rundir="${abinit_prefix}/bin"
++ abinit_wwwdir="${abinit_prefix}/www/abinit"
+ 
+ 
+