Convert all USE_FORTRAN=yes to "USES=fortran, USE_GCC=yes". In most cases

USE_GCC=yes has been omitted though.

Remove USE_FORTRAN handling from bsd.port.mk and bsd.gcc.mk.

Minor cleanups in some ports like USE_GMAKE, NOPORTDOCS,...

Exp-run:	bdrewery
Approved by:	portmgr (bdrewery)

8 files changed, 93 insertions, 3 deletions

diff --git a/science/psi3/Makefile b/science/psi3/Makefile
index b684c1ed9364..2159c78cea71 100644
--- a/science/psi3/Makefile
+++ b/science/psi3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	psi3
 PORTVERSION=	3.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	SF/psicode/psi/${PORTVERSION} \
 		http://www.psicode.org/doc/:doc \
@@ -45,17 +45,18 @@ LAPACK=		-lalapack -lptcblas
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_FORTRAN=	yes
+USES=		fortran gmake
 CONFIGURE_ARGS=	--with-cc=${CC} \
 		--with-cxx=${CXX} \
 		--with-fc=${FC} \
+		--with-opt="${CFLAGS}" \
 		--with-lapack="${LAPACK}" \
 		--with-blas="${BLAS}" \
 		--datadir=${PREFIX}/share/psi3 \
 		--docdir=${WRKSRC}/tmpdoc/ \
 		--with-libdirs="-L${LOCALBASE}/lib" \
 		--with-libs="-lcompat"
+CFLAGS+=	-Wno-error=return-type
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
diff --git a/science/psi3/files/patch-src-bin-clag-clag.cc b/science/psi3/files/patch-src-bin-clag-clag.cc
new file mode 100644
index 000000000000..936ec5520098
--- /dev/null
+++ b/science/psi3/files/patch-src-bin-clag-clag.cc
@@ -0,0 +1,10 @@
+--- src/bin/clag/clag.cc.orig
++++ src/bin/clag/clag.cc
+@@ -46,6 +46,7 @@
+ /***************************************************************************/
+ using namespace psi::clag;
+ 
++int
+ main(int argc, char **argv) 
+ {
+ 
diff --git a/science/psi3/files/patch-src-bin-geom-geom.cc b/science/psi3/files/patch-src-bin-geom-geom.cc
new file mode 100644
index 000000000000..12a3a4afde46
--- /dev/null
+++ b/science/psi3/files/patch-src-bin-geom-geom.cc
@@ -0,0 +1,10 @@
+--- src/bin/geom/geom.cc.orig
++++ src/bin/geom/geom.cc
+@@ -115,6 +115,7 @@
+ void fill_sym_matrix(double **A, int size);
+ }} // namespace psi::geom
+ 
++int
+ main(int argc, char* argv[])
+ {
+   using namespace psi::geom;
diff --git a/science/psi3/files/patch-src-bin-nonbonded-nonbonded.cc b/science/psi3/files/patch-src-bin-nonbonded-nonbonded.cc
new file mode 100644
index 000000000000..c959af29e2f5
--- /dev/null
+++ b/science/psi3/files/patch-src-bin-nonbonded-nonbonded.cc
@@ -0,0 +1,10 @@
+--- src/bin/nonbonded/nonbonded.cc.orig
++++ src/bin/nonbonded/nonbonded.cc
+@@ -32,7 +32,6 @@
+ #include <physconst.h>
+ #include <psifiles.h>
+ #include <masses.h>
+-#include <string>
+ 
+ #include "globals.h"
+ #include "nonbonded.h"
diff --git a/science/psi3/files/patch-src-bin-transqt2-transqt.cc b/science/psi3/files/patch-src-bin-transqt2-transqt.cc
new file mode 100644
index 000000000000..1dd018025cf9
--- /dev/null
+++ b/science/psi3/files/patch-src-bin-transqt2-transqt.cc
@@ -0,0 +1,10 @@
+--- src/bin/transqt2/transqt.cc.orig
++++ src/bin/transqt2/transqt.cc
+@@ -65,6 +65,7 @@
+ 
+ using namespace psi::transqt2;
+ 
++int
+ main(int argc, char *argv[])
+ {
+   int nso, nmo, ntri_so, ntri_mo, nirreps;
diff --git a/science/psi3/files/patch-src-lib-libbasis-combinate.cc b/science/psi3/files/patch-src-lib-libbasis-combinate.cc
new file mode 100644
index 000000000000..3bae2543e928
--- /dev/null
+++ b/science/psi3/files/patch-src-lib-libbasis-combinate.cc
@@ -0,0 +1,12 @@
+--- src/lib/libbasis/combinate.cc.orig
++++ src/lib/libbasis/combinate.cc
+@@ -3,9 +3,7 @@
+     \brief Enter brief description of file here 
+ */
+ 
+-extern "C" {
+ #include <libciomr/libciomr.h>
+-}
+ 
+ #include <stdexcept>
+ #include "combinate.h"
diff --git a/science/psi3/files/patch-src-lib-libipv1-ip_read.cc b/science/psi3/files/patch-src-lib-libipv1-ip_read.cc
new file mode 100644
index 000000000000..34d6e0b5e0bf
--- /dev/null
+++ b/science/psi3/files/patch-src-lib-libipv1-ip_read.cc
@@ -0,0 +1,20 @@
+--- src/lib/libipv1/ip_read.cc.orig
++++ src/lib/libipv1/ip_read.cc
+@@ -12,7 +12,9 @@
+ #include "ip_types.h"
+ #define _IP_ALLOCATE_GLOBAL_
+ #include "ip_global.h"
++extern "C" {
+ #include "y.tab.h"
++}
+ 
+ #include "ip_read.gbl"
+ #include "ip_read.lcl"
+@@ -27,7 +29,6 @@
+ 
+ /* The input for yacc. */
+ extern FILE *yyin;
+-extern void yyparse(void);
+ 
+ /* Set up static variables. */
+ /*static ip_keyword_tree_t *sub_tree = NULL;*/
diff --git a/science/psi3/files/patch-src-lib-libpsio-psio.hpp b/science/psi3/files/patch-src-lib-libpsio-psio.hpp
new file mode 100644
index 000000000000..789d4bd464fb
--- /dev/null
+++ b/science/psi3/files/patch-src-lib-libpsio-psio.hpp
@@ -0,0 +1,17 @@
+--- src/lib/libpsio/psio.hpp.orig
++++ src/lib/libpsio/psio.hpp
+@@ -157,10 +157,11 @@
+ 
+   };
+   
+-extern "C" {
+-  extern int psiopp_ipv1_config(PSIO *psio_obj);
+-}
+   extern PSIO* _default_psio_lib_;
+ }
+ 
++extern "C" {
++  int psiopp_ipv1_config(psi::PSIO *psio_obj);
++}
++
+ #endif /* header guard */