- Update to 1.5.0

PR:		ports/92012
Submitted by:	Ports Fury

5 files changed, 64 insertions, 63 deletions

diff --git a/math/gretl/files/patch-cli::Makefile.in b/math/gretl/files/patch-cli::Makefile.in
index c80706a4dde6..67f5a701a191 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	Wed Oct 22 06:22:31 2003
-+++ cli/Makefile.in	Sun Oct 26 10:19:56 2003
+--- cli/Makefile.in.orig	Fri Sep 10 22:16:11 2004
++++ cli/Makefile.in	Sun Jan 15 14:18:39 2006
 @@ -9,12 +9,16 @@
  exec_prefix = @exec_prefix@
  bindir = @bindir@
@@ -32,7 +32,7 @@
  
  $(CLI): .deps $(OBJS)
 -	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(GRETLLIB) $(READLINE_LIBS) 
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(GRETLLIB) $(READLINE_LIBS) $(INTL_LIBS) $(LDFLAGS)
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJS) $(GRETLLIB) $(READLINE_LIBS) $(INTL_LIBS)
  
  .deps:
  	mkdir $@
diff --git a/math/gretl/files/patch-gnome::Makefile.in b/math/gretl/files/patch-gnome::Makefile.in
index a0f075106313..942dba413e23 100644
--- a/math/gretl/files/patch-gnome::Makefile.in
+++ b/math/gretl/files/patch-gnome::Makefile.in
@@ -1,5 +1,5 @@
---- gnome/Makefile.in.orig	Fri Nov  5 05:16:18 2004
-+++ gnome/Makefile.in	Thu Nov 18 20:14:05 2004
+--- gnome/Makefile.in.orig	Tue Nov 22 03:45:16 2005
++++ gnome/Makefile.in	Fri Jan  6 22:54:18 2006
 @@ -4,10 +4,10 @@
  docdir = $(topsrc)/doc
  
@@ -13,29 +13,18 @@
  
  GCONFTOOL = @GCONFTOOL@
  GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-@@ -26,11 +26,11 @@
-   install_help = install-help-1
+@@ -23,10 +23,10 @@
+   schemadir = $(GCONF_SCHEMA_FILE_DIR)
  endif
  
 -desktopdir = $(gnome_prefix)/share/applications
 -mimedir = $(gnome_prefix)/share/mime-info
 -gpixmaps = $(gnome_prefix)/share/pixmaps
--ghelpdir = $(gnome_prefix)/share/gnome/help/gretl
 -schemadir = $(gnome_prefix)/etc/gconf/schemas
 +desktopdir = $(datadir)/applications
 +mimedir = $(datadir)/mime-info
 +gpixmaps = $(datadir)/pixmaps
-+ghelpdir = $(datadir)/help/gretl
 +schemadir = $(sysconfdir)/gconf/schemas
  
- install: install-images install-misc install-help-dirs $(install_help) $(install_schemas)
+ install: install-images install-misc $(install_schemas)
  
