9 files changed, 105 insertions, 25 deletions
diff --git a/databases/rrdtool10/files/patch-aa b/databases/rrdtool10/files/patch-aa
new file mode 100644
index 000000000000..8436cf0346fb
--- /dev/null
+++ b/databases/rrdtool10/files/patch-aa
@@ -0,0 +1,11 @@
+--- perl-shared/Makefile.PL.in.orig	Thu Apr  8 01:04:53 2004
++++ perl-shared/Makefile.PL.in	Sun Aug  8 18:11:16 2004
+@@ -10,7 +10,7 @@
+     'NAME'         => 'RRDs',
+     'VERSION_FROM' => '@top_srcdir@/perl-shared/RRDs.pm', # finds $VERSION
+     'DEFINE'	   => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
+-    'INC'          => '-I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
++    'INC'          => '-I../ -I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
+     'CCFLAGS'      => "$Config{ccflags} -DHAVE_CONFIG_H",
+     # where to look for the necessary libraries 
+     # Perl will figure out which one is valid
diff --git a/databases/rrdtool10/files/patch-ac b/databases/rrdtool10/files/patch-ac
new file mode 100644
index 000000000000..5d34a7b5d9e1
--- /dev/null
+++ b/databases/rrdtool10/files/patch-ac
@@ -0,0 +1,36 @@
+--- Makefile.in.orig	Sun Aug  8 12:40:15 2004
++++ Makefile.in	Wed Mar 16 21:26:50 2005
+@@ -633,21 +633,7 @@
+ # lets schedule the perl stuff for installation
+ # the special call to install-sh is because the -d switch is not portable
+ # mac os X has its perl module in bundles so it seems
+-install-data-local:
+-	@if test "x$(PERL)" != "xno"; then \
+-	  echo "$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
+-	  $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
+-	  echo "$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl"; \
+-	  $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl; \
+-	  echo "$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl"; \
+-	  $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl; \
+-	  echo "$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
+-	  $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
+-	  echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true"; \
+-	  test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true; \
+-	  echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true"; \
+-	  test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle  && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true; \
+-	fi
++install-data-local: site-perl-inst
+ 
+ # rules for building the perl module
+ 
+@@ -727,8 +713,8 @@
+ site-perl-inst: site-perl-install
+ 
+ site-perl-install: all perl-piped/Makefile perl-shared/Makefile
+-	cd perl-piped && $(MAKE) install
+-	cd perl-shared && $(MAKE) install
++	cd perl-piped && $(MAKE) pure_install
++	cd perl-shared && $(MAKE) pure_install
+ 
+ site-tcl-install: all
+ 	cd tcl && $(MAKE) tcl-install
diff --git a/databases/rrdtool10/files/patch-ae b/databases/rrdtool10/files/patch-ae
new file mode 100644
index 000000000000..b1465ab16354
--- /dev/null
+++ b/databases/rrdtool10/files/patch-ae
@@ -0,0 +1,14 @@
+--- doc/Makefile.in.orig	Sun Apr 14 11:51:02 2002
++++ doc/Makefile.in	Wed May  1 16:05:42 2002
+@@ -110,9 +110,9 @@
+ EXTRA_DIST = $(POD) $(HTML) $(TXT)
+ 
+ # some install rules
+-idocdir = $(prefix)/doc
++idocdir = $(prefix)/share/doc/rrdtool/
+ idoc_DATA = $(POD) $(TXT)
+-ihtmldir = $(prefix)/html
++ihtmldir = $(prefix)/share/doc/rrdtool/html
+ ihtml_DATA = $(HTML)
+ imandir = $(prefix)/man/man1
+ iman_DATA = $(MAN)
diff --git a/databases/rrdtool10/files/patch-af b/databases/rrdtool10/files/patch-af
new file mode 100644
index 000000000000..ab74382bf032
--- /dev/null
+++ b/databases/rrdtool10/files/patch-af
@@ -0,0 +1,11 @@
+--- examples/Makefile.in.orig	Sun Apr 14 11:51:04 2002
++++ examples/Makefile.in	Wed May  1 16:07:13 2002
+@@ -93,7 +93,7 @@
+ 
+ EXTRA_DIST = cgi-demo.cgi.in    piped-demo.pl.in   shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in
+ 
+-examplesdir = $(prefix)/examples
++examplesdir = $(prefix)/share/examples/rrdtool
+ examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl stripes.pl bigtops.pl minmax.pl
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+ CONFIG_HEADER = ../config/config.h
diff --git a/databases/rrdtool10/files/patch-ag b/databases/rrdtool10/files/patch-ag
new file mode 100644
index 000000000000..205d5ac7228c
--- /dev/null
+++ b/databases/rrdtool10/files/patch-ag
@@ -0,0 +1,11 @@
+--- contrib/Makefile.in.orig Sun Apr 14 11:51:05 2002
++++ contrib/Makefile.in	Wed May  1 16:08:10 2002
+@@ -88,7 +88,7 @@
+ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+ 
+ SUBDIRS = trytime
+-contribdir = $(prefix)/contrib
++contribdir = $(prefix)/share/examples/rrdtool
+ contrib_DATA = README
+ EXTRA_DIST = rrdview log2rrd rrd-file-icon rrdproc rrdlastds add_ds killspike rrdfetchnames snmpstats rrdexplorer php3 php4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/databases/rrdtool10/files/patch-ak b/databases/rrdtool10/files/patch-ak
new file mode 100644
index 000000000000..982c95f4fd38
--- /dev/null
+++ b/databases/rrdtool10/files/patch-ak
@@ -0,0 +1,11 @@
+--- contrib/trytime/Makefile.in.orig	Mon Apr  5 02:03:53 2004
++++ contrib/trytime/Makefile.in	Tue Apr  6 11:17:12 2004
+@@ -162,7 +162,7 @@
+ target_vendor = @target_vendor@
+ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
+ EXTRA_DIST = trytime.c
+-contribdir = $(prefix)/contrib/trytime
++contribdir = $(prefix)/share/examples/rrdtool/trytime
+ contrib_DATA = README trytime.c
+ bin_PROGRAMS = trytime
+ trytime_SOURCES = trytime.c
diff --git a/databases/rrdtool10/files/patch-doc-Makefile.in b/databases/rrdtool10/files/patch-doc-Makefile.in
deleted file mode 100644
index aa913c5ed40f..000000000000
--- a/databases/rrdtool10/files/patch-doc-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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 @@
- 
- # some install rules if the install pat
- DOCPREFIX := $(shell echo "@prefix@" | grep rrd >/dev/null && echo "rrdtool-@VERSION@/")
--idocdir = $(prefix)/shared/doc/$(DOCPREFIX)txt
-+idocdir = $(datadir)/doc/rrdtool/txt
- idoc_DATA = $(POD) $(TXT)
--ihtmldir = $(prefix)/shared/doc/$(DOCPREFIX)html
-+ihtmldir = $(datadir)/doc/rrdtool/html
- ihtml_DATA = $(HTML)
- imandir = $(mandir)/man1
- iman_DATA = $(MAN)
diff --git a/databases/rrdtool10/files/patch-examples-Makefile.in b/databases/rrdtool10/files/patch-examples-Makefile.in
deleted file mode 100644
index 9f1a9e49241c..000000000000
--- a/databases/rrdtool10/files/patch-examples-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 \
- 	stripes.pl.in bigtops.pl.in minmax.pl.in 4charts.pl.in
- 
--examplesdir = $(prefix)/examples
-+examplesdir = $(datadir)/examples/rrdtool
- examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \
- 	stripes.pl bigtops.pl minmax.pl 4charts.pl
- 
diff --git a/databases/rrdtool10/files/patch-rrd_graph.c b/databases/rrdtool10/files/patch-rrd_graph.c
new file mode 100644
index 000000000000..b8fcdefb8c77
--- /dev/null
+++ b/databases/rrdtool10/files/patch-rrd_graph.c
@@ -0,0 +1,11 @@
+--- src/rrd_graph.c.orig	Sun Aug  8 14:58:13 2004
++++ src/rrd_graph.c	Sun Aug  8 18:19:06 2004
+@@ -2966,7 +2966,7 @@
+ 
+ 	
+ 	opt = getopt_long(argc, argv, 
+-			  "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgjFYAMX:L:S:RB:O:U:",
++			  "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgjFYAMNX:L:S:RB:O:U:",
+ 			  long_options, &option_index);
+ 
+ 	if (opt == EOF)