5 files changed, 249 insertions, 244 deletions

diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 2a1db304af05..f8d1719ed251 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gretl
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -44,10 +44,9 @@ BROKEN=		"math/lapack appears to be broken on alpha"
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 PKGNAMESUFFIX=	-gnome
 USE_GNOME+=	gnomeprefix gtksourceview libgnomeui
-PLIST_SUB+=	GRETLDATADIR="share/gnome/gretl"
+DATADIR=	${PREFIX}/share/gnome/${PORTNAME}
 .else
 CONFIGURE_ARGS+=	--without-gnome --without-gtksourceview
-PLIST_SUB+=	GRETLDATADIR="share/gretl"
 .endif
 
 post-patch:
diff --git a/math/gretl/distinfo b/math/gretl/distinfo
index 7f3d3d1fd4c2..ba6c43804f84 100644
--- a/math/gretl/distinfo
+++ b/math/gretl/distinfo
@@ -1 +1 @@
-MD5 (gretl-1.2.0.tar.bz2) = bc8f320ca6f3bc2f08fee43d4aeae091
+MD5 (gretl-1.2.1.tar.bz2) = d921e03c09fbbbb4cfde291c42f17793
diff --git a/math/gretl/files/patch-gui2::ssheet.c b/math/gretl/files/patch-gui2::ssheet.c
deleted file mode 100644
index 5e4fb8646f5d..000000000000
--- a/math/gretl/files/patch-gui2::ssheet.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- gui2/ssheet.c.orig	Thu Nov  6 23:46:45 2003
-+++ gui2/ssheet.c	Thu Dec 25 17:33:04 2003
-@@ -822,13 +822,13 @@
- {   
-     GdkModifierType mods; 
-     gint ret = FALSE;
-+    GdkEventButton *bevent = (GdkEventButton *) event;
- 
-     if (event->type != GDK_BUTTON_PRESS) {
- 	return FALSE;
-     }
- 
-     gdk_window_get_pointer(view->window, NULL, NULL, &mods);
--    GdkEventButton *bevent = (GdkEventButton *) event;
- 
-     if (mods & GDK_BUTTON3_MASK) {
- 	gtk_menu_popup (GTK_MENU(sheet->popup), NULL, NULL, NULL, NULL,
diff --git a/math/gretl/files/patch-lib::Makefile.in b/math/gretl/files/patch-lib::Makefile.in
index f524d5c0d343..1a0028beca7e 100644
--- a/math/gretl/files/patch-lib::Makefile.in
+++ b/math/gretl/files/patch-lib::Makefile.in
@@ -45,8 +45,8 @@
  
  $(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
  	$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(AUX_LOBJ) \
--	-rpath $(prefix)/lib $(LIBS) -version-info 0:14:0
-+	-rpath $(prefix)/lib $(LIBS) -version-info 0:14:0 $(LDFLAGS)
+-	-rpath $(prefix)/lib $(LIBS) -version-info 0:15:0
++	-rpath $(prefix)/lib $(LIBS) -version-info 0:15:0 $(LDFLAGS)
  
  .deps:
  	mkdir $@
diff --git a/math/gretl/pkg-plist b/math/gretl/pkg-plist
index d417ce9fe305..c55cb03f87f2 100644
--- a/math/gretl/pkg-plist
+++ b/math/gretl/pkg-plist
@@ -41,12 +41,16 @@ include/gretl/system.h
 include/gretl/texprint.h
 include/gretl/var.h
 include/gretl/version.h
+lib/gretl-gtk2/arma.so
+lib/gretl-gtk2/arma_x12.so
 lib/gretl-gtk2/excel_import.so
 lib/gretl-gtk2/gnumeric_import.so
 lib/gretl-gtk2/johansen.so
 lib/gretl-gtk2/lad.so
 lib/gretl-gtk2/leverage.so
+lib/gretl-gtk2/logistic.so
 lib/gretl-gtk2/mp_ols.so
+lib/gretl-gtk2/nistcheck.so
 lib/gretl-gtk2/panel_data.so
 lib/gretl-gtk2/pca.so
 lib/gretl-gtk2/progress_bar.so
@@ -59,222 +63,235 @@ lib/libgretl-1.0.so
 lib/libgretl-1.0.so.0
 libdata/pkgconfig/gretl.pc
 %%GNOME:%%share/gnome/applications/gretl.desktop
-%%GRETLDATADIR%%/COPYING
-%%GRETLDATADIR%%/data/arma.gdt
-%%GRETLDATADIR%%/data/data10-1.gdt
-%%GRETLDATADIR%%/data/data10-2.gdt
-%%GRETLDATADIR%%/data/data10-3.gdt
-%%GRETLDATADIR%%/data/data10-4.gdt
-%%GRETLDATADIR%%/data/data10-5.gdt
-%%GRETLDATADIR%%/data/data10-6.gdt
-%%GRETLDATADIR%%/data/data10-7.gdt
-%%GRETLDATADIR%%/data/data10-8.gdt
-%%GRETLDATADIR%%/data/data11-1.gdt
-%%GRETLDATADIR%%/data/data12-1.gdt
-%%GRETLDATADIR%%/data/data13-1.gdt
-%%GRETLDATADIR%%/data/data2-1.gdt
-%%GRETLDATADIR%%/data/data2-2.gdt
-%%GRETLDATADIR%%/data/data2-3.gdt
-%%GRETLDATADIR%%/data/data3-1.gdt
-%%GRETLDATADIR%%/data/data3-10.gdt
-%%GRETLDATADIR%%/data/data3-11.gdt
-%%GRETLDATADIR%%/data/data3-12.gdt
-%%GRETLDATADIR%%/data/data3-13.gdt
-%%GRETLDATADIR%%/data/data3-14.gdt
-%%GRETLDATADIR%%/data/data3-15.gdt
-%%GRETLDATADIR%%/data/data3-2.gdt
-%%GRETLDATADIR%%/data/data3-3.gdt
-%%GRETLDATADIR%%/data/data3-4.gdt
-%%GRETLDATADIR%%/data/data3-5.gdt
-%%GRETLDATADIR%%/data/data3-6.gdt
-%%GRETLDATADIR%%/data/data3-7.gdt
-%%GRETLDATADIR%%/data/data3-8.gdt
-%%GRETLDATADIR%%/data/data3-9.gdt
-%%GRETLDATADIR%%/data/data4-1.gdt
-%%GRETLDATADIR%%/data/data4-10.gdt
-%%GRETLDATADIR%%/data/data4-11.gdt
-%%GRETLDATADIR%%/data/data4-12.gdt
-%%GRETLDATADIR%%/data/data4-13.gdt
-%%GRETLDATADIR%%/data/data4-14.gdt
-%%GRETLDATADIR%%/data/data4-15.gdt
-%%GRETLDATADIR%%/data/data4-16.gdt
-%%GRETLDATADIR%%/data/data4-17.gdt
-%%GRETLDATADIR%%/data/data4-2.gdt
-%%GRETLDATADIR%%/data/data4-3.gdt
-%%GRETLDATADIR%%/data/data4-3a.gdt
-%%GRETLDATADIR%%/data/data4-4.gdt
-%%GRETLDATADIR%%/data/data4-5.gdt
-%%GRETLDATADIR%%/data/data4-6.gdt
-%%GRETLDATADIR%%/data/data4-7.gdt
-%%GRETLDATADIR%%/data/data4-8.gdt
-%%GRETLDATADIR%%/data/data4-9.gdt
-%%GRETLDATADIR%%/data/data6-1.gdt
-%%GRETLDATADIR%%/data/data6-2.gdt
-%%GRETLDATADIR%%/data/data6-3.gdt
-%%GRETLDATADIR%%/data/data6-4.gdt
-%%GRETLDATADIR%%/data/data6-5.gdt
-%%GRETLDATADIR%%/data/data6-6.gdt
-%%GRETLDATADIR%%/data/data7-1.gdt
-%%GRETLDATADIR%%/data/data7-10.gdt
-%%GRETLDATADIR%%/data/data7-11.gdt
-%%GRETLDATADIR%%/data/data7-12.gdt
-%%GRETLDATADIR%%/data/data7-13.gdt
-%%GRETLDATADIR%%/data/data7-14.gdt
-%%GRETLDATADIR%%/data/data7-15.gdt
-%%GRETLDATADIR%%/data/data7-16.gdt
-%%GRETLDATADIR%%/data/data7-17.gdt
-%%GRETLDATADIR%%/data/data7-18.gdt
-%%GRETLDATADIR%%/data/data7-19.gdt
-%%GRETLDATADIR%%/data/data7-2.gdt
-%%GRETLDATADIR%%/data/data7-20.gdt
-%%GRETLDATADIR%%/data/data7-21.gdt
-%%GRETLDATADIR%%/data/data7-22.gdt
-%%GRETLDATADIR%%/data/data7-23.gdt
-%%GRETLDATADIR%%/data/data7-24.gdt
-%%GRETLDATADIR%%/data/data7-26.gdt
-%%GRETLDATADIR%%/data/data7-3.gdt
-%%GRETLDATADIR%%/data/data7-4.gdt
-%%GRETLDATADIR%%/data/data7-5.gdt
-%%GRETLDATADIR%%/data/data7-6.gdt
-%%GRETLDATADIR%%/data/data7-7.gdt
-%%GRETLDATADIR%%/data/data7-8.gdt
-%%GRETLDATADIR%%/data/data7-9.gdt
-%%GRETLDATADIR%%/data/data8-1.gdt
-%%GRETLDATADIR%%/data/data8-2.gdt
-%%GRETLDATADIR%%/data/data8-3.gdt
-%%GRETLDATADIR%%/data/data9-1.gdt
-%%GRETLDATADIR%%/data/data9-10.gdt
-%%GRETLDATADIR%%/data/data9-11.gdt
-%%GRETLDATADIR%%/data/data9-12.gdt
-%%GRETLDATADIR%%/data/data9-13.gdt
-%%GRETLDATADIR%%/data/data9-2.gdt
-%%GRETLDATADIR%%/data/data9-3.gdt
-%%GRETLDATADIR%%/data/data9-4.gdt
-%%GRETLDATADIR%%/data/data9-5.gdt
-%%GRETLDATADIR%%/data/data9-6.gdt
-%%GRETLDATADIR%%/data/data9-7.gdt
-%%GRETLDATADIR%%/data/data9-8.gdt
-%%GRETLDATADIR%%/data/data9-9.gdt
-%%GRETLDATADIR%%/data/descriptions
-%%GRETLDATADIR%%/data/ects_nls.gdt
-%%GRETLDATADIR%%/data/greene/greene10_3.gdt
-%%GRETLDATADIR%%/data/greene/greene11_3.gdt
-%%GRETLDATADIR%%/data/greene/greene12_1.gdt
-%%GRETLDATADIR%%/data/greene/greene13_1.gdt
-%%GRETLDATADIR%%/data/greene/greene14_1.gdt
-%%GRETLDATADIR%%/data/greene/greene18_1.gdt
-%%GRETLDATADIR%%/data/greene/greene18_2.gdt
-%%GRETLDATADIR%%/data/greene/greene19_1.gdt
-%%GRETLDATADIR%%/data/greene/greene5_1.gdt
-%%GRETLDATADIR%%/data/greene/greene7_8.gdt
-%%GRETLDATADIR%%/data/greene/greene8_3.gdt
-%%GRETLDATADIR%%/data/greene/greene9_1.gdt
-%%GRETLDATADIR%%/data/greene/wg_descriptions
-%%GRETLDATADIR%%/data/gretldata.dtd
-%%GRETLDATADIR%%/data/hamilton.gdt
-%%GRETLDATADIR%%/data/leverage.gdt
-%%GRETLDATADIR%%/data/longley.gdt
-%%GRETLDATADIR%%/data/sw_ch12.gdt
-%%GRETLDATADIR%%/data/sw_ch14.gdt
-%%GRETLDATADIR%%/db/bcih.bin
-%%GRETLDATADIR%%/db/bcih.idx
-%%GRETLDATADIR%%/gretl-logo.xpm
-%%GRETLDATADIR%%/gretl.hlp
-%%GRETLDATADIR%%/gretl.stamp
-%%GRETLDATADIR%%/gretlcli.hlp
-%%GRETLDATADIR%%/scripts/arma.inp
-%%GRETLDATADIR%%/scripts/ects_nls.inp
-%%GRETLDATADIR%%/scripts/greene11_3.inp
-%%GRETLDATADIR%%/scripts/greene12_1.inp
-%%GRETLDATADIR%%/scripts/greene14_1.inp
-%%GRETLDATADIR%%/scripts/greene14_2.inp
-%%GRETLDATADIR%%/scripts/greene18_6.inp
-%%GRETLDATADIR%%/scripts/greene19_1.inp
-%%GRETLDATADIR%%/scripts/greene7_8.inp
-%%GRETLDATADIR%%/scripts/greene8_3.inp
-%%GRETLDATADIR%%/scripts/greene9_1.inp
-%%GRETLDATADIR%%/scripts/greene9_3.inp
-%%GRETLDATADIR%%/scripts/leverage.inp
-%%GRETLDATADIR%%/scripts/longley.inp
-%%GRETLDATADIR%%/scripts/ps10-1.inp
-%%GRETLDATADIR%%/scripts/ps10-10.inp
-%%GRETLDATADIR%%/scripts/ps10-11.inp
-%%GRETLDATADIR%%/scripts/ps10-2.inp
-%%GRETLDATADIR%%/scripts/ps10-3.inp
-%%GRETLDATADIR%%/scripts/ps10-4.inp
-%%GRETLDATADIR%%/scripts/ps10-5a.inp
-%%GRETLDATADIR%%/scripts/ps10-5b.inp
-%%GRETLDATADIR%%/scripts/ps10-6.inp
-%%GRETLDATADIR%%/scripts/ps10-7.inp
-%%GRETLDATADIR%%/scripts/ps10-8.inp
-%%GRETLDATADIR%%/scripts/ps10-9.inp
-%%GRETLDATADIR%%/scripts/ps11-1.inp
-%%GRETLDATADIR%%/scripts/ps11-2.inp
-%%GRETLDATADIR%%/scripts/ps11-3.inp
-%%GRETLDATADIR%%/scripts/ps12-1.inp
-%%GRETLDATADIR%%/scripts/ps13-1.inp
-%%GRETLDATADIR%%/scripts/ps2-1.inp
-%%GRETLDATADIR%%/scripts/ps2-2.inp
-%%GRETLDATADIR%%/scripts/ps2-3.inp
-%%GRETLDATADIR%%/scripts/ps3-1.inp
-%%GRETLDATADIR%%/scripts/ps3-2.inp
-%%GRETLDATADIR%%/scripts/ps3-3.inp
-%%GRETLDATADIR%%/scripts/ps3-4.inp
-%%GRETLDATADIR%%/scripts/ps3-5.inp
-%%GRETLDATADIR%%/scripts/ps3-6.inp
-%%GRETLDATADIR%%/scripts/ps4-1.inp
-%%GRETLDATADIR%%/scripts/ps4-2.inp
-%%GRETLDATADIR%%/scripts/ps4-3.inp
-%%GRETLDATADIR%%/scripts/ps4-4.inp
-%%GRETLDATADIR%%/scripts/ps4-5.inp
-%%GRETLDATADIR%%/scripts/ps5-1.inp
-%%GRETLDATADIR%%/scripts/ps5-2.inp
-%%GRETLDATADIR%%/scripts/ps5-3.inp
-%%GRETLDATADIR%%/scripts/ps5-4.inp
-%%GRETLDATADIR%%/scripts/ps5-5.inp
-%%GRETLDATADIR%%/scripts/ps6-1.inp
-%%GRETLDATADIR%%/scripts/ps6-10.inp
-%%GRETLDATADIR%%/scripts/ps6-11.inp
-%%GRETLDATADIR%%/scripts/ps6-12.inp
-%%GRETLDATADIR%%/scripts/ps6-2.inp
-%%GRETLDATADIR%%/scripts/ps6-3.inp
-%%GRETLDATADIR%%/scripts/ps6-4.inp
-%%GRETLDATADIR%%/scripts/ps6-5.inp
-%%GRETLDATADIR%%/scripts/ps6-6.inp
-%%GRETLDATADIR%%/scripts/ps6-7.inp
-%%GRETLDATADIR%%/scripts/ps6-8.inp
-%%GRETLDATADIR%%/scripts/ps6-9.inp
-%%GRETLDATADIR%%/scripts/ps7-1.inp
-%%GRETLDATADIR%%/scripts/ps7-2.inp
-%%GRETLDATADIR%%/scripts/ps7-3.inp
-%%GRETLDATADIR%%/scripts/ps7-4.inp
-%%GRETLDATADIR%%/scripts/ps7-5.inp
-%%GRETLDATADIR%%/scripts/ps7-6.inp
-%%GRETLDATADIR%%/scripts/ps7-7.inp
-%%GRETLDATADIR%%/scripts/ps8-1.inp
-%%GRETLDATADIR%%/scripts/ps8-2.inp
-%%GRETLDATADIR%%/scripts/ps8-3.inp
-%%GRETLDATADIR%%/scripts/ps8-4.inp
-%%GRETLDATADIR%%/scripts/ps8-5.inp
-%%GRETLDATADIR%%/scripts/ps8-6.inp
-%%GRETLDATADIR%%/scripts/ps8-7.inp
-%%GRETLDATADIR%%/scripts/ps8-8.inp
-%%GRETLDATADIR%%/scripts/ps9-1.inp
-%%GRETLDATADIR%%/scripts/ps9-10.inp
-%%GRETLDATADIR%%/scripts/ps9-2.inp
-%%GRETLDATADIR%%/scripts/ps9-3.inp
-%%GRETLDATADIR%%/scripts/ps9-4.inp
-%%GRETLDATADIR%%/scripts/ps9-5.inp
-%%GRETLDATADIR%%/scripts/ps9-6.inp
-%%GRETLDATADIR%%/scripts/ps9-7.inp
-%%GRETLDATADIR%%/scripts/ps9-8.inp
-%%GRETLDATADIR%%/scripts/ps9-9.inp
-%%GRETLDATADIR%%/scripts/ps_descriptions
-%%GRETLDATADIR%%/scripts/pscoin.inp
-%%GRETLDATADIR%%/scripts/sw_ch12.inp
-%%GRETLDATADIR%%/scripts/sw_ch14.inp
-%%GRETLDATADIR%%/scripts/testinp
-%%GRETLDATADIR%%/scripts/wg_ps_descriptions
+%%DATADIR%%/COPYING
+%%DATADIR%%/data/data10-1.gdt
+%%DATADIR%%/data/data10-2.gdt
+%%DATADIR%%/data/data10-3.gdt
+%%DATADIR%%/data/data10-4.gdt
+%%DATADIR%%/data/data10-5.gdt
+%%DATADIR%%/data/data10-6.gdt
+%%DATADIR%%/data/data10-7.gdt
+%%DATADIR%%/data/data10-8.gdt
+%%DATADIR%%/data/data11-1.gdt
+%%DATADIR%%/data/data12-1.gdt
+%%DATADIR%%/data/data13-1.gdt
+%%DATADIR%%/data/data2-1.gdt
+%%DATADIR%%/data/data2-2.gdt
+%%DATADIR%%/data/data2-3.gdt
+%%DATADIR%%/data/data3-1.gdt
+%%DATADIR%%/data/data3-10.gdt
+%%DATADIR%%/data/data3-11.gdt
+%%DATADIR%%/data/data3-12.gdt
+%%DATADIR%%/data/data3-13.gdt
+%%DATADIR%%/data/data3-14.gdt
+%%DATADIR%%/data/data3-15.gdt
+%%DATADIR%%/data/data3-2.gdt
+%%DATADIR%%/data/data3-3.gdt
+%%DATADIR%%/data/data3-4.gdt
+%%DATADIR%%/data/data3-5.gdt
+%%DATADIR%%/data/data3-6.gdt
+%%DATADIR%%/data/data3-7.gdt
+%%DATADIR%%/data/data3-8.gdt
+%%DATADIR%%/data/data3-9.gdt
+%%DATADIR%%/data/data4-1.gdt
+%%DATADIR%%/data/data4-10.gdt
+%%DATADIR%%/data/data4-11.gdt
+%%DATADIR%%/data/data4-12.gdt
+%%DATADIR%%/data/data4-13.gdt
+%%DATADIR%%/data/data4-14.gdt
+%%DATADIR%%/data/data4-15.gdt
+%%DATADIR%%/data/data4-16.gdt
+%%DATADIR%%/data/data4-17.gdt
+%%DATADIR%%/data/data4-2.gdt
+%%DATADIR%%/data/data4-3.gdt
+%%DATADIR%%/data/data4-3a.gdt
+%%DATADIR%%/data/data4-4.gdt
+%%DATADIR%%/data/data4-5.gdt
+%%DATADIR%%/data/data4-6.gdt
+%%DATADIR%%/data/data4-7.gdt
+%%DATADIR%%/data/data4-8.gdt
+%%DATADIR%%/data/data4-9.gdt
+%%DATADIR%%/data/data6-1.gdt
+%%DATADIR%%/data/data6-2.gdt
+%%DATADIR%%/data/data6-3.gdt
+%%DATADIR%%/data/data6-4.gdt
+%%DATADIR%%/data/data6-5.gdt
+%%DATADIR%%/data/data6-6.gdt
+%%DATADIR%%/data/data7-1.gdt
+%%DATADIR%%/data/data7-10.gdt
+%%DATADIR%%/data/data7-11.gdt
+%%DATADIR%%/data/data7-12.gdt
+%%DATADIR%%/data/data7-13.gdt
+%%DATADIR%%/data/data7-14.gdt
+%%DATADIR%%/data/data7-15.gdt
+%%DATADIR%%/data/data7-16.gdt
+%%DATADIR%%/data/data7-17.gdt
+%%DATADIR%%/data/data7-18.gdt
+%%DATADIR%%/data/data7-19.gdt
+%%DATADIR%%/data/data7-2.gdt
+%%DATADIR%%/data/data7-20.gdt
+%%DATADIR%%/data/data7-21.gdt
+%%DATADIR%%/data/data7-22.gdt
+%%DATADIR%%/data/data7-23.gdt
+%%DATADIR%%/data/data7-24.gdt
+%%DATADIR%%/data/data7-26.gdt
+%%DATADIR%%/data/data7-3.gdt
+%%DATADIR%%/data/data7-4.gdt
+%%DATADIR%%/data/data7-5.gdt
+%%DATADIR%%/data/data7-6.gdt
+%%DATADIR%%/data/data7-7.gdt
+%%DATADIR%%/data/data7-8.gdt
+%%DATADIR%%/data/data7-9.gdt
+%%DATADIR%%/data/data8-1.gdt
+%%DATADIR%%/data/data8-2.gdt
+%%DATADIR%%/data/data8-3.gdt
+%%DATADIR%%/data/data9-1.gdt
+%%DATADIR%%/data/data9-10.gdt
+%%DATADIR%%/data/data9-11.gdt
+%%DATADIR%%/data/data9-12.gdt
+%%DATADIR%%/data/data9-13.gdt
+%%DATADIR%%/data/data9-2.gdt
+%%DATADIR%%/data/data9-3.gdt
+%%DATADIR%%/data/data9-4.gdt
+%%DATADIR%%/data/data9-5.gdt
+%%DATADIR%%/data/data9-6.gdt
+%%DATADIR%%/data/data9-7.gdt
+%%DATADIR%%/data/data9-8.gdt
+%%DATADIR%%/data/data9-9.gdt
+%%DATADIR%%/data/descriptions
+%%DATADIR%%/data/greene/greene10_3.gdt
+%%DATADIR%%/data/greene/greene11_3.gdt
+%%DATADIR%%/data/greene/greene12_1.gdt
+%%DATADIR%%/data/greene/greene13_1.gdt
+%%DATADIR%%/data/greene/greene14_1.gdt
+%%DATADIR%%/data/greene/greene18_1.gdt
+%%DATADIR%%/data/greene/greene18_2.gdt
+%%DATADIR%%/data/greene/greene19_1.gdt
+%%DATADIR%%/data/greene/greene5_1.gdt
+%%DATADIR%%/data/greene/greene7_8.gdt
+%%DATADIR%%/data/greene/greene8_3.gdt
+%%DATADIR%%/data/greene/greene9_1.gdt
+%%DATADIR%%/data/greene/wg_descriptions
+%%DATADIR%%/data/gretldata.dtd
+%%DATADIR%%/data/misc/arma.gdt
+%%DATADIR%%/data/misc/descriptions
+%%DATADIR%%/data/misc/ects_nls.gdt
+%%DATADIR%%/data/misc/hamilton.gdt
+%%DATADIR%%/data/misc/leverage.gdt
+%%DATADIR%%/data/misc/longley.gdt
+%%DATADIR%%/data/misc/sw_ch12.gdt
+%%DATADIR%%/data/misc/sw_ch14.gdt
+%%DATADIR%%/data/nist/Filip.dat
+%%DATADIR%%/data/nist/Longley.dat
+%%DATADIR%%/data/nist/NoInt1.dat
+%%DATADIR%%/data/nist/NoInt2.dat
+%%DATADIR%%/data/nist/Norris.dat
+%%DATADIR%%/data/nist/Pontius.dat
+%%DATADIR%%/data/nist/Wampler1.dat
+%%DATADIR%%/data/nist/Wampler2.dat
+%%DATADIR%%/data/nist/Wampler3.dat
+%%DATADIR%%/data/nist/Wampler4.dat
+%%DATADIR%%/data/nist/Wampler5.dat
+%%DATADIR%%/db/bcih.bin
+%%DATADIR%%/db/bcih.idx
+%%DATADIR%%/gretl-logo.xpm
+%%DATADIR%%/gretl.hlp
+%%DATADIR%%/gretl.stamp
+%%DATADIR%%/gretlcli.hlp
+%%DATADIR%%/scripts/greene11_3.inp
+%%DATADIR%%/scripts/greene12_1.inp
+%%DATADIR%%/scripts/greene14_1.inp
+%%DATADIR%%/scripts/greene14_2.inp
+%%DATADIR%%/scripts/greene18_6.inp
+%%DATADIR%%/scripts/greene19_1.inp
+%%DATADIR%%/scripts/greene7_8.inp
+%%DATADIR%%/scripts/greene8_3.inp
+%%DATADIR%%/scripts/greene9_1.inp
+%%DATADIR%%/scripts/greene9_3.inp
+%%DATADIR%%/scripts/misc/arma.inp
+%%DATADIR%%/scripts/misc/ects_nls.inp
+%%DATADIR%%/scripts/misc/leverage.inp
+%%DATADIR%%/scripts/misc/longley.inp
+%%DATADIR%%/scripts/misc/ps_descriptions
+%%DATADIR%%/scripts/misc/pscoin.inp
+%%DATADIR%%/scripts/misc/sw_ch12.inp
+%%DATADIR%%/scripts/misc/sw_ch14.inp
+%%DATADIR%%/scripts/ps10-1.inp
+%%DATADIR%%/scripts/ps10-10.inp
+%%DATADIR%%/scripts/ps10-11.inp
+%%DATADIR%%/scripts/ps10-2.inp
+%%DATADIR%%/scripts/ps10-3.inp
+%%DATADIR%%/scripts/ps10-4.inp
+%%DATADIR%%/scripts/ps10-5a.inp
+%%DATADIR%%/scripts/ps10-5b.inp
+%%DATADIR%%/scripts/ps10-6.inp
+%%DATADIR%%/scripts/ps10-7.inp
+%%DATADIR%%/scripts/ps10-8.inp
+%%DATADIR%%/scripts/ps10-9.inp
+%%DATADIR%%/scripts/ps11-1.inp
+%%DATADIR%%/scripts/ps11-2.inp
+%%DATADIR%%/scripts/ps11-3.inp
+%%DATADIR%%/scripts/ps12-1.inp
+%%DATADIR%%/scripts/ps13-1.inp
+%%DATADIR%%/scripts/ps2-1.inp
+%%DATADIR%%/scripts/ps2-2.inp
+%%DATADIR%%/scripts/ps2-3.inp
+%%DATADIR%%/scripts/ps3-1.inp
+%%DATADIR%%/scripts/ps3-2.inp
+%%DATADIR%%/scripts/ps3-3.inp
+%%DATADIR%%/scripts/ps3-4.inp
+%%DATADIR%%/scripts/ps3-5.inp
+%%DATADIR%%/scripts/ps3-6.inp
+%%DATADIR%%/scripts/ps4-1.inp
+%%DATADIR%%/scripts/ps4-2.inp
+%%DATADIR%%/scripts/ps4-3.inp
+%%DATADIR%%/scripts/ps4-4.inp
+%%DATADIR%%/scripts/ps4-5.inp
+%%DATADIR%%/scripts/ps5-1.inp
+%%DATADIR%%/scripts/ps5-2.inp
+%%DATADIR%%/scripts/ps5-3.inp
+%%DATADIR%%/scripts/ps5-4.inp
+%%DATADIR%%/scripts/ps5-5.inp
+%%DATADIR%%/scripts/ps6-1.inp
+%%DATADIR%%/scripts/ps6-10.inp
+%%DATADIR%%/scripts/ps6-11.inp
+%%DATADIR%%/scripts/ps6-12.inp
+%%DATADIR%%/scripts/ps6-2.inp
+%%DATADIR%%/scripts/ps6-3.inp
+%%DATADIR%%/scripts/ps6-4.inp
+%%DATADIR%%/scripts/ps6-5.inp
+%%DATADIR%%/scripts/ps6-6.inp
+%%DATADIR%%/scripts/ps6-7.inp
+%%DATADIR%%/scripts/ps6-8.inp
+%%DATADIR%%/scripts/ps6-9.inp
+%%DATADIR%%/scripts/ps7-1.inp
+%%DATADIR%%/scripts/ps7-2.inp
+%%DATADIR%%/scripts/ps7-3.inp
+%%DATADIR%%/scripts/ps7-4.inp
+%%DATADIR%%/scripts/ps7-5.inp
+%%DATADIR%%/scripts/ps7-6.inp
+%%DATADIR%%/scripts/ps7-7.inp
+%%DATADIR%%/scripts/ps8-1.inp
+%%DATADIR%%/scripts/ps8-2.inp
+%%DATADIR%%/scripts/ps8-3.inp
+%%DATADIR%%/scripts/ps8-4.inp
+%%DATADIR%%/scripts/ps8-5.inp
+%%DATADIR%%/scripts/ps8-6.inp
+%%DATADIR%%/scripts/ps8-7.inp
+%%DATADIR%%/scripts/ps8-8.inp
+%%DATADIR%%/scripts/ps9-1.inp
+%%DATADIR%%/scripts/ps9-10.inp
+%%DATADIR%%/scripts/ps9-2.inp
+%%DATADIR%%/scripts/ps9-3.inp
+%%DATADIR%%/scripts/ps9-4.inp
+%%DATADIR%%/scripts/ps9-5.inp
+%%DATADIR%%/scripts/ps9-6.inp
+%%DATADIR%%/scripts/ps9-7.inp
+%%DATADIR%%/scripts/ps9-8.inp
+%%DATADIR%%/scripts/ps9-9.inp
+%%DATADIR%%/scripts/ps_descriptions
+%%DATADIR%%/scripts/testinp
+%%DATADIR%%/scripts/wg_ps_descriptions
 %%GNOME:%%share/gnome/gtksourceview-1.0/language-specs/gnuplot.lang
 %%GNOME:%%share/gnome/gtksourceview-1.0/language-specs/gretl.lang
 %%GNOME:%%share/gnome/help/gretl/C/chapters/appendices.xml
@@ -305,6 +322,8 @@ libdata/pkgconfig/gretl.pc
 %%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/logistic1.png
+%%GNOME:%%share/gnome/help/gretl/C/figures/logistic2.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
@@ -330,17 +349,21 @@ libdata/pkgconfig/gretl.pc
 %%GNOME:%%share/gnome/pixmaps/gretl.png
 share/locale/es/LC_MESSAGES/gretl.mo
 share/locale/fr/LC_MESSAGES/gretl.mo
+share/locale/it/LC_MESSAGES/gretl.mo
 share/locale/ja/LC_MESSAGES/gretl.mo
 %%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 %%GRETLDATADIR%%/scripts
-@dirrm %%GRETLDATADIR%%/db
-@dirrm %%GRETLDATADIR%%/data/greene
-@dirrm %%GRETLDATADIR%%/data
-@dirrm %%GRETLDATADIR%%
+@dirrm %%DATADIR%%/scripts/misc
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/db
+@dirrm %%DATADIR%%/data/nist
+@dirrm %%DATADIR%%/data/misc
+@dirrm %%DATADIR%%/data/greene
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%
 @dirrm lib/gretl-gtk2
 @dirrm include/gretl
 %%GNOME:%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gretl