- Update to version 1.1.4

PR:		57806
Submitted by:	Ports Fury

4 files changed, 295 insertions, 289 deletions

diff --git a/misc/gretl/Makefile b/misc/gretl/Makefile
index 6dc3ba275cd4..37305a2eaeec 100644
--- a/misc/gretl/Makefile
+++ b/misc/gretl/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gretl
-PORTVERSION=	1.1.2
+PORTVERSION=	1.1.4
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,7 +23,7 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
-USE_GNOME=	gnometarget gtk20 libxml2
+USE_GNOME=	gnomeprefix gnometarget gtksourceview libxml2
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -42,11 +42,9 @@ BROKEN=		"math/lapack appears to be broken on alpha"
 
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 PKGNAMESUFFIX=	-gnome
-USE_GNOME+=	gnomeprefix libgnomeprintui libgnomeui
-PLIST_SUB+=	GRETLDATADIR="share/gnome"
+USE_GNOME+=	libgnomeprintui libgnomeui
 .else
 CONFIGURE_ARGS+=	--without-gnome
-PLIST_SUB+=	GRETLDATADIR="share"
 .endif
 
 post-patch:
diff --git a/misc/gretl/distinfo b/misc/gretl/distinfo
index 656054276191..c4a77aa6a361 100644
--- a/misc/gretl/distinfo
+++ b/misc/gretl/distinfo
@@ -1 +1 @@
-MD5 (gretl-1.1.2.tar.bz2) = a378caa45034102bc4000946d8aa4ccb
+MD5 (gretl-1.1.4.tar.bz2) = 3009db4052cb8c64e1587c66fe88ad70
diff --git a/misc/gretl/files/patch-gui2::Makefile.in b/misc/gretl/files/patch-gui2::Makefile.in
index 3ef4b9989ad8..11cf4b88909d 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	Wed Apr  9 03:57:15 2003
-+++ gui2/Makefile.in	Mon Apr 14 12:35:47 2003
+--- gui2/Makefile.in.orig	Thu Sep 25 22:54:01 2003
++++ gui2/Makefile.in	Sun Oct  5 20:46:18 2003
 @@ -4,6 +4,7 @@
  exec_prefix = @exec_prefix@
  bindir = @bindir@
@@ -8,15 +8,15 @@
  CC = @CC@
  CFLAGS = @CFLAGS@
  MAKE = @MAKE@
-@@ -44,14 +45,13 @@
-   LIBS = $(GNOME_LIBS) $(GTK_EXTRA_LIB) ../lib/libgretl-1.0.la
-   GUI_CFLAGS = $(GNOME_CFLAGS) $(GTK_EXTRA_CFLAGS)
+@@ -47,19 +48,18 @@
+   LIBS = $(GNOME_LIBS) $(GTKSOURCEVIEW_LIBS) $(GTK_EXTRA_LIB) ../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)\"
  else
-   LIBS = $(GTK_LIBS) $(GTK_EXTRA_LIB) ../lib/libgretl-1.0.la
-   GUI_CFLAGS = $(GTK_CFLAGS) $(GTK_EXTRA_CFLAGS)
+   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@
@@ -24,8 +24,14 @@
 +  localedir = $(prefix)/share/locale
    NLSDEF = -DLOCALEDIR=\"$(localedir)\"
  endif
+ ifeq ($(have_gtksourceview),yes)
+   langbase := $(shell pkg-config --variable=prefix gtksourceview-1.0)
+-  langdir = $(langbase)/share/gtksourceview-1.0/language-specs
++  langdir = $(datadir)/gtksourceview-1.0/language-specs
+   query_install_lang = install-lang
+ endif
  
-@@ -64,7 +64,7 @@
+@@ -72,7 +72,7 @@
  
  # Directories
  bindir	= $(prefix)/bin
@@ -34,7 +40,7 @@
  tooldir = $(topsrc)/tools
  libsrc = $(topsrc)/lib/src
  clisrc = $(topsrc)/cli
-@@ -102,7 +102,7 @@
+@@ -110,7 +110,7 @@
  	$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
  
  $(GTKEXTRA_LITE): 
@@ -43,8 +49,8 @@
  
  -include $(OBJS:.o=.d)
  
-@@ -115,7 +115,7 @@
- 	$(LIBTOOL) $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
+@@ -122,7 +122,7 @@
+ 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
  
  install-data: installdirs
 -	$(INSTALL_PROGRAM) ../gretl_sh $(bindir)/gretl
diff --git a/misc/gretl/pkg-plist b/misc/gretl/pkg-plist
index f58f5a878cdb..f299fe50e276 100644
--- a/misc/gretl/pkg-plist
+++ b/misc/gretl/pkg-plist
@@ -56,281 +56,283 @@ lib/libgretl-1.0.a
 lib/libgretl-1.0.so
 lib/libgretl-1.0.so.0
 libdata/pkgconfig/gretl.pc
