- Fix of 'make deinstall' when NOPORTEXAMPLES is defined [1]

- Update to 1.4.3 [2]

PR:		ports/144850 [1]
		ports/146052 [2]
Submitted by:	Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>

4 files changed, 14 insertions, 15 deletions

diff --git a/databases/rrdtool/files/patch-bindings-Makefile.in b/databases/rrdtool/files/patch-bindings-Makefile.in
index daa1de9eb748..5f4563ab8feb 100644
--- a/databases/rrdtool/files/patch-bindings-Makefile.in
+++ b/databases/rrdtool/files/patch-bindings-Makefile.in
@@ -1,6 +1,6 @@
---- ./bindings/Makefile.in.orig	2009-12-01 23:10:30.000000000 +0000
-+++ ./bindings/Makefile.in	2009-12-01 23:14:10.000000000 +0000
-@@ -679,9 +679,9 @@
+--- bindings/Makefile.in.orig	2010-03-23 01:30:03.000000000 +0800
++++ bindings/Makefile.in	2010-04-26 03:43:31.000000000 +0800
+@@ -696,9 +696,9 @@
  all-local:  @COMP_PERL@ @COMP_RUBY@ @COMP_PYTHON@
  
  install-data-local:
@@ -13,13 +13,12 @@
  	$(AM_V_GEN)test -d python/build && cd python && env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py install --skip-build --prefix=$(DESTDIR)$(prefix) --exec-prefix=$(DESTDIR)$(exec_prefix) || true
  
  # rules for building the ruby module
-@@ -692,7 +692,8 @@
+@@ -709,7 +709,7 @@
  
  # rules for building the pyton module
- python:
+ python: Makefile
 -	cd python && env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON) setup.py build
 +	cd python && env INCDIR=../../src BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON) setup.py build
-+
  
  # 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 4ad05f5a748e..8485cde01277 100644
--- a/databases/rrdtool/files/patch-doc-Makefile.in
+++ b/databases/rrdtool/files/patch-doc-Makefile.in
@@ -1,6 +1,6 @@
---- ./doc/Makefile.in.orig	2009-12-01 23:14:57.000000000 +0000
-+++ ./doc/Makefile.in	2009-12-01 23:18:22.000000000 +0000
-@@ -327,9 +327,9 @@
+--- doc/Makefile.in.orig	2010-04-26 03:40:16.000000000 +0800
++++ doc/Makefile.in	2010-04-26 03:44:14.000000000 +0800
+@@ -344,9 +344,9 @@
  
  # what should go into the distribution
  EXTRA_DIST = $(POD) $(POD3) $(HTML) $(MAN) $(MAN3) $(TXT) rrdtool-dump.dtd rrdtool-xport.dtd rrdgraph_libdbi.pod rrdlua.pod
diff --git a/databases/rrdtool/files/patch-examples-Makefile.in b/databases/rrdtool/files/patch-examples-Makefile.in
index fd6514a2c127..f8e70fc686f5 100644
--- a/databases/rrdtool/files/patch-examples-Makefile.in
+++ b/databases/rrdtool/files/patch-examples-Makefile.in
@@ -1,6 +1,6 @@
---- ./examples/Makefile.in.orig	2009-12-01 23:18:52.000000000 +0000
-+++ ./examples/Makefile.in	2009-12-01 23:19:10.000000000 +0000
-@@ -352,7 +352,7 @@
+--- examples/Makefile.in.orig	2010-03-23 01:30:04.000000000 +0800
++++ examples/Makefile.in	2010-04-26 03:45:47.000000000 +0800
+@@ -369,7 +369,7 @@
  top_srcdir = @top_srcdir@
  SUBDIRS = rrdcached
  EXTRA_DIST = cgi-demo.cgi.in
diff --git a/databases/rrdtool/files/patch-src-rrd_open.c b/databases/rrdtool/files/patch-src-rrd_open.c
index 25ec5cd28ab8..330547004f6c 100644
--- a/databases/rrdtool/files/patch-src-rrd_open.c
+++ b/databases/rrdtool/files/patch-src-rrd_open.c
@@ -1,6 +1,6 @@
---- ./src/rrd_open.c.orig	2009-12-01 23:21:20.000000000 +0000
-+++ ./src/rrd_open.c	2009-12-01 23:22:41.000000000 +0000
-@@ -552,9 +552,6 @@
+--- src/rrd_open.c.orig	2010-03-23 00:05:55.000000000 +0800
++++ src/rrd_open.c	2010-04-26 03:46:23.000000000 +0800
+@@ -555,9 +555,6 @@
      int       ret;
  
  #ifdef HAVE_MMAP