- Update to 1.7.5

PR:		124849
Submitted by:	Ports Fury

11 files changed, 89 insertions, 195 deletions

diff --git a/math/gretl/Makefile b/math/gretl/Makefile
index 5ef1068d9cb8..9154b2843a9c 100644
--- a/math/gretl/Makefile
+++ b/math/gretl/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gretl
-PORTVERSION=	1.7.4
-PORTREVISION=	1
+PORTVERSION=	1.7.5
 CATEGORIES=	math finance
 MASTER_SITES=	SF
 
@@ -47,7 +46,7 @@ BROKEN=		math/lapack appears to be broken on alpha
 
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 PKGNAMESUFFIX=	-gnome
-USE_GNOME+=	gnomeprefix gtksourceview libgnomeui
+USE_GNOME+=	gnomeprefix gtksourceview2 libgnomeui
 .else
 CONFIGURE_ARGS+=	--without-gnome --without-gtksourceview
 .endif
diff --git a/math/gretl/distinfo b/math/gretl/distinfo
index ee559c5aed99..feff81e24a8e 100644
--- a/math/gretl/distinfo
+++ b/math/gretl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gretl-1.7.4.tar.bz2) = 263f52d5015b29ec91aa28f36cb54ba9
-SHA256 (gretl-1.7.4.tar.bz2) = 09de2f523fc733559806387b2cd400ccec331f55bc44f242fa631573a75531bf
-SIZE (gretl-1.7.4.tar.bz2) = 4863597
+MD5 (gretl-1.7.5.tar.bz2) = 4a42c68c8a12e8837c0f93cab2a2cbf7
+SHA256 (gretl-1.7.5.tar.bz2) = 5d5984d8d775c8c261c0bf72d4a62d43de7d5e7ad8d69dd5cc1b0c928ba70919
+SIZE (gretl-1.7.5.tar.bz2) = 4990216
diff --git a/math/gretl/files/patch-cli::Makefile.in b/math/gretl/files/patch-cli::Makefile.in
index 0d5ed3166a53..1a3143da96e4 100644
--- a/math/gretl/files/patch-cli::Makefile.in
+++ b/math/gretl/files/patch-cli::Makefile.in
@@ -1,13 +1,6 @@
---- cli/Makefile.in.orig	Sat Sep 11 01:19:35 2004
-+++ cli/Makefile.in	Sun Oct  8 02:07:02 2006
-@@ -9,12 +9,16 @@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- 
- have_readline = @have_readline@
+--- cli/Makefile.in.orig	2008-03-24 21:46:11.000000000 +0900
++++ cli/Makefile.in	2008-06-18 16:22:11.000000000 +0900
+@@ -16,6 +16,10 @@
  READLINE_LIBS = @READLINE_LIBS@
  READLINE_CFLAGS = @READLINE_CFLAGS@
  
@@ -18,7 +11,7 @@
  ifeq ($(CC),)
    CC = gcc
  endif
-@@ -40,17 +44,17 @@
+@@ -41,17 +45,17 @@
  
  DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
  
