Merge in remaining changes from

PR:		51233
Submitted by:	Ports Fury

2 files changed, 273 insertions, 270 deletions

diff --git a/misc/gretl/Makefile b/misc/gretl/Makefile
index bda9fa6e65a2..f2362325e1fb 100644
--- a/misc/gretl/Makefile
+++ b/misc/gretl/Makefile
@@ -22,8 +22,9 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gtk20 libxml2
 USE_GMAKE=	yes
+WANT_GNOME=	yes
+USE_GNOME=	gtk20 libxml2
 USE_AUTOCONF_VER=	253
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -33,12 +34,15 @@ INSTALLS_SHLIB=	yes
 
 MAN1=	gretl.1 gretl-config.1
 
-.if defined(WITHOUT_GNOME2)
-CONFIGURE_ARGS+=	--without-gnome
-PLIST_SUB+=	GNOME2:="@comment " DATADIR="share"
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mlibgnomeui}!=""
+PKGNAMESUFFIX=	-gnome
+USE_GNOME+=	gnomeprefix libgnomeprintui
+PLIST_SUB+=	GRETLDATADIR="share/gnome"
 .else
-USE_GNOME+=	gnomeprefix libgnomeprintui libgnomeui
-PLIST_SUB+=	GNOME2:="" DATADIR="share/gnome"
+CONFIGURE_ARGS+=	--without-gnome
+PLIST_SUB+=	GRETLDATADIR="share"
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/misc/gretl/pkg-plist b/misc/gretl/pkg-plist
index 712b3a6d337a..b1b92cd2d983 100644
--- a/misc/gretl/pkg-plist
+++ b/misc/gretl/pkg-plist
@@ -1,10 +1,9 @@
-@comment $FreeBSD$
 bin/gretl
 bin/gretl_x11
 bin/gretlcli
-%%GNOME2:%%etc/gconf/gconf.xml.defaults/apps/gretl/%gconf.xml
-%%GNOME2:%%etc/gconf/gconf.xml.defaults/schemas/apps/gretl/%gconf.xml
-%%GNOME2:%%etc/gconf/schemas/gretl.schemas
+%%GNOME:%%etc/gconf/gconf.xml.defaults/apps/gretl/%gconf.xml
+%%GNOME:%%etc/gconf/gconf.xml.defaults/schemas/apps/gretl/%gconf.xml
+%%GNOME:%%etc/gconf/schemas/gretl.schemas
 include/gretl/calendar.h
 include/gretl/cmdlist.h
 include/gretl/commands.h
@@ -48,267 +47,267 @@ lib/libgretl-1.0.a
 lib/libgretl-1.0.so
 lib/libgretl-1.0.so.0
 libdata/pkgconfig/gretl.pc
