4 files changed, 39 insertions, 35 deletions

diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 49e3dc546d52..adba259a9dd1 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -7,17 +7,16 @@
 #
 
 PORTNAME=	gretl
-PORTVERSION=	1.6.2
-PORTREVISION=	1
+PORTVERSION=	1.6.5
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gnu Regression, Econometrics and Time-series Library
 
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
-LIB_DEPENDS=	mpfr.1:${PORTSDIR}/math/mpfr
+LIB_DEPENDS=	fftw3.4:${PORTSDIR}/math/fftw3 \
+		mpfr.1:${PORTSDIR}/math/mpfr
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
 USE_BZIP2=	yes
@@ -25,12 +24,12 @@ WANT_GNOME=	yes
 USE_GNOME=	gnometarget gtk20 libxml2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15 autoconf:259
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -DGNUPLOT_PNG" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DGNUPLOT_PNG" \
 		LDFLAGS="-L${LOCALBASE}/lib ${GCCLIBDIR}"
-CONFIGURE_ARGS+=	--enable-static --enable-shared --with-gmake
+CONFIGURE_ARGS=	--enable-static --enable-shared --with-gmake
 ALL_TARGET=	# empty
+USE_LDCONFIG=	yes
 
 MAN1=		gretl.1 gretl-config.1
 
@@ -44,9 +43,23 @@ GCCLIBDIR=	-L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "alpha"
+BROKEN=		math/lapack appears to be broken on alpha
+.endif
+
+.if ${HAVE_GNOME:Mlibgnomeui}!=""
+PKGNAMESUFFIX=	-gnome
+USE_GNOME+=	gnomeprefix gtksourceview libgnomeui
+GCONF_SCHEMAS=	gretl.schemas
+DATADIR=	${PREFIX}/share/gnome/${PORTNAME}
+.else
+CONFIGURE_ARGS+=	--without-gnome --without-gtksourceview
+.endif
+
 .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
