5 files changed, 27 insertions, 23 deletions

diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 94a4f9b8fa9b..04034c04d69b 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gretl
-PORTVERSION=	1.8.7
-PORTREVISION=	3
+PORTVERSION=	1.9.1
 CATEGORIES=	math finance
 MASTER_SITES=	SF
 
@@ -21,7 +20,6 @@ LIB_DEPENDS=	fftw3.5:${PORTSDIR}/math/fftw3 \
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
 USE_BZIP2=	yes
-WANT_GNOME=	yes
 USE_GNOME=	gnomehier gtk20 gtksourceview2 libxml2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
diff --git a/math/gretl/distinfo b/math/gretl/distinfo
index 31588ffc02db..6da4bdd119b4 100644
--- a/math/gretl/distinfo
+++ b/math/gretl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gretl-1.8.7.tar.bz2) = f011cd534669901d63a39b618fa3bd42
-SHA256 (gretl-1.8.7.tar.bz2) = 4564e6e27ae7b855a4c5a166d9f56c16e57d380fa3bac627076157d5d4448e69
-SIZE (gretl-1.8.7.tar.bz2) = 7011559
+MD5 (gretl-1.9.1.tar.bz2) = 1227de74bdc4dde33df33103de3fdf76
+SHA256 (gretl-1.9.1.tar.bz2) = b46916828132cc6955ed20cf4c9816d17cae3f692368a245d56f8e55f3efda39
+SIZE (gretl-1.9.1.tar.bz2) = 7545384
diff --git a/math/gretl/files/patch-cli::Makefile.in b/math/gretl/files/patch-cli::Makefile.in
index 0bcb9824e1dd..8b4b5949a7d7 100644
--- a/math/gretl/files/patch-cli::Makefile.in
+++ b/math/gretl/files/patch-cli::Makefile.in
@@ -1,6 +1,6 @@
---- cli/Makefile.in.orig	2009-12-31 01:24:50.000000000 +0900
-+++ cli/Makefile.in	2010-02-02 03:05:49.000000000 +0900
-@@ -18,6 +18,10 @@
+--- cli/Makefile.in.orig	2010-06-16 22:01:23.000000000 +0900
++++ cli/Makefile.in	2010-07-09 04:31:31.000000000 +0900
+@@ -20,6 +20,10 @@
  
  quiet_build = @quiet_build@
  
@@ -11,25 +11,25 @@
  ifeq ($(CC),)
    CC = gcc
  endif
-@@ -52,10 +56,10 @@
+@@ -54,10 +58,10 @@
  
  DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
  
 -override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(READLINE_CFLAGS) $(DEFS)
 +override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(READLINE_CFLAGS) $(DEFS) $(CPPFLAGS)
  
- CLI = gretlcli
+ CLI = gretlcli$(EXEEXT)
 -LIBTOOL = ../libtool
 +LIBTOOL = @LIBTOOL@
  
  %.o: %.c
  	$(CCECHO)
-@@ -65,7 +69,7 @@
+@@ -67,7 +71,7 @@
  $(CLI): .deps $(OBJS)
  	$(LDECHO)
- 	$(AMP)$(LIBTOOL) --mode=link $(CCV) -o $@ $(LDFLAGS) $(OBJS) $(GRETLLIB) \
--	$(READLINE_LIBS)
-+	$(READLINE_LIBS) $(INTL_LIBS)
+ 	$(AMP)$(LIBTOOL) --mode=link $(CCV) -o $@ $(LDFLAGS) $(OBJS) \
+-	$(GRETLLIB) $(READLINE_LIBS)
++	$(GRETLLIB) $(READLINE_LIBS) $(INTL_LIBS)
  
  .deps:
  	$(AMP)mkdir $@
diff --git a/math/gretl/files/patch-gui2::Makefile.in b/math/gretl/files/patch-gui2::Makefile.in
index 811333ada1e9..f2b546bbe56a 100644
--- a/math/gretl/files/patch-gui2::Makefile.in
+++ b/math/gretl/files/patch-gui2::Makefile.in
@@ -1,15 +1,15 @@
---- gui2/Makefile.in.orig	2009-12-31 01:25:11.000000000 +0900
-+++ gui2/Makefile.in	2010-02-02 03:07:35.000000000 +0900
-@@ -117,7 +117,7 @@
+--- gui2/Makefile.in.orig	2010-06-16 22:03:53.000000000 +0900
++++ gui2/Makefile.in	2010-07-09 04:32:55.000000000 +0900
+@@ -118,7 +118,7 @@
  #### End of system configuration section. ####
  
  SHELL = /bin/sh
 -LIBTOOL = ../libtool
 +LIBTOOL = @LIBTOOL@
