7 files changed, 51 insertions, 48 deletions

diff --git a/misc/gretl/Makefile b/misc/gretl/Makefile
index 811156b334c7..679a04ae4d11 100644
--- a/misc/gretl/Makefile
+++ b/misc/gretl/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gretl
-PORTVERSION=	1.6.1
+PORTVERSION=	1.6.2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/gretl/distinfo b/misc/gretl/distinfo
index a141d1903b87..79a7ed956c28 100644
--- a/misc/gretl/distinfo
+++ b/misc/gretl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gretl-1.6.1.tar.bz2) = 1577859cb6b32ec6a71d9290e1faaa68
-SHA256 (gretl-1.6.1.tar.bz2) = ae67b7c6024e2853849809678b9c3d3090c524306b2e058fd8d185e0c615c6f1
-SIZE (gretl-1.6.1.tar.bz2) = 4306701
+MD5 (gretl-1.6.2.tar.bz2) = 73b9abd4d15fcb639319aed2d53c9bd1
+SHA256 (gretl-1.6.2.tar.bz2) = 99b356eb8a11ae42842f85a621a4ba24620d54433e51150221417e3c3f727482
+SIZE (gretl-1.6.2.tar.bz2) = 4370377
diff --git a/misc/gretl/files/patch-configure b/misc/gretl/files/patch-configure
deleted file mode 100644
index 984588eccc50..000000000000
--- a/misc/gretl/files/patch-configure
+++ /dev/null
@@ -1,30 +0,0 @@
---- configure.orig	Tue Dec 13 22:30:07 2005
-+++ configure	Wed Feb  8 13:36:33 2006
-@@ -24725,27 +24725,6 @@
-   have_gnuplot=yes
- fi
- 
--gnuplot_png=no
--if test "$build_gui" = "yes" ; then
--  echo "$as_me:$LINENO: checking for PNG support in gnuplot" >&5
--echo $ECHO_N "checking for PNG support in gnuplot... $ECHO_C" >&6
--  echo "set term png" | `which gnuplot` 2>/dev/null && gnuplot_png=yes
--  if test "$gnuplot_png" = yes ; then
--    echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--    cat >>confdefs.h <<\_ACEOF
--#define GNUPLOT_PNG 1
--_ACEOF
--
--  else
--    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--    echo
--    echo "* gretl needs PNG support in gnuplot."
--    echo "* The current version of gnuplot is available from www.gnuplot.info"
--    exit
--  fi
--fi
- 
- 
- 
diff --git a/misc/gretl/files/patch-lib__src__gretl_matrix.c b/misc/gretl/files/patch-lib__src__gretl_matrix.c
new file mode 100644
index 000000000000..0943f175bcd1
--- /dev/null
+++ b/misc/gretl/files/patch-lib__src__gretl_matrix.c
@@ -0,0 +1,17 @@
+--- lib/src/gretl_matrix.c.orig	Wed Mar 14 09:25:57 2007
++++ lib/src/gretl_matrix.c	Sat Apr 14 03:50:51 2007
+@@ -432,12 +432,13 @@
+ {
+     int reverse = (start > end);
+     int i, k, n = 1 + (reverse ? (start-end) : (end-start));
++    gretl_matrix *v;
+ 
+     if (n == 0) {
+ 	return NULL;
+     }
+ 
+-    gretl_matrix *v = gretl_vector_alloc(n);
++    v = gretl_vector_alloc(n);
+   
+     if (v == NULL) {
+ 	return v;
diff --git a/misc/gretl/files/patch-plugin__oprobit.c b/misc/gretl/files/patch-plugin__oprobit.c
new file mode 100644
index 000000000000..8b8ff968336a
--- /dev/null
+++ b/misc/gretl/files/patch-plugin__oprobit.c
@@ -0,0 +1,19 @@
+--- plugin/oprobit.c.orig	Fri Feb 16 06:47:19 2007
++++ plugin/oprobit.c	Sat Apr 14 03:58:23 2007
+@@ -665,6 +665,7 @@
+     gretl_matrix *V = NULL;
+     double *theta = NULL;
+     int err;
++    op_container *OC;
+ 
+     /* BFGS apparatus */
+     int maxit = 1000;
+@@ -679,7 +680,7 @@
+ 	opt &= ~OPT_R;
+     }
+ 
+-    op_container *OC = op_container_new(ci, Z, pmod, opt);
++    OC = op_container_new(ci, Z, pmod, opt);
+     if (OC == NULL) {
+ 	return E_ALLOC;
+     }
diff --git a/misc/gretl/files/patch-share::Makefile.in b/misc/gretl/files/patch-share::Makefile.in
index 3ca2b355d26d..2ae91dc9c01b 100644
--- a/misc/gretl/files/patch-share::Makefile.in
+++ b/misc/gretl/files/patch-share::Makefile.in
@@ -1,7 +1,7 @@
---- share/Makefile.in.orig	Wed Aug 30 10:23:29 2006
-+++ share/Makefile.in	Sun Oct  8 02:56:33 2006
-@@ -1,15 +1,16 @@
- topsrc = @top_srcdir@
+--- share/Makefile.in.orig	Fri Mar  9 11:04:53 2007
++++ share/Makefile.in	Sat Apr 14 02:54:05 2007
+@@ -2,15 +2,16 @@
+ datarootdir = @datarootdir@
  
  prefix = @prefix@
 +datadir = @datadir@
@@ -19,28 +19,24 @@
  
  EN_GUI_HLP = $(sharesrc)/gretlgui.hlp
  EN_CMD_HLP = $(sharesrc)/gretlcmd.hlp
-@@ -41,17 +42,17 @@
- all: $(AUTO_HELPFILES)
+@@ -45,14 +46,14 @@
+ all: $(query_make_help)
  
- $(AUTO_HELPFILES): 
+ help:
 -	make -C ../doc/commands help-all
 +	$(MAKE) -C ../doc/commands help-all
  
  .PHONY :
  
- help:
--	make -C ../doc/commands help-all
-+	$(MAKE) -C ../doc/commands help-all
- 
  install: installdirs install_datafiles install_scripts install_functions \
- 	install_help install_fonts
+ 	install_help install_fonts $(query_install_help)
  	$(INSTALL_DATA) $(sharesrc)/gretl.stamp $(gretldir)/gretl.stamp
 -	make -C bcih install
 +	$(MAKE) -C bcih install
  
  install-strip: install
  
-@@ -77,12 +78,12 @@
+@@ -78,12 +79,12 @@
  	$(INSTALL_DATA) $(sharesrc)/functions/gretlfunc.dtd $(gretldir)/functions 
  
  install_man: gretl.1
@@ -56,7 +52,7 @@
  	$(tooldir)/mkinstalldirs $(gretldir)/helpfigs
  	$(INSTALL_DATA) $(EN_GUI_HLP) $(gretldir)/gretlgui.hlp
  	$(INSTALL_DATA) $(EN_CMD_HLP) $(gretldir)/gretlcmd.hlp
-@@ -95,8 +96,8 @@
+@@ -96,8 +97,8 @@
  	$(INSTALL_DATA) $(IT_CLI_HLP) $(gretldir)/gretlcli.hlp.it
  	for f in $(sharesrc)/texfigs/*.png ; do \
  	$(INSTALL_DATA) $$f $(gretldir)/helpfigs ; done
diff --git a/misc/gretl/pkg-plist b/misc/gretl/pkg-plist
index f3ba2198a7a1..9d12262a8e0f 100644
--- a/misc/gretl/pkg-plist
+++ b/misc/gretl/pkg-plist
@@ -45,6 +45,7 @@ include/gretl/nls.h
 include/gretl/nonparam.h
 include/gretl/objstack.h
 include/gretl/options.h
+include/gretl/plotspec.h
 include/gretl/plugins.h
 include/gretl/printout.h
 include/gretl/pvalues.h