pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

rrdtool: remove, pkgsrc one is newer.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun Sep 4 19:55:48 2016 +0200
Changeset:	751611ebbd013c1e712923e08cd87a48533a2270

Modified Files:
	Makefile
Removed Files:
	rrdtool/DESCR
	rrdtool/Makefile
	rrdtool/PLIST
	rrdtool/TODO
	rrdtool/buildlink3.mk
	rrdtool/distinfo
	rrdtool/patches/patch-aa
	rrdtool/patches/patch-ab
	rrdtool/patches/patch-al
	rrdtool/patches/patch-am
	rrdtool/patches/patch-bindings_perl-shared_Makefile.PL

Log Message:
rrdtool: remove, pkgsrc one is newer.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=751611ebbd013c1e712923e08cd87a48533a2270

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |   4 +-
 rrdtool/DESCR                                      |  11 --
 rrdtool/Makefile                                   |  57 ---------
 rrdtool/PLIST                                      | 142 ---------------------
 rrdtool/TODO                                       |  42 ------
 rrdtool/buildlink3.mk                              |  23 ----
 rrdtool/distinfo                                   |  10 --
 rrdtool/patches/patch-aa                           |  13 --
 rrdtool/patches/patch-ab                           |  27 ----
 rrdtool/patches/patch-al                           |  15 ---
 rrdtool/patches/patch-am                           |  15 ---
 .../patches/patch-bindings_perl-shared_Makefile.PL |  18 ---
 12 files changed, 2 insertions(+), 375 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index c02adcb..1fc23c5 100644
--- a/Makefile
+++ b/Makefile
@@ -3220,7 +3220,6 @@ SUBDIR+=	py-parameters
 SUBDIR+=	py-paramunittest
 SUBDIR+=	py-path.py
 SUBDIR+=	py-pathlib
-SUBDIR+=	py-pbkdf2
 SUBDIR+=	py-pcapy
 SUBDIR+=	py-pdef
 SUBDIR+=	py-pdfposter
@@ -3446,6 +3445,7 @@ SUBDIR+=	py-sphereTS
 SUBDIR+=	py-sphinxreport
 SUBDIR+=	py-sphviewer
 SUBDIR+=	py-spm1d
+SUBDIR+=	py-spotpy
 SUBDIR+=	py-sppy
 SUBDIR+=	py-spyse
 SUBDIR+=	py-sqlalchemy-searchable
@@ -3464,6 +3464,7 @@ SUBDIR+=	py-sunpy
 SUBDIR+=	py-swiginac
 SUBDIR+=	py-symath
 SUBDIR+=	py-symboltype
+SUBDIR+=	py-symcxx
 SUBDIR+=	py-symeig
 SUBDIR+=	py-sympycore
 SUBDIR+=	py-t3m
@@ -3708,7 +3709,6 @@ SUBDIR+=	roxterm
 SUBDIR+=	rpcemu
 SUBDIR+=	rpki-svn
 SUBDIR+=	rpm5
-SUBDIR+=	rrdtool
 SUBDIR+=	rsem
 SUBDIR+=	rsget
 SUBDIR+=	rsound
