5 files changed, 25 insertions, 15 deletions

diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 9b6c9c2d0648..e289f83c0a9b 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gretl
-PORTVERSION=	1.2.3
+PORTVERSION=	1.2.4
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/gretl/distinfo b/math/gretl/distinfo
index 737e56e5e55e..405b778bd314 100644
--- a/math/gretl/distinfo
+++ b/math/gretl/distinfo
@@ -1,2 +1,2 @@
-MD5 (gretl-1.2.3.tar.bz2) = b5f41e847d79b06be24150f3123557bb
-SIZE (gretl-1.2.3.tar.bz2) = 4071121
+MD5 (gretl-1.2.4.tar.bz2) = 436c790d75533ccaf2649e7a7b600eb8
+SIZE (gretl-1.2.4.tar.bz2) = 4166976
diff --git a/math/gretl/files/patch-gui2::Makefile.in b/math/gretl/files/patch-gui2::Makefile.in
index a7cb19b8c698..88dff43db9a8 100644
--- a/math/gretl/files/patch-gui2::Makefile.in
+++ b/math/gretl/files/patch-gui2::Makefile.in
@@ -1,5 +1,5 @@
---- gui2/Makefile.in.orig	Wed Nov 26 00:59:06 2003
-+++ gui2/Makefile.in	Thu Dec 25 13:25:07 2003
+--- gui2/Makefile.in.orig	Wed Mar 17 22:34:09 2004
++++ gui2/Makefile.in	Thu Apr  1 19:37:11 2004
 @@ -4,6 +4,7 @@
  exec_prefix = @exec_prefix@
  bindir = @bindir@
@@ -26,24 +26,24 @@
      query_install_lang = install-lang
    endif
  endif