-@@ -73,7 +73,7 @@
- 	  $(ghelpdir)/it/chapters/`basename $$f` ; done
- 	$(INSTALL_DATA) $(docdir)/figures/*.png $(ghelpdir)/it/figures
- 	$(INSTALL_DATA) $(docdir)/figures_it/*.png $(ghelpdir)/it/figures
--	make -C $(omfdir) install
-+	$(MAKE) -C $(omfdir) install
- 
- install-help-1:
- 	-$(INSTALL_DATA) $(topsrc)/gnome/topic.dat $(ghelpdir)/C
diff --git a/math/gretl/files/patch-gui2::Makefile.in b/math/gretl/files/patch-gui2::Makefile.in
index 88dff43db9a8..c327571c73af 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	Wed Mar 17 22:34:09 2004
-+++ gui2/Makefile.in	Thu Apr  1 19:37:11 2004
+--- gui2/Makefile.in.orig	Mon Nov 21 23:02:28 2005
++++ gui2/Makefile.in	Sun Jan 15 14:51:18 2006
 @@ -4,6 +4,7 @@
  exec_prefix = @exec_prefix@
  bindir = @bindir@
@@ -52,9 +52,24 @@
  tooldir = $(topsrc)/tools
  libsrc = $(topsrc)/lib/src
  clisrc = $(topsrc)/cli
-@@ -124,10 +125,10 @@
+@@ -149,23 +150,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)
+ 
+ $(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
+ 
+ gretl.lang: mklang
+ 	./mklang > $@
+ 
  $(GTKEXTRA_LITE): 
 -	make -C gtkextra-lite
 +	$(MAKE) -C gtkextra-lite
@@ -65,7 +80,7 @@
  
  .deps:
  	mkdir $@
-@@ -142,7 +143,7 @@
+@@ -180,7 +181,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 55aecb17e83a..bde274933e66 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	Sat Jan 29 02:45:42 2005
-+++ lib/Makefile.in	Tue Feb  1 20:14:33 2005
+--- lib/Makefile.in.orig	Thu Dec  8 00:25:48 2005
++++ lib/Makefile.in	Sun Jan 15 14:54:18 2006
 @@ -22,6 +22,11 @@
  
  have_gtk = @have_gtk@
@@ -32,7 +32,7 @@
  
  #### End of system configuration section. ####
  
-@@ -119,7 +124,7 @@
+@@ -186,7 +191,7 @@
  LIBTOOL = ../libtool
  
  override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(XML_CFLAGS) $(GLIB_CFLAGS) \
@@ -41,12 +41,12 @@
  
  COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) 
  
-@@ -130,7 +135,7 @@
+@@ -195,7 +200,7 @@
+ 	$(CC) $(CFLAGS) -MM -MT $*.lo $< > .deps/$*.d
+ 
  $(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
- 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(AUX_LOBJ) \
+-	$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(AUX_LOBJ) \
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(LOBJS) $(AUX_LOBJ) \
  	-rpath $(prefix)/lib $(LIBS) \
--	-version-info $(CURRENT):$(REVISION):$(AGE)
-+	-version-info $(CURRENT):$(REVISION):$(AGE) $(LDFLAGS)
+ 	-version-info $(CURRENT):$(REVISION):$(AGE)
  
- .deps:
- 	mkdir $@
diff --git a/math/gretl/files/patch-share::Makefile.in b/math/gretl/files/patch-share::Makefile.in
index 4baf38e1d71c..b7eda4cfefb6 100644
--- a/math/gretl/files/patch-share::Makefile.in
+++ b/math/gretl/files/patch-share::Makefile.in
@@ -1,52 +1,49 @@
---- share/Makefile.in.orig	Sat Jun 12 04:15:49 2004
-+++ share/Makefile.in	Thu Jul  1 23:06:55 2004
-@@ -1,13 +1,14 @@
+--- share/Makefile.in.orig	Wed Dec 14 00:24:43 2005
++++ share/Makefile.in	Fri Jan  6 22:59:04 2006
+@@ -1,15 +1,16 @@
  topsrc = @top_srcdir@
  
  prefix = @prefix@
 +datadir = @datadir@
  have_gtk = @have_gtk@
+ build_docs = @build_docs@
  
 -gretldir = $(prefix)/share/gretl
 +gretldir = $(datadir)/gretl
  tooldir = $(topsrc)/tools
  sharesrc = $(topsrc)/share
+ pdfdir = $(topsrc)/doc/tex
  
 -INSTALL_DATA = cp -fp
 +INSTALL_DATA = @INSTALL_DATA@
  
- AUTO_HELPFILES = \
- 	$(sharesrc)/gretl.hlp \
-@@ -44,7 +45,7 @@
+ ifeq ($(build_docs),yes)
+   AUTO_HELPFILES = \
+@@ -46,14 +47,14 @@
+ all: $(AUTO_HELPFILES)
  
- install: installdirs install_datafiles install_scripts install_help
+ $(AUTO_HELPFILES): 
+-	make -C ../doc/commands help-all
++	$(MAKE) -C ../doc/commands help-all
+ 
+ .PHONY :
+ 
+ install: installdirs install_datafiles install_scripts install_help \
+ 	$(INSTALL_GUI_SCRIPT_HELP) $(INSTALL_HELP_FIGS)
  	$(INSTALL_DATA) $(sharesrc)/gretl.stamp $(gretldir)/gretl.stamp
 -	make -C bcih install
 +	$(MAKE) -C bcih install
  
  install-strip: install
  
-@@ -74,10 +75,10 @@
- 	$(tooldir)/mkinstalldirs $(gretldir)
- 	$(INSTALL_DATA) $(sharesrc)/gretl.hlp $(gretldir)/gretl.hlp
- 	$(INSTALL_DATA) $(sharesrc)/gretlcli.hlp $(gretldir)/gretlcli.hlp
--	$(INSTALL_DATA) $(ES_GUI_HLP) $(gretldir)/gretl.hlp.es
--	$(INSTALL_DATA) $(ES_CLI_HLP) $(gretldir)/gretlcli.hlp.es
--	$(INSTALL_DATA) $(IT_GUI_HLP) $(gretldir)/gretl.hlp.it
--	$(INSTALL_DATA) $(IT_CLI_HLP) $(gretldir)/gretlcli.hlp.it
-+#	$(INSTALL_DATA) $(ES_GUI_HLP) $(gretldir)/gretl.hlp.es
-+#	$(INSTALL_DATA) $(ES_CLI_HLP) $(gretldir)/gretlcli.hlp.es
-+#	$(INSTALL_DATA) $(IT_GUI_HLP) $(gretldir)/gretl.hlp.it
-+#	$(INSTALL_DATA) $(IT_CLI_HLP) $(gretldir)/gretlcli.hlp.it
- 
- installdirs:
- 	$(tooldir)/mkinstalldirs $(gretldir) $(gretldir)/data 
-@@ -93,7 +94,7 @@
- 
- $(RECODE_FILES): $(sharesrc)/gretl.hlp.es $(sharesrc)/gretlcli.hlp.es \
- 	$(sharesrc)/gretl.hlp.it $(sharesrc)/gretlcli.hlp.it
--	for f in $^ ; do recode l1..utf-8 < $$f > $$f.utf8 ; done
-+#	for f in $^ ; do recode l1..utf-8 < $$f > $$f.utf8 ; done
- 
- clean:
- 	make -C bcih clean
+@@ -76,8 +77,8 @@
+ 	$(INSTALL_DATA) $$f $(gretldir)/scripts/misc ; done
+ 
+ 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
+ 
+ install_helpfigs: 
+ 	$(tooldir)/mkinstalldirs $(gretldir)/helpfigs