-%%GNOME2:%%%%DATADIR%%/applications/gretl.desktop
-%%DATADIR%%/gretl/COPYING
-%%DATADIR%%/gretl/data/data10-1.gdt
-%%DATADIR%%/gretl/data/data10-2.gdt
-%%DATADIR%%/gretl/data/data10-3.gdt
-%%DATADIR%%/gretl/data/data10-4.gdt
-%%DATADIR%%/gretl/data/data10-5.gdt
-%%DATADIR%%/gretl/data/data10-6.gdt
-%%DATADIR%%/gretl/data/data10-7.gdt
-%%DATADIR%%/gretl/data/data10-8.gdt
-%%DATADIR%%/gretl/data/data11-1.gdt
-%%DATADIR%%/gretl/data/data12-1.gdt
-%%DATADIR%%/gretl/data/data13-1.gdt
-%%DATADIR%%/gretl/data/data2-1.gdt
-%%DATADIR%%/gretl/data/data2-2.gdt
-%%DATADIR%%/gretl/data/data2-3.gdt
-%%DATADIR%%/gretl/data/data3-1.gdt
-%%DATADIR%%/gretl/data/data3-10.gdt
-%%DATADIR%%/gretl/data/data3-11.gdt
-%%DATADIR%%/gretl/data/data3-12.gdt
-%%DATADIR%%/gretl/data/data3-13.gdt
-%%DATADIR%%/gretl/data/data3-14.gdt
-%%DATADIR%%/gretl/data/data3-15.gdt
-%%DATADIR%%/gretl/data/data3-2.gdt
-%%DATADIR%%/gretl/data/data3-3.gdt
-%%DATADIR%%/gretl/data/data3-4.gdt
-%%DATADIR%%/gretl/data/data3-5.gdt
-%%DATADIR%%/gretl/data/data3-6.gdt
-%%DATADIR%%/gretl/data/data3-7.gdt
-%%DATADIR%%/gretl/data/data3-8.gdt
-%%DATADIR%%/gretl/data/data3-9.gdt
-%%DATADIR%%/gretl/data/data4-1.gdt
-%%DATADIR%%/gretl/data/data4-10.gdt
-%%DATADIR%%/gretl/data/data4-11.gdt
-%%DATADIR%%/gretl/data/data4-12.gdt
-%%DATADIR%%/gretl/data/data4-13.gdt
-%%DATADIR%%/gretl/data/data4-14.gdt
-%%DATADIR%%/gretl/data/data4-15.gdt
-%%DATADIR%%/gretl/data/data4-16.gdt
-%%DATADIR%%/gretl/data/data4-17.gdt
-%%DATADIR%%/gretl/data/data4-2.gdt
-%%DATADIR%%/gretl/data/data4-3.gdt
-%%DATADIR%%/gretl/data/data4-3a.gdt
-%%DATADIR%%/gretl/data/data4-4.gdt
-%%DATADIR%%/gretl/data/data4-5.gdt
-%%DATADIR%%/gretl/data/data4-6.gdt
-%%DATADIR%%/gretl/data/data4-7.gdt
-%%DATADIR%%/gretl/data/data4-8.gdt
-%%DATADIR%%/gretl/data/data4-9.gdt
-%%DATADIR%%/gretl/data/data6-1.gdt
-%%DATADIR%%/gretl/data/data6-2.gdt
-%%DATADIR%%/gretl/data/data6-3.gdt
-%%DATADIR%%/gretl/data/data6-4.gdt
-%%DATADIR%%/gretl/data/data6-5.gdt
-%%DATADIR%%/gretl/data/data6-6.gdt
-%%DATADIR%%/gretl/data/data7-1.gdt
-%%DATADIR%%/gretl/data/data7-10.gdt
-%%DATADIR%%/gretl/data/data7-11.gdt
-%%DATADIR%%/gretl/data/data7-12.gdt
-%%DATADIR%%/gretl/data/data7-13.gdt
-%%DATADIR%%/gretl/data/data7-14.gdt
-%%DATADIR%%/gretl/data/data7-15.gdt
-%%DATADIR%%/gretl/data/data7-16.gdt
-%%DATADIR%%/gretl/data/data7-17.gdt
-%%DATADIR%%/gretl/data/data7-18.gdt
-%%DATADIR%%/gretl/data/data7-19.gdt
-%%DATADIR%%/gretl/data/data7-2.gdt
-%%DATADIR%%/gretl/data/data7-20.gdt
-%%DATADIR%%/gretl/data/data7-21.gdt
-%%DATADIR%%/gretl/data/data7-22.gdt
-%%DATADIR%%/gretl/data/data7-23.gdt
-%%DATADIR%%/gretl/data/data7-24.gdt
-%%DATADIR%%/gretl/data/data7-26.gdt
-%%DATADIR%%/gretl/data/data7-3.gdt
-%%DATADIR%%/gretl/data/data7-4.gdt
-%%DATADIR%%/gretl/data/data7-5.gdt
-%%DATADIR%%/gretl/data/data7-6.gdt
-%%DATADIR%%/gretl/data/data7-7.gdt
-%%DATADIR%%/gretl/data/data7-8.gdt
-%%DATADIR%%/gretl/data/data7-9.gdt
-%%DATADIR%%/gretl/data/data8-1.gdt
-%%DATADIR%%/gretl/data/data8-2.gdt
-%%DATADIR%%/gretl/data/data8-3.gdt
-%%DATADIR%%/gretl/data/data9-1.gdt
-%%DATADIR%%/gretl/data/data9-10.gdt
-%%DATADIR%%/gretl/data/data9-11.gdt
-%%DATADIR%%/gretl/data/data9-12.gdt
-%%DATADIR%%/gretl/data/data9-13.gdt
-%%DATADIR%%/gretl/data/data9-2.gdt
-%%DATADIR%%/gretl/data/data9-3.gdt
-%%DATADIR%%/gretl/data/data9-4.gdt
-%%DATADIR%%/gretl/data/data9-5.gdt
-%%DATADIR%%/gretl/data/data9-6.gdt
-%%DATADIR%%/gretl/data/data9-7.gdt
-%%DATADIR%%/gretl/data/data9-8.gdt
-%%DATADIR%%/gretl/data/data9-9.gdt
-%%DATADIR%%/gretl/data/descriptions
-%%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
-%%DATADIR%%/gretl/data/greene/greene7_8.gdt
-%%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/bcih.bin
-%%DATADIR%%/gretl/db/bcih.idx
-%%DATADIR%%/gretl/gretl-logo.xpm
-%%DATADIR%%/gretl/gretl.hlp
-%%DATADIR%%/gretl/gretl.stamp
-%%DATADIR%%/gretl/gretlcli.hlp
-%%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
-%%DATADIR%%/gretl/scripts/greene8_3.inp
-%%DATADIR%%/gretl/scripts/greene9_1.inp
-%%DATADIR%%/gretl/scripts/ps10-1.inp
-%%DATADIR%%/gretl/scripts/ps10-10.inp
-%%DATADIR%%/gretl/scripts/ps10-11.inp
-%%DATADIR%%/gretl/scripts/ps10-2.inp
-%%DATADIR%%/gretl/scripts/ps10-3.inp
-%%DATADIR%%/gretl/scripts/ps10-4.inp
-%%DATADIR%%/gretl/scripts/ps10-5a.inp
-%%DATADIR%%/gretl/scripts/ps10-5b.inp
-%%DATADIR%%/gretl/scripts/ps10-6.inp
-%%DATADIR%%/gretl/scripts/ps10-7.inp
-%%DATADIR%%/gretl/scripts/ps10-8.inp
-%%DATADIR%%/gretl/scripts/ps10-9.inp
-%%DATADIR%%/gretl/scripts/ps11-1.inp
-%%DATADIR%%/gretl/scripts/ps11-2.inp
-%%DATADIR%%/gretl/scripts/ps11-3.inp
-%%DATADIR%%/gretl/scripts/ps12-1.inp
-%%DATADIR%%/gretl/scripts/ps13-1.inp
-%%DATADIR%%/gretl/scripts/ps2-1.inp
-%%DATADIR%%/gretl/scripts/ps2-2.inp
-%%DATADIR%%/gretl/scripts/ps2-3.inp
-%%DATADIR%%/gretl/scripts/ps3-1.inp
-%%DATADIR%%/gretl/scripts/ps3-2.inp
-%%DATADIR%%/gretl/scripts/ps3-3.inp
-%%DATADIR%%/gretl/scripts/ps3-4.inp
-%%DATADIR%%/gretl/scripts/ps3-5.inp
-%%DATADIR%%/gretl/scripts/ps3-6.inp
-%%DATADIR%%/gretl/scripts/ps4-1.inp
-%%DATADIR%%/gretl/scripts/ps4-2.inp
-%%DATADIR%%/gretl/scripts/ps4-3.inp
-%%DATADIR%%/gretl/scripts/ps4-4.inp
-%%DATADIR%%/gretl/scripts/ps4-5.inp
-%%DATADIR%%/gretl/scripts/ps5-1.inp
-%%DATADIR%%/gretl/scripts/ps5-2.inp
-%%DATADIR%%/gretl/scripts/ps5-3.inp
-%%DATADIR%%/gretl/scripts/ps5-4.inp
-%%DATADIR%%/gretl/scripts/ps5-5.inp
-%%DATADIR%%/gretl/scripts/ps6-1.inp
-%%DATADIR%%/gretl/scripts/ps6-10.inp
-%%DATADIR%%/gretl/scripts/ps6-11.inp
-%%DATADIR%%/gretl/scripts/ps6-12.inp
-%%DATADIR%%/gretl/scripts/ps6-2.inp
-%%DATADIR%%/gretl/scripts/ps6-3.inp
-%%DATADIR%%/gretl/scripts/ps6-4.inp
-%%DATADIR%%/gretl/scripts/ps6-5.inp
-%%DATADIR%%/gretl/scripts/ps6-6.inp
-%%DATADIR%%/gretl/scripts/ps6-7.inp
-%%DATADIR%%/gretl/scripts/ps6-8.inp
-%%DATADIR%%/gretl/scripts/ps6-9.inp
-%%DATADIR%%/gretl/scripts/ps7-1.inp
-%%DATADIR%%/gretl/scripts/ps7-2.inp
-%%DATADIR%%/gretl/scripts/ps7-3.inp
-%%DATADIR%%/gretl/scripts/ps7-4.inp
-%%DATADIR%%/gretl/scripts/ps7-5.inp
-%%DATADIR%%/gretl/scripts/ps7-6.inp
-%%DATADIR%%/gretl/scripts/ps7-7.inp
-%%DATADIR%%/gretl/scripts/ps8-1.inp
-%%DATADIR%%/gretl/scripts/ps8-2.inp
-%%DATADIR%%/gretl/scripts/ps8-3.inp
-%%DATADIR%%/gretl/scripts/ps8-4.inp
-%%DATADIR%%/gretl/scripts/ps8-5.inp
-%%DATADIR%%/gretl/scripts/ps8-6.inp
-%%DATADIR%%/gretl/scripts/ps8-7.inp
-%%DATADIR%%/gretl/scripts/ps8-8.inp
-%%DATADIR%%/gretl/scripts/ps9-1.inp
-%%DATADIR%%/gretl/scripts/ps9-10.inp
-%%DATADIR%%/gretl/scripts/ps9-2.inp
-%%DATADIR%%/gretl/scripts/ps9-3.inp
-%%DATADIR%%/gretl/scripts/ps9-4.inp
-%%DATADIR%%/gretl/scripts/ps9-5.inp
-%%DATADIR%%/gretl/scripts/ps9-6.inp
-%%DATADIR%%/gretl/scripts/ps9-7.inp
-%%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
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/biblio.xml
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/cli.xml
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/cmdref.xml
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/datafiles.xml
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/graphs.xml
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/intro.xml
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/looping.xml
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/modes.xml
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/native.xml
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/optarg.xml
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/panel.xml
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/starting.xml
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/chapters/trouble.xml
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/adf1.png
-%%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/corc.png
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/cumulate.png
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/datafiles.png
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/greeneC.png
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/gretl-logo.png
-%%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/mainwin.png
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/menubar.png
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/modelwin.png
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/note.png
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/plot_control.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/toolbar.png
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/figures/warning.png
-%%GNOME2:%%%%DATADIR%%/help/gretl/C/gretl.xml
-%%GNOME2:%%%%DATADIR%%/mime-info/gretl.keys
-%%GNOME2:%%%%DATADIR%%/mime-info/gretl.mime
-%%GNOME2:%%%%DATADIR%%/omf/gretl/gretl-C.omf
-%%GNOME2:%%%%DATADIR%%/pixmaps/gnome-application-x-gretldata.png
-%%GNOME2:%%%%DATADIR%%/pixmaps/gnome-application-x-gretlsession.png
-%%GNOME2:%%%%DATADIR%%/pixmaps/gretl-logo.xpm
-%%GNOME2:%%%%DATADIR%%/pixmaps/gretl.png
+%%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/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/greene18_1.gdt
+%%GRETLDATADIR%%/gretl/data/greene/greene18_2.gdt
+%%GRETLDATADIR%%/gretl/data/greene/greene19_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/longley.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/greene11_3.inp
+%%GRETLDATADIR%%/gretl/scripts/greene12_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/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/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/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/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/modelwin.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
 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
-%%GNOME2:%%@dirrm %%DATADIR%%/help/gretl/C
-%%GNOME2:%%@dirrm %%DATADIR%%/help/gretl
-@dirrm %%DATADIR%%/gretl/scripts
-@dirrm %%DATADIR%%/gretl/db
-@dirrm %%DATADIR%%/gretl/data/greene
-@dirrm %%DATADIR%%/gretl/data
-@dirrm %%DATADIR%%/gretl
+%%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
 @dirrm lib/gretl
 @dirrm include/gretl
-%%GNOME2:%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gretl
-%%GNOME2:%%@dirrm etc/gconf/gconf.xml.defaults/apps/gretl
+%%GNOME:%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gretl
+%%GNOME:%%@dirrm etc/gconf/gconf.xml.defaults/apps/gretl