- Update to version 1.6.0.

PR:		ports/104175
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

7 files changed, 98 insertions, 64 deletions

diff --git a/math/gretl/files/patch-cli::Makefile.in b/math/gretl/files/patch-cli::Makefile.in
index 67f5a701a191..0d5ed3166a53 100644
--- a/math/gretl/files/patch-cli::Makefile.in
+++ b/math/gretl/files/patch-cli::Makefile.in
@@ -1,5 +1,5 @@
---- cli/Makefile.in.orig	Fri Sep 10 22:16:11 2004
-+++ cli/Makefile.in	Sun Jan 15 14:18:39 2006
+--- 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@
@@ -18,7 +18,7 @@
  ifeq ($(CC),)
    CC = gcc
  endif
-@@ -40,7 +44,7 @@
+@@ -40,17 +44,17 @@
  
  DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
  
@@ -26,8 +26,11 @@
 +override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(READLINE_CFLAGS) $(DEFS) $(CPPFLAGS)
  
  CLI = gretlcli
- LIBTOOL = ../libtool
-@@ -50,7 +54,7 @@
+-LIBTOOL = ../libtool
++LIBTOOL = @LIBTOOL@
+ 
+ %.o: %.c
+ 	$(CC) -c $(CFLAGS) $<
  	$(CC) $(CFLAGS) -MM $< > .deps/$*.d 
  
  $(CLI): .deps $(OBJS)
diff --git a/math/gretl/files/patch-gui2::Makefile.in b/math/gretl/files/patch-gui2::Makefile.in
index c327571c73af..f5844dd3e5eb 100644
--- a/math/gretl/files/patch-gui2::Makefile.in
+++ b/math/gretl/files/patch-gui2::Makefile.in
@@ -1,5 +1,5 @@
---- gui2/Makefile.in.orig	Mon Nov 21 23:02:28 2005
-+++ gui2/Makefile.in	Sun Jan 15 14:51:18 2006
+--- gui2/Makefile.in.orig	Thu Jul 27 04:51:05 2006
++++ gui2/Makefile.in	Sun Oct  8 02:07:29 2006
 @@ -4,6 +4,7 @@
  exec_prefix = @exec_prefix@
  bindir = @bindir@
@@ -8,7 +8,7 @@
  CC = @CC@
  CFLAGS = @CFLAGS@
  MAKE = @MAKE@
-@@ -47,7 +48,7 @@
+@@ -50,7 +51,7 @@
  
  ifeq ($(have_gtksourceview),yes)
    langbase := $(shell pkg-config --variable=prefix gtksourceview-1.0)
@@ -17,7 +17,7 @@
    query_install_lang = install-lang
  endif
  
-@@ -56,7 +57,7 @@
+@@ -59,7 +60,7 @@
      GTKSOURCEVIEW_CFLAGS = -I$(topsrc)/gui2
      GTKSOURCEVIEW_LIBS = -L./gtksourceview -lgtksourceview-lite
      MY_SOURCEVIEW_LIB = gtksourceview/libgtksourceview-lite.a
@@ -26,7 +26,7 @@
      query_install_lang = install-lang
    endif
  endif
-@@ -66,14 +67,14 @@
+@@ -69,14 +70,14 @@
  	../lib/libgretl-1.0.la
    GUI_CFLAGS = $(GNOME_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(GTK_EXTRA_CFLAGS)
    query_install_gnome = install-gnome
@@ -43,7 +43,7 @@
    NLSDEF = -DLOCALEDIR=\"$(localedir)\"
  endif
  
-@@ -85,7 +86,7 @@
+@@ -88,7 +89,7 @@
  
  # Directories
  bindir	= $(prefix)/bin
@@ -52,20 +52,29 @@
  tooldir = $(topsrc)/tools
  libsrc = $(topsrc)/lib/src
  clisrc = $(topsrc)/cli
-@@ -149,23 +150,23 @@
+@@ -97,7 +98,7 @@
+ #### End of system configuration section. ####
+ 
+ SHELL = /bin/sh
+-LIBTOOL = ../libtool
++LIBTOOL = @LIBTOOL@
+ PROG  = gretl_x11
+ 
+ vpath %.c $(topsrc)/gui2
+@@ -156,23 +157,23 @@
  	$(CC) $(CFLAGS) -MM $< > .deps/$*.d 
  
  $(PROG): .deps $(OBJS) $(HACK_OBJ) $(GTKEXTRA_LITE) $(MY_SOURCEVIEW_LIB)
--	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB)
+-	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB) $(CARBONLIB)
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(HACK_OBJ) $(LIBS) $(INETLIB) $(CARBONLIB)
  
  $(HACK_OBJ): $(HACK_SRC) $(HACK_HDR)
  	$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
  
  mklang: mklang.c
