Attachment #83537 for bug #119310

Lines 6-12 Link Here

(-)Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= rrdtool	8	PORTNAME= rrdtool
9	PORTVERSION= 1.2.23	9	PORTVERSION= 1.2.26
10	CATEGORIES= databases graphics	10	CATEGORIES= databases graphics
11	MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/	11	MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
12		12

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (rrdtool-1.2.23.tar.gz) = dafa161bc9c61e57636a6085c87c1fe8	1	MD5 (rrdtool-1.2.26.tar.gz) = b2c179e2d2ec2a92969648c4ebd382dc
2	SHA256 (rrdtool-1.2.23.tar.gz) = 4b1df00b23a74a1c81734dd274e72e00d8bb29b11e1f3d2938ff87691ece1f0f	2	SHA256 (rrdtool-1.2.26.tar.gz) = 685088c51e63fd9d41387cd39615036baed4460beb87c1ab7127f9325b348b24
3	SIZE (rrdtool-1.2.23.tar.gz) = 1061530	3	SIZE (rrdtool-1.2.26.tar.gz) = 1080151




--- ./bindings/Makefile.in.orig	2008-01-08 10:36:56.000000000 +0800
+++ ./bindings/Makefile.in	2008-01-08 10:38:18.000000000 +0800
@@ -544,9 +544,9 @@
 all-local:  @COMP_PERL@ @COMP_RUBY@ @COMP_PYTHON@
 
 install-data-local:
-	test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true
-	test -f perl-shared/Makefile && cd perl-shared && $(MAKE) install || true
-	test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) $(RUBY_MAKE_OPTIONS) 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
+	test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(exec_prefix) install || true
 	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 buildung the ruby module
@@ -557,7 +557,7 @@
-	cd ruby && $(RUBY) extconf.rb && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS)
+	cd ruby && $(RUBY) extconf.rb && $(MAKE) EPREFIX=$(exec_prefix)
 
 # rules for buildung the pyton module
 python:
-	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

Return to bug 119310

Lines 1-26 Link Here

(-)files/patch-bindings-Makefile.in (-10 / +8 lines)
1	--- ./bindings/Makefile.in.orig Thu May 3 02:06:59 2007	1	--- ./bindings/Makefile.in.orig 2008-01-08 10:36:56.000000000 +0800
2	+++ ./bindings/Makefile.in Tue May 29 03:45:40 2007	2	+++ ./bindings/Makefile.in 2008-01-08 10:38:18.000000000 +0800
3	@@ -539,18 +539,18 @@	3	@@ -544,9 +544,9 @@
4	all-local: @COMP_PERL@ @COMP_RUBY@ @COMP_PYTHON@	4	all-local: @COMP_PERL@ @COMP_RUBY@ @COMP_PYTHON@
5		5
6	install-data-local:	6	install-data-local:
7	- test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install \|\| true	7	- test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install \|\| true
8	- test -f perl-shared/Makefile && cd perl-shared && $(MAKE) install \|\| true	8	- test -f perl-shared/Makefile && cd perl-shared && $(MAKE) install \|\| true
9	- test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) install \|\| true	9	- test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) $(RUBY_MAKE_OPTIONS) install \|\| true
10	+ test -f perl-piped/Makefile && cd perl-piped && $(MAKE) pure_install \|\| true	10	+ test -f perl-piped/Makefile && cd perl-piped && $(MAKE) pure_install \|\| true
11	+ test -f perl-shared/Makefile && cd perl-shared && $(MAKE) pure_install \|\| true	11	+ test -f perl-shared/Makefile && cd perl-shared && $(MAKE) pure_install \|\| true
12	+ test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(exec_prefix) install \|\| true	12	+ test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(exec_prefix) install \|\| true
13	test -d python/build && cd python && env LIBDIR=$(libdir) $(PYTHON) setup.py install --skip-build --prefix=$(DESTDIR)$(prefix) --exec-prefix=$(DESTDIR)$(exec_prefix) \|\| true	13	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
14		14
15	# rules for buildung the ruby module	15	# rules for buildung the ruby module
16	ruby:	16	@@ -557,7 +557,7 @@
17	- cd ruby && $(RUBY) extconf.rb && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS)
18	+ cd ruby && $(RUBY) extconf.rb && $(MAKE) EPREFIX=$(exec_prefix)
19		17
20	# rules for buildung the pyton module	18	# rules for buildung the pyton module
21	python:	19	python:
22	- cd python && env LIBDIR=../../src/.libs $(PYTHON) setup.py build	20	- cd python && env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON) setup.py build
23	+ cd python && env LIBDIR=../../src/.libs INCDIR=../../src $(PYTHON) setup.py build	21	+ cd python && env INCDIR=../../src BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON) setup.py build
24		22
25	# rules for building the perl module	23	# rules for building the perl module
26	perl_piped: perl-piped/Makefile	24	perl_piped: perl-piped/Makefile