-@@ -66,14 +67,13 @@
+@@ -66,14 +67,14 @@
  	../lib/libgretl-1.0.la
    GUI_CFLAGS = $(GNOME_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(GTK_EXTRA_CFLAGS)
    query_install_gnome = install-gnome
--  GNOMEDEF = -DGNOME_DISABLE_DEPRECATED -DDATADIR=\"$(gnome_prefix)/share\"
-+  GNOMEDEF = -DGNOME_DISABLE_DEPRECATED -DDATADIR=\"$(datadir)\"
+-  GNOMEDEF = -DDATADIR=\"$(gnome_prefix)/share\"
++  GNOMEDEF = -DDATADIR=\"$(datadir)\"
  else
    LIBS = $(GTK_LIBS) $(GTKSOURCEVIEW_LIBS) $(GTK_EXTRA_LIB) ../lib/libgretl-1.0.la
    GUI_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(GTK_EXTRA_CFLAGS)
  endif
  ifeq ($(USE_NLS),yes)
--  datadir = @datadir@
+   datadir = @datadir@
 -  localedir = $(datadir)/locale
 +  localedir = $(prefix)/share/locale
    NLSDEF = -DLOCALEDIR=\"$(localedir)\"
  endif
  
-@@ -87,7 +87,7 @@
+@@ -85,7 +86,7 @@
  
  # Directories
  bindir	= $(prefix)/bin
@@ -52,7 +52,7 @@
  tooldir = $(topsrc)/tools
  libsrc = $(topsrc)/lib/src
  clisrc = $(topsrc)/cli
-@@ -126,10 +126,10 @@
+@@ -124,10 +125,10 @@
  	$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
  
  $(GTKEXTRA_LITE): 
@@ -65,7 +65,7 @@
  
  .deps:
  	mkdir $@
-@@ -144,7 +144,7 @@
+@@ -142,7 +143,7 @@
  	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
  
  install-data: installdirs
diff --git a/math/gretl/files/patch-lib::Makefile.in b/math/gretl/files/patch-lib::Makefile.in
index e762ee8208e6..02ca0337d858 100644
--- a/math/gretl/files/patch-lib::Makefile.in
+++ b/math/gretl/files/patch-lib::Makefile.in
@@ -45,8 +45,8 @@
  
  $(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
  	$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(AUX_LOBJ) \
--	-rpath $(prefix)/lib $(LIBS) -version-info 0:16:0
-+	-rpath $(prefix)/lib $(LIBS) -version-info 0:16:0 $(LDFLAGS)
+-	-rpath $(prefix)/lib $(LIBS) -version-info 0:17:0
++	-rpath $(prefix)/lib $(LIBS) -version-info 0:17:0 $(LDFLAGS)
  
  .deps:
  	mkdir $@
diff --git a/math/gretl/pkg-plist b/math/gretl/pkg-plist
index 1def15f5443c..b78bcf68a977 100644
--- a/math/gretl/pkg-plist
+++ b/math/gretl/pkg-plist
@@ -4,6 +4,7 @@ bin/gretlcli
 %%GNOME:%%etc/gconf/gconf.xml.defaults/apps/gretl/%gconf.xml
 %%GNOME:%%etc/gconf/gconf.xml.defaults/schemas/apps/gretl/%gconf.xml
 %%GNOME:%%etc/gconf/schemas/gretl.schemas
+include/gretl/bhhh_max.h
 include/gretl/calendar.h
 include/gretl/clapack_double.h
 include/gretl/compare.h
@@ -22,16 +23,19 @@ include/gretl/gretl_matrix.h
 include/gretl/gretl_matrix_private.h
 include/gretl/gretl_model.h
 include/gretl/gretl_paths.h
+include/gretl/gretl_private.h
+include/gretl/gretl_string_table.h
 include/gretl/gretl_utils.h
 include/gretl/gretl_win32.h
 include/gretl/interact.h
-include/gretl/internal.h
 include/gretl/libgretl.h
 include/gretl/libprob.h
+include/gretl/libset.h
 include/gretl/modelprint.h
 include/gretl/monte_carlo.h
 include/gretl/nls.h
 include/gretl/nonparam.h
+include/gretl/options.h
 include/gretl/plugins.h
 include/gretl/printout.h
 include/gretl/pvalues.h
@@ -46,6 +50,7 @@ include/gretl/version.h
 lib/gretl-gtk2/arma.so
 lib/gretl-gtk2/arma_x12.so
 lib/gretl-gtk2/excel_import.so
+lib/gretl-gtk2/garch.so
 lib/gretl-gtk2/gnumeric_import.so
 lib/gretl-gtk2/johansen.so
 lib/gretl-gtk2/lad.so
@@ -178,10 +183,12 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/data/greene/wg_descriptions
 %%DATADIR%%/data/gretldata.dtd
 %%DATADIR%%/data/misc/arma.gdt
+%%DATADIR%%/data/misc/b-g.gdt
 %%DATADIR%%/data/misc/descriptions
 %%DATADIR%%/data/misc/djclose.gdt
 %%DATADIR%%/data/misc/ects_nls.gdt
 %%DATADIR%%/data/misc/hamilton.gdt
+%%DATADIR%%/data/misc/klein.gdt
 %%DATADIR%%/data/misc/leverage.gdt
 %%DATADIR%%/data/misc/longley.gdt
 %%DATADIR%%/data/misc/sw_ch12.gdt
@@ -216,6 +223,8 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/scripts/greene9_3.inp
 %%DATADIR%%/scripts/misc/arma.inp
 %%DATADIR%%/scripts/misc/ects_nls.inp
+%%DATADIR%%/scripts/misc/garch.inp
+%%DATADIR%%/scripts/misc/klein.inp
 %%DATADIR%%/scripts/misc/leverage.inp
 %%DATADIR%%/scripts/misc/longley.inp
 %%DATADIR%%/scripts/misc/ps_descriptions
@@ -326,6 +335,7 @@ libdata/pkgconfig/gretl.pc
 %%GNOME:%%share/gnome/help/gretl/C/figures/cumulate.png
 %%GNOME:%%share/gnome/help/gretl/C/figures/datafiles.png
 %%GNOME:%%share/gnome/help/gretl/C/figures/dffit.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/garch_h.png
 %%GNOME:%%share/gnome/help/gretl/C/figures/greeneC.png
 %%GNOME:%%share/gnome/help/gretl/C/figures/gretl-logo.png
 %%GNOME:%%share/gnome/help/gretl/C/figures/hsk.png