- 	$(CC) -c -I.. -I$(libsrc) $<
--	$(LIBTOOL) --mode=link $(CC) -o $@ mklang.o ../lib/libgretl-1.0.la
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ mklang.o ../lib/libgretl-1.0.la
+ 	$(CC) -c -I.. -I$(libsrc) $(XML_CFLAGS) $<
+-	$(LIBTOOL) --mode=link $(CC) -o $@ mklang.o ../lib/libgretl-1.0.la $(XML_LIBS)
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ mklang.o ../lib/libgretl-1.0.la $(XML_LIBS)
  
  gretl.lang: mklang
  	./mklang > $@
@@ -80,7 +89,7 @@
  
  .deps:
  	mkdir $@
-@@ -180,7 +181,7 @@
+@@ -187,7 +188,7 @@
  	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s $(PROG) $(bindir)/$(PROG)
  
  install-data: installdirs
diff --git a/math/gretl/files/patch-lib::Makefile.in b/math/gretl/files/patch-lib::Makefile.in
index bde274933e66..01d5373abae3 100644
--- a/math/gretl/files/patch-lib::Makefile.in
+++ b/math/gretl/files/patch-lib::Makefile.in
@@ -1,5 +1,5 @@
---- lib/Makefile.in.orig	Thu Dec  8 00:25:48 2005
-+++ lib/Makefile.in	Sun Jan 15 14:54:18 2006
+--- lib/Makefile.in.orig	Tue May 23 18:27:51 2006
++++ lib/Makefile.in	Sun Oct  8 02:07:54 2006
 @@ -22,6 +22,11 @@
  
  have_gtk = @have_gtk@
@@ -32,8 +32,12 @@
  
  #### End of system configuration section. ####
  
-@@ -186,7 +191,7 @@
- LIBTOOL = ../libtool
+@@ -187,10 +192,10 @@
+ LOBJS = $(SRCS:.c=.lo)
+ AUX_LOBJ = $(CEPHES_SRC:.c=.lo) $(MINPACK_SRC:.c=.lo)
+ 
+-LIBTOOL = ../libtool
++LIBTOOL = @LIBTOOL@
  
  override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(XML_CFLAGS) $(GLIB_CFLAGS) \
 -	$(GMP_CFLAGS) -DHAVE_CONFIG_H
@@ -41,7 +45,7 @@
  
  COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) 
  