-%%GNOME:%%%%GRETLDATADIR%%/applications/gretl.desktop
-%%GRETLDATADIR%%/gretl/COPYING
-%%GRETLDATADIR%%/gretl/data/data10-1.gdt
-%%GRETLDATADIR%%/gretl/data/data10-2.gdt
-%%GRETLDATADIR%%/gretl/data/data10-3.gdt
-%%GRETLDATADIR%%/gretl/data/data10-4.gdt
-%%GRETLDATADIR%%/gretl/data/data10-5.gdt
-%%GRETLDATADIR%%/gretl/data/data10-6.gdt
-%%GRETLDATADIR%%/gretl/data/data10-7.gdt
-%%GRETLDATADIR%%/gretl/data/data10-8.gdt
-%%GRETLDATADIR%%/gretl/data/data11-1.gdt
-%%GRETLDATADIR%%/gretl/data/data12-1.gdt
-%%GRETLDATADIR%%/gretl/data/data13-1.gdt
-%%GRETLDATADIR%%/gretl/data/data2-1.gdt
-%%GRETLDATADIR%%/gretl/data/data2-2.gdt
-%%GRETLDATADIR%%/gretl/data/data2-3.gdt
-%%GRETLDATADIR%%/gretl/data/data3-1.gdt
-%%GRETLDATADIR%%/gretl/data/data3-10.gdt
-%%GRETLDATADIR%%/gretl/data/data3-11.gdt
-%%GRETLDATADIR%%/gretl/data/data3-12.gdt
-%%GRETLDATADIR%%/gretl/data/data3-13.gdt
-%%GRETLDATADIR%%/gretl/data/data3-14.gdt
-%%GRETLDATADIR%%/gretl/data/data3-15.gdt
-%%GRETLDATADIR%%/gretl/data/data3-2.gdt
-%%GRETLDATADIR%%/gretl/data/data3-3.gdt
-%%GRETLDATADIR%%/gretl/data/data3-4.gdt
-%%GRETLDATADIR%%/gretl/data/data3-5.gdt
-%%GRETLDATADIR%%/gretl/data/data3-6.gdt
-%%GRETLDATADIR%%/gretl/data/data3-7.gdt
-%%GRETLDATADIR%%/gretl/data/data3-8.gdt
-%%GRETLDATADIR%%/gretl/data/data3-9.gdt
-%%GRETLDATADIR%%/gretl/data/data4-1.gdt
-%%GRETLDATADIR%%/gretl/data/data4-10.gdt
-%%GRETLDATADIR%%/gretl/data/data4-11.gdt
-%%GRETLDATADIR%%/gretl/data/data4-12.gdt
-%%GRETLDATADIR%%/gretl/data/data4-13.gdt
-%%GRETLDATADIR%%/gretl/data/data4-14.gdt
-%%GRETLDATADIR%%/gretl/data/data4-15.gdt
-%%GRETLDATADIR%%/gretl/data/data4-16.gdt
-%%GRETLDATADIR%%/gretl/data/data4-17.gdt
-%%GRETLDATADIR%%/gretl/data/data4-2.gdt
-%%GRETLDATADIR%%/gretl/data/data4-3.gdt
-%%GRETLDATADIR%%/gretl/data/data4-3a.gdt
-%%GRETLDATADIR%%/gretl/data/data4-4.gdt
-%%GRETLDATADIR%%/gretl/data/data4-5.gdt
-%%GRETLDATADIR%%/gretl/data/data4-6.gdt
-%%GRETLDATADIR%%/gretl/data/data4-7.gdt
-%%GRETLDATADIR%%/gretl/data/data4-8.gdt
-%%GRETLDATADIR%%/gretl/data/data4-9.gdt
-%%GRETLDATADIR%%/gretl/data/data6-1.gdt
-%%GRETLDATADIR%%/gretl/data/data6-2.gdt
-%%GRETLDATADIR%%/gretl/data/data6-3.gdt
-%%GRETLDATADIR%%/gretl/data/data6-4.gdt
-%%GRETLDATADIR%%/gretl/data/data6-5.gdt
-%%GRETLDATADIR%%/gretl/data/data6-6.gdt
-%%GRETLDATADIR%%/gretl/data/data7-1.gdt
-%%GRETLDATADIR%%/gretl/data/data7-10.gdt
-%%GRETLDATADIR%%/gretl/data/data7-11.gdt
-%%GRETLDATADIR%%/gretl/data/data7-12.gdt
-%%GRETLDATADIR%%/gretl/data/data7-13.gdt
-%%GRETLDATADIR%%/gretl/data/data7-14.gdt
-%%GRETLDATADIR%%/gretl/data/data7-15.gdt
-%%GRETLDATADIR%%/gretl/data/data7-16.gdt
-%%GRETLDATADIR%%/gretl/data/data7-17.gdt
-%%GRETLDATADIR%%/gretl/data/data7-18.gdt
-%%GRETLDATADIR%%/gretl/data/data7-19.gdt
-%%GRETLDATADIR%%/gretl/data/data7-2.gdt
-%%GRETLDATADIR%%/gretl/data/data7-20.gdt
-%%GRETLDATADIR%%/gretl/data/data7-21.gdt
-%%GRETLDATADIR%%/gretl/data/data7-22.gdt
-%%GRETLDATADIR%%/gretl/data/data7-23.gdt
-%%GRETLDATADIR%%/gretl/data/data7-24.gdt
-%%GRETLDATADIR%%/gretl/data/data7-26.gdt
-%%GRETLDATADIR%%/gretl/data/data7-3.gdt
-%%GRETLDATADIR%%/gretl/data/data7-4.gdt
-%%GRETLDATADIR%%/gretl/data/data7-5.gdt
-%%GRETLDATADIR%%/gretl/data/data7-6.gdt
-%%GRETLDATADIR%%/gretl/data/data7-7.gdt
-%%GRETLDATADIR%%/gretl/data/data7-8.gdt
-%%GRETLDATADIR%%/gretl/data/data7-9.gdt
-%%GRETLDATADIR%%/gretl/data/data8-1.gdt
-%%GRETLDATADIR%%/gretl/data/data8-2.gdt
-%%GRETLDATADIR%%/gretl/data/data8-3.gdt
-%%GRETLDATADIR%%/gretl/data/data9-1.gdt
-%%GRETLDATADIR%%/gretl/data/data9-10.gdt
-%%GRETLDATADIR%%/gretl/data/data9-11.gdt
-%%GRETLDATADIR%%/gretl/data/data9-12.gdt
-%%GRETLDATADIR%%/gretl/data/data9-13.gdt
-%%GRETLDATADIR%%/gretl/data/data9-2.gdt
-%%GRETLDATADIR%%/gretl/data/data9-3.gdt
-%%GRETLDATADIR%%/gretl/data/data9-4.gdt
-%%GRETLDATADIR%%/gretl/data/data9-5.gdt
-%%GRETLDATADIR%%/gretl/data/data9-6.gdt
-%%GRETLDATADIR%%/gretl/data/data9-7.gdt
-%%GRETLDATADIR%%/gretl/data/data9-8.gdt
-%%GRETLDATADIR%%/gretl/data/data9-9.gdt
-%%GRETLDATADIR%%/gretl/data/descriptions
-%%GRETLDATADIR%%/gretl/data/ects_nls.gdt
-%%GRETLDATADIR%%/gretl/data/greene/greene10_3.gdt
-%%GRETLDATADIR%%/gretl/data/greene/greene11_3.gdt
-%%GRETLDATADIR%%/gretl/data/greene/greene12_1.gdt
-%%GRETLDATADIR%%/gretl/data/greene/greene13_1.gdt
-%%GRETLDATADIR%%/gretl/data/greene/greene14_1.gdt
-%%GRETLDATADIR%%/gretl/data/greene/greene18_1.gdt
-%%GRETLDATADIR%%/gretl/data/greene/greene18_2.gdt
-%%GRETLDATADIR%%/gretl/data/greene/greene19_1.gdt
-%%GRETLDATADIR%%/gretl/data/greene/greene5_1.gdt
-%%GRETLDATADIR%%/gretl/data/greene/greene7_8.gdt
-%%GRETLDATADIR%%/gretl/data/greene/greene8_3.gdt
-%%GRETLDATADIR%%/gretl/data/greene/greene9_1.gdt
-%%GRETLDATADIR%%/gretl/data/greene/wg_descriptions
-%%GRETLDATADIR%%/gretl/data/gretldata.dtd
-%%GRETLDATADIR%%/gretl/data/hamilton.gdt
-%%GRETLDATADIR%%/gretl/data/leverage.gdt
-%%GRETLDATADIR%%/gretl/data/longley.gdt
-%%GRETLDATADIR%%/gretl/data/sw_ch12.gdt
-%%GRETLDATADIR%%/gretl/db/bcih.bin
-%%GRETLDATADIR%%/gretl/db/bcih.idx
-%%GRETLDATADIR%%/gretl/gretl-logo.xpm
-%%GRETLDATADIR%%/gretl/gretl.hlp
-%%GRETLDATADIR%%/gretl/gretl.stamp
-%%GRETLDATADIR%%/gretl/gretlcli.hlp
-%%GRETLDATADIR%%/gretl/scripts/ects_nls.inp
-%%GRETLDATADIR%%/gretl/scripts/greene11_3.inp
-%%GRETLDATADIR%%/gretl/scripts/greene12_1.inp
-%%GRETLDATADIR%%/gretl/scripts/greene14_1.inp
-%%GRETLDATADIR%%/gretl/scripts/greene14_2.inp
-%%GRETLDATADIR%%/gretl/scripts/greene18_6.inp
-%%GRETLDATADIR%%/gretl/scripts/greene19_1.inp
-%%GRETLDATADIR%%/gretl/scripts/greene7_8.inp
-%%GRETLDATADIR%%/gretl/scripts/greene8_3.inp
-%%GRETLDATADIR%%/gretl/scripts/greene9_1.inp
-%%GRETLDATADIR%%/gretl/scripts/greene9_3.inp
-%%GRETLDATADIR%%/gretl/scripts/leverage.inp
-%%GRETLDATADIR%%/gretl/scripts/longley.inp
-%%GRETLDATADIR%%/gretl/scripts/ps10-1.inp
-%%GRETLDATADIR%%/gretl/scripts/ps10-10.inp
-%%GRETLDATADIR%%/gretl/scripts/ps10-11.inp
-%%GRETLDATADIR%%/gretl/scripts/ps10-2.inp
-%%GRETLDATADIR%%/gretl/scripts/ps10-3.inp
-%%GRETLDATADIR%%/gretl/scripts/ps10-4.inp
-%%GRETLDATADIR%%/gretl/scripts/ps10-5a.inp
-%%GRETLDATADIR%%/gretl/scripts/ps10-5b.inp
-%%GRETLDATADIR%%/gretl/scripts/ps10-6.inp
-%%GRETLDATADIR%%/gretl/scripts/ps10-7.inp
-%%GRETLDATADIR%%/gretl/scripts/ps10-8.inp
-%%GRETLDATADIR%%/gretl/scripts/ps10-9.inp
-%%GRETLDATADIR%%/gretl/scripts/ps11-1.inp
-%%GRETLDATADIR%%/gretl/scripts/ps11-2.inp
-%%GRETLDATADIR%%/gretl/scripts/ps11-3.inp
-%%GRETLDATADIR%%/gretl/scripts/ps12-1.inp
-%%GRETLDATADIR%%/gretl/scripts/ps13-1.inp
-%%GRETLDATADIR%%/gretl/scripts/ps2-1.inp
-%%GRETLDATADIR%%/gretl/scripts/ps2-2.inp
-%%GRETLDATADIR%%/gretl/scripts/ps2-3.inp
-%%GRETLDATADIR%%/gretl/scripts/ps3-1.inp
-%%GRETLDATADIR%%/gretl/scripts/ps3-2.inp
-%%GRETLDATADIR%%/gretl/scripts/ps3-3.inp
-%%GRETLDATADIR%%/gretl/scripts/ps3-4.inp
-%%GRETLDATADIR%%/gretl/scripts/ps3-5.inp
-%%GRETLDATADIR%%/gretl/scripts/ps3-6.inp
-%%GRETLDATADIR%%/gretl/scripts/ps4-1.inp
-%%GRETLDATADIR%%/gretl/scripts/ps4-2.inp
-%%GRETLDATADIR%%/gretl/scripts/ps4-3.inp
-%%GRETLDATADIR%%/gretl/scripts/ps4-4.inp
-%%GRETLDATADIR%%/gretl/scripts/ps4-5.inp
-%%GRETLDATADIR%%/gretl/scripts/ps5-1.inp
-%%GRETLDATADIR%%/gretl/scripts/ps5-2.inp
-%%GRETLDATADIR%%/gretl/scripts/ps5-3.inp
-%%GRETLDATADIR%%/gretl/scripts/ps5-4.inp
-%%GRETLDATADIR%%/gretl/scripts/ps5-5.inp
-%%GRETLDATADIR%%/gretl/scripts/ps6-1.inp
-%%GRETLDATADIR%%/gretl/scripts/ps6-10.inp
-%%GRETLDATADIR%%/gretl/scripts/ps6-11.inp
-%%GRETLDATADIR%%/gretl/scripts/ps6-12.inp
-%%GRETLDATADIR%%/gretl/scripts/ps6-2.inp
-%%GRETLDATADIR%%/gretl/scripts/ps6-3.inp
-%%GRETLDATADIR%%/gretl/scripts/ps6-4.inp
-%%GRETLDATADIR%%/gretl/scripts/ps6-5.inp
-%%GRETLDATADIR%%/gretl/scripts/ps6-6.inp
-%%GRETLDATADIR%%/gretl/scripts/ps6-7.inp
-%%GRETLDATADIR%%/gretl/scripts/ps6-8.inp
-%%GRETLDATADIR%%/gretl/scripts/ps6-9.inp
-%%GRETLDATADIR%%/gretl/scripts/ps7-1.inp
-%%GRETLDATADIR%%/gretl/scripts/ps7-2.inp
-%%GRETLDATADIR%%/gretl/scripts/ps7-3.inp
-%%GRETLDATADIR%%/gretl/scripts/ps7-4.inp
-%%GRETLDATADIR%%/gretl/scripts/ps7-5.inp
-%%GRETLDATADIR%%/gretl/scripts/ps7-6.inp
-%%GRETLDATADIR%%/gretl/scripts/ps7-7.inp
-%%GRETLDATADIR%%/gretl/scripts/ps8-1.inp
-%%GRETLDATADIR%%/gretl/scripts/ps8-2.inp
-%%GRETLDATADIR%%/gretl/scripts/ps8-3.inp
-%%GRETLDATADIR%%/gretl/scripts/ps8-4.inp
-%%GRETLDATADIR%%/gretl/scripts/ps8-5.inp
-%%GRETLDATADIR%%/gretl/scripts/ps8-6.inp
-%%GRETLDATADIR%%/gretl/scripts/ps8-7.inp
-%%GRETLDATADIR%%/gretl/scripts/ps8-8.inp
-%%GRETLDATADIR%%/gretl/scripts/ps9-1.inp
-%%GRETLDATADIR%%/gretl/scripts/ps9-10.inp
-%%GRETLDATADIR%%/gretl/scripts/ps9-2.inp
-%%GRETLDATADIR%%/gretl/scripts/ps9-3.inp
-%%GRETLDATADIR%%/gretl/scripts/ps9-4.inp
-%%GRETLDATADIR%%/gretl/scripts/ps9-5.inp
-%%GRETLDATADIR%%/gretl/scripts/ps9-6.inp
-%%GRETLDATADIR%%/gretl/scripts/ps9-7.inp
-%%GRETLDATADIR%%/gretl/scripts/ps9-8.inp
-%%GRETLDATADIR%%/gretl/scripts/ps9-9.inp
-%%GRETLDATADIR%%/gretl/scripts/ps_descriptions
-%%GRETLDATADIR%%/gretl/scripts/pscoin.inp
-%%GRETLDATADIR%%/gretl/scripts/sw_ch12.inp
-%%GRETLDATADIR%%/gretl/scripts/testinp
-%%GRETLDATADIR%%/gretl/scripts/wg_ps_descriptions
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/chapters/appendices.xml
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/chapters/biblio.xml
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/chapters/cli.xml
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/chapters/cmdref.xml
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/chapters/datafiles.xml
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/chapters/graphs.xml
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/chapters/intro.xml
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/chapters/looping.xml
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/chapters/modes.xml
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/chapters/native.xml
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/chapters/nls.xml
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/chapters/optarg.xml
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/chapters/panel.xml
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/chapters/starting.xml
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/chapters/trouble.xml
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/adf1.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/adf2.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/autocorr.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/caution.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/corc.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/cumulate.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/datafiles.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/greeneC.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/gretl-logo.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/important.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/influence.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/ldx.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/ldy.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/mainwin.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/menubar.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/model_table.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/modelwin.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/nls_window.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/note.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/plot_control.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/scriptwin.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/selector.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/session.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/tip.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/toolbar.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/figures/warning.png
-%%GNOME:%%%%GRETLDATADIR%%/help/gretl/C/gretl.xml
-%%GNOME:%%%%GRETLDATADIR%%/mime-info/gretl.keys
-%%GNOME:%%%%GRETLDATADIR%%/mime-info/gretl.mime
-%%GNOME:%%%%GRETLDATADIR%%/omf/gretl/gretl-C.omf
-%%GNOME:%%%%GRETLDATADIR%%/pixmaps/gnome-application-x-gretldata.png
-%%GNOME:%%%%GRETLDATADIR%%/pixmaps/gnome-application-x-gretlsession.png
-%%GNOME:%%%%GRETLDATADIR%%/pixmaps/gretl-logo.xpm
-%%GNOME:%%%%GRETLDATADIR%%/pixmaps/gretl.png
+%%GNOME:%%share/gnome/applications/gretl.desktop
+share/gnome/gtksourceview-1.0/language-specs/gnuplot.lang
+share/gnome/gtksourceview-1.0/language-specs/gretl.lang
+share/gnome/gretl/COPYING
+share/gnome/gretl/data/data10-1.gdt
+share/gnome/gretl/data/data10-2.gdt
+share/gnome/gretl/data/data10-3.gdt
+share/gnome/gretl/data/data10-4.gdt
+share/gnome/gretl/data/data10-5.gdt
+share/gnome/gretl/data/data10-6.gdt
+share/gnome/gretl/data/data10-7.gdt
+share/gnome/gretl/data/data10-8.gdt
+share/gnome/gretl/data/data11-1.gdt
+share/gnome/gretl/data/data12-1.gdt
+share/gnome/gretl/data/data13-1.gdt
+share/gnome/gretl/data/data2-1.gdt
+share/gnome/gretl/data/data2-2.gdt
+share/gnome/gretl/data/data2-3.gdt
+share/gnome/gretl/data/data3-1.gdt
+share/gnome/gretl/data/data3-10.gdt
+share/gnome/gretl/data/data3-11.gdt
+share/gnome/gretl/data/data3-12.gdt
+share/gnome/gretl/data/data3-13.gdt
+share/gnome/gretl/data/data3-14.gdt
+share/gnome/gretl/data/data3-15.gdt
+share/gnome/gretl/data/data3-2.gdt
+share/gnome/gretl/data/data3-3.gdt
+share/gnome/gretl/data/data3-4.gdt
+share/gnome/gretl/data/data3-5.gdt
+share/gnome/gretl/data/data3-6.gdt
+share/gnome/gretl/data/data3-7.gdt
+share/gnome/gretl/data/data3-8.gdt
+share/gnome/gretl/data/data3-9.gdt
+share/gnome/gretl/data/data4-1.gdt
+share/gnome/gretl/data/data4-10.gdt
+share/gnome/gretl/data/data4-11.gdt
+share/gnome/gretl/data/data4-12.gdt
+share/gnome/gretl/data/data4-13.gdt
+share/gnome/gretl/data/data4-14.gdt
+share/gnome/gretl/data/data4-15.gdt
+share/gnome/gretl/data/data4-16.gdt
+share/gnome/gretl/data/data4-17.gdt
+share/gnome/gretl/data/data4-2.gdt
+share/gnome/gretl/data/data4-3.gdt
+share/gnome/gretl/data/data4-3a.gdt
+share/gnome/gretl/data/data4-4.gdt
+share/gnome/gretl/data/data4-5.gdt
+share/gnome/gretl/data/data4-6.gdt
+share/gnome/gretl/data/data4-7.gdt
+share/gnome/gretl/data/data4-8.gdt
+share/gnome/gretl/data/data4-9.gdt
+share/gnome/gretl/data/data6-1.gdt
+share/gnome/gretl/data/data6-2.gdt
+share/gnome/gretl/data/data6-3.gdt
+share/gnome/gretl/data/data6-4.gdt
+share/gnome/gretl/data/data6-5.gdt
+share/gnome/gretl/data/data6-6.gdt
+share/gnome/gretl/data/data7-1.gdt
+share/gnome/gretl/data/data7-10.gdt
+share/gnome/gretl/data/data7-11.gdt
+share/gnome/gretl/data/data7-12.gdt
+share/gnome/gretl/data/data7-13.gdt
+share/gnome/gretl/data/data7-14.gdt
+share/gnome/gretl/data/data7-15.gdt
+share/gnome/gretl/data/data7-16.gdt
+share/gnome/gretl/data/data7-17.gdt
+share/gnome/gretl/data/data7-18.gdt
+share/gnome/gretl/data/data7-19.gdt
+share/gnome/gretl/data/data7-2.gdt
+share/gnome/gretl/data/data7-20.gdt
+share/gnome/gretl/data/data7-21.gdt
+share/gnome/gretl/data/data7-22.gdt
+share/gnome/gretl/data/data7-23.gdt
+share/gnome/gretl/data/data7-24.gdt
+share/gnome/gretl/data/data7-26.gdt
+share/gnome/gretl/data/data7-3.gdt
+share/gnome/gretl/data/data7-4.gdt
+share/gnome/gretl/data/data7-5.gdt
+share/gnome/gretl/data/data7-6.gdt
+share/gnome/gretl/data/data7-7.gdt
+share/gnome/gretl/data/data7-8.gdt
+share/gnome/gretl/data/data7-9.gdt
+share/gnome/gretl/data/data8-1.gdt
+share/gnome/gretl/data/data8-2.gdt
+share/gnome/gretl/data/data8-3.gdt
+share/gnome/gretl/data/data9-1.gdt
+share/gnome/gretl/data/data9-10.gdt
+share/gnome/gretl/data/data9-11.gdt
+share/gnome/gretl/data/data9-12.gdt
+share/gnome/gretl/data/data9-13.gdt
+share/gnome/gretl/data/data9-2.gdt
+share/gnome/gretl/data/data9-3.gdt
+share/gnome/gretl/data/data9-4.gdt
+share/gnome/gretl/data/data9-5.gdt
+share/gnome/gretl/data/data9-6.gdt
+share/gnome/gretl/data/data9-7.gdt
+share/gnome/gretl/data/data9-8.gdt
+share/gnome/gretl/data/data9-9.gdt
+share/gnome/gretl/data/descriptions
+share/gnome/gretl/data/ects_nls.gdt
+share/gnome/gretl/data/greene/greene10_3.gdt
+share/gnome/gretl/data/greene/greene11_3.gdt
+share/gnome/gretl/data/greene/greene12_1.gdt
+share/gnome/gretl/data/greene/greene13_1.gdt
+share/gnome/gretl/data/greene/greene14_1.gdt
+share/gnome/gretl/data/greene/greene18_1.gdt
+share/gnome/gretl/data/greene/greene18_2.gdt
+share/gnome/gretl/data/greene/greene19_1.gdt
+share/gnome/gretl/data/greene/greene5_1.gdt
+share/gnome/gretl/data/greene/greene7_8.gdt
+share/gnome/gretl/data/greene/greene8_3.gdt
+share/gnome/gretl/data/greene/greene9_1.gdt
+share/gnome/gretl/data/greene/wg_descriptions
+share/gnome/gretl/data/gretldata.dtd
+share/gnome/gretl/data/hamilton.gdt
+share/gnome/gretl/data/leverage.gdt
+share/gnome/gretl/data/longley.gdt
+share/gnome/gretl/data/sw_ch12.gdt
+share/gnome/gretl/db/bcih.bin
+share/gnome/gretl/db/bcih.idx
+share/gnome/gretl/gretl-logo.xpm
+share/gnome/gretl/gretl.hlp
+share/gnome/gretl/gretl.stamp
+share/gnome/gretl/gretlcli.hlp
+share/gnome/gretl/scripts/ects_nls.inp
+share/gnome/gretl/scripts/greene11_3.inp
+share/gnome/gretl/scripts/greene12_1.inp
+share/gnome/gretl/scripts/greene14_1.inp
+share/gnome/gretl/scripts/greene14_2.inp
+share/gnome/gretl/scripts/greene18_6.inp
+share/gnome/gretl/scripts/greene19_1.inp
+share/gnome/gretl/scripts/greene7_8.inp
+share/gnome/gretl/scripts/greene8_3.inp
+share/gnome/gretl/scripts/greene9_1.inp
+share/gnome/gretl/scripts/greene9_3.inp
+share/gnome/gretl/scripts/leverage.inp
+share/gnome/gretl/scripts/longley.inp
+share/gnome/gretl/scripts/ps10-1.inp
+share/gnome/gretl/scripts/ps10-10.inp
+share/gnome/gretl/scripts/ps10-11.inp
+share/gnome/gretl/scripts/ps10-2.inp
+share/gnome/gretl/scripts/ps10-3.inp
+share/gnome/gretl/scripts/ps10-4.inp
+share/gnome/gretl/scripts/ps10-5a.inp
+share/gnome/gretl/scripts/ps10-5b.inp
+share/gnome/gretl/scripts/ps10-6.inp
+share/gnome/gretl/scripts/ps10-7.inp
+share/gnome/gretl/scripts/ps10-8.inp
+share/gnome/gretl/scripts/ps10-9.inp
+share/gnome/gretl/scripts/ps11-1.inp
+share/gnome/gretl/scripts/ps11-2.inp
+share/gnome/gretl/scripts/ps11-3.inp
+share/gnome/gretl/scripts/ps12-1.inp
+share/gnome/gretl/scripts/ps13-1.inp
+share/gnome/gretl/scripts/ps2-1.inp
+share/gnome/gretl/scripts/ps2-2.inp
+share/gnome/gretl/scripts/ps2-3.inp
+share/gnome/gretl/scripts/ps3-1.inp
+share/gnome/gretl/scripts/ps3-2.inp
+share/gnome/gretl/scripts/ps3-3.inp
+share/gnome/gretl/scripts/ps3-4.inp
+share/gnome/gretl/scripts/ps3-5.inp
+share/gnome/gretl/scripts/ps3-6.inp
+share/gnome/gretl/scripts/ps4-1.inp
+share/gnome/gretl/scripts/ps4-2.inp
+share/gnome/gretl/scripts/ps4-3.inp
+share/gnome/gretl/scripts/ps4-4.inp
+share/gnome/gretl/scripts/ps4-5.inp
+share/gnome/gretl/scripts/ps5-1.inp
+share/gnome/gretl/scripts/ps5-2.inp
+share/gnome/gretl/scripts/ps5-3.inp
+share/gnome/gretl/scripts/ps5-4.inp
+share/gnome/gretl/scripts/ps5-5.inp
+share/gnome/gretl/scripts/ps6-1.inp
+share/gnome/gretl/scripts/ps6-10.inp
+share/gnome/gretl/scripts/ps6-11.inp
+share/gnome/gretl/scripts/ps6-12.inp
+share/gnome/gretl/scripts/ps6-2.inp
+share/gnome/gretl/scripts/ps6-3.inp
+share/gnome/gretl/scripts/ps6-4.inp
+share/gnome/gretl/scripts/ps6-5.inp
+share/gnome/gretl/scripts/ps6-6.inp
+share/gnome/gretl/scripts/ps6-7.inp
+share/gnome/gretl/scripts/ps6-8.inp
+share/gnome/gretl/scripts/ps6-9.inp
+share/gnome/gretl/scripts/ps7-1.inp
+share/gnome/gretl/scripts/ps7-2.inp
+share/gnome/gretl/scripts/ps7-3.inp
+share/gnome/gretl/scripts/ps7-4.inp
+share/gnome/gretl/scripts/ps7-5.inp
+share/gnome/gretl/scripts/ps7-6.inp
+share/gnome/gretl/scripts/ps7-7.inp
+share/gnome/gretl/scripts/ps8-1.inp
+share/gnome/gretl/scripts/ps8-2.inp
+share/gnome/gretl/scripts/ps8-3.inp
+share/gnome/gretl/scripts/ps8-4.inp
+share/gnome/gretl/scripts/ps8-5.inp
+share/gnome/gretl/scripts/ps8-6.inp
+share/gnome/gretl/scripts/ps8-7.inp
+share/gnome/gretl/scripts/ps8-8.inp
+share/gnome/gretl/scripts/ps9-1.inp
+share/gnome/gretl/scripts/ps9-10.inp
+share/gnome/gretl/scripts/ps9-2.inp
+share/gnome/gretl/scripts/ps9-3.inp
+share/gnome/gretl/scripts/ps9-4.inp
+share/gnome/gretl/scripts/ps9-5.inp
+share/gnome/gretl/scripts/ps9-6.inp
+share/gnome/gretl/scripts/ps9-7.inp
+share/gnome/gretl/scripts/ps9-8.inp
+share/gnome/gretl/scripts/ps9-9.inp
+share/gnome/gretl/scripts/ps_descriptions
+share/gnome/gretl/scripts/pscoin.inp
+share/gnome/gretl/scripts/sw_ch12.inp
+share/gnome/gretl/scripts/testinp
+share/gnome/gretl/scripts/wg_ps_descriptions
+%%GNOME:%%share/gnome/help/gretl/C/chapters/appendices.xml
+%%GNOME:%%share/gnome/help/gretl/C/chapters/biblio.xml
+%%GNOME:%%share/gnome/help/gretl/C/chapters/cli.xml
+%%GNOME:%%share/gnome/help/gretl/C/chapters/cmdref.xml
+%%GNOME:%%share/gnome/help/gretl/C/chapters/datafiles.xml
+%%GNOME:%%share/gnome/help/gretl/C/chapters/graphs.xml
+%%GNOME:%%share/gnome/help/gretl/C/chapters/intro.xml
+%%GNOME:%%share/gnome/help/gretl/C/chapters/looping.xml
+%%GNOME:%%share/gnome/help/gretl/C/chapters/modes.xml
+%%GNOME:%%share/gnome/help/gretl/C/chapters/native.xml
+%%GNOME:%%share/gnome/help/gretl/C/chapters/nls.xml
+%%GNOME:%%share/gnome/help/gretl/C/chapters/optarg.xml
+%%GNOME:%%share/gnome/help/gretl/C/chapters/panel.xml
+%%GNOME:%%share/gnome/help/gretl/C/chapters/starting.xml
+%%GNOME:%%share/gnome/help/gretl/C/chapters/trouble.xml
+%%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/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/influence.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/mainwin.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/menubar.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/model_table.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/modelwin.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/nls_window.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/scriptwin.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/selector.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/toolbar.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/warning.png
+%%GNOME:%%share/gnome/help/gretl/C/gretl.xml
+%%GNOME:%%share/gnome/mime-info/gretl.keys
+%%GNOME:%%share/gnome/mime-info/gretl.mime
+%%GNOME:%%share/gnome/omf/gretl/gretl-C.omf
+%%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretldata.png
+%%GNOME:%%share/gnome/pixmaps/gnome-application-x-gretlsession.png
+%%GNOME:%%share/gnome/pixmaps/gretl-logo.xpm
+%%GNOME:%%share/gnome/pixmaps/gretl.png
 share/locale/es/LC_MESSAGES/gretl.mo
 share/locale/fr/LC_MESSAGES/gretl.mo
 share/locale/ja/LC_MESSAGES/gretl.mo
