Upgrade to version 1.2.10.

3 files changed, 18 insertions, 18 deletions

diff --git a/databases/rrdtool/files/patch-bindings-Makefile.in b/databases/rrdtool/files/patch-bindings-Makefile.in
index f7e9672a5c16..29eb27835f0f 100644
--- a/databases/rrdtool/files/patch-bindings-Makefile.in
+++ b/databases/rrdtool/files/patch-bindings-Makefile.in
@@ -1,13 +1,13 @@
---- bindings/Makefile.in.orig	Tue May 17 04:57:45 2005
-+++ bindings/Makefile.in	Mon May 23 11:40:24 2005
-@@ -519,8 +519,8 @@
+--- bindings/Makefile.in.orig	Fri Jun 17 13:07:13 2005
++++ bindings/Makefile.in	Fri Jun 17 15:44:27 2005
+@@ -525,8 +525,8 @@
  all-local:  @COMP_PERL@
  
  install-data-local:
--	cd perl-piped && test -f Makefile && $(MAKE) install || true
--	cd perl-shared && test -f Makefile && $(MAKE) install || true
-+	cd perl-piped && test -f Makefile && $(MAKE) pure_install || true
-+	cd perl-shared && test -f Makefile && $(MAKE) pure_install || true
+-	test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true
+-	test -f perl-shared/Makefile && cd perl-shared && $(MAKE) install || true
++	test -f perl-piped/Makefile && cd perl-piped && $(MAKE) pure_install || true
++	test -f perl-shared/Makefile && cd perl-shared && $(MAKE) pure_install || true
  
  # rules for building the perl module
  perl_piped: perl-piped/Makefile
diff --git a/databases/rrdtool/files/patch-doc-Makefile.in b/databases/rrdtool/files/patch-doc-Makefile.in
index aa913c5ed40f..3eb65c33194e 100644
--- a/databases/rrdtool/files/patch-doc-Makefile.in
+++ b/databases/rrdtool/files/patch-doc-Makefile.in
@@ -1,13 +1,13 @@
---- doc/Makefile.in.orig	Sun May  8 03:59:02 2005
-+++ doc/Makefile.in	Mon May  9 00:02:25 2005
-@@ -215,9 +215,9 @@
+--- doc/Makefile.in.orig	Fri Jun 17 13:07:14 2005
++++ doc/Makefile.in	Fri Jun 17 15:49:49 2005
+@@ -233,9 +233,9 @@
  
  # some install rules if the install pat
- DOCPREFIX := $(shell echo "@prefix@" | grep rrd >/dev/null && echo "rrdtool-@VERSION@/")
--idocdir = $(prefix)/shared/doc/$(DOCPREFIX)txt
+ DOCPREFIX := $(shell echo "@prefix@" | grep rrd >/dev/null || echo "rrdtool-@VERSION@/")
+-idocdir = $(prefix)/share/doc/$(DOCPREFIX)txt
 +idocdir = $(datadir)/doc/rrdtool/txt
  idoc_DATA = $(POD) $(TXT)
--ihtmldir = $(prefix)/shared/doc/$(DOCPREFIX)html
+-ihtmldir = $(prefix)/share/doc/$(DOCPREFIX)html
 +ihtmldir = $(datadir)/doc/rrdtool/html
  ihtml_DATA = $(HTML)
  imandir = $(mandir)/man1
diff --git a/databases/rrdtool/files/patch-examples-Makefile.in b/databases/rrdtool/files/patch-examples-Makefile.in
index 9f1a9e49241c..a617269af30d 100644
--- a/databases/rrdtool/files/patch-examples-Makefile.in
+++ b/databases/rrdtool/files/patch-examples-Makefile.in
@@ -1,10 +1,10 @@
---- examples/Makefile.in.orig	Sun May  8 03:59:03 2005
-+++ examples/Makefile.in	Mon May  9 00:05:04 2005
-@@ -194,7 +194,7 @@
- EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in \
+--- examples/Makefile.in.orig	Fri Jun 17 15:50:33 2005
++++ examples/Makefile.in	Fri Jun 17 15:50:46 2005
+@@ -213,7 +213,7 @@
  	stripes.pl.in bigtops.pl.in minmax.pl.in 4charts.pl.in
  
--examplesdir = $(prefix)/examples
+ EXPREFIX := $(shell echo "@prefix@" | grep rrd >/dev/null || echo "rrdtool-@VERSION@/")
+-examplesdir = $(prefix)/$(EXPREFIX)examples
 +examplesdir = $(datadir)/examples/rrdtool
  examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \
  	stripes.pl bigtops.pl minmax.pl 4charts.pl