upgrade to 0.994

unbreak

PR:		37687
Submitted by:	Ports Fury

20 files changed, 954 insertions, 614 deletions

diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 91adefa590bc..2401d5a0ec68 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -7,26 +7,29 @@
 #
 
 PORTNAME=	gretl
-PORTVERSION=	0.991
+PORTVERSION=	0.994
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BROKEN=		"Does not build"
-
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
-LIB_DEPENDS=	gtkextra:${PORTSDIR}/x11-toolkits/gtkextra \
-		xml:${PORTSDIR}/textproc/libxml
+LIB_DEPENDS=	gnomeole2.0:${PORTSDIR}/devel/libole2 \
+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+		xml.5:${PORTSDIR}/textproc/libxml \
+		gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
 USE_X_PREFIX=	yes
 USE_GTK=	yes
 WANT_GNOME=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gmake
 USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-gmake
 INSTALLS_SHLIB=	yes
 
 MAN1=	gretl.1 gretl-config.1
@@ -36,23 +39,12 @@ MAN1=	gretl.1 gretl-config.1
 .if defined(HAVE_GNOME)
 USE_GNOME=	yes
 .else
-CONFIGURE_ARGS=	--disable-gnome
+CONFIGURE_ARGS+=	--without-gnome
 .endif
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
-		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
-		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
-
-post-patch:
-.for file in gui/gretl.c lib/src/graphing.c
-	@${PERL} -pi -e "s,SIGCLD,SIGCHLD,g" ${WRKSRC}/${file}
-.endfor
-	@${PERL} -pi -e "s,-ldl,,g" ${WRKSRC}/lib/Makefile.in
-.for file in gui/Makefile.in plugin/Makefile.in
-	@${PERL} -pi -e "s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/${file}
-.endfor
+	@${PERL} -pi -e 's|`glib-config|`\$$GLIB_CONFIG|g ; \
+		 s|/share/gretl/|/lib/gretl/|g' ${WRKSRC}/configure
+	@${PERL} -pi -e 's|SIGCLD|SIGCHLD|g' ${WRKSRC}/gui/gretl.c
 
 .include <bsd.port.post.mk>