diff --git a/math/gretl/files/patch-gnome::Makefile.in b/math/gretl/files/patch-gnome::Makefile.in
deleted file mode 100644
index 8c1ad3d1db3c..000000000000
--- a/math/gretl/files/patch-gnome::Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
---- gnome/Makefile.in.orig	Sat Dec 23 00:26:03 2006
-+++ gnome/Makefile.in	Sun Mar 25 02:18:02 2007
-@@ -5,12 +5,10 @@
- 
- INSTALL = @INSTALL@
- prefix = @prefix@
--gnome_prefix = @gnome_prefix@
-+datadir = @datadir@
- have_gnome = @have_gnome@
- 
--ifeq ($(gnome_prefix),NA)
--  gnome_prefix = $(prefix)
--endif
-+sysconfdir = @sysconfdir@
- 
- GCONFTOOL = @GCONFTOOL@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-@@ -26,10 +24,10 @@
-   schemadir = $(GCONF_SCHEMA_FILE_DIR)
- endif
- 
--desktopdir = $(gnome_prefix)/share/applications
--mimedir = $(gnome_prefix)/share/mime-info
--gpixmaps = $(gnome_prefix)/share/pixmaps
--schemadir = $(gnome_prefix)/etc/gconf/schemas
-+desktopdir = $(datadir)/applications
-+mimedir = $(datadir)/mime-info
-+gpixmaps = $(datadir)/pixmaps
-+schemadir = $(sysconfdir)/gconf/schemas
- 
- install: install-images install-misc $(install_schemas)
- 
diff --git a/math/gretl/files/patch-gui2::Makefile.in b/math/gretl/files/patch-gui2::Makefile.in
index cfa69970d671..33b1a23e6564 100644
--- a/math/gretl/files/patch-gui2::Makefile.in
+++ b/math/gretl/files/patch-gui2::Makefile.in
@@ -1,58 +1,6 @@
---- gui2/Makefile.in.orig	2008-02-07 10:22:01.000000000 +0900
-+++ gui2/Makefile.in	2008-02-29 03:05:18.000000000 +0900
-@@ -5,6 +5,7 @@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
- libdir = @libdir@
-+datadir = @datadir@
- CC = @CC@
- CFLAGS = @CFLAGS@
- MAKE = @MAKE@
-@@ -49,7 +50,7 @@
- 
- 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
- 
-@@ -58,7 +59,7 @@
-     GTKSOURCEVIEW_CFLAGS = -I$(topsrc)/gui2
-     GTKSOURCEVIEW_LIBS = -L./gtksourceview -lgtksourceview-lite
-     MY_SOURCEVIEW_LIB = gtksourceview/libgtksourceview-lite.a
--    langdir = $(prefix)/share/gretl/gtksourceview
-+    langdir = $(datadir)/gretl/gtksourceview
-     query_install_lang = install-lang
-   endif
- endif
-@@ -68,14 +69,14 @@
- 	../lib/libgretl-1.0.la
-   GUI_CFLAGS = $(GNOME_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(GTK_EXTRA_CFLAGS)
-   query_install_gnome = install-gnome
--  GNOMEDEF = -DDATADIR=\"$(gnome_prefix)/share\"
-+  GNOMEDEF = -DDATADIR=\"$(datadir)\"
- else
-   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@
--  localedir = $(datadir)/locale
-+  localedir = $(prefix)/share/locale
-   NLSDEF = -DLOCALEDIR=\"$(localedir)\"
- endif
- 
-@@ -87,7 +88,7 @@
- 
- # Directories
- bindir	= $(prefix)/bin
--gretldir = $(prefix)/share/gretl
-+gretldir = $(datadir)/gretl
- tooldir = $(topsrc)/tools
- libsrc = $(topsrc)/lib/src
- clisrc = $(topsrc)/cli
-@@ -96,7 +97,7 @@
+--- gui2/Makefile.in.orig	2008-05-25 01:52:30.000000000 +0900
++++ gui2/Makefile.in	2008-06-18 13:53:40.000000000 +0900
+@@ -109,7 +110,7 @@
  #### End of system configuration section. ####
  
  SHELL = /bin/sh
@@ -61,10 +9,10 @@
  PROG  = gretl_x11
  
  vpath %.c $(topsrc)/gui2
-@@ -155,13 +156,13 @@
+@@ -168,13 +169,13 @@
  	$(CC) $(CFLAGS) -MM $< > .deps/$*.d 
  
- $(PROG): .deps $(OBJS) $(HACK_OBJ) $(GTKEXTRA_LITE) $(MY_SOURCEVIEW_LIB) 
+ $(PROG): .deps $(OBJS) $(HACK_OBJ) $(GTKEXTRA_LITE) $(GTKSOURCEVIEW_LITE) 
 -	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB) $(CARBONLIB)
 +	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB) $(CARBONLIB)
  
@@ -77,25 +25,25 @@
  
  mklang.o: mklang.c $(topsrc)/lib/src/options.c $(topsrc)/lib/src/genlex.c
  	$(CC) -c -I.. -I$(libsrc) $(XML_CFLAGS) $<
