sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
- Update to 1.4.3 [2]

PR:		ports/144850 [1]
		ports/146052 [2]
Submitted by:	Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
This commit is contained in:
Sylvio Cesar Teixeira 2010-04-26 22:47:08 +00:00
parent b066458d0e
commit b0051c1a78
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=253307
7 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
databases/rrdtool/Makefile
View file

@ -6,8 +6,7 @@
# #
PORTNAME= rrdtool PORTNAME= rrdtool
PORTVERSION= 1.4.2 PORTVERSION= 1.4.3
PORTREVISION= 1
CATEGORIES= databases graphics CATEGORIES= databases graphics
MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/ MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
@ -32,14 +31,14 @@ USE_GNOME= gnomehack intltool
CONFIGURE_ARGS= --disable-tcl CONFIGURE_ARGS= --disable-tcl
PORTDOCS= * PORTDOCS= *
PORTEXAMPLES= 4charts.pl bigtops.pl cgi-demo.cgi minmax.pl piped-demo.pl \ PORTEXAMPLES= 4charts.pl bigtops.pl cgi-demo.cgi minmax.pl perftest.pl \
perftest.pl shared-demo.pl stripes.pl piped-demo.pl shared-demo.pl stripes.pl
OPTIONS= PYTHON_MODULE "Build PYTHON bindings" off \ OPTIONS= DEJAVU "Use DejaVu fonts (requires X11)" off \
RUBY_MODULE "Build RUBY bindings" off \ MMAP "Use mmap in rrd_update" on \
PERL_MODULE "Build PERL module" on \ PERL_MODULE "Build PERL module" on \
DEJAVU "Use DejaVu fonts (requires X11)" off \ PYTHON_MODULE "Build PYTHON bindings" off \
MMAP "Use mmap in rrd_update" on RUBY_MODULE "Build RUBY bindings" off
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
@ -88,11 +87,12 @@ CFLAGS:= ${CFLAGS:N-ffast-math}
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \ MAN1= bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \
rrdbuild.1 rrdcached.1 rrdcgi.1 rrdcreate.1 rrddump.1 rrdfetch.1 rrdfirst.1 rrdflushcached.1 \ rrdbuild.1 rrdcached.1 rrdcgi.1 rrdcreate.1 rrddump.1 \
rrdgraph.1 rrdgraph_data.1 rrdgraph_examples.1 rrdgraph_graph.1 \ rrdfetch.1 rrdfirst.1 rrdflushcached.1 rrdgraph.1 \
rrdgraph_rpn.1 rrdinfo.1 rrdlast.1 rrdresize.1 rrdrestore.1 \ rrdgraph_data.1 rrdgraph_examples.1 rrdgraph_graph.1 \
rrdthreads.1 rrdtool.1 rrdtune.1 rrdtutorial.1 rrdupdate.1 \ rrdgraph_rpn.1 rrdinfo.1 rrdlast.1 rrdlastupdate.1 \
rrdxport.1 rrdlastupdate.1 rrdresize.1 rrdrestore.1 rrdthreads.1 rrdtool.1 rrdtune.1 \
rrdtutorial.1 rrdupdate.1 rrdxport.1
.if !defined(WITHOUT_PERL_MODULE) .if !defined(WITHOUT_PERL_MODULE)
MAN3= RRDp.3 RRDs.3 MAN3= RRDp.3 RRDs.3
@ -113,10 +113,10 @@ post-extract:
.endif .endif
post-install: post-install:
.if !defined(BATCH) .if !defined(BATCH) && !defined(NOPORTEXAMPLES)
@${ECHO_MSG} "" @${ECHO_MSG} ""
@${ECHO_MSG} "############################################################################" @${ECHO_MSG} "############################################################################"
@${ECHO_MSG} "# See ${PREFIX}/share/examples/rrdtool for some demonstration code #" @${ECHO_MSG} "# See ${EXAMPLESDIR} for some demonstration code #"
@${ECHO_MSG} "############################################################################" @${ECHO_MSG} "############################################################################"
.endif .endif

6
databases/rrdtool/distinfo
View file

@ -1,3 +1,3 @@
MD5 (rrdtool-1.4.2.tar.gz) = 9318d3b4016dd9dd9897f1eac7548032 MD5 (rrdtool-1.4.3.tar.gz) = 492cf946c72f85987238faa2c311b7bb
SHA256 (rrdtool-1.4.2.tar.gz) = e55ebe13b16515a275185229a93ee1fc266010a9e3c6b05b229a1530695311cb SHA256 (rrdtool-1.4.3.tar.gz) = 1aecfba0cb255aef6ae27534825022b83996abec0b7b94576e3b9d061ddf6d73
SIZE (rrdtool-1.4.2.tar.gz) = 1355269 SIZE (rrdtool-1.4.3.tar.gz) = 1381821