@@ -61,17 +74,4 @@ LAPACK=		-llapack
 pre-configure:
 	@${DIRNAME} `${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
 
-.if ${ARCH} == "alpha"
-BROKEN=		math/lapack appears to be broken on alpha
-.endif
-
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-PKGNAMESUFFIX=	-gnome
-USE_GNOME+=	gnomeprefix gtksourceview libgnomeui
-GCONF_SCHEMAS=	gretl.schemas
-DATADIR=	${PREFIX}/share/gnome/${PORTNAME}
-.else
-CONFIGURE_ARGS+=	--without-gnome --without-gtksourceview
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/math/gretl/distinfo b/math/gretl/distinfo
index 79a7ed956c28..3ab72c0df012 100644
--- a/math/gretl/distinfo
+++ b/math/gretl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gretl-1.6.2.tar.bz2) = 73b9abd4d15fcb639319aed2d53c9bd1
-SHA256 (gretl-1.6.2.tar.bz2) = 99b356eb8a11ae42842f85a621a4ba24620d54433e51150221417e3c3f727482
-SIZE (gretl-1.6.2.tar.bz2) = 4370377
+MD5 (gretl-1.6.5.tar.bz2) = ed2ca08e8e06df14bc2d4a071535c3e5
+SHA256 (gretl-1.6.5.tar.bz2) = c6f40ed667fdc25298724c0aa9ada06d1f6a75f328d6f72a2ee906e92ae8faac
+SIZE (gretl-1.6.5.tar.bz2) = 4362695
diff --git a/math/gretl/files/patch-lib::Makefile.in b/math/gretl/files/patch-lib::Makefile.in
index 01d5373abae3..f193e4b1000f 100644
--- a/math/gretl/files/patch-lib::Makefile.in
+++ b/math/gretl/files/patch-lib::Makefile.in
@@ -1,6 +1,6 @@
---- lib/Makefile.in.orig	Tue May 23 18:27:51 2006
-+++ lib/Makefile.in	Sun Oct  8 02:07:54 2006
-@@ -22,6 +22,11 @@
+--- lib/Makefile.in.orig	Mon Apr 16 10:13:11 2007
++++ lib/Makefile.in	Mon May 21 16:10:51 2007
+@@ -25,6 +25,11 @@
  
  have_gtk = @have_gtk@
  
@@ -12,7 +12,7 @@
  ifeq ($(INSTALL_PROGRAM),)
    INSTALL_PROGRAM = $(INSTALL) -m 755
  endif
-@@ -36,7 +41,7 @@
+@@ -39,7 +44,7 @@
  libdir = $(prefix)/lib
  includedir = $(prefix)/include/gretl
  aclocaldir = $(prefix)/share/aclocal
@@ -21,18 +21,18 @@
  
  INSTALLDIRS = $(libdir) $(includedir) $(aclocaldir)
  
-@@ -52,8 +57,8 @@
+@@ -55,8 +60,8 @@
  
  # hard-coded -L/usr/local/lib is a bodge!!
  
 -LIBS = $(LAPACK_LIBS) -lm -ldl -L/usr/local/lib -lz $(XML_LIBS) \
--	$(GLIB_LIBS) $(GMP_LIBS)
+-	$(GLIB_LIBS) $(GMP_LIBS) $(FFTW_LIBS)
 +LIBS = $(LAPACK_LIBS) -lm -lz $(XML_LIBS) \
-+	$(GLIB_LIBS) $(GMP_LIBS) $(INTL_LIBS)
++	$(GLIB_LIBS) $(GMP_LIBS) $(FFTW_LIBS) $(INTL_LIBS)
  
  #### End of system configuration section. ####
  
-@@ -187,10 +192,10 @@
+@@ -204,10 +209,10 @@
  LOBJS = $(SRCS:.c=.lo)
  AUX_LOBJ = $(CEPHES_SRC:.c=.lo) $(MINPACK_SRC:.c=.lo)
  
@@ -40,12 +40,12 @@
 +LIBTOOL = @LIBTOOL@
  
  override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(XML_CFLAGS) $(GLIB_CFLAGS) \
--	$(GMP_CFLAGS) -DHAVE_CONFIG_H
-+	$(GMP_CFLAGS) -DHAVE_CONFIG_H $(CPPFLAGS)
+-	$(GMP_CFLAGS) $(FFTW_CFLAGS) -DHAVE_CONFIG_H
++	$(GMP_CFLAGS) $(FFTW_CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H
  
  COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) 
  
-@@ -199,7 +204,7 @@
+@@ -216,7 +221,7 @@
  	$(CC) $(CFLAGS) -MM -MT $*.lo $< > .deps/$*.d
  
  $(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
diff --git a/math/gretl/pkg-plist b/math/gretl/pkg-plist
index 9d12262a8e0f..29d406f2ee05 100644
--- a/math/gretl/pkg-plist
+++ b/math/gretl/pkg-plist
@@ -3,6 +3,7 @@ bin/gretl_x11
 bin/gretlcli
 include/gretl/adf_kpss.h
 include/gretl/bhhh_max.h
+include/gretl/bootstrap.h
 include/gretl/calendar.h
 include/gretl/compare.h
 include/gretl/compat.h
@@ -18,6 +19,7 @@ include/gretl/genmain.h
 include/gretl/graphing.h
 include/gretl/gretl_commands.h
 include/gretl/gretl_errors.h
+include/gretl/gretl_fft.h
 include/gretl/gretl_func.h
 include/gretl/gretl_intl.h
 include/gretl/gretl_list.h
@@ -357,6 +359,7 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/scripts/greene12_1.inp
 %%DATADIR%%/scripts/greene14_1.inp
 %%DATADIR%%/scripts/greene14_2.inp
+%%DATADIR%%/scripts/greene15_3.inp
 %%DATADIR%%/scripts/greene18_6.inp
 %%DATADIR%%/scripts/greene19_1.inp
 %%DATADIR%%/scripts/greene19_3.inp
@@ -369,6 +372,7 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/scripts/misc/armaloop.inp
 %%DATADIR%%/scripts/misc/bjg.inp
 %%DATADIR%%/scripts/misc/camtriv.inp
+%%DATADIR%%/scripts/misc/convolve.inp
 %%DATADIR%%/scripts/misc/denmark.inp
 %%DATADIR%%/scripts/misc/ects_nls.inp
 %%DATADIR%%/scripts/misc/garch.inp