-@@ -170,10 +171,10 @@
- 	./mklang > $@
+@@ -183,10 +184,10 @@
+ 	./mklang $(LANGOPT) > $@
  
  $(GTKEXTRA_LITE): 
 -	make -C gtkextra-lite
 +	$(MAKE) -C gtkextra-lite
  
- gtksourceview/libgtksourceview-lite.a:
+ $(GTKSOURCEVIEW_LITE):
 -	make -C gtksourceview
 +	$(MAKE) -C gtksourceview
  
  .deps:
  	mkdir $@
-@@ -188,7 +189,7 @@
- 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
+@@ -201,7 +202,7 @@
+ 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s $(PROG) $(DESTDIR)$(bindir)/$(PROG)
  
  install-data: installdirs
--	$(INSTALL_PROGRAM) ../gretl_sh $(bindir)/gretl
-+	$(INSTALL_SCRIPT) ../gretl_sh $(bindir)/gretl
- 	$(INSTALL_DATA) $(topsrc)/pixmaps/gretl-logo.xpm $(gretldir)
- 	$(INSTALL_DATA) $(topsrc)/COPYING $(gretldir)
+-	$(INSTALL_PROGRAM) ../gretl_sh $(DESTDIR)$(bindir)/gretl
++	$(INSTALL_SCRIPT) ../gretl_sh $(DESTDIR)$(bindir)/gretl
+ 	$(INSTALL_DATA) $(topsrc)/pixmaps/gretl-logo.xpm $(DESTDIR)$(gretldir)
+ 	$(INSTALL_DATA) $(topsrc)/COPYING $(DESTDIR)$(gretldir)
  
diff --git a/math/gretl/files/patch-lib::Makefile.in b/math/gretl/files/patch-lib::Makefile.in
index f193e4b1000f..ec3a4552aa81 100644
--- a/math/gretl/files/patch-lib::Makefile.in
+++ b/math/gretl/files/patch-lib::Makefile.in
@@ -1,27 +1,26 @@
---- lib/Makefile.in.orig	Mon Apr 16 10:13:11 2007
-+++ lib/Makefile.in	Mon May 21 16:10:51 2007
-@@ -25,6 +25,11 @@
+--- lib/Makefile.in.orig	2008-05-25 10:40:28.000000000 +0900
++++ lib/Makefile.in	2008-06-18 16:15:55.000000000 +0900
+@@ -25,6 +25,10 @@
  
  have_gtk = @have_gtk@
  
-+datadir = @datadir@
-+CPPFLAGS = @CPPFLAGS@ -DDATADIR=\"$(datadir)\"
++CPPFLAGS = @CPPFLAGS@
 +LDFLAGS = @LDFLAGS@
 +INTL_LIBS = @LTLIBINTL@
 +
  ifeq ($(INSTALL_PROGRAM),)
    INSTALL_PROGRAM = $(INSTALL) -m 755
  endif
-@@ -39,7 +44,7 @@
+@@ -39,7 +43,7 @@
  libdir = $(prefix)/lib
  includedir = $(prefix)/include/gretl
  aclocaldir = $(prefix)/share/aclocal
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  
- INSTALLDIRS = $(libdir) $(includedir) $(aclocaldir)
+ INSTALLDIRS = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(aclocaldir)
  
-@@ -55,8 +60,8 @@
+@@ -55,8 +59,8 @@
  
  # hard-coded -L/usr/local/lib is a bodge!!
  
@@ -32,7 +31,7 @@
  
  #### End of system configuration section. ####
  
-@@ -204,10 +209,10 @@
+@@ -215,10 +219,10 @@
  LOBJS = $(SRCS:.c=.lo)
  AUX_LOBJ = $(CEPHES_SRC:.c=.lo) $(MINPACK_SRC:.c=.lo)
  
@@ -45,7 +44,7 @@
  
  COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) 
  