11
databases/rrdtool/files/patch-bindings-Makefile.in
View file

@ -1,6 +1,6 @@
--- ./bindings/Makefile.in.orig 2009-12-01 23:10:30.000000000 +0000 --- bindings/Makefile.in.orig 2010-03-23 01:30:03.000000000 +0800
+++ ./bindings/Makefile.in 2009-12-01 23:14:10.000000000 +0000 +++ bindings/Makefile.in 2010-04-26 03:43:31.000000000 +0800
@@ -679,9 +679,9 @@ @@ -696,9 +696,9 @@
all-local: @COMP_PERL@ @COMP_RUBY@ @COMP_PYTHON@ all-local: @COMP_PERL@ @COMP_RUBY@ @COMP_PYTHON@
install-data-local: 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 $(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 # rules for building the ruby module
@@ -692,7 +692,8 @@ @@ -709,7 +709,7 @@
# rules for building the pyton module # 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 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 + 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 # rules for building the perl module
perl_piped: perl-piped/Makefile perl_piped: perl-piped/Makefile

6
databases/rrdtool/files/patch-doc-Makefile.in
View file

@ -1,6 +1,6 @@
--- ./doc/Makefile.in.orig 2009-12-01 23:14:57.000000000 +0000 --- doc/Makefile.in.orig 2010-04-26 03:40:16.000000000 +0800
+++ ./doc/Makefile.in 2009-12-01 23:18:22.000000000 +0000 +++ doc/Makefile.in 2010-04-26 03:44:14.000000000 +0800
@@ -327,9 +327,9 @@ @@ -344,9 +344,9 @@
# what should go into the distribution # 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 EXTRA_DIST = $(POD) $(POD3) $(HTML) $(MAN) $(MAN3) $(TXT) rrdtool-dump.dtd rrdtool-xport.dtd rrdgraph_libdbi.pod rrdlua.pod

6
databases/rrdtool/files/patch-examples-Makefile.in
View file

@ -1,6 +1,6 @@
--- ./examples/Makefile.in.orig 2009-12-01 23:18:52.000000000 +0000 --- examples/Makefile.in.orig 2010-03-23 01:30:04.000000000 +0800
+++ ./examples/Makefile.in 2009-12-01 23:19:10.000000000 +0000 +++ examples/Makefile.in 2010-04-26 03:45:47.000000000 +0800
@@ -352,7 +352,7 @@ @@ -369,7 +369,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
SUBDIRS = rrdcached SUBDIRS = rrdcached
EXTRA_DIST = cgi-demo.cgi.in EXTRA_DIST = cgi-demo.cgi.in

6
databases/rrdtool/files/patch-src-rrd_open.c
View file

@ -1,6 +1,6 @@
--- ./src/rrd_open.c.orig 2009-12-01 23:21:20.000000000 +0000 --- src/rrd_open.c.orig 2010-03-23 00:05:55.000000000 +0800
+++ ./src/rrd_open.c 2009-12-01 23:22:41.000000000 +0000 +++ src/rrd_open.c 2010-04-26 03:46:23.000000000 +0800
@@ -552,9 +552,6 @@ @@ -555,9 +555,6 @@
int ret; int ret;
#ifdef HAVE_MMAP #ifdef HAVE_MMAP

11
databases/rrdtool/pkg-plist
View file

@ -14,18 +14,19 @@ lib/librrd_th.la
lib/librrd_th.so lib/librrd_th.so
lib/librrd_th.so.5 lib/librrd_th.so.5
libdata/pkgconfig/librrd.pc libdata/pkgconfig/librrd.pc
%%WITH_PERL%%%%SITE_PERL%%/RRDp.pm
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
%%WITH_PERL%%%%SITE_PERL%%/RRDp.pm
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/py_rrdtool-0.2.1-py2.6.egg-info
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtoolmodule.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtoolmodule.so
%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so %%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs
%%PORTEXAMPLES%%share/rrdtool/examples/rrdcached/RRDCached.pm %%PORTEXAMPLES%%share/rrdtool/examples/rrdcached/RRDCached.pm
%%PORTEXAMPLES%%share/rrdtool/examples/rrdcached/rrdcached-size.pl %%PORTEXAMPLES%%share/rrdtool/examples/rrdcached/rrdcached-size.pl
@dirrm share/rrdtool/examples/rrdcached %%PORTEXAMPLES%%@dirrm share/rrdtool/examples/rrdcached
@dirrm share/rrdtool/examples %%PORTEXAMPLES%%@dirrm share/rrdtool/examples
@dirrm share/rrdtool %%PORTEXAMPLES%%@dirrm share/rrdtool