-%%GNOME:%%@dirrm %%GRETLDATADIR%%/omf/gretl
-%%GNOME:%%@dirrm %%GRETLDATADIR%%/help/gretl/C/figures
-%%GNOME:%%@dirrm %%GRETLDATADIR%%/help/gretl/C/chapters
-%%GNOME:%%@dirrm %%GRETLDATADIR%%/help/gretl/C
-%%GNOME:%%@dirrm %%GRETLDATADIR%%/help/gretl
-@dirrm %%GRETLDATADIR%%/gretl/scripts
-@dirrm %%GRETLDATADIR%%/gretl/db
-@dirrm %%GRETLDATADIR%%/gretl/data/greene
-@dirrm %%GRETLDATADIR%%/gretl/data
-@dirrm %%GRETLDATADIR%%/gretl
+%%GNOME:%%@dirrm share/gnome/omf/gretl
+%%GNOME:%%@dirrm share/gnome/help/gretl/C/figures
+%%GNOME:%%@dirrm share/gnome/help/gretl/C/chapters
+%%GNOME:%%@dirrm share/gnome/help/gretl/C
+%%GNOME:%%@dirrm share/gnome/help/gretl
+@dirrm share/gnome/gretl/scripts
+@dirrm share/gnome/gretl/db
+@dirrm share/gnome/gretl/data/greene
+@dirrm share/gnome/gretl/data
+@dirrm share/gnome/gretl
 @dirrm lib/gretl
 @dirrm include/gretl
 %%GNOME:%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gretl