-@@ -216,7 +221,7 @@
+@@ -227,7 +231,7 @@
  	$(CC) $(CFLAGS) -MM -MT $*.lo $< > .deps/$*.d
  
  $(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
diff --git a/math/gretl/files/patch-lib::src::gretl_paths.c b/math/gretl/files/patch-lib::src::gretl_paths.c
deleted file mode 100644
index 12770b080297..000000000000
--- a/math/gretl/files/patch-lib::src::gretl_paths.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/src/gretl_paths.c.orig	Wed Feb 11 06:14:36 2004
-+++ lib/src/gretl_paths.c	Sun Feb 29 18:10:53 2004
-@@ -432,8 +432,8 @@
- 	if (home != NULL) {
- 	    strcpy(ppaths->gretldir, home);
- 	} else {
--	    strcpy(ppaths->gretldir, GRETL_PREFIX);
--	    strcat(ppaths->gretldir, "/share/gretl/");
-+	    strcpy(ppaths->gretldir, DATADIR);
-+	    strcat(ppaths->gretldir, "/gretl/");
- 	} 
- 
- 	sprintf(ppaths->binbase, "%sdb/", ppaths->gretldir);
diff --git a/math/gretl/files/patch-plugin::Makefile.in b/math/gretl/files/patch-plugin::Makefile.in
index ee99f0eaee70..56252cb48e43 100644
--- a/math/gretl/files/patch-plugin::Makefile.in
+++ b/math/gretl/files/patch-plugin::Makefile.in
@@ -1,6 +1,6 @@
---- plugin/Makefile.in.orig	Tue Sep 12 22:53:16 2006
-+++ plugin/Makefile.in	Sun Oct  8 02:08:19 2006
-@@ -8,6 +8,10 @@
+--- plugin/Makefile.in.orig	2008-05-27 01:47:52.000000000 +0900
++++ plugin/Makefile.in	2008-06-18 13:56:53.000000000 +0900
+@@ -11,6 +11,10 @@
  INSTALL = @INSTALL@
  LN = @LN_S@
  
@@ -9,8 +9,8 @@
 +INTL_LIBS = @LTLIBINTL@
 +
  build_gui = @build_gui@
- have_gtk = @have_gtk@
  have_gmp = @have_gmp@
+ build_mailer = @build_mailer@
 @@ -45,7 +49,7 @@
  
  override CFLAGS += -I.. -I$(topsrc)/gui2 -DHAVE_CONFIG_H
@@ -20,27 +20,28 @@
  COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) 
  LINK = $(LIBTOOL) --mode=link $(CC) -module -avoid-version -rpath $(plugindir)
  
-@@ -163,7 +167,7 @@
- URCDATA = $(topsrc)/plugin/data/urcdata.gz
+@@ -175,7 +179,7 @@
  
  override CFLAGS += $(GRETLINC) $(GTK_CFLAGS) $(GMP_CFLAGS) $(MPFR_CFLAGS) \
--	$(XML_CFLAGS) $(GRETL_LIBOLE2_CFLAGS) $(ZIP_CFLAGS) $(AUDIO_CFLAGS) -I. $(GMPDEF)
-+	$(XML_CFLAGS) $(GRETL_LIBOLE2_CFLAGS) $(ZIP_CFLAGS) $(AUDIO_CFLAGS) -I. $(GMPDEF) $(CPPFLAGS)
+ 	$(XML_CFLAGS) $(GRETL_LIBOLE2_CFLAGS) $(ZIP_CFLAGS) $(AUDIO_CFLAGS) \
+-	$(ODBC_CFLAGS) -I. $(GMPDEF)
++	$(ODBC_CFLAGS) -I. $(GMPDEF) $(CPPFLAGS)
  
  %.lo: %.c
  	$(COMPILE) $< 
-@@ -266,12 +270,12 @@
+@@ -296,13 +300,13 @@
  .PHONY: 
  
- install: $(GRETLLIB) $(PLUGINS) $(URCDATA) installdirs 
+ install: $(GRETLLIB) $(PLUGINS) $(URCDATA) $(DWDATA) installdirs 
 -	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
 +	$(LIBTOOL) --mode=install $(INSTALL_DATA) \
- 	$(PLUGINS) $(plugindir)
- 	$(INSTALL_DATA) $(URCDATA) $(plugindir)/data
+ 	$(PLUGINS) $(DESTDIR)$(plugindir)
+ 	$(INSTALL_DATA) $(URCDATA) $(DESTDIR)$(plugindir)/data
+ 	$(INSTALL_DATA) $(DWDATA) $(DESTDIR)$(plugindir)/data
  
  install-strip: $(GRETLLIB) $(PLUGINS) installdirs
 -	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s \
 +	$(LIBTOOL) --mode=install $(INSTALL_DATA) -s \