diff --git a/math/gretl/distinfo b/math/gretl/distinfo
index 9846038c6f8f..5e3e958250eb 100644
--- a/math/gretl/distinfo
+++ b/math/gretl/distinfo
@@ -1 +1 @@
-MD5 (gretl-0.991.tar.gz) = 766a8041f0486c58fe882840b3ba39d1
+MD5 (gretl-0.994.tar.gz) = a4f69d758c52b9f60c74c85e50f0cdd9
diff --git a/math/gretl/files/patch-Makefile.in b/math/gretl/files/patch-Makefile.in
new file mode 100644
index 000000000000..18ccc2247eff
--- /dev/null
+++ b/math/gretl/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+--- Makefile.in.orig	Tue Mar 12 02:54:07 2002
++++ Makefile.in	Thu May  2 01:42:34 2002
+@@ -22,8 +22,9 @@
+   CC = gcc
+ endif
+ 
+-INSTALL_PROGRAM = ${INSTALL} -m 755
+-INSTALL_DATA = ${INSTALL} -m 644
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_DATA = @INSTALL_DATA@
+ 
+ export
+ 
diff --git a/math/gretl/files/patch-configure b/math/gretl/files/patch-configure
new file mode 100644
index 000000000000..4b01c0577cb3
--- /dev/null
+++ b/math/gretl/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sun Apr 21 23:11:36 2002
++++ configure	Wed May  1 06:58:01 2002
+@@ -6114,6 +6114,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/math/gretl/files/patch-gui::Makefile.in b/math/gretl/files/patch-gui::Makefile.in
new file mode 100644
index 000000000000..05a2282e2353
--- /dev/null
+++ b/math/gretl/files/patch-gui::Makefile.in
@@ -0,0 +1,38 @@
+--- gui/Makefile.in.orig	Mon Apr 22 01:43:31 2002
++++ gui/Makefile.in	Thu May  2 01:49:12 2002
+@@ -41,21 +41,20 @@
+   LIBS = `gnome-config --libs gnomeui print` `gtkextra-config --libs` ../lib/libgretl.la
+   GUI_CFLAGS = `gnome-config --cflags gnomeui print` `gtkextra-config --cflags`
+   desktopdir = $(gnome_prefix)/share/gnome/apps/Applications
+-  mimedir = $(gnome_prefix)/share/mime-info
+-  gpixmaps = $(gnome_prefix)/share/pixmaps
++  mimedir = $(gnome_prefix)/share/gnome/mime-info
++  gpixmaps = $(gnome_prefix)/share/gnome/pixmaps
+   ghelpdir = $(gnome_prefix)/share/gnome/help/gretl
+   query_install_gnome = install-gnome
+ else
+-  LIBS = `gtk-config --libs` `gtkextra-config --libs` ../lib/libgretl.la
+-  GUI_CFLAGS = `gtk-config --cflags` `gtkextra-config --cflags`
++  LIBS = `$(GTK_CONFIG) --libs` `gtkextra-config --libs` ../lib/libgretl.la
++  GUI_CFLAGS = `$(GTK_CONFIG) --cflags` `gtkextra-config --cflags`
+ endif
+ 
+ override CFLAGS += $(PIXBUF_CFLAGS)
+ override LIBS += $(PIXBUF_LIBS)
+ 
+ # Directories
+-bindir	= $(prefix)/bin
+-gretldir = $(prefix)/share/gretl
++gretldir = $(libdir)/gretl
+ tooldir = $(topsrc)/tools
+ libsrc = $(topsrc)/lib/src
+ clisrc = $(topsrc)/cli
+@@ -90,7 +89,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) gretl-logo.xpm $(gretldir)
+ 	$(INSTALL_DATA) $(topsrc)/COPYING $(gretldir)
+ 
diff --git a/math/gretl/files/patch-lib::Makefile.in b/math/gretl/files/patch-lib::Makefile.in
new file mode 100644
index 000000000000..b766748b9c4e
--- /dev/null
+++ b/math/gretl/files/patch-lib::Makefile.in
@@ -0,0 +1,40 @@
+--- lib/Makefile.in.orig	Mon Apr 22 01:43:31 2002
++++ lib/Makefile.in	Wed May  1 23:59:51 2002
+@@ -11,8 +11,8 @@
+ XML_CFLAGS = @XML_CFLAGS@
+ XML_LIBS = @XML_LIBS@
+ 
+-ifeq ($(INSTALL_PROGRAM),)
+-  INSTALL_PROGRAM = $(INSTALL) -m 755
++ifeq ($(INSTALL_SCRIPT),)
++  INSTALL_SCRIPT = $(INSTALL) -m 755
+ endif
+ ifeq ($(INSTALL_DATA),)
+   INSTALL_DATA = $(INSTALL) -m 644
+@@ -27,7 +27,7 @@
+ 
+ # General compile options and libs:
+ LIBGRETL = libgretl.la
+-LIBS = -lm -ldl -L/usr/local/lib -lz $(XML_LIBS)
++LIBS = -lm -lz $(XML_LIBS)
+ 
+ #### End of system configuration section. ####
+ 
+@@ -61,14 +61,14 @@
+ .PHONY: 
+ 
+ install: $(LIBGRETL) install-data
+-	$(LIBTOOL) $(INSTALL_PROGRAM) $< $(libdir)/$<
++	$(LIBTOOL) $(INSTALL_DATA) $< $(libdir)/$<
+ 
+ install-strip: $(LIBGRETL) install-data
+-	$(LIBTOOL) $(INSTALL_PROGRAM) -s $< $(libdir)/$<
++	$(LIBTOOL) $(INSTALL_DATA) -s $< $(libdir)/$<
+ 
+ install-data: installdirs
+ 	$(INSTALL_DATA) $(srcdir)/*.h $(includedir)
+-	$(INSTALL_PROGRAM) ../gretl-config $(bindir)
++	$(INSTALL_SCRIPT) ../gretl-config $(bindir)
+ 
+ installdirs:
+ 	$(topsrc)/tools/mkinstalldirs $(libdir) $(includedir)
diff --git a/math/gretl/files/patch-plugin::Makefile.in b/math/gretl/files/patch-plugin::Makefile.in
new file mode 100644
index 000000000000..1c2311d1564b
--- /dev/null
+++ b/math/gretl/files/patch-plugin::Makefile.in
@@ -0,0 +1,51 @@
+--- plugin/Makefile.in.orig	Thu Mar 28 07:05:24 2002
++++ plugin/Makefile.in	Thu May  2 01:46:10 2002
+@@ -2,6 +2,7 @@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
++libdir = @libdir@
+ CC = @CC@
+ CFLAGS = @CFLAGS@
+ MAKE = @MAKE@
+@@ -21,7 +22,7 @@
+ endif
+ 
+ # Installation directory
+-share = $(prefix)/share/gretl
++gretldir = $(libdir)/gretl
+ 
+ LIBTOOL = $(topsrc)/libtool
+ COMPILE = $(LIBTOOL) --mode=compile $(CC) -c -fPIC -DPIC $(CFLAGS) 
+@@ -29,8 +30,8 @@
+ 
+ GRETLINC = -I$(topsrc)/lib/src
+ GRETLLIB = ../lib/libgretl.la
+-GTKINC = `gtk-config --cflags`
+-GTKLIB = `gtk-config --libs`
++GTKINC = `$(GTK_CONFIG) --cflags`
++GTKLIB = `$(GTK_CONFIG) --libs`
+ 
+ PLUGINS = stats_tables.so panel_data.so progress_bar.so \
+ 	gnumeric_import.so excel_import.so
+@@ -85,15 +86,15 @@
+ .PHONY: 
+ 
+ install: $(PLUGINS) installdirs
+-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
+-	$(PLUGINS) $(share)/plugins
++	$(LIBTOOL) --mode=install $(INSTALL_DATA) \
++	$(PLUGINS) $(gretldir)/plugins
+ 
+ install-strip: $(PLUGINS) installdirs
+-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s \
+-	$(PLUGINS) $(share)/plugins
++	$(LIBTOOL) --mode=install $(INSTALL_DATA) -s \
++	$(PLUGINS) $(gretldir)/plugins
+ 
+ installdirs:
+-	$(topsrc)/tools/mkinstalldirs $(share)/plugins
++	$(topsrc)/tools/mkinstalldirs $(gretldir)/plugins
+ 
+ clean:
+ 	rm -f *.o *.lo $(PLUGINS) core 
diff --git a/math/gretl/files/patch-plugin::workbook.c b/math/gretl/files/patch-plugin::workbook.c
new file mode 100644
index 000000000000..968444a7e846
--- /dev/null
+++ b/math/gretl/files/patch-plugin::workbook.c
@@ -0,0 +1,10 @@
+--- plugin/workbook.c.orig	Thu Apr 11 05:33:44 2002
++++ plugin/workbook.c	Thu May  2 01:27:51 2002
+@@ -2,6 +2,7 @@
+ 
+ #include <stdio.h>
+ #include <glib.h>
++#include <wchar.h>
+ #include "biff.h"
+ #include "importer.h"
+ 
diff --git a/math/gretl/files/patch-share::Makefile.in b/math/gretl/files/patch-share::Makefile.in
new file mode 100644
index 000000000000..8c2a6a5c6645
--- /dev/null
+++ b/math/gretl/files/patch-share::Makefile.in
@@ -0,0 +1,16 @@
+--- share/Makefile.in.orig	Thu Mar 28 07:10:47 2002
++++ share/Makefile.in	Wed May  1 06:56:53 2002
+@@ -1,10 +1,11 @@
+ topsrc = ..
+ 
+ prefix = @prefix@
++libdir = @libdir@
+ 
+-gretldir = $(prefix)/share/gretl
++gretldir = $(libdir)/gretl
+ tooldir = $(topsrc)/tools
+-INSTALL_DATA = cp -fp
++INSTALL_DATA = @INSTALL_DATA@
+ 
+ .PHONY :
+ 
diff --git a/math/gretl/pkg-plist b/math/gretl/pkg-plist
index b46ffc30e8af..0c5f26132efe 100644
--- a/math/gretl/pkg-plist
+++ b/math/gretl/pkg-plist
@@ -27,289 +27,288 @@ include/gretl/utils.h
 include/gretl/var.h
 include/gretl/version.h
 include/gretl/win32.h
-lib/libgretl.la
+lib/gretl/COPYING
+lib/gretl/data/data10-1.gdt
+lib/gretl/data/data10-2.gdt
+lib/gretl/data/data10-3.gdt
+lib/gretl/data/data10-4.gdt
+lib/gretl/data/data10-5.gdt
+lib/gretl/data/data10-6.gdt
+lib/gretl/data/data10-7.gdt
+lib/gretl/data/data10-8.gdt
+lib/gretl/data/data11-1.gdt
+lib/gretl/data/data12-1.gdt
+lib/gretl/data/data13-1.gdt
+lib/gretl/data/data2-1.gdt
+lib/gretl/data/data2-2.gdt
+lib/gretl/data/data2-3.gdt
+lib/gretl/data/data3-1.gdt
+lib/gretl/data/data3-10.gdt
+lib/gretl/data/data3-11.gdt
+lib/gretl/data/data3-12.gdt
+lib/gretl/data/data3-13.gdt
+lib/gretl/data/data3-14.gdt
+lib/gretl/data/data3-15.gdt
+lib/gretl/data/data3-2.gdt
+lib/gretl/data/data3-3.gdt
+lib/gretl/data/data3-4.gdt
+lib/gretl/data/data3-5.gdt
+lib/gretl/data/data3-6.gdt
+lib/gretl/data/data3-7.gdt
+lib/gretl/data/data3-8.gdt
+lib/gretl/data/data3-9.gdt
+lib/gretl/data/data4-1.gdt
+lib/gretl/data/data4-10.gdt
+lib/gretl/data/data4-11.gdt
+lib/gretl/data/data4-12.gdt
+lib/gretl/data/data4-13.gdt
+lib/gretl/data/data4-14.gdt
+lib/gretl/data/data4-15.gdt
+lib/gretl/data/data4-16.gdt
+lib/gretl/data/data4-17.gdt
+lib/gretl/data/data4-2.gdt
+lib/gretl/data/data4-3.gdt
+lib/gretl/data/data4-3a.gdt
+lib/gretl/data/data4-4.gdt
+lib/gretl/data/data4-5.gdt
+lib/gretl/data/data4-6.gdt
+lib/gretl/data/data4-7.gdt
+lib/gretl/data/data4-8.gdt
+lib/gretl/data/data4-9.gdt
+lib/gretl/data/data6-1.gdt
+lib/gretl/data/data6-2.gdt
+lib/gretl/data/data6-3.gdt
+lib/gretl/data/data6-4.gdt
+lib/gretl/data/data6-5.gdt
+lib/gretl/data/data6-6.gdt
+lib/gretl/data/data7-1.gdt
+lib/gretl/data/data7-10.gdt
+lib/gretl/data/data7-11.gdt
+lib/gretl/data/data7-12.gdt
+lib/gretl/data/data7-13.gdt
+lib/gretl/data/data7-14.gdt
+lib/gretl/data/data7-15.gdt
+lib/gretl/data/data7-16.gdt
+lib/gretl/data/data7-17.gdt
+lib/gretl/data/data7-18.gdt
+lib/gretl/data/data7-19.gdt
+lib/gretl/data/data7-2.gdt
+lib/gretl/data/data7-20.gdt
+lib/gretl/data/data7-21.gdt
+lib/gretl/data/data7-22.gdt
+lib/gretl/data/data7-23.gdt
+lib/gretl/data/data7-24.gdt
+lib/gretl/data/data7-26.gdt
+lib/gretl/data/data7-3.gdt
+lib/gretl/data/data7-4.gdt
+lib/gretl/data/data7-5.gdt
+lib/gretl/data/data7-6.gdt
+lib/gretl/data/data7-7.gdt
+lib/gretl/data/data7-8.gdt
+lib/gretl/data/data7-9.gdt
+lib/gretl/data/data8-1.gdt
+lib/gretl/data/data8-2.gdt
+lib/gretl/data/data8-3.gdt
+lib/gretl/data/data9-1.gdt
+lib/gretl/data/data9-10.gdt
+lib/gretl/data/data9-11.gdt
+lib/gretl/data/data9-12.gdt
+lib/gretl/data/data9-13.gdt
+lib/gretl/data/data9-2.gdt
+lib/gretl/data/data9-3.gdt
+lib/gretl/data/data9-4.gdt
+lib/gretl/data/data9-5.gdt
+lib/gretl/data/data9-6.gdt
+lib/gretl/data/data9-7.gdt
+lib/gretl/data/data9-8.gdt
+lib/gretl/data/data9-9.gdt
+lib/gretl/data/descriptions
+lib/gretl/data/greene/greene10_3.gdt
+lib/gretl/data/greene/greene11_3.gdt
+lib/gretl/data/greene/greene12_1.gdt
+lib/gretl/data/greene/greene18_1.gdt
+lib/gretl/data/greene/greene18_2.gdt
+lib/gretl/data/greene/greene19_1.gdt
+lib/gretl/data/greene/greene7_8.gdt
+lib/gretl/data/greene/greene8_3.gdt
+lib/gretl/data/greene/wg_descriptions
+lib/gretl/db/README
+lib/gretl/db/bcih.bin
+lib/gretl/db/bcih.idx
+lib/gretl/gretl-logo.xpm
+lib/gretl/gretl.hlp
+lib/gretl/gretl.stamp
+lib/gretl/gretlcli.hlp
+lib/gretl/plugins/excel_import.so
+lib/gretl/plugins/gnumeric_import.so
+lib/gretl/plugins/panel_data.so
+lib/gretl/plugins/progress_bar.so
+lib/gretl/plugins/stats_tables.so
+lib/gretl/scripts/greene11_3.inp
+lib/gretl/scripts/greene12_1.inp
+lib/gretl/scripts/greene18_6.inp
+lib/gretl/scripts/greene19_1.inp
+lib/gretl/scripts/greene7_8.inp
+lib/gretl/scripts/greene8_3.inp
+lib/gretl/scripts/ps10-1.inp
+lib/gretl/scripts/ps10-10.inp
+lib/gretl/scripts/ps10-11.inp
+lib/gretl/scripts/ps10-2.inp
+lib/gretl/scripts/ps10-3.inp
+lib/gretl/scripts/ps10-4.inp
+lib/gretl/scripts/ps10-5a.inp
+lib/gretl/scripts/ps10-5b.inp
+lib/gretl/scripts/ps10-6.inp
+lib/gretl/scripts/ps10-7.inp
+lib/gretl/scripts/ps10-8.inp
+lib/gretl/scripts/ps10-9.inp
+lib/gretl/scripts/ps11-1.inp
+lib/gretl/scripts/ps11-2.inp
+lib/gretl/scripts/ps11-3.inp
+lib/gretl/scripts/ps12-1.inp
+lib/gretl/scripts/ps13-1.inp
+lib/gretl/scripts/ps2-1.inp
+lib/gretl/scripts/ps2-2.inp
+lib/gretl/scripts/ps2-3.inp
+lib/gretl/scripts/ps3-1.inp
+lib/gretl/scripts/ps3-2.inp
+lib/gretl/scripts/ps3-3.inp
+lib/gretl/scripts/ps3-4.inp
+lib/gretl/scripts/ps3-5.inp
+lib/gretl/scripts/ps3-6.inp
+lib/gretl/scripts/ps4-1.inp
+lib/gretl/scripts/ps4-2.inp
+lib/gretl/scripts/ps4-3.inp
+lib/gretl/scripts/ps4-4.inp
+lib/gretl/scripts/ps4-5.inp
+lib/gretl/scripts/ps5-1.inp
+lib/gretl/scripts/ps5-2.inp
+lib/gretl/scripts/ps5-3.inp
+lib/gretl/scripts/ps5-4.inp
+lib/gretl/scripts/ps5-5.inp
+lib/gretl/scripts/ps6-1.inp
+lib/gretl/scripts/ps6-10.inp
+lib/gretl/scripts/ps6-11.inp
+lib/gretl/scripts/ps6-12.inp
+lib/gretl/scripts/ps6-2.inp
+lib/gretl/scripts/ps6-3.inp
+lib/gretl/scripts/ps6-4.inp
+lib/gretl/scripts/ps6-5.inp
+lib/gretl/scripts/ps6-6.inp
+lib/gretl/scripts/ps6-7.inp
+lib/gretl/scripts/ps6-8.inp
+lib/gretl/scripts/ps6-9.inp
+lib/gretl/scripts/ps7-1.inp
+lib/gretl/scripts/ps7-2.inp
+lib/gretl/scripts/ps7-3.inp
+lib/gretl/scripts/ps7-4.inp
+lib/gretl/scripts/ps7-5.inp
+lib/gretl/scripts/ps7-6.inp
+lib/gretl/scripts/ps7-7.inp
+lib/gretl/scripts/ps8-1.inp
+lib/gretl/scripts/ps8-2.inp
+lib/gretl/scripts/ps8-3.inp
+lib/gretl/scripts/ps8-4.inp
+lib/gretl/scripts/ps8-5.inp
+lib/gretl/scripts/ps8-6.inp
+lib/gretl/scripts/ps8-7.inp
+lib/gretl/scripts/ps8-8.inp
+lib/gretl/scripts/ps9-1.inp
+lib/gretl/scripts/ps9-10.inp
+lib/gretl/scripts/ps9-2.inp
+lib/gretl/scripts/ps9-3.inp
+lib/gretl/scripts/ps9-4.inp
+lib/gretl/scripts/ps9-5.inp
+lib/gretl/scripts/ps9-6.inp
+lib/gretl/scripts/ps9-7.inp
+lib/gretl/scripts/ps9-8.inp
+lib/gretl/scripts/ps9-9.inp
+lib/gretl/scripts/ps_descriptions
+lib/gretl/scripts/testinp
+lib/gretl/scripts/wg_ps_descriptions
+lib/libgretl.a
 lib/libgretl.so
-lib/libgretl.so.10
-share/gnome/apps/Applications/gretl.desktop
-share/gnome/help/gretl/C/a3318.html
-share/gnome/help/gretl/C/a3420.html
-share/gnome/help/gretl/C/a3447.html
-share/gnome/help/gretl/C/a3481.html
-share/gnome/help/gretl/C/b3605.html
-share/gnome/help/gretl/C/c1046.html
-share/gnome/help/gretl/C/c1287.html
-share/gnome/help/gretl/C/c137.html
-share/gnome/help/gretl/C/c208.html
-share/gnome/help/gretl/C/c21.html
-share/gnome/help/gretl/C/c3204.html
-share/gnome/help/gretl/C/c3243.html
-share/gnome/help/gretl/C/c434.html
-share/gnome/help/gretl/C/c577.html
-share/gnome/help/gretl/C/c752.html
-share/gnome/help/gretl/C/c900.html
-share/gnome/help/gretl/C/c960.html
-share/gnome/help/gretl/C/docbook.css
-share/gnome/help/gretl/C/figures/adf1.png
-share/gnome/help/gretl/C/figures/adf2.png
-share/gnome/help/gretl/C/figures/autocorr.png
-share/gnome/help/gretl/C/figures/caution.png
-share/gnome/help/gretl/C/figures/chisqu.png
-share/gnome/help/gretl/C/figures/corc.png
-share/gnome/help/gretl/C/figures/cumulate.png
-share/gnome/help/gretl/C/figures/datafiles.png
-share/gnome/help/gretl/C/figures/greeneC.png
-share/gnome/help/gretl/C/figures/gretl-logo.png
-share/gnome/help/gretl/C/figures/important.png
-share/gnome/help/gretl/C/figures/ldx.png
-share/gnome/help/gretl/C/figures/ldy.png
-share/gnome/help/gretl/C/figures/linreg.png
-share/gnome/help/gretl/C/figures/mainwin.png
-share/gnome/help/gretl/C/figures/menubar.png
-share/gnome/help/gretl/C/figures/modelwin.png
-share/gnome/help/gretl/C/figures/nonlin.png
-share/gnome/help/gretl/C/figures/note.png
-share/gnome/help/gretl/C/figures/plot_control.png
-share/gnome/help/gretl/C/figures/resid.png
-share/gnome/help/gretl/C/figures/scriptwin.png
-share/gnome/help/gretl/C/figures/session.png
-share/gnome/help/gretl/C/figures/tip.png
-share/gnome/help/gretl/C/figures/tipbak.png
-share/gnome/help/gretl/C/figures/toolbar.png
-share/gnome/help/gretl/C/figures/uhatsq.png
-share/gnome/help/gretl/C/figures/warning.png
-share/gnome/help/gretl/C/figures/yhat.png
-share/gnome/help/gretl/C/index.html
-share/gnome/help/gretl/C/topic.dat
-share/gnome/help/gretl/C/x1002.html
-share/gnome/help/gretl/C/x1035.html
-share/gnome/help/gretl/C/x1146.html
-share/gnome/help/gretl/C/x1211.html
-share/gnome/help/gretl/C/x1327.html
-share/gnome/help/gretl/C/x3079.html
-share/gnome/help/gretl/C/x3331.html
-share/gnome/help/gretl/C/x3399.html
-share/gnome/help/gretl/C/x490.html
-share/gnome/help/gretl/C/x537.html
-share/gnome/help/gretl/C/x585.html
-share/gnome/help/gretl/C/x612.html
-share/gnome/help/gretl/C/x639.html
-share/gnome/help/gretl/C/x69.html
-share/gnome/help/gretl/C/x720.html
-share/gnome/help/gretl/C/x84.html
-share/gnome/help/gretl/C/x840.html
-share/gnome/help/gretl/C/x870.html
-share/gnome/help/gretl/C/x884.html
-share/gnome/help/gretl/C/x936.html
-share/gretl/COPYING
-share/gretl/data/data10-1.gdt
-share/gretl/data/data10-2.gdt
-share/gretl/data/data10-3.gdt
-share/gretl/data/data10-4.gdt
-share/gretl/data/data10-5.gdt
-share/gretl/data/data10-6.gdt
-share/gretl/data/data10-7.gdt
-share/gretl/data/data10-8.gdt
-share/gretl/data/data11-1.gdt
-share/gretl/data/data12-1.gdt
-share/gretl/data/data13-1.gdt
-share/gretl/data/data2-1.gdt
-share/gretl/data/data2-2.gdt
-share/gretl/data/data2-3.gdt
-share/gretl/data/data3-1.gdt
-share/gretl/data/data3-10.gdt
-share/gretl/data/data3-11.gdt
-share/gretl/data/data3-12.gdt
-share/gretl/data/data3-13.gdt
-share/gretl/data/data3-14.gdt
-share/gretl/data/data3-15.gdt
-share/gretl/data/data3-2.gdt
-share/gretl/data/data3-3.gdt
-share/gretl/data/data3-4.gdt
-share/gretl/data/data3-5.gdt
-share/gretl/data/data3-6.gdt
-share/gretl/data/data3-7.gdt
-share/gretl/data/data3-8.gdt
-share/gretl/data/data3-9.gdt
-share/gretl/data/data4-1.gdt
-share/gretl/data/data4-10.gdt
-share/gretl/data/data4-11.gdt
-share/gretl/data/data4-12.gdt
-share/gretl/data/data4-13.gdt
-share/gretl/data/data4-14.gdt
-share/gretl/data/data4-15.gdt
-share/gretl/data/data4-16.gdt
-share/gretl/data/data4-17.gdt
-share/gretl/data/data4-2.gdt
-share/gretl/data/data4-3.gdt
-share/gretl/data/data4-3a.gdt
-share/gretl/data/data4-4.gdt
-share/gretl/data/data4-5.gdt
-share/gretl/data/data4-6.gdt
-share/gretl/data/data4-7.gdt
-share/gretl/data/data4-8.gdt
-share/gretl/data/data4-9.gdt
-share/gretl/data/data6-1.gdt
-share/gretl/data/data6-2.gdt
-share/gretl/data/data6-3.gdt
-share/gretl/data/data6-4.gdt
-share/gretl/data/data6-5.gdt
-share/gretl/data/data6-6.gdt
-share/gretl/data/data7-1.gdt
-share/gretl/data/data7-10.gdt
-share/gretl/data/data7-11.gdt
-share/gretl/data/data7-12.gdt
-share/gretl/data/data7-13.gdt
-share/gretl/data/data7-14.gdt
-share/gretl/data/data7-15.gdt
-share/gretl/data/data7-16.gdt
-share/gretl/data/data7-17.gdt
-share/gretl/data/data7-18.gdt
-share/gretl/data/data7-19.gdt
-share/gretl/data/data7-2.gdt
-share/gretl/data/data7-20.gdt
-share/gretl/data/data7-21.gdt
-share/gretl/data/data7-22.gdt
-share/gretl/data/data7-23.gdt
-share/gretl/data/data7-24.gdt
-share/gretl/data/data7-26.gdt
-share/gretl/data/data7-3.gdt
-share/gretl/data/data7-4.gdt
-share/gretl/data/data7-5.gdt
-share/gretl/data/data7-6.gdt
-share/gretl/data/data7-7.gdt
-share/gretl/data/data7-8.gdt
-share/gretl/data/data7-9.gdt
-share/gretl/data/data8-1.gdt
-share/gretl/data/data8-2.gdt
-share/gretl/data/data8-3.gdt
-share/gretl/data/data9-1.gdt
-share/gretl/data/data9-10.gdt
-share/gretl/data/data9-11.gdt
-share/gretl/data/data9-12.gdt
-share/gretl/data/data9-13.gdt
-share/gretl/data/data9-2.gdt
-share/gretl/data/data9-3.gdt
-share/gretl/data/data9-4.gdt
-share/gretl/data/data9-5.gdt
-share/gretl/data/data9-6.gdt
-share/gretl/data/data9-7.gdt
-share/gretl/data/data9-8.gdt
-share/gretl/data/data9-9.gdt
-share/gretl/data/descriptions
-share/gretl/data/greene/greene10_3.gdt
-share/gretl/data/greene/greene11_3.gdt
-share/gretl/data/greene/greene12_1.gdt
-share/gretl/data/greene/greene18_1.gdt
-share/gretl/data/greene/greene18_2.gdt
-share/gretl/data/greene/greene19_1.gdt
-share/gretl/data/greene/greene7_8.gdt
-share/gretl/data/greene/greene8_3.gdt
-share/gretl/data/greene/wg_descriptions
-share/gretl/db/README
-share/gretl/db/bcih.bin
-share/gretl/db/bcih.idx
-share/gretl/gretl-logo.xpm
-share/gretl/gretl.hlp
-share/gretl/gretl.stamp
-share/gretl/gretlcli.hlp
-share/gretl/plugins/panel_data.so
-share/gretl/plugins/progress_bar.so
-share/gretl/plugins/stats_tables.so
-share/gretl/scripts/greene11_3.inp
-share/gretl/scripts/greene12_1.inp
-share/gretl/scripts/greene18_6.inp
-share/gretl/scripts/greene19_1.inp
-share/gretl/scripts/greene7_8.inp
-share/gretl/scripts/greene8_3.inp
-share/gretl/scripts/ps10-1.inp
-share/gretl/scripts/ps10-10.inp
-share/gretl/scripts/ps10-11.inp
-share/gretl/scripts/ps10-2.inp
-share/gretl/scripts/ps10-3.inp
-share/gretl/scripts/ps10-4.inp
-share/gretl/scripts/ps10-5a.inp
-share/gretl/scripts/ps10-5b.inp
-share/gretl/scripts/ps10-6.inp
-share/gretl/scripts/ps10-7.inp
-share/gretl/scripts/ps10-8.inp
-share/gretl/scripts/ps10-9.inp
-share/gretl/scripts/ps11-1.inp
-share/gretl/scripts/ps11-2.inp
-share/gretl/scripts/ps11-3.inp
-share/gretl/scripts/ps12-1.inp
-share/gretl/scripts/ps13-1.inp
-share/gretl/scripts/ps2-1.inp
-share/gretl/scripts/ps2-2.inp
-share/gretl/scripts/ps2-3.inp
-share/gretl/scripts/ps3-1.inp
-share/gretl/scripts/ps3-2.inp
-share/gretl/scripts/ps3-3.inp
-share/gretl/scripts/ps3-4.inp
-share/gretl/scripts/ps3-5.inp
-share/gretl/scripts/ps3-6.inp
-share/gretl/scripts/ps4-1.inp
-share/gretl/scripts/ps4-2.inp
-share/gretl/scripts/ps4-3.inp
-share/gretl/scripts/ps4-4.inp
-share/gretl/scripts/ps4-5.inp
-share/gretl/scripts/ps5-1.inp
-share/gretl/scripts/ps5-2.inp
-share/gretl/scripts/ps5-3.inp
-share/gretl/scripts/ps5-4.inp
-share/gretl/scripts/ps5-5.inp
-share/gretl/scripts/ps6-1.inp
-share/gretl/scripts/ps6-10.inp
-share/gretl/scripts/ps6-11.inp
-share/gretl/scripts/ps6-12.inp
-share/gretl/scripts/ps6-2.inp
-share/gretl/scripts/ps6-3.inp
-share/gretl/scripts/ps6-4.inp
-share/gretl/scripts/ps6-5.inp
-share/gretl/scripts/ps6-6.inp
-share/gretl/scripts/ps6-7.inp
-share/gretl/scripts/ps6-8.inp
-share/gretl/scripts/ps6-9.inp
-share/gretl/scripts/ps7-1.inp
-share/gretl/scripts/ps7-2.inp
-share/gretl/scripts/ps7-3.inp
-share/gretl/scripts/ps7-4.inp
-share/gretl/scripts/ps7-5.inp
-share/gretl/scripts/ps7-6.inp
-share/gretl/scripts/ps7-7.inp
-share/gretl/scripts/ps8-1.inp
-share/gretl/scripts/ps8-2.inp
-share/gretl/scripts/ps8-3.inp
-share/gretl/scripts/ps8-4.inp
-share/gretl/scripts/ps8-5.inp
-share/gretl/scripts/ps8-6.inp
-share/gretl/scripts/ps8-7.inp
-share/gretl/scripts/ps8-8.inp
-share/gretl/scripts/ps9-1.inp
-share/gretl/scripts/ps9-10.inp
-share/gretl/scripts/ps9-2.inp
-share/gretl/scripts/ps9-3.inp
-share/gretl/scripts/ps9-4.inp
-share/gretl/scripts/ps9-5.inp
-share/gretl/scripts/ps9-6.inp
-share/gretl/scripts/ps9-7.inp
-share/gretl/scripts/ps9-8.inp
-share/gretl/scripts/ps9-9.inp
-share/gretl/scripts/ps_descriptions
-share/gretl/scripts/testinp
-share/gretl/scripts/wg_ps_descriptions
-share/mime-info/gretl.keys
-share/mime-info/gretl.mime
-share/pixmaps/gnome-application-x-gretldata.png
-share/pixmaps/gnome-application-x-gretlsession.png
-share/pixmaps/gretl-gnome-logo.xpm
-share/pixmaps/gretl.png
+lib/libgretl.so.12
+%%GNOME:%%share/gnome/apps/Applications/gretl.desktop
+%%GNOME:%%share/gnome/help/gretl/C/a3374.html
+%%GNOME:%%share/gnome/help/gretl/C/a3476.html
+%%GNOME:%%share/gnome/help/gretl/C/a3503.html
+%%GNOME:%%share/gnome/help/gretl/C/a3537.html
+%%GNOME:%%share/gnome/help/gretl/C/b3661.html
+%%GNOME:%%share/gnome/help/gretl/C/c1058.html
+%%GNOME:%%share/gnome/help/gretl/C/c1299.html
+%%GNOME:%%share/gnome/help/gretl/C/c137.html
+%%GNOME:%%share/gnome/help/gretl/C/c208.html
+%%GNOME:%%share/gnome/help/gretl/C/c21.html
+%%GNOME:%%share/gnome/help/gretl/C/c3260.html
+%%GNOME:%%share/gnome/help/gretl/C/c3299.html
+%%GNOME:%%share/gnome/help/gretl/C/c434.html
+%%GNOME:%%share/gnome/help/gretl/C/c577.html
+%%GNOME:%%share/gnome/help/gretl/C/c764.html
+%%GNOME:%%share/gnome/help/gretl/C/c912.html
+%%GNOME:%%share/gnome/help/gretl/C/c972.html
+%%GNOME:%%share/gnome/help/gretl/C/docbook.css
+%%GNOME:%%share/gnome/help/gretl/C/figures/adf1.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/adf2.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/autocorr.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/caution.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/chisqu.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/corc.png
+%%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/greeneC.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/gretl-logo.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/important.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/ldx.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/ldy.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/linreg.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/mainwin.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/menubar.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/modelwin.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/nonlin.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/note.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/plot_control.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/resid.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/scriptwin.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/session.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/tip.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/tipbak.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/toolbar.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/uhatsq.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/warning.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/yhat.png
+%%GNOME:%%share/gnome/help/gretl/C/index.html
+%%GNOME:%%share/gnome/help/gretl/C/topic.dat
+%%GNOME:%%share/gnome/help/gretl/C/x1014.html
+%%GNOME:%%share/gnome/help/gretl/C/x1047.html
+%%GNOME:%%share/gnome/help/gretl/C/x1158.html
+%%GNOME:%%share/gnome/help/gretl/C/x1223.html
+%%GNOME:%%share/gnome/help/gretl/C/x1339.html
+%%GNOME:%%share/gnome/help/gretl/C/x3138.html
+%%GNOME:%%share/gnome/help/gretl/C/x3387.html
+%%GNOME:%%share/gnome/help/gretl/C/x3455.html
+%%GNOME:%%share/gnome/help/gretl/C/x490.html
+%%GNOME:%%share/gnome/help/gretl/C/x537.html
+%%GNOME:%%share/gnome/help/gretl/C/x585.html
+%%GNOME:%%share/gnome/help/gretl/C/x619.html
+%%GNOME:%%share/gnome/help/gretl/C/x646.html
+%%GNOME:%%share/gnome/help/gretl/C/x69.html
+%%GNOME:%%share/gnome/help/gretl/C/x732.html
+%%GNOME:%%share/gnome/help/gretl/C/x84.html
+%%GNOME:%%share/gnome/help/gretl/C/x852.html
+%%GNOME:%%share/gnome/help/gretl/C/x882.html
+%%GNOME:%%share/gnome/help/gretl/C/x896.html
+%%GNOME:%%share/gnome/help/gretl/C/x948.html
+%%GNOME:%%share/gnome/mime-info/gretl.keys
+%%GNOME:%%share/gnome/mime-info/gretl.mime
+%%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretldata.png
+%%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretlsession.png
+%%GNOME:%%share/gnome/pixmaps/gretl-gnome-logo.xpm
+%%GNOME:%%share/gnome/pixmaps/gretl.png
+@dirrm lib/gretl/scripts
+@dirrm lib/gretl/plugins
+@dirrm lib/gretl/db
+@dirrm lib/gretl/data/greene
+@dirrm lib/gretl/data
+@dirrm lib/gretl
 @dirrm include/gretl
-@dirrm share/gnome/help/gretl/C/figures
-@dirrm share/gnome/help/gretl/C
-@dirrm share/gnome/help/gretl
-@dirrm share/gretl/data/greene
-@dirrm share/gretl/data
-@dirrm share/gretl/db
-@dirrm share/gretl/plugins
-@dirrm share/gretl/scripts
-@dirrm share/gretl
diff --git a/misc/gretl/Makefile b/misc/gretl/Makefile
index 91adefa590bc..2401d5a0ec68 100644
--- a/misc/gretl/Makefile
+++ b/misc/gretl/Makefile
@@ -7,26 +7,29 @@
 #
 
 PORTNAME=	gretl
-PORTVERSION=	0.991
+PORTVERSION=	0.994
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BROKEN=		"Does not build"
-
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
-LIB_DEPENDS=	gtkextra:${PORTSDIR}/x11-toolkits/gtkextra \
-		xml:${PORTSDIR}/textproc/libxml
+LIB_DEPENDS=	gnomeole2.0:${PORTSDIR}/devel/libole2 \
+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+		xml.5:${PORTSDIR}/textproc/libxml \
+		gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
 USE_X_PREFIX=	yes
 USE_GTK=	yes
 WANT_GNOME=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gmake
 USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-gmake
 INSTALLS_SHLIB=	yes
 
 MAN1=	gretl.1 gretl-config.1
@@ -36,23 +39,12 @@ MAN1=	gretl.1 gretl-config.1
 .if defined(HAVE_GNOME)
 USE_GNOME=	yes
 .else
-CONFIGURE_ARGS=	--disable-gnome
+CONFIGURE_ARGS+=	--without-gnome
 .endif
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
-		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
-		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
-
-post-patch:
-.for file in gui/gretl.c lib/src/graphing.c
-	@${PERL} -pi -e "s,SIGCLD,SIGCHLD,g" ${WRKSRC}/${file}
-.endfor
-	@${PERL} -pi -e "s,-ldl,,g" ${WRKSRC}/lib/Makefile.in
-.for file in gui/Makefile.in plugin/Makefile.in
-	@${PERL} -pi -e "s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/${file}
-.endfor
+	@${PERL} -pi -e 's|`glib-config|`\$$GLIB_CONFIG|g ; \
+		 s|/share/gretl/|/lib/gretl/|g' ${WRKSRC}/configure
+	@${PERL} -pi -e 's|SIGCLD|SIGCHLD|g' ${WRKSRC}/gui/gretl.c
 
 .include <bsd.port.post.mk>
diff --git a/misc/gretl/distinfo b/misc/gretl/distinfo
index 9846038c6f8f..5e3e958250eb 100644
--- a/misc/gretl/distinfo
+++ b/misc/gretl/distinfo
@@ -1 +1 @@
-MD5 (gretl-0.991.tar.gz) = 766a8041f0486c58fe882840b3ba39d1
+MD5 (gretl-0.994.tar.gz) = a4f69d758c52b9f60c74c85e50f0cdd9
diff --git a/misc/gretl/files/patch-Makefile.in b/misc/gretl/files/patch-Makefile.in
new file mode 100644
index 000000000000..18ccc2247eff
--- /dev/null
+++ b/misc/gretl/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+--- Makefile.in.orig	Tue Mar 12 02:54:07 2002
++++ Makefile.in	Thu May  2 01:42:34 2002
+@@ -22,8 +22,9 @@
+   CC = gcc
+ endif
+ 
+-INSTALL_PROGRAM = ${INSTALL} -m 755
+-INSTALL_DATA = ${INSTALL} -m 644
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_DATA = @INSTALL_DATA@
+ 
+ export
+ 
diff --git a/misc/gretl/files/patch-configure b/misc/gretl/files/patch-configure
new file mode 100644
index 000000000000..4b01c0577cb3
--- /dev/null
+++ b/misc/gretl/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sun Apr 21 23:11:36 2002
++++ configure	Wed May  1 06:58:01 2002
+@@ -6114,6 +6114,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/misc/gretl/files/patch-gui::Makefile.in b/misc/gretl/files/patch-gui::Makefile.in
new file mode 100644
index 000000000000..05a2282e2353
--- /dev/null
+++ b/misc/gretl/files/patch-gui::Makefile.in
@@ -0,0 +1,38 @@
+--- gui/Makefile.in.orig	Mon Apr 22 01:43:31 2002
++++ gui/Makefile.in	Thu May  2 01:49:12 2002
+@@ -41,21 +41,20 @@
+   LIBS = `gnome-config --libs gnomeui print` `gtkextra-config --libs` ../lib/libgretl.la
+   GUI_CFLAGS = `gnome-config --cflags gnomeui print` `gtkextra-config --cflags`
+   desktopdir = $(gnome_prefix)/share/gnome/apps/Applications
+-  mimedir = $(gnome_prefix)/share/mime-info
+-  gpixmaps = $(gnome_prefix)/share/pixmaps
++  mimedir = $(gnome_prefix)/share/gnome/mime-info
++  gpixmaps = $(gnome_prefix)/share/gnome/pixmaps
+   ghelpdir = $(gnome_prefix)/share/gnome/help/gretl
+   query_install_gnome = install-gnome
+ else
+-  LIBS = `gtk-config --libs` `gtkextra-config --libs` ../lib/libgretl.la
+-  GUI_CFLAGS = `gtk-config --cflags` `gtkextra-config --cflags`
++  LIBS = `$(GTK_CONFIG) --libs` `gtkextra-config --libs` ../lib/libgretl.la
++  GUI_CFLAGS = `$(GTK_CONFIG) --cflags` `gtkextra-config --cflags`
+ endif
+ 
+ override CFLAGS += $(PIXBUF_CFLAGS)
+ override LIBS += $(PIXBUF_LIBS)
+ 
+ # Directories
+-bindir	= $(prefix)/bin
+-gretldir = $(prefix)/share/gretl
++gretldir = $(libdir)/gretl
+ tooldir = $(topsrc)/tools
+ libsrc = $(topsrc)/lib/src
+ clisrc = $(topsrc)/cli
+@@ -90,7 +89,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) gretl-logo.xpm $(gretldir)
+ 	$(INSTALL_DATA) $(topsrc)/COPYING $(gretldir)
+ 
diff --git a/misc/gretl/files/patch-lib::Makefile.in b/misc/gretl/files/patch-lib::Makefile.in
new file mode 100644
index 000000000000..b766748b9c4e
--- /dev/null
+++ b/misc/gretl/files/patch-lib::Makefile.in
@@ -0,0 +1,40 @@
+--- lib/Makefile.in.orig	Mon Apr 22 01:43:31 2002
++++ lib/Makefile.in	Wed May  1 23:59:51 2002
+@@ -11,8 +11,8 @@
+ XML_CFLAGS = @XML_CFLAGS@
+ XML_LIBS = @XML_LIBS@
+ 
+-ifeq ($(INSTALL_PROGRAM),)
+-  INSTALL_PROGRAM = $(INSTALL) -m 755
++ifeq ($(INSTALL_SCRIPT),)
++  INSTALL_SCRIPT = $(INSTALL) -m 755
+ endif
+ ifeq ($(INSTALL_DATA),)
+   INSTALL_DATA = $(INSTALL) -m 644
+@@ -27,7 +27,7 @@
+ 
+ # General compile options and libs:
+ LIBGRETL = libgretl.la
+-LIBS = -lm -ldl -L/usr/local/lib -lz $(XML_LIBS)
++LIBS = -lm -lz $(XML_LIBS)
+ 
+ #### End of system configuration section. ####
+ 
+@@ -61,14 +61,14 @@
+ .PHONY: 
+ 
+ install: $(LIBGRETL) install-data
+-	$(LIBTOOL) $(INSTALL_PROGRAM) $< $(libdir)/$<
++	$(LIBTOOL) $(INSTALL_DATA) $< $(libdir)/$<
+ 
+ install-strip: $(LIBGRETL) install-data
+-	$(LIBTOOL) $(INSTALL_PROGRAM) -s $< $(libdir)/$<
++	$(LIBTOOL) $(INSTALL_DATA) -s $< $(libdir)/$<
+ 
+ install-data: installdirs
+ 	$(INSTALL_DATA) $(srcdir)/*.h $(includedir)
+-	$(INSTALL_PROGRAM) ../gretl-config $(bindir)
++	$(INSTALL_SCRIPT) ../gretl-config $(bindir)
+ 
+ installdirs:
+ 	$(topsrc)/tools/mkinstalldirs $(libdir) $(includedir)
diff --git a/misc/gretl/files/patch-plugin::Makefile.in b/misc/gretl/files/patch-plugin::Makefile.in
new file mode 100644
index 000000000000..1c2311d1564b
--- /dev/null
+++ b/misc/gretl/files/patch-plugin::Makefile.in
@@ -0,0 +1,51 @@
+--- plugin/Makefile.in.orig	Thu Mar 28 07:05:24 2002
++++ plugin/Makefile.in	Thu May  2 01:46:10 2002
+@@ -2,6 +2,7 @@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
++libdir = @libdir@
+ CC = @CC@
+ CFLAGS = @CFLAGS@
+ MAKE = @MAKE@
+@@ -21,7 +22,7 @@
+ endif
+ 
+ # Installation directory
+-share = $(prefix)/share/gretl
++gretldir = $(libdir)/gretl
+ 
+ LIBTOOL = $(topsrc)/libtool
+ COMPILE = $(LIBTOOL) --mode=compile $(CC) -c -fPIC -DPIC $(CFLAGS) 
+@@ -29,8 +30,8 @@
+ 
+ GRETLINC = -I$(topsrc)/lib/src
+ GRETLLIB = ../lib/libgretl.la
+-GTKINC = `gtk-config --cflags`
+-GTKLIB = `gtk-config --libs`
++GTKINC = `$(GTK_CONFIG) --cflags`
++GTKLIB = `$(GTK_CONFIG) --libs`
+ 
+ PLUGINS = stats_tables.so panel_data.so progress_bar.so \
+ 	gnumeric_import.so excel_import.so
+@@ -85,15 +86,15 @@
+ .PHONY: 
+ 
+ install: $(PLUGINS) installdirs
+-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
+-	$(PLUGINS) $(share)/plugins
++	$(LIBTOOL) --mode=install $(INSTALL_DATA) \
++	$(PLUGINS) $(gretldir)/plugins
+ 
+ install-strip: $(PLUGINS) installdirs
+-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s \
+-	$(PLUGINS) $(share)/plugins
++	$(LIBTOOL) --mode=install $(INSTALL_DATA) -s \
++	$(PLUGINS) $(gretldir)/plugins
+ 
+ installdirs:
+-	$(topsrc)/tools/mkinstalldirs $(share)/plugins
++	$(topsrc)/tools/mkinstalldirs $(gretldir)/plugins
+ 
+ clean:
+ 	rm -f *.o *.lo $(PLUGINS) core 
diff --git a/misc/gretl/files/patch-plugin::workbook.c b/misc/gretl/files/patch-plugin::workbook.c
new file mode 100644
index 000000000000..968444a7e846
--- /dev/null
+++ b/misc/gretl/files/patch-plugin::workbook.c
@@ -0,0 +1,10 @@
+--- plugin/workbook.c.orig	Thu Apr 11 05:33:44 2002
++++ plugin/workbook.c	Thu May  2 01:27:51 2002
+@@ -2,6 +2,7 @@
+ 
+ #include <stdio.h>
+ #include <glib.h>
++#include <wchar.h>
+ #include "biff.h"
+ #include "importer.h"
+ 
diff --git a/misc/gretl/files/patch-share::Makefile.in b/misc/gretl/files/patch-share::Makefile.in
new file mode 100644
index 000000000000..8c2a6a5c6645
--- /dev/null
+++ b/misc/gretl/files/patch-share::Makefile.in
@@ -0,0 +1,16 @@
+--- share/Makefile.in.orig	Thu Mar 28 07:10:47 2002
++++ share/Makefile.in	Wed May  1 06:56:53 2002
+@@ -1,10 +1,11 @@
+ topsrc = ..
+ 
+ prefix = @prefix@
++libdir = @libdir@
+ 
+-gretldir = $(prefix)/share/gretl
++gretldir = $(libdir)/gretl
+ tooldir = $(topsrc)/tools
+-INSTALL_DATA = cp -fp
++INSTALL_DATA = @INSTALL_DATA@
+ 
+ .PHONY :
+ 
diff --git a/misc/gretl/pkg-plist b/misc/gretl/pkg-plist
index b46ffc30e8af..0c5f26132efe 100644
--- a/misc/gretl/pkg-plist
+++ b/misc/gretl/pkg-plist
@@ -27,289 +27,288 @@ include/gretl/utils.h
 include/gretl/var.h
 include/gretl/version.h
 include/gretl/win32.h
-lib/libgretl.la
+lib/gretl/COPYING
+lib/gretl/data/data10-1.gdt
+lib/gretl/data/data10-2.gdt
+lib/gretl/data/data10-3.gdt
+lib/gretl/data/data10-4.gdt
+lib/gretl/data/data10-5.gdt
+lib/gretl/data/data10-6.gdt
+lib/gretl/data/data10-7.gdt
+lib/gretl/data/data10-8.gdt
+lib/gretl/data/data11-1.gdt
+lib/gretl/data/data12-1.gdt
+lib/gretl/data/data13-1.gdt
+lib/gretl/data/data2-1.gdt
+lib/gretl/data/data2-2.gdt
+lib/gretl/data/data2-3.gdt
+lib/gretl/data/data3-1.gdt
+lib/gretl/data/data3-10.gdt
+lib/gretl/data/data3-11.gdt
+lib/gretl/data/data3-12.gdt
+lib/gretl/data/data3-13.gdt
+lib/gretl/data/data3-14.gdt
+lib/gretl/data/data3-15.gdt
+lib/gretl/data/data3-2.gdt
+lib/gretl/data/data3-3.gdt
+lib/gretl/data/data3-4.gdt
+lib/gretl/data/data3-5.gdt
+lib/gretl/data/data3-6.gdt
+lib/gretl/data/data3-7.gdt
+lib/gretl/data/data3-8.gdt
+lib/gretl/data/data3-9.gdt
+lib/gretl/data/data4-1.gdt
+lib/gretl/data/data4-10.gdt
+lib/gretl/data/data4-11.gdt
+lib/gretl/data/data4-12.gdt
+lib/gretl/data/data4-13.gdt
+lib/gretl/data/data4-14.gdt
+lib/gretl/data/data4-15.gdt
+lib/gretl/data/data4-16.gdt
+lib/gretl/data/data4-17.gdt
+lib/gretl/data/data4-2.gdt
+lib/gretl/data/data4-3.gdt
+lib/gretl/data/data4-3a.gdt
+lib/gretl/data/data4-4.gdt
+lib/gretl/data/data4-5.gdt
+lib/gretl/data/data4-6.gdt
+lib/gretl/data/data4-7.gdt
+lib/gretl/data/data4-8.gdt
+lib/gretl/data/data4-9.gdt
+lib/gretl/data/data6-1.gdt
+lib/gretl/data/data6-2.gdt
+lib/gretl/data/data6-3.gdt
+lib/gretl/data/data6-4.gdt
+lib/gretl/data/data6-5.gdt
+lib/gretl/data/data6-6.gdt
+lib/gretl/data/data7-1.gdt
+lib/gretl/data/data7-10.gdt
+lib/gretl/data/data7-11.gdt
+lib/gretl/data/data7-12.gdt
+lib/gretl/data/data7-13.gdt
+lib/gretl/data/data7-14.gdt
+lib/gretl/data/data7-15.gdt
+lib/gretl/data/data7-16.gdt
+lib/gretl/data/data7-17.gdt
+lib/gretl/data/data7-18.gdt
+lib/gretl/data/data7-19.gdt
+lib/gretl/data/data7-2.gdt
+lib/gretl/data/data7-20.gdt
+lib/gretl/data/data7-21.gdt
+lib/gretl/data/data7-22.gdt
+lib/gretl/data/data7-23.gdt
+lib/gretl/data/data7-24.gdt
+lib/gretl/data/data7-26.gdt
+lib/gretl/data/data7-3.gdt
+lib/gretl/data/data7-4.gdt
+lib/gretl/data/data7-5.gdt
+lib/gretl/data/data7-6.gdt
+lib/gretl/data/data7-7.gdt
+lib/gretl/data/data7-8.gdt
+lib/gretl/data/data7-9.gdt
+lib/gretl/data/data8-1.gdt
+lib/gretl/data/data8-2.gdt
+lib/gretl/data/data8-3.gdt
+lib/gretl/data/data9-1.gdt
+lib/gretl/data/data9-10.gdt
+lib/gretl/data/data9-11.gdt
+lib/gretl/data/data9-12.gdt
+lib/gretl/data/data9-13.gdt
+lib/gretl/data/data9-2.gdt
+lib/gretl/data/data9-3.gdt
+lib/gretl/data/data9-4.gdt
+lib/gretl/data/data9-5.gdt
+lib/gretl/data/data9-6.gdt
+lib/gretl/data/data9-7.gdt
+lib/gretl/data/data9-8.gdt
+lib/gretl/data/data9-9.gdt
+lib/gretl/data/descriptions
+lib/gretl/data/greene/greene10_3.gdt
+lib/gretl/data/greene/greene11_3.gdt
+lib/gretl/data/greene/greene12_1.gdt
+lib/gretl/data/greene/greene18_1.gdt
+lib/gretl/data/greene/greene18_2.gdt
+lib/gretl/data/greene/greene19_1.gdt
+lib/gretl/data/greene/greene7_8.gdt
+lib/gretl/data/greene/greene8_3.gdt
+lib/gretl/data/greene/wg_descriptions
+lib/gretl/db/README
+lib/gretl/db/bcih.bin
+lib/gretl/db/bcih.idx
+lib/gretl/gretl-logo.xpm
+lib/gretl/gretl.hlp
+lib/gretl/gretl.stamp
+lib/gretl/gretlcli.hlp
+lib/gretl/plugins/excel_import.so
+lib/gretl/plugins/gnumeric_import.so
+lib/gretl/plugins/panel_data.so
+lib/gretl/plugins/progress_bar.so
+lib/gretl/plugins/stats_tables.so
+lib/gretl/scripts/greene11_3.inp
+lib/gretl/scripts/greene12_1.inp
+lib/gretl/scripts/greene18_6.inp
+lib/gretl/scripts/greene19_1.inp
+lib/gretl/scripts/greene7_8.inp
+lib/gretl/scripts/greene8_3.inp
+lib/gretl/scripts/ps10-1.inp
+lib/gretl/scripts/ps10-10.inp
+lib/gretl/scripts/ps10-11.inp
+lib/gretl/scripts/ps10-2.inp
+lib/gretl/scripts/ps10-3.inp
+lib/gretl/scripts/ps10-4.inp
+lib/gretl/scripts/ps10-5a.inp
+lib/gretl/scripts/ps10-5b.inp
+lib/gretl/scripts/ps10-6.inp
+lib/gretl/scripts/ps10-7.inp
+lib/gretl/scripts/ps10-8.inp
+lib/gretl/scripts/ps10-9.inp
+lib/gretl/scripts/ps11-1.inp
+lib/gretl/scripts/ps11-2.inp
+lib/gretl/scripts/ps11-3.inp
+lib/gretl/scripts/ps12-1.inp
+lib/gretl/scripts/ps13-1.inp
+lib/gretl/scripts/ps2-1.inp
+lib/gretl/scripts/ps2-2.inp
+lib/gretl/scripts/ps2-3.inp
+lib/gretl/scripts/ps3-1.inp
+lib/gretl/scripts/ps3-2.inp
+lib/gretl/scripts/ps3-3.inp
+lib/gretl/scripts/ps3-4.inp
+lib/gretl/scripts/ps3-5.inp
+lib/gretl/scripts/ps3-6.inp
+lib/gretl/scripts/ps4-1.inp
+lib/gretl/scripts/ps4-2.inp
+lib/gretl/scripts/ps4-3.inp
+lib/gretl/scripts/ps4-4.inp
+lib/gretl/scripts/ps4-5.inp
+lib/gretl/scripts/ps5-1.inp
+lib/gretl/scripts/ps5-2.inp
+lib/gretl/scripts/ps5-3.inp
+lib/gretl/scripts/ps5-4.inp
+lib/gretl/scripts/ps5-5.inp
+lib/gretl/scripts/ps6-1.inp
+lib/gretl/scripts/ps6-10.inp
+lib/gretl/scripts/ps6-11.inp
+lib/gretl/scripts/ps6-12.inp
+lib/gretl/scripts/ps6-2.inp
+lib/gretl/scripts/ps6-3.inp
+lib/gretl/scripts/ps6-4.inp
+lib/gretl/scripts/ps6-5.inp
+lib/gretl/scripts/ps6-6.inp
+lib/gretl/scripts/ps6-7.inp
+lib/gretl/scripts/ps6-8.inp
+lib/gretl/scripts/ps6-9.inp
+lib/gretl/scripts/ps7-1.inp
+lib/gretl/scripts/ps7-2.inp
+lib/gretl/scripts/ps7-3.inp
+lib/gretl/scripts/ps7-4.inp
+lib/gretl/scripts/ps7-5.inp
+lib/gretl/scripts/ps7-6.inp
+lib/gretl/scripts/ps7-7.inp
+lib/gretl/scripts/ps8-1.inp
+lib/gretl/scripts/ps8-2.inp
+lib/gretl/scripts/ps8-3.inp
+lib/gretl/scripts/ps8-4.inp
+lib/gretl/scripts/ps8-5.inp
+lib/gretl/scripts/ps8-6.inp
+lib/gretl/scripts/ps8-7.inp
+lib/gretl/scripts/ps8-8.inp
+lib/gretl/scripts/ps9-1.inp
+lib/gretl/scripts/ps9-10.inp
+lib/gretl/scripts/ps9-2.inp
+lib/gretl/scripts/ps9-3.inp
+lib/gretl/scripts/ps9-4.inp
+lib/gretl/scripts/ps9-5.inp
+lib/gretl/scripts/ps9-6.inp
+lib/gretl/scripts/ps9-7.inp
+lib/gretl/scripts/ps9-8.inp
+lib/gretl/scripts/ps9-9.inp
+lib/gretl/scripts/ps_descriptions
+lib/gretl/scripts/testinp
+lib/gretl/scripts/wg_ps_descriptions
+lib/libgretl.a
 lib/libgretl.so
-lib/libgretl.so.10
-share/gnome/apps/Applications/gretl.desktop
-share/gnome/help/gretl/C/a3318.html
-share/gnome/help/gretl/C/a3420.html
-share/gnome/help/gretl/C/a3447.html
-share/gnome/help/gretl/C/a3481.html
-share/gnome/help/gretl/C/b3605.html
-share/gnome/help/gretl/C/c1046.html
-share/gnome/help/gretl/C/c1287.html
-share/gnome/help/gretl/C/c137.html
-share/gnome/help/gretl/C/c208.html
-share/gnome/help/gretl/C/c21.html
-share/gnome/help/gretl/C/c3204.html
-share/gnome/help/gretl/C/c3243.html
-share/gnome/help/gretl/C/c434.html
-share/gnome/help/gretl/C/c577.html
-share/gnome/help/gretl/C/c752.html
-share/gnome/help/gretl/C/c900.html
-share/gnome/help/gretl/C/c960.html
-share/gnome/help/gretl/C/docbook.css
-share/gnome/help/gretl/C/figures/adf1.png
-share/gnome/help/gretl/C/figures/adf2.png
-share/gnome/help/gretl/C/figures/autocorr.png
-share/gnome/help/gretl/C/figures/caution.png
-share/gnome/help/gretl/C/figures/chisqu.png
-share/gnome/help/gretl/C/figures/corc.png
-share/gnome/help/gretl/C/figures/cumulate.png
-share/gnome/help/gretl/C/figures/datafiles.png
-share/gnome/help/gretl/C/figures/greeneC.png
-share/gnome/help/gretl/C/figures/gretl-logo.png
-share/gnome/help/gretl/C/figures/important.png
-share/gnome/help/gretl/C/figures/ldx.png
-share/gnome/help/gretl/C/figures/ldy.png
-share/gnome/help/gretl/C/figures/linreg.png
-share/gnome/help/gretl/C/figures/mainwin.png
-share/gnome/help/gretl/C/figures/menubar.png
-share/gnome/help/gretl/C/figures/modelwin.png
-share/gnome/help/gretl/C/figures/nonlin.png
-share/gnome/help/gretl/C/figures/note.png
-share/gnome/help/gretl/C/figures/plot_control.png
-share/gnome/help/gretl/C/figures/resid.png
-share/gnome/help/gretl/C/figures/scriptwin.png
-share/gnome/help/gretl/C/figures/session.png
-share/gnome/help/gretl/C/figures/tip.png
-share/gnome/help/gretl/C/figures/tipbak.png
-share/gnome/help/gretl/C/figures/toolbar.png
-share/gnome/help/gretl/C/figures/uhatsq.png
-share/gnome/help/gretl/C/figures/warning.png
-share/gnome/help/gretl/C/figures/yhat.png
-share/gnome/help/gretl/C/index.html
-share/gnome/help/gretl/C/topic.dat
-share/gnome/help/gretl/C/x1002.html
-share/gnome/help/gretl/C/x1035.html
-share/gnome/help/gretl/C/x1146.html
-share/gnome/help/gretl/C/x1211.html
-share/gnome/help/gretl/C/x1327.html
-share/gnome/help/gretl/C/x3079.html
-share/gnome/help/gretl/C/x3331.html
-share/gnome/help/gretl/C/x3399.html
-share/gnome/help/gretl/C/x490.html
-share/gnome/help/gretl/C/x537.html
-share/gnome/help/gretl/C/x585.html
-share/gnome/help/gretl/C/x612.html
-share/gnome/help/gretl/C/x639.html
-share/gnome/help/gretl/C/x69.html
-share/gnome/help/gretl/C/x720.html
-share/gnome/help/gretl/C/x84.html
-share/gnome/help/gretl/C/x840.html
-share/gnome/help/gretl/C/x870.html
-share/gnome/help/gretl/C/x884.html
-share/gnome/help/gretl/C/x936.html
-share/gretl/COPYING
-share/gretl/data/data10-1.gdt
-share/gretl/data/data10-2.gdt
-share/gretl/data/data10-3.gdt
-share/gretl/data/data10-4.gdt
-share/gretl/data/data10-5.gdt
-share/gretl/data/data10-6.gdt
-share/gretl/data/data10-7.gdt
-share/gretl/data/data10-8.gdt
-share/gretl/data/data11-1.gdt
-share/gretl/data/data12-1.gdt
-share/gretl/data/data13-1.gdt
-share/gretl/data/data2-1.gdt
-share/gretl/data/data2-2.gdt
-share/gretl/data/data2-3.gdt
-share/gretl/data/data3-1.gdt
-share/gretl/data/data3-10.gdt
-share/gretl/data/data3-11.gdt
-share/gretl/data/data3-12.gdt
-share/gretl/data/data3-13.gdt
-share/gretl/data/data3-14.gdt
-share/gretl/data/data3-15.gdt
-share/gretl/data/data3-2.gdt
-share/gretl/data/data3-3.gdt
-share/gretl/data/data3-4.gdt
-share/gretl/data/data3-5.gdt
-share/gretl/data/data3-6.gdt
-share/gretl/data/data3-7.gdt
-share/gretl/data/data3-8.gdt
-share/gretl/data/data3-9.gdt
-share/gretl/data/data4-1.gdt
-share/gretl/data/data4-10.gdt
-share/gretl/data/data4-11.gdt
-share/gretl/data/data4-12.gdt
-share/gretl/data/data4-13.gdt
-share/gretl/data/data4-14.gdt
-share/gretl/data/data4-15.gdt
-share/gretl/data/data4-16.gdt
-share/gretl/data/data4-17.gdt
-share/gretl/data/data4-2.gdt
-share/gretl/data/data4-3.gdt
-share/gretl/data/data4-3a.gdt
-share/gretl/data/data4-4.gdt
-share/gretl/data/data4-5.gdt
-share/gretl/data/data4-6.gdt
-share/gretl/data/data4-7.gdt
-share/gretl/data/data4-8.gdt
-share/gretl/data/data4-9.gdt
-share/gretl/data/data6-1.gdt
-share/gretl/data/data6-2.gdt
-share/gretl/data/data6-3.gdt
-share/gretl/data/data6-4.gdt
-share/gretl/data/data6-5.gdt
-share/gretl/data/data6-6.gdt
-share/gretl/data/data7-1.gdt
-share/gretl/data/data7-10.gdt
-share/gretl/data/data7-11.gdt
-share/gretl/data/data7-12.gdt
-share/gretl/data/data7-13.gdt
-share/gretl/data/data7-14.gdt
-share/gretl/data/data7-15.gdt
-share/gretl/data/data7-16.gdt
-share/gretl/data/data7-17.gdt
-share/gretl/data/data7-18.gdt
-share/gretl/data/data7-19.gdt
-share/gretl/data/data7-2.gdt
-share/gretl/data/data7-20.gdt
-share/gretl/data/data7-21.gdt
-share/gretl/data/data7-22.gdt
-share/gretl/data/data7-23.gdt
-share/gretl/data/data7-24.gdt
-share/gretl/data/data7-26.gdt
-share/gretl/data/data7-3.gdt
-share/gretl/data/data7-4.gdt
-share/gretl/data/data7-5.gdt
-share/gretl/data/data7-6.gdt
-share/gretl/data/data7-7.gdt
-share/gretl/data/data7-8.gdt
-share/gretl/data/data7-9.gdt
-share/gretl/data/data8-1.gdt
-share/gretl/data/data8-2.gdt
-share/gretl/data/data8-3.gdt
-share/gretl/data/data9-1.gdt
-share/gretl/data/data9-10.gdt
-share/gretl/data/data9-11.gdt
-share/gretl/data/data9-12.gdt
-share/gretl/data/data9-13.gdt
-share/gretl/data/data9-2.gdt
-share/gretl/data/data9-3.gdt
-share/gretl/data/data9-4.gdt
-share/gretl/data/data9-5.gdt
-share/gretl/data/data9-6.gdt
-share/gretl/data/data9-7.gdt
-share/gretl/data/data9-8.gdt
-share/gretl/data/data9-9.gdt
-share/gretl/data/descriptions
-share/gretl/data/greene/greene10_3.gdt
-share/gretl/data/greene/greene11_3.gdt
-share/gretl/data/greene/greene12_1.gdt
-share/gretl/data/greene/greene18_1.gdt
-share/gretl/data/greene/greene18_2.gdt
-share/gretl/data/greene/greene19_1.gdt
-share/gretl/data/greene/greene7_8.gdt
-share/gretl/data/greene/greene8_3.gdt
-share/gretl/data/greene/wg_descriptions
-share/gretl/db/README
-share/gretl/db/bcih.bin
-share/gretl/db/bcih.idx
-share/gretl/gretl-logo.xpm
-share/gretl/gretl.hlp
-share/gretl/gretl.stamp
-share/gretl/gretlcli.hlp
-share/gretl/plugins/panel_data.so
-share/gretl/plugins/progress_bar.so
-share/gretl/plugins/stats_tables.so
-share/gretl/scripts/greene11_3.inp
-share/gretl/scripts/greene12_1.inp
-share/gretl/scripts/greene18_6.inp
-share/gretl/scripts/greene19_1.inp
-share/gretl/scripts/greene7_8.inp
-share/gretl/scripts/greene8_3.inp
-share/gretl/scripts/ps10-1.inp
-share/gretl/scripts/ps10-10.inp
-share/gretl/scripts/ps10-11.inp
-share/gretl/scripts/ps10-2.inp
-share/gretl/scripts/ps10-3.inp
-share/gretl/scripts/ps10-4.inp
-share/gretl/scripts/ps10-5a.inp
-share/gretl/scripts/ps10-5b.inp
-share/gretl/scripts/ps10-6.inp
-share/gretl/scripts/ps10-7.inp
-share/gretl/scripts/ps10-8.inp
-share/gretl/scripts/ps10-9.inp
-share/gretl/scripts/ps11-1.inp
-share/gretl/scripts/ps11-2.inp
-share/gretl/scripts/ps11-3.inp
-share/gretl/scripts/ps12-1.inp
-share/gretl/scripts/ps13-1.inp
-share/gretl/scripts/ps2-1.inp
-share/gretl/scripts/ps2-2.inp
-share/gretl/scripts/ps2-3.inp
-share/gretl/scripts/ps3-1.inp
-share/gretl/scripts/ps3-2.inp
-share/gretl/scripts/ps3-3.inp
-share/gretl/scripts/ps3-4.inp
-share/gretl/scripts/ps3-5.inp
-share/gretl/scripts/ps3-6.inp
-share/gretl/scripts/ps4-1.inp
-share/gretl/scripts/ps4-2.inp
-share/gretl/scripts/ps4-3.inp
-share/gretl/scripts/ps4-4.inp
-share/gretl/scripts/ps4-5.inp
-share/gretl/scripts/ps5-1.inp
-share/gretl/scripts/ps5-2.inp
-share/gretl/scripts/ps5-3.inp
-share/gretl/scripts/ps5-4.inp
-share/gretl/scripts/ps5-5.inp
-share/gretl/scripts/ps6-1.inp
-share/gretl/scripts/ps6-10.inp
-share/gretl/scripts/ps6-11.inp
-share/gretl/scripts/ps6-12.inp
-share/gretl/scripts/ps6-2.inp
-share/gretl/scripts/ps6-3.inp
-share/gretl/scripts/ps6-4.inp
-share/gretl/scripts/ps6-5.inp
-share/gretl/scripts/ps6-6.inp
-share/gretl/scripts/ps6-7.inp
-share/gretl/scripts/ps6-8.inp
-share/gretl/scripts/ps6-9.inp
-share/gretl/scripts/ps7-1.inp
-share/gretl/scripts/ps7-2.inp
-share/gretl/scripts/ps7-3.inp
-share/gretl/scripts/ps7-4.inp
-share/gretl/scripts/ps7-5.inp
-share/gretl/scripts/ps7-6.inp
-share/gretl/scripts/ps7-7.inp
-share/gretl/scripts/ps8-1.inp
-share/gretl/scripts/ps8-2.inp
-share/gretl/scripts/ps8-3.inp
-share/gretl/scripts/ps8-4.inp
-share/gretl/scripts/ps8-5.inp
-share/gretl/scripts/ps8-6.inp
-share/gretl/scripts/ps8-7.inp
-share/gretl/scripts/ps8-8.inp
-share/gretl/scripts/ps9-1.inp
-share/gretl/scripts/ps9-10.inp
-share/gretl/scripts/ps9-2.inp
-share/gretl/scripts/ps9-3.inp
-share/gretl/scripts/ps9-4.inp
-share/gretl/scripts/ps9-5.inp
-share/gretl/scripts/ps9-6.inp
-share/gretl/scripts/ps9-7.inp
-share/gretl/scripts/ps9-8.inp
-share/gretl/scripts/ps9-9.inp
-share/gretl/scripts/ps_descriptions
-share/gretl/scripts/testinp
-share/gretl/scripts/wg_ps_descriptions
-share/mime-info/gretl.keys
-share/mime-info/gretl.mime
-share/pixmaps/gnome-application-x-gretldata.png
-share/pixmaps/gnome-application-x-gretlsession.png
-share/pixmaps/gretl-gnome-logo.xpm
-share/pixmaps/gretl.png
+lib/libgretl.so.12
+%%GNOME:%%share/gnome/apps/Applications/gretl.desktop
+%%GNOME:%%share/gnome/help/gretl/C/a3374.html
+%%GNOME:%%share/gnome/help/gretl/C/a3476.html
+%%GNOME:%%share/gnome/help/gretl/C/a3503.html
+%%GNOME:%%share/gnome/help/gretl/C/a3537.html
+%%GNOME:%%share/gnome/help/gretl/C/b3661.html
+%%GNOME:%%share/gnome/help/gretl/C/c1058.html
+%%GNOME:%%share/gnome/help/gretl/C/c1299.html
+%%GNOME:%%share/gnome/help/gretl/C/c137.html
+%%GNOME:%%share/gnome/help/gretl/C/c208.html
+%%GNOME:%%share/gnome/help/gretl/C/c21.html
+%%GNOME:%%share/gnome/help/gretl/C/c3260.html
+%%GNOME:%%share/gnome/help/gretl/C/c3299.html
+%%GNOME:%%share/gnome/help/gretl/C/c434.html
+%%GNOME:%%share/gnome/help/gretl/C/c577.html
+%%GNOME:%%share/gnome/help/gretl/C/c764.html
+%%GNOME:%%share/gnome/help/gretl/C/c912.html
+%%GNOME:%%share/gnome/help/gretl/C/c972.html
+%%GNOME:%%share/gnome/help/gretl/C/docbook.css
+%%GNOME:%%share/gnome/help/gretl/C/figures/adf1.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/adf2.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/autocorr.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/caution.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/chisqu.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/corc.png
+%%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/greeneC.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/gretl-logo.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/important.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/ldx.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/ldy.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/linreg.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/mainwin.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/menubar.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/modelwin.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/nonlin.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/note.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/plot_control.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/resid.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/scriptwin.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/session.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/tip.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/tipbak.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/toolbar.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/uhatsq.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/warning.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/yhat.png
+%%GNOME:%%share/gnome/help/gretl/C/index.html
+%%GNOME:%%share/gnome/help/gretl/C/topic.dat
+%%GNOME:%%share/gnome/help/gretl/C/x1014.html
+%%GNOME:%%share/gnome/help/gretl/C/x1047.html
+%%GNOME:%%share/gnome/help/gretl/C/x1158.html
+%%GNOME:%%share/gnome/help/gretl/C/x1223.html
+%%GNOME:%%share/gnome/help/gretl/C/x1339.html
+%%GNOME:%%share/gnome/help/gretl/C/x3138.html
+%%GNOME:%%share/gnome/help/gretl/C/x3387.html
+%%GNOME:%%share/gnome/help/gretl/C/x3455.html
+%%GNOME:%%share/gnome/help/gretl/C/x490.html
+%%GNOME:%%share/gnome/help/gretl/C/x537.html
+%%GNOME:%%share/gnome/help/gretl/C/x585.html
+%%GNOME:%%share/gnome/help/gretl/C/x619.html
+%%GNOME:%%share/gnome/help/gretl/C/x646.html
+%%GNOME:%%share/gnome/help/gretl/C/x69.html
+%%GNOME:%%share/gnome/help/gretl/C/x732.html
+%%GNOME:%%share/gnome/help/gretl/C/x84.html
+%%GNOME:%%share/gnome/help/gretl/C/x852.html
+%%GNOME:%%share/gnome/help/gretl/C/x882.html
+%%GNOME:%%share/gnome/help/gretl/C/x896.html
+%%GNOME:%%share/gnome/help/gretl/C/x948.html
+%%GNOME:%%share/gnome/mime-info/gretl.keys
+%%GNOME:%%share/gnome/mime-info/gretl.mime
+%%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretldata.png
+%%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretlsession.png
+%%GNOME:%%share/gnome/pixmaps/gretl-gnome-logo.xpm
+%%GNOME:%%share/gnome/pixmaps/gretl.png
+@dirrm lib/gretl/scripts
+@dirrm lib/gretl/plugins
+@dirrm lib/gretl/db
+@dirrm lib/gretl/data/greene
+@dirrm lib/gretl/data
+@dirrm lib/gretl
 @dirrm include/gretl
-@dirrm share/gnome/help/gretl/C/figures
-@dirrm share/gnome/help/gretl/C
-@dirrm share/gnome/help/gretl
-@dirrm share/gretl/data/greene
-@dirrm share/gretl/data
-@dirrm share/gretl/db
-@dirrm share/gretl/plugins
-@dirrm share/gretl/scripts
-@dirrm share/gretl