Update to version 1.0.7.

PR:		51057
Submitted by:	Ports Fury

14 files changed, 168 insertions, 138 deletions

diff --git a/misc/gretl/Makefile b/misc/gretl/Makefile
index e2097b255fb7..bda9fa6e65a2 100644
--- a/misc/gretl/Makefile
+++ b/misc/gretl/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gretl
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTVERSION=	1.0.7
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,9 +16,11 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gnu Regression, Econometrics and Time-series Library
 
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
-LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
-BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+LIB_DEPENDS=	lapack.3:${PORTSDIR}/math/lapack \
+		gmp.6:${PORTSDIR}/math/libgmp4
+RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20 libxml2
 USE_GMAKE=	yes
diff --git a/misc/gretl/distinfo b/misc/gretl/distinfo
index b358138982ad..38c42f95509f 100644
--- a/misc/gretl/distinfo
+++ b/misc/gretl/distinfo
@@ -1 +1 @@
-MD5 (gretl-1.0.2.tar.gz) = 42f3daf7ab7409a3c760677afb6e293d
+MD5 (gretl-1.0.7.tar.bz2) = ab7be0659523ea851ec1a3bad837eeee
diff --git a/misc/gretl/files/patch-cli::Makefile.in b/misc/gretl/files/patch-cli::Makefile.in
index afef1f23fac4..7ca8d93c2f0f 100644
--- a/misc/gretl/files/patch-cli::Makefile.in
+++ b/misc/gretl/files/patch-cli::Makefile.in
@@ -1,5 +1,5 @@
---- cli/Makefile.in.orig	Tue Nov 12 04:28:19 2002
-+++ cli/Makefile.in	Mon Nov 18 20:00:01 2002
+--- cli/Makefile.in.orig	Wed Apr  9 03:57:13 2003
++++ cli/Makefile.in	Mon Apr 14 16:59:22 2003
 @@ -15,6 +15,10 @@
  RL_OBJ = @RL_OBJ@
  USE_NLS = @USE_NLS@
@@ -29,20 +29,23 @@
  
  # Directories
  tooldir = $(topsrc)/tools
-@@ -41,14 +44,14 @@
+@@ -45,7 +48,7 @@
+ SRCS = gretlcli.c common.c complete.c
+ OBJS = gretlcli.o $(RL_OBJ)
  
- #### End of system configuration section. ####
- 
--override CFLAGS += -I. -I.. -I$(libsrc) $(DEFS)
-+override CFLAGS += -I. -I.. -I$(libsrc) $(DEFS) $(CPPFLAGS)
+-override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(DEFS)
++override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(DEFS) $(CPPFLAGS)
  
  CLI = gretlcli
- LIBTOOL = $(topsrc)/libtool
- 
- $(CLI): gretlcli.o $(RL_OBJ)
- 	../libtool --mode=link $(CC) -o $@ $< \
--	$(RL_OBJ) $(GRETLLIB) $(CLI_LIBS) 
-+	$(RL_OBJ) $(GRETLLIB) $(CLI_LIBS) $(LDFLAGS)
+ LIBTOOL = ../libtool
+@@ -55,9 +58,7 @@
+ 	$(CC) -MM -MG -I.. -I$(topsrc) -I$(libsrc) $(DEFS) $< >$*.d 2>/dev/null
+ 
+ $(CLI): $(OBJS)
+-	../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(CLI_LIBS) 
+-
+--include gretlcli.d
++	../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(CLI_LIBS) $(LDFLAGS)
  
  .PHONY :
  