- 	$(PLUGINS) $(plugindir)
+ 	$(PLUGINS) $(DESTDIR)$(plugindir)
  
  installdirs:
diff --git a/math/gretl/files/patch-share::Makefile.in b/math/gretl/files/patch-share::Makefile.in
index 11843ac34ac7..2b9c948d41f4 100644
--- a/math/gretl/files/patch-share::Makefile.in
+++ b/math/gretl/files/patch-share::Makefile.in
@@ -1,16 +1,6 @@
---- share/Makefile.in.orig	2008-02-26 11:46:06.000000000 +0900
-+++ share/Makefile.in	2008-02-29 03:15:31.000000000 +0900
-@@ -2,15 +2,16 @@
- datarootdir = @datarootdir@
- 
- prefix = @prefix@
-+datadir = @datadir@
- have_gtk = @have_gtk@
- build_docs = @build_docs@
- 
--gretldir = $(prefix)/share/gretl
-+gretldir = $(datadir)/gretl
- tooldir = $(topsrc)/tools
+--- share/Makefile.in.orig	2008-03-24 21:48:13.000000000 +0900
++++ share/Makefile.in	2008-06-18 16:11:18.000000000 +0900
+@@ -10,7 +10,7 @@
  sharesrc = $(topsrc)/share
  pdfdir = ../doc/tex
  
@@ -19,7 +9,7 @@
  
  EN_GUI_HLP = $(sharesrc)/gretlgui.hlp
  EN_CMD_HLP = $(sharesrc)/gretlcmd.hlp
-@@ -55,14 +56,14 @@
+@@ -55,14 +55,14 @@
  all: $(query_make_help)
  
  help:
@@ -30,36 +20,36 @@
  
  install: installdirs install_datafiles install_scripts install_functions \
  	install_help install_fonts $(query_install_help)
- 	$(INSTALL_DATA) $(sharesrc)/gretl.stamp $(gretldir)/gretl.stamp
+ 	$(INSTALL_DATA) $(sharesrc)/gretl.stamp $(DESTDIR)$(gretldir)/gretl.stamp
 -	make -C bcih install
 +	$(MAKE) -C bcih install
  
  install-strip: install
  
-@@ -88,12 +89,12 @@
- 	$(INSTALL_DATA) $(sharesrc)/functions/gretlfunc.dtd $(gretldir)/functions 
+@@ -88,12 +88,12 @@
+ 	$(INSTALL_DATA) $(sharesrc)/functions/gretlfunc.dtd $(DESTDIR)$(gretldir)/functions 
  
  install_man: gretl.1
--	$(tooldir)/mkinstalldirs $(prefix)/share/man/man1
--	$(INSTALL_DATA) $(topsrc)/gretl.1 $(prefix)/share/man/man1
-+	$(tooldir)/mkinstalldirs $(prefix)/man/man1
-+	$(INSTALL_DATA) $(topsrc)/gretl.1 $(prefix)/man/man1
+-	$(tooldir)/mkinstalldirs $(DESTDIR)$(prefix)/share/man/man1
+-	$(INSTALL_DATA) $(topsrc)/gretl.1 $(DESTDIR)$(prefix)/share/man/man1
++	$(tooldir)/mkinstalldirs $(DESTDIR)$(prefix)/man/man1
++	$(INSTALL_DATA) $(topsrc)/gretl.1 $(DESTDIR)$(prefix)/man/man1
  
  install_help: $(query_make_help)
