* Migrate to gfortran.

* Bump port revision.
* Use gfortran compiled atlas/blas/lapack.

4 files changed, 86 insertions, 12 deletions

diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 5be1a0233d24..f4936c57be18 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gretl
 PORTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,8 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gnu Regression, Econometrics and Time-series Library
 
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
-LIB_DEPENDS=	lapack.4:${PORTSDIR}/math/lapack \
-		gmp.7:${PORTSDIR}/math/libgmp4
+LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
 USE_BZIP2=	yes
@@ -27,16 +27,42 @@ USE_GNOME=	gnometarget gtk20 libxml2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DGNUPLOT_PNG" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-static --enable-shared --with-gmake
+USE_AUTOTOOLS=	libtool:15 autoconf:259
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -DGNUPLOT_PNG" \
+		LDFLAGS="-L${LOCALBASE}/lib ${GCCLIBDIR}"
+CONFIGURE_ARGS+=	--enable-static --enable-shared --with-gmake
+		
 ALL_TARGET=	# empty
 
 MAN1=		gretl.1 gretl-config.1
 
+WANT_FORTRAN=	yes #dummy but future use
+BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42
+FC=		gfortran42
+F77=		gfortran42
+CONFIGURE_ENV+=	FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}" LAPACK_LIBS="${BLAS} ${LAPACK} -l${FORTRANRUNTIME}"
+FORTRANRUNTIME=	gfortran
+GCCLIBDIR=     -L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
+
 .include <bsd.port.pre.mk>
 
+.if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
+WITH_ATLAS=     yes
+.endif
+.if defined(WITH_ATLAS)
+LIB_DEPENDS+=   atlas.2:${PORTSDIR}/math/atlas
+BLAS=		-lf77blas -latlas
+LAPACK=		-lalapack -lcblas
+.else
+LIB_DEPENDS+=   blas.2:${PORTSDIR}/math/blas
+LIB_DEPENDS+=   lapack.4:${PORTSDIR}/math/lapack
+BLAS=		-lblas
+LAPACK=		-llapack
+.endif
+
+post-patch:
+	@${DIRNAME} `${LOCALBASE}/bin/${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
+
 .if ${ARCH} == "alpha"
 BROKEN=		math/lapack appears to be broken on alpha
 .endif
diff --git a/math/gretl/files/patch-macros-lapack.m4 b/math/gretl/files/patch-macros-lapack.m4
new file mode 100644
index 000000000000..e2c4ae940129
--- /dev/null
+++ b/math/gretl/files/patch-macros-lapack.m4
@@ -0,0 +1,11 @@
+--- macros/lapack.m4~	Fri Aug 26 05:19:27 2005
++++ macros/lapack.m4	Tue Jan 23 10:04:28 2007
+@@ -17,7 +17,7 @@
+ 
+   if test x"${LAPACK_LIBS}" = x ; then 
+      AC_MSG_CHECKING(for libgfortran, libg2c or libf2c)
+-     AC_CHECK_LIB(gfortran,etime_,FLIB="-lgfortran",FLIB="none")
++     AC_CHECK_LIB(gfortran,_gfortran_etime,FLIB="-lgfortran",FLIB="none")
+      if test $FLIB = "none" ; then
+         AC_CHECK_LIB(g2c,c_sqrt,FLIB="-lg2c",FLIB="none")
+      fi
diff --git a/misc/gretl/Makefile b/misc/gretl/Makefile
index 5be1a0233d24..f4936c57be18 100644
--- a/misc/gretl/Makefile
+++ b/misc/gretl/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gretl
 PORTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,8 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gnu Regression, Econometrics and Time-series Library
 
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
-LIB_DEPENDS=	lapack.4:${PORTSDIR}/math/lapack \
-		gmp.7:${PORTSDIR}/math/libgmp4
+LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
 USE_BZIP2=	yes
@@ -27,16 +27,42 @@ USE_GNOME=	gnometarget gtk20 libxml2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DGNUPLOT_PNG" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-static --enable-shared --with-gmake
+USE_AUTOTOOLS=	libtool:15 autoconf:259
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -DGNUPLOT_PNG" \
+		LDFLAGS="-L${LOCALBASE}/lib ${GCCLIBDIR}"
+CONFIGURE_ARGS+=	--enable-static --enable-shared --with-gmake
+		
 ALL_TARGET=	# empty
 
 MAN1=		gretl.1 gretl-config.1
 
+WANT_FORTRAN=	yes #dummy but future use
+BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42
+FC=		gfortran42
+F77=		gfortran42
+CONFIGURE_ENV+=	FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}" LAPACK_LIBS="${BLAS} ${LAPACK} -l${FORTRANRUNTIME}"
+FORTRANRUNTIME=	gfortran
+GCCLIBDIR=     -L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
+
 .include <bsd.port.pre.mk>
 
+.if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
+WITH_ATLAS=     yes
+.endif
+.if defined(WITH_ATLAS)
+LIB_DEPENDS+=   atlas.2:${PORTSDIR}/math/atlas
+BLAS=		-lf77blas -latlas
+LAPACK=		-lalapack -lcblas
+.else
+LIB_DEPENDS+=   blas.2:${PORTSDIR}/math/blas
+LIB_DEPENDS+=   lapack.4:${PORTSDIR}/math/lapack
+BLAS=		-lblas
+LAPACK=		-llapack
+.endif
+
+post-patch:
+	@${DIRNAME} `${LOCALBASE}/bin/${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
+
 .if ${ARCH} == "alpha"
 BROKEN=		math/lapack appears to be broken on alpha
 .endif
diff --git a/misc/gretl/files/patch-macros-lapack.m4 b/misc/gretl/files/patch-macros-lapack.m4
new file mode 100644
index 000000000000..e2c4ae940129
--- /dev/null
+++ b/misc/gretl/files/patch-macros-lapack.m4
@@ -0,0 +1,11 @@
+--- macros/lapack.m4~	Fri Aug 26 05:19:27 2005
++++ macros/lapack.m4	Tue Jan 23 10:04:28 2007
+@@ -17,7 +17,7 @@
+ 
+   if test x"${LAPACK_LIBS}" = x ; then 
+      AC_MSG_CHECKING(for libgfortran, libg2c or libf2c)
+-     AC_CHECK_LIB(gfortran,etime_,FLIB="-lgfortran",FLIB="none")
++     AC_CHECK_LIB(gfortran,_gfortran_etime,FLIB="-lgfortran",FLIB="none")
+      if test $FLIB = "none" ; then
+         AC_CHECK_LIB(g2c,c_sqrt,FLIB="-lg2c",FLIB="none")
+      fi