-@@ -195,7 +200,7 @@
+@@ -199,7 +204,7 @@
  	$(CC) $(CFLAGS) -MM -MT $*.lo $< > .deps/$*.d
  
  $(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
diff --git a/math/gretl/files/patch-lib__src__printout.c b/math/gretl/files/patch-lib__src__printout.c
new file mode 100644
index 000000000000..c36f49ff7faf
--- /dev/null
+++ b/math/gretl/files/patch-lib__src__printout.c
@@ -0,0 +1,16 @@
+--- lib/src/printout.c.orig	Fri Sep  8 02:15:00 2006
++++ lib/src/printout.c	Sun Oct  8 01:52:29 2006
+@@ -400,11 +400,11 @@
+ void print_xtab (const Xtab *tab, gretlopt opt, PRN *prn)
+ {
+     int i, j, r, c;
+-    r = tab->rows;
+-    c = tab->cols;
+     double x, y;
+     int n5 = 0;
+     double pearson = 0.0;
++    r = tab->rows;
++    c = tab->cols;
+ 
+     pputc(prn, '\n');
+     pprintf(prn, _("Cross-tabulation of %s (rows) against %s (columns)"),
diff --git a/math/gretl/files/patch-plugin::Makefile.in b/math/gretl/files/patch-plugin::Makefile.in
index 583ba44c4101..ee99f0eaee70 100644
--- a/math/gretl/files/patch-plugin::Makefile.in
+++ b/math/gretl/files/patch-plugin::Makefile.in
@@ -1,5 +1,5 @@
---- plugin/Makefile.in.orig	Sun May 22 12:11:20 2005
-+++ plugin/Makefile.in	Wed Jul  6 02:05:05 2005
+--- 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 @@
  INSTALL = @INSTALL@
  LN = @LN_S@
@@ -11,16 +11,25 @@
  build_gui = @build_gui@
  have_gtk = @have_gtk@
  have_gmp = @have_gmp@
-@@ -145,7 +149,7 @@
+@@ -45,7 +49,7 @@
+ 
+ override CFLAGS += -I.. -I$(topsrc)/gui2 -DHAVE_CONFIG_H
+ 
+-LIBTOOL = ../libtool
++LIBTOOL = @LIBTOOL@
+ 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
  
- override CFLAGS += $(GRETLINC) $(GTK_CFLAGS) $(GMP_CFLAGS) $(XML_CFLAGS) \
--	$(LIBOLE2_CFLAGS) $(AUDIO_CFLAGS) -I. $(GMPDEF)
-+	$(LIBOLE2_CFLAGS) $(AUDIO_CFLAGS) -I. $(GMPDEF) $(CPPFLAGS)
+ 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)
  
  %.lo: %.c
  	$(COMPILE) $< 
-@@ -239,12 +243,12 @@
+@@ -266,12 +270,12 @@
  .PHONY: 
  
  install: $(GRETLLIB) $(PLUGINS) $(URCDATA) installdirs 
diff --git a/math/gretl/files/patch-share::Makefile.in b/math/gretl/files/patch-share::Makefile.in
index 4441f1b0a108..3ca2b355d26d 100644
--- a/math/gretl/files/patch-share::Makefile.in
+++ b/math/gretl/files/patch-share::Makefile.in
@@ -1,5 +1,5 @@
---- share/Makefile.in.orig	Thu Feb  2 03:39:37 2006
-+++ share/Makefile.in	Tue Jun 13 22:39:26 2006
+--- share/Makefile.in.orig	Wed Aug 30 10:23:29 2006
++++ share/Makefile.in	Sun Oct  8 02:56:33 2006
 @@ -1,15 +1,16 @@
  topsrc = @top_srcdir@
  
@@ -12,14 +12,14 @@
 +gretldir = $(datadir)/gretl
  tooldir = $(topsrc)/tools
  sharesrc = $(topsrc)/share
- pdfdir = $(topsrc)/doc/tex
+ pdfdir = ../doc/tex
  
 -INSTALL_DATA = cp -fp
 +INSTALL_DATA = @INSTALL_DATA@
  
- ifeq ($(build_docs),yes)
-   AUTO_HELPFILES = \
-@@ -46,17 +47,17 @@
+ EN_GUI_HLP = $(sharesrc)/gretlgui.hlp
+ EN_CMD_HLP = $(sharesrc)/gretlcmd.hlp
+@@ -41,17 +42,17 @@
  all: $(AUTO_HELPFILES)
  
  $(AUTO_HELPFILES): 
@@ -32,16 +32,16 @@
 -	make -C ../doc/commands help-all
 +	$(MAKE) -C ../doc/commands help-all
  
- install: installdirs install_datafiles install_scripts install_help \
- 	$(INSTALL_GUI_SCRIPT_HELP) $(INSTALL_HELP_FIGS)
+ install: installdirs install_datafiles install_scripts install_functions \
+ 	install_help install_fonts
  	$(INSTALL_DATA) $(sharesrc)/gretl.stamp $(gretldir)/gretl.stamp
 -	make -C bcih install
 +	$(MAKE) -C bcih install
  
  install-strip: install
  
-@@ -79,8 +80,8 @@
- 	$(INSTALL_DATA) $$f $(gretldir)/scripts/misc ; done
+@@ -77,12 +78,12 @@
+ 	$(INSTALL_DATA) $(sharesrc)/functions/gretlfunc.dtd $(gretldir)/functions 
  
  install_man: gretl.1
 -	$(tooldir)/mkinstalldirs $(prefix)/share/man/man1
@@ -49,5 +49,21 @@
 +	$(tooldir)/mkinstalldirs $(prefix)/man/man1
 +	$(INSTALL_DATA) $(topsrc)/gretl.1 $(prefix)/man/man1
  
- install_helpfigs: 
+ install_help: $(AUTO_HELPFILES)
+ 	$(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
+@@ -95,8 +96,8 @@
+ 	$(INSTALL_DATA) $(IT_CLI_HLP) $(gretldir)/gretlcli.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
++#	for f in $(pdfdir)/gretl-ref.pdf $(pdfdir)/gretl-guide.pdf ; do \
++#	if test -f $$f ; then $(INSTALL_DATA) $$f $(gretldir)/doc ; fi ; done
+ 
+ install_fonts:
+ 	for f in $(sharesrc)/fonts/*.ttf ; do \
diff --git a/math/gretl/files/patch-tools::ltmain.sh b/math/gretl/files/patch-tools::ltmain.sh
deleted file mode 100644
index ab2039515415..000000000000
--- a/math/gretl/files/patch-tools::ltmain.sh
+++ /dev/null
@@ -1,23 +0,0 @@
---- tools/ltmain.sh.orig	Mon Feb 10 02:23:55 2003
-+++ tools/ltmain.sh	Mon Apr 14 12:23:06 2003
-@@ -967,6 +967,7 @@
- 	;;
- 
-       -avoid-version)
-+	build_old_libs=no
- 	avoid_version=yes
- 	continue
- 	;;
-@@ -4280,10 +4281,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"