- Update to 1.6.1

PR:             110817
Submitted by:   KATO Tsuguru <tkato432@yahoo.com>

5 files changed, 47 insertions, 45 deletions

diff --git a/misc/gretl/Makefile b/misc/gretl/Makefile
index 5892f4213e0d..811156b334c7 100644
--- a/misc/gretl/Makefile
+++ b/misc/gretl/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gretl
-PORTVERSION=	1.6.0
-PORTREVISION=	1
+PORTVERSION=	1.6.1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,11 +16,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gnu Regression, Econometrics and Time-series Library
 
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
-LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
+LIB_DEPENDS=	mpfr.1:${PORTSDIR}/math/mpfr
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnometarget gtk20 libxml2
 USE_GETTEXT=	yes
@@ -31,31 +29,30 @@ 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
+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`/../../..
+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
+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 -lcblas
 .else
-LIB_DEPENDS+=   blas.2:${PORTSDIR}/math/blas
-LIB_DEPENDS+=   lapack.4:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
+LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
 BLAS=		-lblas
 LAPACK=		-llapack
 .endif
@@ -67,10 +64,6 @@ pre-configure:
 BROKEN=		math/lapack appears to be broken on alpha
 .endif
 
-.if ${OSVERSION} < 500018 || exists(${LOCALBASE}/lib/libreadline.so.5)
-LIB_DEPENDS+=	readline.5:${PORTSDIR}/devel/readline
-.endif
-
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 PKGNAMESUFFIX=	-gnome
 USE_GNOME+=	gnomeprefix gtksourceview libgnomeui
diff --git a/misc/gretl/distinfo b/misc/gretl/distinfo
index 27e39b04528d..a141d1903b87 100644
--- a/misc/gretl/distinfo
+++ b/misc/gretl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gretl-1.6.0.tar.bz2) = bf043ac5403403479eebe68fc2e7db5a
-SHA256 (gretl-1.6.0.tar.bz2) = 3a1207ff82e57d1db863a0a73e36758c5606fec23e07bc2e0a39a08043fe5216
-SIZE (gretl-1.6.0.tar.bz2) = 3609530
+MD5 (gretl-1.6.1.tar.bz2) = 1577859cb6b32ec6a71d9290e1faaa68
+SHA256 (gretl-1.6.1.tar.bz2) = ae67b7c6024e2853849809678b9c3d3090c524306b2e058fd8d185e0c615c6f1
+SIZE (gretl-1.6.1.tar.bz2) = 4306701
diff --git a/misc/gretl/files/patch-gnome::Makefile.in b/misc/gretl/files/patch-gnome::Makefile.in
index 942dba413e23..8c1ad3d1db3c 100644
--- a/misc/gretl/files/patch-gnome::Makefile.in
+++ b/misc/gretl/files/patch-gnome::Makefile.in
@@ -1,19 +1,21 @@
---- gnome/Makefile.in.orig	Tue Nov 22 03:45:16 2005
-+++ gnome/Makefile.in	Fri Jan  6 22:54:18 2006
-@@ -4,10 +4,10 @@
- docdir = $(topsrc)/doc
+--- gnome/Makefile.in.orig	Sat Dec 23 00:26:03 2006
++++ gnome/Makefile.in	Sun Mar 25 02:18:02 2007
+@@ -5,12 +5,10 @@
  
  INSTALL = @INSTALL@
+ prefix = @prefix@
 -gnome_prefix = @gnome_prefix@
 +datadir = @datadir@
  have_gnome = @have_gnome@
  
--sysconfdir = $(gnome_prefix)/etc
+-ifeq ($(gnome_prefix),NA)
+-  gnome_prefix = $(prefix)
+-endif
 +sysconfdir = @sysconfdir@
  
  GCONFTOOL = @GCONFTOOL@
  GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-@@ -23,10 +23,10 @@
+@@ -26,10 +24,10 @@
    schemadir = $(GCONF_SCHEMA_FILE_DIR)
  endif
  
diff --git a/misc/gretl/files/patch-lib__src__printout.c b/misc/gretl/files/patch-lib__src__printout.c
deleted file mode 100644
index c36f49ff7faf..000000000000
--- a/misc/gretl/files/patch-lib__src__printout.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- lib/src/printout.c.orig	Fri Sep  8 02:15:00 2006
-+++ lib/src/printout.c	Sun Oct  8 01:52:29 2006
-@@ -400,11 +400,11 @@
- void print_xtab (const Xtab *tab, gretlopt opt, PRN *prn)
- {
-     int i, j, r, c;
--    r = tab->rows;
--    c = tab->cols;
-     double x, y;
-     int n5 = 0;
-     double pearson = 0.0;
-+    r = tab->rows;
-+    c = tab->cols;
- 
-     pputc(prn, '\n');
-     pprintf(prn, _("Cross-tabulation of %s (rows) against %s (columns)"),
diff --git a/misc/gretl/pkg-plist b/misc/gretl/pkg-plist
index 7a984d9d8344..f3ba2198a7a1 100644
--- a/misc/gretl/pkg-plist
+++ b/misc/gretl/pkg-plist
@@ -13,7 +13,8 @@ include/gretl/describe.h
 include/gretl/discrete.h
 include/gretl/estimate.h
 include/gretl/forecast.h
-include/gretl/generate.h
+include/gretl/genfuncs.h
+include/gretl/genmain.h
 include/gretl/graphing.h
 include/gretl/gretl_commands.h
 include/gretl/gretl_errors.h
@@ -29,11 +30,13 @@ include/gretl/gretl_restrict.h
 include/gretl/gretl_string_table.h
 include/gretl/gretl_utils.h
 include/gretl/gretl_win32.h
+include/gretl/gretl_www.h
 include/gretl/gretl_xml.h
 include/gretl/interact.h
 include/gretl/kalman.h
 include/gretl/libgretl.h
 include/gretl/libset.h
+include/gretl/matrix_extra.h
 include/gretl/missing.h
 include/gretl/modelprint.h
 include/gretl/modelspec.h
@@ -56,6 +59,9 @@ include/gretl/tsls.h
 include/gretl/usermat.h
 include/gretl/var.h
 include/gretl/varprint.h
+lib/gretl-gtk2/arbond.a
+lib/gretl-gtk2/arbond.la
+lib/gretl-gtk2/arbond.so
 lib/gretl-gtk2/arma.a
 lib/gretl-gtk2/arma.la
 lib/gretl-gtk2/arma.so
@@ -105,6 +111,9 @@ lib/gretl-gtk2/mp_ols.so
 lib/gretl-gtk2/nistcheck.a
 lib/gretl-gtk2/nistcheck.la
 lib/gretl-gtk2/nistcheck.so
+lib/gretl-gtk2/oprobit.a
+lib/gretl-gtk2/oprobit.la
+lib/gretl-gtk2/oprobit.so
 lib/gretl-gtk2/pca.a
 lib/gretl-gtk2/pca.la
 lib/gretl-gtk2/pca.so
@@ -255,28 +264,34 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/data/greene/greene9_1.gdt
 %%DATADIR%%/data/greene/wg_descriptions
 %%DATADIR%%/data/gretldata.dtd
+%%DATADIR%%/data/misc/abdata.gdt
 %%DATADIR%%/data/misc/anscombe.gdt
 %%DATADIR%%/data/misc/arma.gdt
-%%DATADIR%%/data/misc/armaloop.gdt
 %%DATADIR%%/data/misc/b-g.gdt
 %%DATADIR%%/data/misc/bjg.gdt
 %%DATADIR%%/data/misc/denmark.gdt
 %%DATADIR%%/data/misc/descriptions
 %%DATADIR%%/data/misc/djclose.gdt
 %%DATADIR%%/data/misc/ects_nls.gdt
+%%DATADIR%%/data/misc/hall.gdt
 %%DATADIR%%/data/misc/hamilton.gdt
 %%DATADIR%%/data/misc/hendry_jae.gdt
 %%DATADIR%%/data/misc/jgm-data.gdt
+%%DATADIR%%/data/misc/keane.gdt
+%%DATADIR%%/data/misc/kennan.gdt
 %%DATADIR%%/data/misc/klein.gdt
 %%DATADIR%%/data/misc/kmenta.gdt
 %%DATADIR%%/data/misc/leverage.gdt
 %%DATADIR%%/data/misc/longley.gdt
 %%DATADIR%%/data/misc/mccullagh.gdt
+%%DATADIR%%/data/misc/mroz.gdt
 %%DATADIR%%/data/misc/mrw.gdt
 %%DATADIR%%/data/misc/np.gdt
 %%DATADIR%%/data/misc/nysewk.gdt
 %%DATADIR%%/data/misc/penngrow.gdt
+%%DATADIR%%/data/misc/pension.gdt
 %%DATADIR%%/data/misc/poisson.gdt
+%%DATADIR%%/data/misc/rac3d.gdt
 %%DATADIR%%/data/misc/sw_ch12.gdt
 %%DATADIR%%/data/misc/sw_ch14.gdt
 %%DATADIR%%/data/nist/Filip.dat
@@ -292,6 +307,7 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/data/nist/Wampler5.dat
 %%DATADIR%%/db/fedstl.bin
 %%DATADIR%%/db/fedstl.idx
+%%DATADIR%%/fonts/Vera.ttf
 %%DATADIR%%/fonts/luxisr.ttf
 %%DATADIR%%/functions/gretlfunc.dtd
 %%NOGNOME:%%%%DATADIR%%/gtksourceview/gnuplot.lang
@@ -348,26 +364,31 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/scripts/greene8_3.inp
 %%DATADIR%%/scripts/greene9_1.inp
 %%DATADIR%%/scripts/greene9_3.inp
-%%DATADIR%%/scripts/misc/arma.inp
+%%DATADIR%%/scripts/misc/arbond91.inp
 %%DATADIR%%/scripts/misc/armaloop.inp
 %%DATADIR%%/scripts/misc/bjg.inp
+%%DATADIR%%/scripts/misc/camtriv.inp
 %%DATADIR%%/scripts/misc/denmark.inp
 %%DATADIR%%/scripts/misc/ects_nls.inp
 %%DATADIR%%/scripts/misc/garch.inp
+%%DATADIR%%/scripts/misc/hall_cbapm.inp
 %%DATADIR%%/scripts/misc/hamilton.inp
 %%DATADIR%%/scripts/misc/jgm-1996.inp
+%%DATADIR%%/scripts/misc/keane.inp
 %%DATADIR%%/scripts/misc/klein.inp
 %%DATADIR%%/scripts/misc/kmenta.inp
 %%DATADIR%%/scripts/misc/leverage.inp
 %%DATADIR%%/scripts/misc/longley.inp
 %%DATADIR%%/scripts/misc/mrw.inp
+%%DATADIR%%/scripts/misc/oprobit.inp
 %%DATADIR%%/scripts/misc/penngrow.inp
 %%DATADIR%%/scripts/misc/perron97.inp
 %%DATADIR%%/scripts/misc/ps_descriptions
-%%DATADIR%%/scripts/misc/pscoin.inp
 %%DATADIR%%/scripts/misc/restrict.inp
 %%DATADIR%%/scripts/misc/sw_ch12.inp
 %%DATADIR%%/scripts/misc/sw_ch14.inp
+%%DATADIR%%/scripts/misc/weibull.inp
+%%DATADIR%%/scripts/misc/wg_nls.inp
 %%DATADIR%%/scripts/ps10-1.inp
 %%DATADIR%%/scripts/ps10-10.inp
 %%DATADIR%%/scripts/ps10-11.inp
@@ -451,7 +472,7 @@ libdata/pkgconfig/gretl.pc
 %%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretldata.png
 %%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretlsession.png
 %%GNOME:%%share/gnome/pixmaps/gretl-logo.xpm
-%%GNOME:%%share/gnome/pixmaps/gretl.png
+%%GNOME:%%share/gnome/pixmaps/gretl.xpm
 share/locale/de/LC_MESSAGES/gretl.mo
 share/locale/es/LC_MESSAGES/gretl.mo
 share/locale/eu/LC_MESSAGES/gretl.mo
@@ -459,6 +480,8 @@ share/locale/fr/LC_MESSAGES/gretl.mo
 share/locale/it/LC_MESSAGES/gretl.mo
 share/locale/ja/LC_MESSAGES/gretl.mo
 share/locale/pl/LC_MESSAGES/gretl.mo
+share/locale/pt/LC_MESSAGES/gretl.mo
+share/locale/pt_BR/LC_MESSAGES/gretl.mo
 share/locale/rw/LC_MESSAGES/gretl.mo
 share/locale/tr/LC_MESSAGES/gretl.mo
 @dirrm %%DATADIR%%/scripts/misc