- 	$(tooldir)/mkinstalldirs $(gretldir)
--	$(tooldir)/mkinstalldirs $(gretldir)/doc
-+#	$(tooldir)/mkinstalldirs $(gretldir)/doc
- 	$(tooldir)/mkinstalldirs $(gretldir)/helpfigs
- 	$(INSTALL_DATA) $(EN_GUI_HLP) $(gretldir)/gretlgui.hlp
- 	$(INSTALL_DATA) $(EN_CMD_HLP) $(gretldir)/gretlcmd.hlp
-@@ -110,8 +111,8 @@
- 	$(INSTALL_DATA) $(IT_GUI_GENHLP) $(gretldir)/genrgui.hlp.it
+ 	$(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir)
+-	$(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir)/doc
++#	$(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir)/doc
+ 	$(tooldir)/mkinstalldirs $(DESTDIR)$(gretldir)/helpfigs
+ 	$(INSTALL_DATA) $(EN_GUI_HLP) $(DESTDIR)$(gretldir)/gretlgui.hlp
+ 	$(INSTALL_DATA) $(EN_CMD_HLP) $(DESTDIR)$(gretldir)/gretlcmd.hlp
+@@ -110,8 +110,8 @@
+ 	$(INSTALL_DATA) $(IT_GUI_GENHLP) $(DESTDIR)$(gretldir)/genrgui.hlp.it
  	for f in $(sharesrc)/texfigs/*.png ; do \
  	$(INSTALL_DATA) $$f $(gretldir)/helpfigs ; done
 -	for f in $(pdfdir)/gretl-ref.pdf $(pdfdir)/gretl-guide.pdf ; do \
--	if test -f $$f ; then $(INSTALL_DATA) $$f $(gretldir)/doc ; fi ; done
+-	if test -f $$f ; then $(INSTALL_DATA) $$f $(DESTDIR)$(gretldir)/doc ; fi ; done
 +#	for f in $(pdfdir)/gretl-ref.pdf $(pdfdir)/gretl-guide.pdf ; do \
-+#	if test -f $$f ; then $(INSTALL_DATA) $$f $(gretldir)/doc ; fi ; done
++#	if test -f $$f ; then $(INSTALL_DATA) $$f $(DESTDIR)$(gretldir)/doc ; fi ; done
  
  install_fonts:
  	for f in $(sharesrc)/fonts/*.ttf ; do \
diff --git a/math/gretl/files/patch-share::bcih::Makefile.in b/math/gretl/files/patch-share::bcih::Makefile.in
index 0be68fd9f6f1..c1fb7973c814 100644
--- a/math/gretl/files/patch-share::bcih::Makefile.in
+++ b/math/gretl/files/patch-share::bcih::Makefile.in
@@ -1,14 +1,11 @@
---- share/bcih/Makefile.in.orig	Sat Apr 26 04:32:37 2003
-+++ share/bcih/Makefile.in	Sun May  4 03:16:24 2003
-@@ -4,7 +4,10 @@
- INSTALL_DATA = cp -fp
+--- share/bcih/Makefile.in.orig	2008-03-24 21:48:14.000000000 +0900
++++ share/bcih/Makefile.in	2008-06-18 16:13:23.000000000 +0900
+@@ -1,7 +1,7 @@
+ topsrc = @top_srcdir@
  
- prefix = @prefix@
--gretldir = $(prefix)/share/gretl
-+datadir = @datadir@
-+gretldir = $(datadir)/gretl
+ CC = @CC@
+-INSTALL_DATA = cp -fp
 +INSTALL_DATA = @INSTALL_DATA@
-+
- VPATH = $(topsrc)/share/bcih
  
- bcih.bin: mkbin bcih.dat
+ prefix = @prefix@
+ gretldir = $(prefix)/share/gretl
diff --git a/math/gretl/pkg-plist b/math/gretl/pkg-plist
index aed89369da21..dd646c2878a5 100644
--- a/math/gretl/pkg-plist
+++ b/math/gretl/pkg-plist
@@ -20,7 +20,9 @@ include/gretl/genmain.h
 include/gretl/graphing.h
 include/gretl/gretl_commands.h
 include/gretl/gretl_errors.h
+include/gretl/gretl_f2c.h
 include/gretl/gretl_fft.h
+include/gretl/gretl_foreign.h
 include/gretl/gretl_func.h
 include/gretl/gretl_intl.h
 include/gretl/gretl_list.h
@@ -75,6 +77,7 @@ lib/gretl-gtk2/arma.so
 lib/gretl-gtk2/arma_x12.a
 lib/gretl-gtk2/arma_x12.la
 lib/gretl-gtk2/arma_x12.so
+lib/gretl-gtk2/data/dwdata.gz
 lib/gretl-gtk2/data/urcdata.gz
 lib/gretl-gtk2/eviews_import.a
 lib/gretl-gtk2/eviews_import.la
@@ -136,6 +139,9 @@ lib/gretl-gtk2/poisson.so
 lib/gretl-gtk2/progress_bar.a
 lib/gretl-gtk2/progress_bar.la
 lib/gretl-gtk2/progress_bar.so
+lib/gretl-gtk2/quantreg.a
+lib/gretl-gtk2/quantreg.la
+lib/gretl-gtk2/quantreg.so
 lib/gretl-gtk2/range-mean.a
 lib/gretl-gtk2/range-mean.la
 lib/gretl-gtk2/range-mean.so
@@ -285,10 +291,12 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/data/misc/b-g.gdt
 %%DATADIR%%/data/misc/bjg.gdt
 %%DATADIR%%/data/misc/broiler.gdt
+%%DATADIR%%/data/misc/credscore.gdt
 %%DATADIR%%/data/misc/denmark.gdt
 %%DATADIR%%/data/misc/descriptions
 %%DATADIR%%/data/misc/djclose.gdt
 %%DATADIR%%/data/misc/ects_nls.gdt
+%%DATADIR%%/data/misc/engel.gdt
 %%DATADIR%%/data/misc/hall.gdt
 %%DATADIR%%/data/misc/hamilton.gdt
 %%DATADIR%%/data/misc/hendry_jae.gdt
@@ -342,6 +350,7 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/gretlgui.hlp
 %%DATADIR%%/gretlgui.hlp.es
 %%DATADIR%%/gretlgui.hlp.it
+%%NOGNOME:%%%%DATADIR%%/gtksourceview/R.lang
 %%NOGNOME:%%%%DATADIR%%/gtksourceview/gnuplot.lang
 %%NOGNOME:%%%%DATADIR%%/gtksourceview/gretl.lang
 %%DATADIR%%/helpfigs/Gamma.png
@@ -393,11 +402,13 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/scripts/misc/bjg.inp
 %%DATADIR%%/scripts/misc/camtriv.inp
 %%DATADIR%%/scripts/misc/convolve.inp
+%%DATADIR%%/scripts/misc/credscore.inp
 %%DATADIR%%/scripts/misc/denmark.inp
 %%DATADIR%%/scripts/misc/ects_nls.inp
 %%DATADIR%%/scripts/misc/garch.inp
 %%DATADIR%%/scripts/misc/hall_cbapm.inp
 %%DATADIR%%/scripts/misc/hamilton.inp
+%%DATADIR%%/scripts/misc/heckit.inp
 %%DATADIR%%/scripts/misc/jgm-1996.inp
 %%DATADIR%%/scripts/misc/keane.inp
 %%DATADIR%%/scripts/misc/klein.inp
@@ -405,6 +416,7 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/scripts/misc/leverage.inp
 %%DATADIR%%/scripts/misc/longley.inp
 %%DATADIR%%/scripts/misc/mrw.inp
+%%DATADIR%%/scripts/misc/mrw_qr.inp
 %%DATADIR%%/scripts/misc/ooballot.inp
 %%DATADIR%%/scripts/misc/oprobit.inp
 %%DATADIR%%/scripts/misc/penngrow.inp
@@ -491,8 +503,8 @@ libdata/pkgconfig/gretl.pc
 %%DATADIR%%/scripts/ps_descriptions
 %%DATADIR%%/scripts/testinp
 %%DATADIR%%/scripts/wg_ps_descriptions
-%%GNOME:%%share/gtksourceview-1.0/language-specs/gnuplot.lang
-%%GNOME:%%share/gtksourceview-1.0/language-specs/gretl.lang
+%%GNOME:%%share/gtksourceview-2.0/language-specs/gnuplot.lang
+%%GNOME:%%share/gtksourceview-2.0/language-specs/gretl.lang
 share/locale/de/LC_MESSAGES/gretl.mo
 share/locale/es/LC_MESSAGES/gretl.mo
 share/locale/eu/LC_MESSAGES/gretl.mo