diff --git a/misc/gretl/files/patch-configure.in b/misc/gretl/files/patch-configure.in
new file mode 100644
index 000000000000..878856ca23be
--- /dev/null
+++ b/misc/gretl/files/patch-configure.in
@@ -0,0 +1,11 @@
+--- configure.in.orig	Wed Apr  9 01:11:09 2003
++++ configure.in	Mon Apr 14 15:16:28 2003
+@@ -417,7 +417,7 @@
+ dnl Check for libpng
+ dnl
+ if test ${png_comments} = yes && test ${have_gtk} = "2.0" ; then
+-    PKG_CHECK_MODULES(PNG, libpng,
++    PKG_CHECK_MODULES(PNG, libpng12,
+         png_failed="no",
+ 	png_failed="yes"
+    )
diff --git a/misc/gretl/files/patch-doc::manual.xml b/misc/gretl/files/patch-doc::manual.xml
index 903d8b6e8bd6..a1bcc63d192a 100644
--- a/misc/gretl/files/patch-doc::manual.xml
+++ b/misc/gretl/files/patch-doc::manual.xml
@@ -1,5 +1,5 @@
---- doc/manual.xml.orig	Fri Nov  8 01:30:56 2002
-+++ doc/manual.xml	Mon Nov 18 20:26:15 2002
+--- doc/manual.xml.orig	Wed Feb  5 02:02:07 2003
++++ doc/manual.xml	Mon Apr 14 12:30:41 2003
 @@ -1,6 +1,6 @@
  <?xml version="1.0"?>
 -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
@@ -7,5 +7,5 @@
 +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 +    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
  
- <!ENTITY version "1.0">
+ <!ENTITY version "1.0.3">
  <!ENTITY latex "LaTeX">
diff --git a/misc/gretl/files/patch-gui2::Makefile.in b/misc/gretl/files/patch-gui2::Makefile.in
index b6f3cf5ea560..3ef4b9989ad8 100644
--- a/misc/gretl/files/patch-gui2::Makefile.in
+++ b/misc/gretl/files/patch-gui2::Makefile.in
@@ -1,5 +1,5 @@
---- gui2/Makefile.in.orig	Tue Nov 12 04:28:20 2002
-+++ gui2/Makefile.in	Mon Nov 18 20:02:19 2002
+--- gui2/Makefile.in.orig	Wed Apr  9 03:57:15 2003
++++ gui2/Makefile.in	Mon Apr 14 12:35:47 2003
 @@ -4,6 +4,7 @@
  exec_prefix = @exec_prefix@
  bindir = @bindir@
@@ -8,7 +8,7 @@
  CC = @CC@
  CFLAGS = @CFLAGS@
  MAKE = @MAKE@
-@@ -42,14 +43,13 @@
+@@ -44,14 +45,13 @@
    LIBS = $(GNOME_LIBS) $(GTK_EXTRA_LIB) ../lib/libgretl-1.0.la
    GUI_CFLAGS = $(GNOME_CFLAGS) $(GTK_EXTRA_CFLAGS)
    query_install_gnome = install-gnome
@@ -25,7 +25,7 @@
    NLSDEF = -DLOCALEDIR=\"$(localedir)\"
  endif
  
-@@ -60,7 +60,7 @@
+@@ -64,7 +64,7 @@
  
  # Directories
  bindir	= $(prefix)/bin
@@ -34,21 +34,21 @@
  tooldir = $(topsrc)/tools
  libsrc = $(topsrc)/lib/src
  clisrc = $(topsrc)/cli
-@@ -92,7 +92,7 @@
+@@ -102,7 +102,7 @@
  	$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
  
  $(GTKEXTRA_LITE): 
 -	make -C gtkextra-lite
 +	$(MAKE) -C gtkextra-lite
  
- .PHONY:
+ -include $(OBJS:.o=.d)
  
-@@ -103,7 +103,7 @@
+@@ -115,7 +115,7 @@
  	$(LIBTOOL) $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
  
  install-data: installdirs
--	$(INSTALL_PROGRAM) $(topsrc)/gretl_sh $(bindir)/gretl
-+	$(INSTALL_SCRIPT) $(topsrc)/gretl_sh $(bindir)/gretl
- 	$(INSTALL_DATA) ../pixmaps/gretl-logo.xpm $(gretldir)
+-	$(INSTALL_PROGRAM) ../gretl_sh $(bindir)/gretl
++	$(INSTALL_SCRIPT) ../gretl_sh $(bindir)/gretl
+ 	$(INSTALL_DATA) $(topsrc)/pixmaps/gretl-logo.xpm $(gretldir)
  	$(INSTALL_DATA) $(topsrc)/COPYING $(gretldir)
  
diff --git a/misc/gretl/files/patch-gui2::gretl.c b/misc/gretl/files/patch-gui2::gretl.c
deleted file mode 100644
index dcf9fa877ac4..000000000000
--- a/misc/gretl/files/patch-gui2::gretl.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- gui2/gretl.c.orig	Tue Oct  8 02:10:30 2002
-+++ gui2/gretl.c	Mon Oct 21 08:48:34 2002
-@@ -1560,7 +1560,7 @@
- {
-     pid_t pid;
- 
--    signal(SIGCLD, SIG_IGN);
-+    signal(SIGCHLD, SIG_IGN);
- 
-     pid = fork();
-     if (pid == -1) {
-@@ -1649,7 +1649,7 @@
- 	return;
-     }
- 
--    signal(SIGCLD, SIG_IGN); 
-+    signal(SIGCHLD, SIG_IGN); 
-     pid = fork();
- 
-     if (pid == -1) {
diff --git a/misc/gretl/files/patch-gui2::omf-install::Makefile.in b/misc/gretl/files/patch-gui2::omf-install::Makefile.in
index 45b94a1ec05c..b72b4211dc60 100644
--- a/misc/gretl/files/patch-gui2::omf-install::Makefile.in
+++ b/misc/gretl/files/patch-gui2::omf-install::Makefile.in
@@ -1,11 +1,17 @@
---- gui2/omf-install/Makefile.in.orig	Sun Aug 25 03:09:19 2002
-+++ gui2/omf-install/Makefile.in	Mon Oct 21 07:48:35 2002
-@@ -1,9 +1,9 @@
+--- gui2/omf-install/Makefile.in.orig	Wed Apr  9 01:11:18 2003
++++ gui2/omf-install/Makefile.in	Mon Apr 14 17:37:41 2003
+@@ -1,13 +1,14 @@
+-topsrc = $top_srcdir@
++topsrc = @top_srcdir@
+ tooldir = $(topsrc)/tools
  
  INSTALL = @INSTALL@
 -gnome_prefix = @gnome_prefix@
++INSTALL_DATA = @INSTALL_DATA@
 +datadir = @datadir@
  
+ VPATH = $(topsrc)/gui2/omf-install
+ 
 -docdir = $(gnome_prefix)/share/gnome/help/gretl/C
 -omfdir = $(gnome_prefix)/share/omf/gretl
 +docdir = $(datadir)/help/gretl/C
@@ -13,10 +19,10 @@
  
  gretl-C.omf: gretl-C.omf.in
  	  scrollkeeper-preinstall $(docdir)/`awk 'BEGIN {RS = ">" } \
-@@ -12,5 +12,5 @@
+@@ -16,5 +17,5 @@
  
  install: gretl-C.omf
- 	../../tools/mkinstalldirs $(omfdir)
+ 	$(tooldir)/mkinstalldirs $(omfdir)
 -	$(INSTALL) -m 644 $< $(omfdir)
 -	scrollkeeper-update -p $(gnome_prefix)/var/scrollkeeper
 +	$(INSTALL_DATA) $< $(omfdir)
diff --git a/misc/gretl/files/patch-lib::Makefile.in b/misc/gretl/files/patch-lib::Makefile.in
index 0cfd14e305db..5096b37fa345 100644
--- a/misc/gretl/files/patch-lib::Makefile.in
+++ b/misc/gretl/files/patch-lib::Makefile.in
@@ -1,7 +1,7 @@
---- lib/Makefile.in.orig	Wed Dec  4 11:49:39 2002
-+++ lib/Makefile.in	Sat Dec 14 05:26:28 2002
-@@ -14,6 +14,11 @@
- GLIB_LIBS = @GLIB_LIBS@
+--- lib/Makefile.in.orig	Wed Apr  9 03:57:16 2003
++++ lib/Makefile.in	Mon Apr 14 17:50:12 2003
+@@ -16,6 +16,11 @@
+ GMP_LIBS = @GMP_LIBS@
  have_gtk = @have_gtk@
  
 +datadir = @datadir@
@@ -12,7 +12,7 @@
  ifeq ($(INSTALL_PROGRAM),)
    INSTALL_PROGRAM = $(INSTALL) -m 755
  endif
-@@ -28,7 +33,7 @@
+@@ -30,7 +35,7 @@
  libdir = $(prefix)/lib
  includedir = $(prefix)/include/gretl
  aclocaldir = $(prefix)/share/aclocal
@@ -21,29 +21,30 @@
  
  INSTALLDIRS = $(libdir) $(includedir) $(aclocaldir)
  
-@@ -42,7 +47,7 @@
+@@ -44,7 +49,7 @@
    INSTALL_CFG = install-cfg-old
  endif
  
--LIBS = -lm -ldl -L/usr/local/lib -lz $(XML_LIBS) $(GLIB_LIBS)
-+LIBS = -lm -lz $(XML_LIBS) $(GLIB_LIBS) $(INTL_LIBS)
+-LIBS = -lm -ldl -L/usr/local/lib -lz $(XML_LIBS) $(GLIB_LIBS) $(GMP_LIBS)
++LIBS = -lm -lz $(XML_LIBS) $(GLIB_LIBS) $(GMP_LIBS) $(INTL_LIBS)
  
  #### End of system configuration section. ####
  
-@@ -73,14 +78,14 @@
+@@ -79,7 +84,7 @@
  
- override CFLAGS += -I. -I./src -I.. $(XML_CFLAGS) $(GLIB_CFLAGS) -DHAVE_CONFIG_H
+ LIBTOOL = ../libtool
  
--COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)
-+COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(CPPFLAGS)
+-override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(XML_CFLAGS) $(GLIB_CFLAGS) $(GMP_CFLAGS) -DHAVE_CONFIG_H
++override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(XML_CFLAGS) $(GLIB_CFLAGS) $(GMP_CFLAGS) -DHAVE_CONFIG_H $(CPPFLAGS)
  
- .c.o:        
- 	$(COMPILE) $<
+ COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)
  
- $(LIBGRETL): $(OBJS) $(LOBJS) $(CEPHES_OBJ) $(CEPHES_OBJ)
+@@ -89,7 +94,7 @@
+ 
+ $(LIBGRETL): $(OBJS) $(LOBJS) $(CEPHES_OBJ) $(CEPHES_LOBJ)
  	$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(CEPHES_LOBJ) \
--	-rpath $(prefix)/lib $(LIBS) -version-info 0:2:0
-+	-rpath $(prefix)/lib $(LIBS) -version-info 0:2:0 $(LDFLAGS)
+-	-rpath $(prefix)/lib $(LIBS) -version-info 0:6:0
++	-rpath $(prefix)/lib $(LIBS) -version-info 0:6:0 $(LDFLAGS)
  
- .PHONY: 
+ -include $(OBJS:.o=.d)
  
diff --git a/misc/gretl/files/patch-plugin::Makefile.in b/misc/gretl/files/patch-plugin::Makefile.in
index e02bb5a24afa..32b467be7b5e 100644
--- a/misc/gretl/files/patch-plugin::Makefile.in
+++ b/misc/gretl/files/patch-plugin::Makefile.in
@@ -1,5 +1,5 @@
---- plugin/Makefile.in.orig	Fri Oct 11 03:03:46 2002
-+++ plugin/Makefile.in	Mon Oct 21 10:23:25 2002
+--- plugin/Makefile.in.orig	Wed Apr  9 08:46:09 2003
++++ plugin/Makefile.in	Mon Apr 14 12:45:07 2003
 @@ -8,6 +8,10 @@
  INSTALL = @INSTALL@
  LN = @LN_S@
@@ -11,27 +11,27 @@
  have_gtk = @have_gtk@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
-@@ -31,8 +35,8 @@
+@@ -36,8 +40,8 @@
  override CFLAGS += -I.. -DHAVE_CONFIG_H
  
- LIBTOOL = $(topsrc)/libtool
+ LIBTOOL = ../libtool
 -COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) 
--LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -shared
+-LINK = $(LIBTOOL) --mode=link $(CC) -module -avoid-version -rpath $(plugindir)
 +COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(CPPFLAGS)
-+LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -shared $(LDFLAGS)
++LINK = $(LIBTOOL) --mode=link $(CC) -module -avoid-version -rpath $(plugindir) $(LDFLAGS)
  
  GRETLINC = -I$(topsrc)/lib/src
- GRETLLIB = ../lib/libgretl.la
-@@ -47,7 +51,7 @@
-   PROGRESS_PLUGIN = progress_bar.so
-   GNUMERIC_PLUGIN = gnumeric_import.so
-   EXCEL_PLUGIN = excel_import.so
--  GRETL_LIBOLE2_CFLAGS := -I. $(shell glib-config --cflags)
-+  GRETL_LIBOLE2_CFLAGS := -I. $(shell $(GLIB_CONFIG) --cflags)
+ GRETLLIB = ../lib/libgretl-1.0.la
+@@ -46,7 +50,7 @@
+   GTK_CFLAGS += -DGTK_DISABLE_DEPRECATED
+   GRETL_LIBOLE2_CFLAGS := -I$(topsrc)/plugin $(shell pkg-config --cflags glib-2.0)
+ else
+-  GRETL_LIBOLE2_CFLAGS := -I$(topsrc)/plugin $(shell glib-config --cflags)
++  GRETL_LIBOLE2_CFLAGS := -I$(topsrc)/plugin $(shell $(GLIB_CONFIG) --cflags)
  endif  
  
- PLUGINS = stats_tables.so panel_data.so des_import.so range-mean.so lad.so \
-@@ -156,11 +160,11 @@
+ SRCS = excel_import.c gnumeric_import.c gretl_matrix.c import_common.c \
+@@ -130,15 +134,15 @@
  .PHONY: 
  
  install: $(PLUGINS) installdirs
@@ -44,4 +44,9 @@
 +	$(LIBTOOL) --mode=install $(INSTALL_DATA) -s \
  	$(PLUGINS) $(plugindir)
  
+ install-lapack: $(GRETLLIB) $(LAPACK_PLUGINS) installdirs
+-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
++	$(LIBTOOL) --mode=install $(INSTALL_DATA) \
+ 	$(LAPACK_PLUGINS) $(plugindir)
+ 
  installdirs:
diff --git a/misc/gretl/files/patch-share::Makefile.in b/misc/gretl/files/patch-share::Makefile.in
index c4811e225653..7e699a74e148 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	Mon Sep 30 03:49:42 2002
-+++ share/Makefile.in	Mon Oct 21 07:31:57 2002
-@@ -1,11 +1,12 @@
- topsrc = ..
+--- share/Makefile.in.orig	Wed Apr  9 06:54:39 2003
++++ share/Makefile.in	Mon Apr 14 16:09:00 2003
+@@ -1,13 +1,14 @@
+ topsrc = @top_srcdir@
  
  prefix = @prefix@
 +datadir = @datadir@
@@ -10,8 +10,39 @@
 -gretldir = $(prefix)/share/gretl
 +gretldir = $(datadir)/gretl
  tooldir = $(topsrc)/tools
+ sharesrc = $(topsrc)/share
+ 
 -INSTALL_DATA = cp -fp
 +INSTALL_DATA = @INSTALL_DATA@
  
  ifeq ($(have_gtk),2.0)
-    ES_GUI_HLP = gretl.hlp.es.utf8
+    ES_GUI_HLP = $(sharesrc)/gretl.hlp.es.utf8
+@@ -26,7 +27,7 @@
+ 
+ install: installdirs install_datafiles install_scripts install_help
+ 	$(INSTALL_DATA) $(sharesrc)/gretl.stamp $(gretldir)/gretl.stamp
+-	make -C bcih install
++	$(MAKE) -C bcih install
+ 
+ install-strip: install
+ 
+@@ -50,8 +51,8 @@
+ 	$(tooldir)/mkinstalldirs $(gretldir)
+ 	$(INSTALL_DATA) $(sharesrc)/gretl.hlp $(gretldir)/gretl.hlp
+ 	$(INSTALL_DATA) $(sharesrc)/gretlcli.hlp $(gretldir)/gretlcli.hlp
+-	$(INSTALL_DATA) $(ES_GUI_HLP) $(gretldir)/gretl.hlp.es
+-	$(INSTALL_DATA) $(ES_CLI_HLP) $(gretldir)/gretlcli.hlp.es
++#	$(INSTALL_DATA) $(ES_GUI_HLP) $(gretldir)/gretl.hlp.es
++#	$(INSTALL_DATA) $(ES_CLI_HLP) $(gretldir)/gretlcli.hlp.es
+ 
+ installdirs:
+ 	$(tooldir)/mkinstalldirs $(gretldir) $(gretldir)/data 
+@@ -59,7 +60,7 @@
+ 	$(tooldir)/mkinstalldirs $(gretldir)/scripts $(gretldir)/db
+ 
+ $(UTF8_FILES): $(sharesrc)/gretl.hlp.es $(sharesrc)/gretlcli.hlp.es
+-	for f in $^ ; do recode l1..utf-8 < $$f > $$f.utf8 ; done
++#	for f in $^ ; do recode l1..utf-8 < $$f > $$f.utf8 ; done
+ 
+ clean:
+ 	make -C bcih clean
diff --git a/misc/gretl/files/patch-share::bcih::Makefile.in b/misc/gretl/files/patch-share::bcih::Makefile.in
new file mode 100644
index 000000000000..dc46fce57e84
--- /dev/null
+++ b/misc/gretl/files/patch-share::bcih::Makefile.in
@@ -0,0 +1,17 @@
+--- share/bcih/Makefile.in.orig	Wed Apr  9 03:57:19 2003
++++ share/bcih/Makefile.in	Mon Apr 14 16:07:21 2003
+@@ -2,11 +2,12 @@
+ 
+ CC = @CC@
+ prefix = @prefix@
++datadir = @datadir@
+ 
+ VPATH = $(topsrc)/share/bcih
+ 
+-gretldir = $(prefix)/share/gretl
+-INSTALL_DATA = cp -fp
++gretldir = $(datadir)/gretl
++INSTALL_DATA = @INSTALL_DATA@
+ 
+ mkbin: mkbin.c
+ 	$(CC) -o $@ $<
diff --git a/misc/gretl/files/patch-tools::ltmain.sh b/misc/gretl/files/patch-tools::ltmain.sh
index 3d010b6c9f88..ab2039515415 100644
--- a/misc/gretl/files/patch-tools::ltmain.sh
+++ b/misc/gretl/files/patch-tools::ltmain.sh
@@ -1,6 +1,6 @@
---- tools/ltmain.sh.orig	Mon May 20 06:43:59 2002
-+++ tools/ltmain.sh	Mon Oct 21 10:45:46 2002
-@@ -956,6 +956,7 @@
+--- tools/ltmain.sh.orig	Mon Feb 10 02:23:55 2003
++++ tools/ltmain.sh	Mon Apr 14 12:23:06 2003
+@@ -967,6 +967,7 @@
  	;;
  
        -avoid-version)
@@ -8,33 +8,7 @@
  	avoid_version=yes
  	continue
  	;;
-@@ -1043,14 +1044,14 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -2441,7 +2442,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
- 	  *)
-@@ -4210,10 +4211,12 @@
+@@ -4280,10 +4281,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/misc/gretl/pkg-plist b/misc/gretl/pkg-plist
index ff772ebdd371..712b3a6d337a 100644
--- a/misc/gretl/pkg-plist
+++ b/misc/gretl/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/gretl
 bin/gretl_x11
 bin/gretlcli
@@ -16,6 +17,7 @@ include/gretl/estimate.h
 include/gretl/generate.h
 include/gretl/graphing.h
 include/gretl/gretl_utils.h
+include/gretl/gretl_win32.h
 include/gretl/interact.h
 include/gretl/internal.h
 include/gretl/libgretl.h
@@ -25,20 +27,23 @@ include/gretl/monte_carlo.h
 include/gretl/nonparam.h
 include/gretl/printout.h
 include/gretl/pvalues.h
+include/gretl/random.h
 include/gretl/strutils.h
 include/gretl/subsample.h
+include/gretl/system.h
 include/gretl/texprint.h
 include/gretl/var.h
 include/gretl/version.h
-include/gretl/win32.h
-lib/gretl/excel_import-2.so
-lib/gretl/gnumeric_import-2.so
+lib/gretl/excel_import.so
+lib/gretl/gnumeric_import.so
+lib/gretl/johansen.so
 lib/gretl/lad.so
 lib/gretl/mp_ols.so
 lib/gretl/panel_data.so
-lib/gretl/progress_bar-2.so
+lib/gretl/progress_bar.so
 lib/gretl/range-mean.so
 lib/gretl/stats_tables.so
+lib/gretl/sur.so
 lib/libgretl-1.0.a
 lib/libgretl-1.0.so
 lib/libgretl-1.0.so.0
@@ -143,6 +148,7 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/gretl/data/greene/greene10_3.gdt
 %%DATADIR%%/gretl/data/greene/greene11_3.gdt
 %%DATADIR%%/gretl/data/greene/greene12_1.gdt
+%%DATADIR%%/gretl/data/greene/greene13_1.gdt
 %%DATADIR%%/gretl/data/greene/greene18_1.gdt
 %%DATADIR%%/gretl/data/greene/greene18_2.gdt
 %%DATADIR%%/gretl/data/greene/greene19_1.gdt
@@ -150,18 +156,18 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/gretl/data/greene/greene8_3.gdt
 %%DATADIR%%/gretl/data/greene/greene9_1.gdt
 %%DATADIR%%/gretl/data/greene/wg_descriptions
+%%DATADIR%%/gretl/data/gretldata.dtd
+%%DATADIR%%/gretl/data/hamilton.gdt
 %%DATADIR%%/gretl/data/longley.gdt
-%%DATADIR%%/gretl/db/README
 %%DATADIR%%/gretl/db/bcih.bin
 %%DATADIR%%/gretl/db/bcih.idx
 %%DATADIR%%/gretl/gretl-logo.xpm
 %%DATADIR%%/gretl/gretl.hlp
-%%DATADIR%%/gretl/gretl.hlp.es
 %%DATADIR%%/gretl/gretl.stamp
 %%DATADIR%%/gretl/gretlcli.hlp
-%%DATADIR%%/gretl/gretlcli.hlp.es
 %%DATADIR%%/gretl/scripts/greene11_3.inp
 %%DATADIR%%/gretl/scripts/greene12_1.inp
+%%DATADIR%%/gretl/scripts/greene14_2.inp
 %%DATADIR%%/gretl/scripts/greene18_6.inp
 %%DATADIR%%/gretl/scripts/greene19_1.inp
 %%DATADIR%%/gretl/scripts/greene7_8.inp
@@ -241,6 +247,7 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/gretl/scripts/ps9-8.inp
 %%DATADIR%%/gretl/scripts/ps9-9.inp
 %%DATADIR%%/gretl/scripts/ps_descriptions
+%%DATADIR%%/gretl/scripts/pscoin.inp
 %%DATADIR%%/gretl/scripts/testinp
 %%DATADIR%%/gretl/scripts/wg_ps_descriptions
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/appendices.xml
@@ -261,7 +268,6 @@ libdata/pkgconfig/gretl.pc
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/adf2.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/autocorr.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/caution.png
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/chisqu.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/corc.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/cumulate.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/datafiles.png
@@ -270,23 +276,17 @@ libdata/pkgconfig/gretl.pc
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/important.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/ldx.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/ldy.png
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/linreg.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/mainwin.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/menubar.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/modelwin.png
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/nonlin.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/note.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/plot_control.png
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/resid.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/scriptwin.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/selector.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/session.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/tip.png
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/tipbak.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/toolbar.png
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/uhatsq.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/warning.png
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/yhat.png
 %%GNOME2:%%%%DATADIR%%/help/gretl/C/gretl.xml
 %%GNOME2:%%%%DATADIR%%/mime-info/gretl.keys
 %%GNOME2:%%%%DATADIR%%/mime-info/gretl.mime
@@ -297,6 +297,7 @@ libdata/pkgconfig/gretl.pc
 %%GNOME2:%%%%DATADIR%%/pixmaps/gretl.png
 share/locale/es/LC_MESSAGES/gretl.mo
 share/locale/fr/LC_MESSAGES/gretl.mo
+share/locale/ja/LC_MESSAGES/gretl.mo
 %%GNOME2:%%@dirrm %%DATADIR%%/omf/gretl
 %%GNOME2:%%@dirrm %%DATADIR%%/help/gretl/C/figures
 %%GNOME2:%%@dirrm %%DATADIR%%/help/gretl/C/chapters