Update to version 1.3.0

PR:		ports/74082
Submitted by:	Ports Fury

3 files changed, 28 insertions, 29 deletions

diff --git a/math/gretl/files/patch-gnome::Makefile.in b/math/gretl/files/patch-gnome::Makefile.in
index 0daf4dce042b..a0f075106313 100644
--- a/math/gretl/files/patch-gnome::Makefile.in
+++ b/math/gretl/files/patch-gnome::Makefile.in
@@ -1,7 +1,7 @@
---- gnome/Makefile.in.orig	Tue Aug 27 03:11:56 2002
-+++ gnome/Makefile.in	Mon Oct 21 08:27:48 2002
-@@ -2,10 +2,10 @@
- docdir = ../doc
+--- gnome/Makefile.in.orig	Fri Nov  5 05:16:18 2004
++++ gnome/Makefile.in	Thu Nov 18 20:14:05 2004
+@@ -4,10 +4,10 @@
+ docdir = $(topsrc)/doc
  
  INSTALL = @INSTALL@
 -gnome_prefix = @gnome_prefix@
@@ -13,7 +13,7 @@
  
  GCONFTOOL = @GCONFTOOL@
  GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-@@ -24,11 +24,11 @@
+@@ -26,11 +26,11 @@
    install_help = install-help-1
  endif
  
@@ -30,12 +30,12 @@
  
  install: install-images install-misc install-help-dirs $(install_help) $(install_schemas)
  
-@@ -58,7 +58,7 @@
- 	  cat $$f | sed s+fileref=\"figures/[^\"]*+\&.png+g > \
- 	  $(ghelpdir)/C/chapters/`basename $$f` ; done
- 	$(INSTALL_DATA) $(docdir)/figures/*.png $(ghelpdir)/C/figures
+@@ -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) topic.dat $(ghelpdir)/C
+ 	-$(INSTALL_DATA) $(topsrc)/gnome/topic.dat $(ghelpdir)/C
diff --git a/math/gretl/files/patch-lib::Makefile.in b/math/gretl/files/patch-lib::Makefile.in
index 6843bf0b89ca..32c0d8ddd963 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 11 23:27:53 2003
-+++ lib/Makefile.in	Thu Dec 25 13:19:07 2003
+--- lib/Makefile.in.orig	Mon Nov  1 01:05:09 2004
++++ lib/Makefile.in	Thu Nov 18 20:25:22 2004
 @@ -18,6 +18,11 @@
  
  have_gtk = @have_gtk@
@@ -32,7 +32,7 @@
  
  #### End of system configuration section. ####
  
-@@ -78,7 +83,7 @@
+@@ -115,7 +120,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) 
  
-@@ -88,7 +93,7 @@
+@@ -125,7 +130,7 @@
  
  $(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
  	$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(AUX_LOBJ) \
--	-rpath $(prefix)/lib $(LIBS) -version-info 0:22:0
-+	-rpath $(prefix)/lib $(LIBS) -version-info 0:22:0 $(LDFLAGS)
+-	-rpath $(prefix)/lib $(LIBS) -version-info 0:23:0
++	-rpath $(prefix)/lib $(LIBS) -version-info 0:23:0 $(LDFLAGS)
  
  .deps:
  	mkdir $@
diff --git a/math/gretl/files/patch-plugin::Makefile.in b/math/gretl/files/patch-plugin::Makefile.in
index 61055a2418ed..b2043c0e7495 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 Oct 19 23:15:51 2003
-+++ plugin/Makefile.in	Sun Oct 26 10:24:36 2003
+--- plugin/Makefile.in.orig	Wed Oct 20 00:55:16 2004
++++ plugin/Makefile.in	Thu Nov 18 20:24:54 2004
 @@ -8,6 +8,10 @@
  INSTALL = @INSTALL@
  LN = @LN_S@
@@ -11,24 +11,23 @@
  have_gtk = @have_gtk@
  have_gmp = @have_gmp@
  
-@@ -35,8 +39,8 @@
- override CFLAGS += -I.. -DHAVE_CONFIG_H
+@@ -96,7 +100,7 @@
+ URCDATA = $(topsrc)/plugin/data/urcdata.gz
  
- LIBTOOL = ../libtool
--COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) 
--LINK = $(LIBTOOL) --mode=link $(CC) -module -avoid-version -rpath $(plugindir)
-+COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(CPPFLAGS)
-+LINK = $(LIBTOOL) --mode=link $(CC) -module -avoid-version -rpath $(plugindir) $(LDFLAGS)
+ override CFLAGS += $(GRETLINC) $(GTK_CFLAGS) $(GMP_CFLAGS) $(XML_CFLAGS) \
+-	$(LIBOLE2_CFLAGS) $(AUDIO_CFLAGS) -I. $(GMPDEF)
++	$(LIBOLE2_CFLAGS) $(AUDIO_CFLAGS) -I. $(GMPDEF) $(CPPFLAGS)
  
- GRETLINC = -I$(topsrc)/lib/src
- GRETLLIB = ../lib/libgretl-1.0.la
-@@ -136,11 +140,11 @@
+ %.lo: %.c
+ 	$(COMPILE) $< 
+@@ -181,12 +185,12 @@
  .PHONY: 
  
- install: $(GRETLLIB) $(PLUGINS) installdirs
+ install: $(GRETLLIB) $(PLUGINS) $(URCDATA) installdirs 
 -	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
 +	$(LIBTOOL) --mode=install $(INSTALL_DATA) \
  	$(PLUGINS) $(plugindir)
+ 	$(INSTALL_DATA) $(URCDATA) $(plugindir)/data
  
  install-strip: $(GRETLLIB) $(PLUGINS) installdirs
 -	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s \