- PROG  = gretl_x11
+ PROG  = gretl_x11$(EXEEXT)
  
  vpath %.c $(topsrc)/gui2
-@@ -192,13 +192,13 @@
+@@ -193,13 +193,13 @@
  	$(AMP)$(CC) -c -I.. -I$(libsrc) $(XML_CFLAGS) $<
  
  mklang: mklang.o 
@@ -25,7 +25,7 @@
  
  .deps:
  	$(AMP)mkdir $@
-@@ -213,7 +213,7 @@
+@@ -214,7 +214,7 @@
  	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s $(PROG) $(DESTDIR)$(bindir)/$(PROG)
  
  install-data: installdirs
diff --git a/math/gretl/pkg-plist b/math/gretl/pkg-plist
index 9bc8bc72cb31..ed2ca0b6cfd3 100644
--- a/math/gretl/pkg-plist
+++ b/math/gretl/pkg-plist
@@ -8,20 +8,19 @@ include/gretl/boxplots.h
 include/gretl/calendar.h
 include/gretl/compare.h
 include/gretl/compat.h
-include/gretl/csvdata.h
 include/gretl/dataio.h
 include/gretl/dataset.h
 include/gretl/dbread.h
 include/gretl/describe.h
 include/gretl/discrete.h
 include/gretl/estimate.h
-include/gretl/flow_control.h
 include/gretl/forecast.h
 include/gretl/genfuncs.h
 include/gretl/genmain.h
 include/gretl/graphing.h
 include/gretl/gretl_bfgs.h
 include/gretl/gretl_commands.h
+include/gretl/gretl_data_io.h
 include/gretl/gretl_errors.h
 include/gretl/gretl_f2c.h
 include/gretl/gretl_fft.h
@@ -86,6 +85,9 @@ lib/gretl-gtk2/arma_x12.la
 lib/gretl-gtk2/arma_x12.so
 lib/gretl-gtk2/data/dwdata.gz
 lib/gretl-gtk2/data/urcdata.gz
+lib/gretl-gtk2/duration.a
+lib/gretl-gtk2/duration.la
+lib/gretl-gtk2/duration.so
 lib/gretl-gtk2/eviews_import.a
 lib/gretl-gtk2/eviews_import.la
 lib/gretl-gtk2/eviews_import.so
@@ -334,6 +336,7 @@ share/applications/gretl.desktop
 %%DATADIR%%/data/misc/pension.gdt
 %%DATADIR%%/data/misc/poisson.gdt
 %%DATADIR%%/data/misc/rac3d.gdt
+%%DATADIR%%/data/misc/recid.gdt
 %%DATADIR%%/data/misc/sw_ch12.gdt
 %%DATADIR%%/data/misc/sw_ch14.gdt
 %%DATADIR%%/data/misc/theil.gdt
@@ -349,11 +352,13 @@ share/applications/gretl.desktop
 %%DATADIR%%/data/nist/Wampler3.dat
 %%DATADIR%%/data/nist/Wampler4.dat
 %%DATADIR%%/data/nist/Wampler5.dat
+%%DATADIR%%/data/plotbars/nber.txt
 %%DATADIR%%/db/fedstl.bin
 %%DATADIR%%/db/fedstl.idx
 %%DATADIR%%/fonts/FreeSans.ttf
 %%DATADIR%%/fonts/Vera.ttf
 %%DATADIR%%/fonts/VeraMono.ttf
+%%DATADIR%%/functions/criteria.gfn
 %%DATADIR%%/functions/gretlfunc.dtd
 %%DATADIR%%/genrcli.hlp
 %%DATADIR%%/genrcli.hlp.it
@@ -559,6 +564,7 @@ share/pixmaps/gretl.xpm
 @dirrm %%DATADIR%%/functions
 @dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%/db
+@dirrm %%DATADIR%%/data/plotbars
 @dirrm %%DATADIR%%/data/nist
 @dirrm %%DATADIR%%/data/misc
 @dirrm %%DATADIR%%/data/greene