diff --git a/rrdtool/DESCR b/rrdtool/DESCR
deleted file mode 100644
index cbb1d37..0000000
--- a/rrdtool/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-Round Robin Database Tools
-==========================
-
-It is pretty easy to gather status information from all sorts of things,
-ranging from the temperature in your office to the number of octets which
-have passed through the FDDI interface of your router. But it is not so
-trivial to store this data in a efficient and systematic manner. This is
-where RRDtool kicks in. It lets you log and analyze the data you gather from
-all kinds of data-sources (DS). The data analysis part of RRDtool is based
-on the ability to quickly generate graphical representations of the data
-values collected over a definable time period.
diff --git a/rrdtool/Makefile b/rrdtool/Makefile
deleted file mode 100644
index 407ad7a..0000000
--- a/rrdtool/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2015/08/16 13:23:24 makoto Exp $
-#
-# Please, also update databases/ruby-rrdtool
-
-DISTNAME=	rrdtool-1.5.4
-CATEGORIES=	databases graphics net
-MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://oss.oetiker.ch/rrdtool/
-COMMENT=	Data analysis tool generating graphical representations
-LICENSE=	gnu-gpl-v2
-
-DEPENDS+=		dejavu-ttf>=2.26:../../fonts/dejavu-ttf
-
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake pkg-config perl msgfmt intltool groff nroff
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-shared
-CONFIGURE_ARGS+=	--with-perl-options=${MAKE_PARAMS:Q}
-CONFIGURE_ARGS+=	--disable-tcl
-CONFIGURE_ARGS+=	--disable-python
-CONFIGURE_ARGS+=	--disable-ruby
-CONFIGURE_ARGS+=	--disable-lua
-CONFIGURE_ARGS+=	--disable-libdbi
-
-PTHREAD_OPTS+=		require
-PERL5_CONFIGURE=	no
-PERL5_PACKLIST+=	auto/RRDp/.packlist
-PERL5_PACKLIST+=	auto/RRDs/.packlist
-
-# rrdtool explicitly forbids any use of -ffast-math
-BUILDLINK_TRANSFORM+=	rm:-ffast-math
-
-SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-build
-SUBST_MESSAGE.prefix=	Fixing $${prefix} in scripts.
-SUBST_FILES.prefix=	examples/cgi-demo.cgi
-SUBST_SED.prefix=	-e '1s,^\#! \$${prefix},\#! ${PREFIX},'
-
-REPLACE_PYTHON=		examples/stripes.py
-TEST_TARGET=		# *** No rule to make target 'test'. 
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/pixman/buildlink3.mk"
-.include "../../lang/perl5/module.mk"
-.include "../../lang/python/application.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/rrdtool/PLIST b/rrdtool/PLIST
deleted file mode 100644
index 50dcbfc..0000000
--- a/rrdtool/PLIST
+++ /dev/null
@@ -1,142 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2015/08/16 13:23:24 makoto Exp $
-bin/rrdcached
-bin/rrdcgi
-bin/rrdcreate
-bin/rrdinfo
-bin/rrdtool
-bin/rrdupdate
-include/rrd.h
-include/rrd_client.h
-include/rrd_format.h
-lib/librrd.la
-lib/librrd_th.la
-lib/pkgconfig/librrd.pc
-man/man1/bin_dec_hex.1
-man/man1/cdeftutorial.1
-man/man1/rpntutorial.1
-man/man1/rrd-beginners.1
-man/man1/rrdbuild.1
-man/man1/rrdcached.1
-man/man1/rrdcgi.1
-man/man1/rrdcreate.1
-man/man1/rrddump.1
-man/man1/rrdfetch.1
-man/man1/rrdfirst.1
-man/man1/rrdflushcached.1
-man/man1/rrdgraph.1
-man/man1/rrdgraph_data.1
-man/man1/rrdgraph_examples.1
-man/man1/rrdgraph_graph.1
-man/man1/rrdgraph_rpn.1
-man/man1/rrdinfo.1
-man/man1/rrdlast.1
-man/man1/rrdlastupdate.1
-man/man1/rrdresize.1
-man/man1/rrdrestore.1
-man/man1/rrdthreads.1
-man/man1/rrdtool.1
-man/man1/rrdtune.1
-man/man1/rrdtutorial.1
-man/man1/rrdupdate.1
-man/man1/rrdxport.1
-man/man3/librrd.3
-share/doc/rrdtool-${PKGVERSION}/html/RRDp.html
-share/doc/rrdtool-${PKGVERSION}/html/RRDs.html
-share/doc/rrdtool-${PKGVERSION}/html/bin_dec_hex.html
-share/doc/rrdtool-${PKGVERSION}/html/cdeftutorial.html
-share/doc/rrdtool-${PKGVERSION}/html/index.html
-share/doc/rrdtool-${PKGVERSION}/html/librrd.html
-share/doc/rrdtool-${PKGVERSION}/html/rpntutorial.html
-share/doc/rrdtool-${PKGVERSION}/html/rrd-beginners.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdbuild.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdcached.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdcgi.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdcreate.html
-share/doc/rrdtool-${PKGVERSION}/html/rrddump.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdfetch.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdfirst.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdflushcached.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdgraph.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_data.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_examples.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_graph.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdgraph_rpn.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdinfo.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdlast.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdlastupdate.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdresize.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdrestore.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdthreads.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdtool.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdtune.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdtutorial.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdupdate.html
-share/doc/rrdtool-${PKGVERSION}/html/rrdxport.html
-share/doc/rrdtool-${PKGVERSION}/txt/bin_dec_hex.pod
-share/doc/rrdtool-${PKGVERSION}/txt/bin_dec_hex.txt
-share/doc/rrdtool-${PKGVERSION}/txt/cdeftutorial.pod
-share/doc/rrdtool-${PKGVERSION}/txt/cdeftutorial.txt
-share/doc/rrdtool-${PKGVERSION}/txt/librrd.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rpntutorial.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rpntutorial.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrd-beginners.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrd-beginners.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdbuild.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdbuild.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdcached.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdcached.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdcgi.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdcgi.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdcreate.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdcreate.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrddump.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrddump.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdfetch.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdfetch.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdfirst.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdfirst.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdflushcached.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdflushcached.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_data.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_data.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_examples.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_examples.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_graph.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_graph.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_rpn.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdgraph_rpn.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdinfo.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdinfo.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdlast.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdlast.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdlastupdate.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdlastupdate.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdresize.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdresize.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdrestore.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdrestore.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdthreads.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdthreads.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdtool.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdtool.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdtune.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdtune.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdtutorial.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdtutorial.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdupdate.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdupdate.txt
-share/doc/rrdtool-${PKGVERSION}/txt/rrdxport.pod
-share/doc/rrdtool-${PKGVERSION}/txt/rrdxport.txt
-share/examples/rrdcached/RRDCached.pm
-share/examples/rrdcached/rrdcached-size.pl
-share/examples/rrdtool/4charts.pl
-share/examples/rrdtool/bigtops.pl
-share/examples/rrdtool/cgi-demo.cgi
-share/examples/rrdtool/minmax.pl
-share/examples/rrdtool/perftest.pl
-share/examples/rrdtool/piped-demo.pl
-share/examples/rrdtool/shared-demo.pl
-share/examples/rrdtool/stripes.pl
-share/examples/rrdtool/stripes.py
diff --git a/rrdtool/TODO b/rrdtool/TODO
deleted file mode 100644
index b4efed5..0000000
--- a/rrdtool/TODO
+++ /dev/null
@@ -1,42 +0,0 @@
-Check following configure result
-
-----------------------------------------------------------------
-Config is DONE!
-
-          With MMAP IO: yes
-          With Locking: yes
-      Build rrd_getopt: no
-       Build rrd_graph: yes
-     Build rrd_restore: yes
-       Static programs: no
-          Perl Modules: perl-piped perl-shared
-           Perl Binary: /usr/pkg/bin/perl
-          Perl Version: 5.22.0
-          Perl Options: INSTALLDIRS=vendor
-          Ruby Modules: 
-           Ruby Binary: /usr/pkg/bin/ruby
-          Ruby Options: sitedir=/usr/pkg/lib/ruby
-    Build Lua Bindings: no
-    Build Tcl Bindings: no
- Build Python Bindings: no
-        Build examples: yes
-       Build rrdcached: yes
-          Build rrdcgi: yes
-       Build librrd MT: yes
-           Use gettext: yes
-           With libDBI: no
-         With librados: no
-          With libwrap: no
-      With systemd dir: 
-
-             Libraries: -lpng -lm  -lglib-2.0 -lintl  -lpangocairo-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lintl -lcairo  -lxml2 
-
-Type 'make' to compile the software and use 'make install' to 
-install everything to: /usr/pkg.
-
-       ... that wishlist is NO JOKE. If you find RRDtool useful
-make me happy. Go to http://tobi.oetiker.ch/wish and
-place an order.
-
-                               -- Tobi Oetiker <tobi%oetiker.ch@localhost>
-----------------------------------------------------------------
diff --git a/rrdtool/buildlink3.mk b/rrdtool/buildlink3.mk
deleted file mode 100644
index 9d93229..0000000
--- a/rrdtool/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2015/08/16 13:23:24 makoto Exp $
-
-BUILDLINK_TREE+=	rrdtool
-
-.if !defined(RRDTOOL_BUILDLINK3_MK)
-RRDTOOL_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.rrdtool+=	rrdtool>=1.3.9
-BUILDLINK_ABI_DEPENDS.rrdtool+=	rrdtool>=1.4.9nb1
-BUILDLINK_PKGSRCDIR.rrdtool?=	../../databases/rrdtool
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/pixman/buildlink3.mk"
-.endif	# RRDTOOL_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-rrdtool
diff --git a/rrdtool/distinfo b/rrdtool/distinfo
deleted file mode 100644
index 271b02a..0000000
--- a/rrdtool/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.3 2015/08/16 13:23:24 makoto Exp $
-
-SHA1 (rrdtool-1.5.4.tar.gz) = 5020ffb6c4d309207df946ab13fafff973465b2a
-RMD160 (rrdtool-1.5.4.tar.gz) = f336795c1ae26eb618793c9899fdf66984861d64
-Size (rrdtool-1.5.4.tar.gz) = 2181438 bytes
-SHA1 (patch-aa) = 317fc6e46e15333574d0e977d8ab34e916920f4a
-SHA1 (patch-ab) = 81131a74c8e9b81edfaa4b6746d4ab8508e82ac2
-SHA1 (patch-al) = 985e90539340c8bac9788e897c4b7b899fe9f6b1
-SHA1 (patch-am) = 6c0a0890b1e8e2c1a186e2015c0cf5acd719b686
-SHA1 (patch-bindings_perl-shared_Makefile.PL) = 1704531ecfcac0aeb0da03f350d9a657e3d8535d
diff --git a/rrdtool/patches/patch-aa b/rrdtool/patches/patch-aa
deleted file mode 100644
index 5e0c086..0000000
--- a/rrdtool/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2015/08/16 13:23:24 makoto Exp $
-
---- src/rrd_lastupdate.c.orig	2012-01-24 10:08:48.000000000 +0000
-+++ src/rrd_lastupdate.c
-@@ -75,7 +75,7 @@ int rrd_lastupdate (int argc, char **arg
-         printf(" %s", ds_names[i]);
-     printf ("\n\n");
- 
--    printf ("%10lu:", last_update);
-+    printf ("%10llu:", (unsigned long long)last_update);
-     for (i = 0; i < ds_count; i++) {
-         printf(" %s", last_ds[i]);
-         free(last_ds[i]);
diff --git a/rrdtool/patches/patch-ab b/rrdtool/patches/patch-ab
deleted file mode 100644
index e3d41d2..0000000
--- a/rrdtool/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2015/08/16 13:23:24 makoto Exp $
-
---- src/rrd_tool.c.orig	2012-01-24 10:08:48.000000000 +0000
-+++ src/rrd_tool.c
-@@ -670,11 +670,11 @@ int HandleInputLine(
-     else if (strcmp("resize", argv[1]) == 0)
-         rrd_resize(argc - 1, &argv[1]);
-     else if (strcmp("last", argv[1]) == 0)
--        printf("%ld\n", rrd_last(argc - 1, &argv[1]));
-+	    printf("%lld\n", (long long)rrd_last(argc - 1, &argv[1]));
-     else if (strcmp("lastupdate", argv[1]) == 0) {
-         rrd_lastupdate(argc - 1, &argv[1]);
-     } else if (strcmp("first", argv[1]) == 0)
--        printf("%ld\n", rrd_first(argc - 1, &argv[1]));
-+	    printf("%lld\n", (long long)rrd_first(argc - 1, &argv[1]));
-     else if (strcmp("update", argv[1]) == 0)
-         rrd_update(argc - 1, &argv[1]);
-     else if (strcmp("fetch", argv[1]) == 0) {
-@@ -692,7 +692,7 @@ int HandleInputLine(
-                 printf("%20s", ds_namv[i]);
-             printf("\n\n");
-             for (ti = start + step; ti <= end; ti += step) {
--                printf("%10lu:", ti);
-+		    printf("%10llu:", (unsigned long long)ti);
-                 for (ii = 0; ii < ds_cnt; ii++)
-                     printf(" %0.10e", *(datai++));
-                 printf("\n");
diff --git a/rrdtool/patches/patch-al b/rrdtool/patches/patch-al
deleted file mode 100644
index 799634b..0000000
--- a/rrdtool/patches/patch-al
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-al,v 1.3 2015/08/16 13:23:24 makoto Exp $
-
-Correct examples directory.
-
---- examples/Makefile.in.orig	2015-08-10 00:17:18.000000000 +0900
-+++ examples/Makefile.in	2015-08-16 22:02:38.000000000 +0900
-@@ -420,7 +420,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = rrdcached
- EXTRA_DIST = cgi-demo.cgi.in stripes.py
--examplesdir = $(pkgdatadir)/examples
-+examplesdir = $(prefix)/share/examples/rrdtool
- examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \
- 	stripes.pl bigtops.pl minmax.pl 4charts.pl perftest.pl \
-         stripes.py
diff --git a/rrdtool/patches/patch-am b/rrdtool/patches/patch-am
deleted file mode 100644
index 28495ee..0000000
--- a/rrdtool/patches/patch-am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-am,v 1.1 2015/08/16 13:23:24 makoto Exp $
-
-Correct examples directory.
-
---- examples/rrdcached/Makefile.in.orig	2010-07-06 07:23:46.000000000 +0000
-+++ examples/rrdcached/Makefile.in
-@@ -283,7 +283,7 @@ target_vendor = @target_vendor@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--examplesdir = $(pkgdatadir)/examples/rrdcached
-+examplesdir = $(prefix)/share/examples/rrdcached
- examples_SCRIPTS = RRDCached.pm rrdcached-size.pl
- EXTRA_DIST = RRDCached.pm rrdcached-size.pl
- all: all-am
diff --git a/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL b/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL
deleted file mode 100644
index 76b1f48..0000000
--- a/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-bindings_perl-shared_Makefile.PL,v 1.1 2015/08/16 13:23:24 makoto Exp $
-
- 
---- bindings/perl-shared/Makefile.PL.orig	2015-04-20 23:12:18.000000000 +0900
-+++ bindings/perl-shared/Makefile.PL	2015-08-16 22:00:55.000000000 +0900
-@@ -40,9 +40,9 @@ if (($Config{'osname'} eq 'MSWin32' && $
- 		for ($^O){
- 			/linux/   && do{ $R = "-Wl,--rpath -Wl,$rp"};
- 			/hpux/    && do{ $R = "+b$rp"};
--			/solaris/ && do{ $R = "-R$rp"};
--			/bsd/     && do{ $R = "-Wl,--rpath -Wl,$rp"};
--			/aix/     && do{ $R = "-blibpath:$rp"};
-+			/solaris/ && do{ $R = "-Wl,-R$rp"};
-+			/bsd/	  && do{ $R = "-Wl,-R$rp"};
-+			/aix/	  && do{ $R = "-Wl,-blibpath:$rp"};
- 		}
- 	}
- 


Home | Main Index | Thread Index | Old Index