Import of pkgsrc-2015Q3
This commit is contained in:
@@ -1,9 +1,8 @@
|
||||
# $NetBSD: Makefile,v 1.118 2015/06/12 10:48:46 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.119 2015/08/18 12:29:44 mef Exp $
|
||||
#
|
||||
# Please, also update databases/ruby-rrdtool
|
||||
|
||||
DISTNAME= rrdtool-1.4.9
|
||||
PKGREVISION= 2
|
||||
DISTNAME= rrdtool-1.5.4
|
||||
CATEGORIES= databases graphics net
|
||||
MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
|
||||
|
||||
@@ -39,6 +38,9 @@ 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"
|
||||
@@ -49,5 +51,7 @@ SUBST_SED.prefix= -e '1s,^\#! \$${prefix},\#! ${PREFIX},'
|
||||
.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"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@comment $NetBSD: PLIST,v 1.14 2014/08/24 07:06:02 adam Exp $
|
||||
@comment $NetBSD: PLIST,v 1.15 2015/08/18 12:29:44 mef Exp $
|
||||
bin/rrdcached
|
||||
bin/rrdcgi
|
||||
bin/rrdcreate
|
||||
@@ -139,3 +139,4 @@ 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
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
$NetBSD: distinfo,v 1.46 2014/10/07 10:23:41 adam Exp $
|
||||
$NetBSD: distinfo,v 1.48 2015/08/26 22:03:38 joerg Exp $
|
||||
|
||||
SHA1 (rrdtool-1.4.9.tar.gz) = c83b158b4aaadbf28b15823fa863db1672700d3b
|
||||
RMD160 (rrdtool-1.4.9.tar.gz) = 8c067f0207bdfeb067be3c9b31c8e35009485200
|
||||
Size (rrdtool-1.4.9.tar.gz) = 1385640 bytes
|
||||
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) = abc25497a10d59b1ad2e3a263f818eef89985538
|
||||
SHA1 (patch-al) = 985e90539340c8bac9788e897c4b7b899fe9f6b1
|
||||
SHA1 (patch-am) = 6c0a0890b1e8e2c1a186e2015c0cf5acd719b686
|
||||
SHA1 (patch-bindings_perl-shared_Makefile.PL) = d767dca08217a909132646216679a5d1fad4b77c
|
||||
SHA1 (patch-bindings_perl-shared_Makefile.PL) = 1704531ecfcac0aeb0da03f350d9a657e3d8535d
|
||||
SHA1 (patch-src_gettext.h) = 1254beedc267d901e154ea98599bdfddbe49ddc0
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
$NetBSD: patch-al,v 1.17 2010/07/06 07:31:20 adam Exp $
|
||||
$NetBSD: patch-al,v 1.18 2015/08/18 12:29:44 mef Exp $
|
||||
|
||||
Correct examples directory.
|
||||
|
||||
--- examples/Makefile.in.orig 2010-07-05 19:31:54.000000000 +0000
|
||||
+++ examples/Makefile.in
|
||||
@@ -330,7 +330,7 @@ top_builddir = @top_builddir@
|
||||
--- 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
|
||||
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.pl bigtops.pl minmax.pl 4charts.pl perftest.pl \
|
||||
stripes.py
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
$NetBSD: patch-bindings_perl-shared_Makefile.PL,v 1.1 2013/10/20 18:18:52 joerg Exp $
|
||||
$NetBSD: patch-bindings_perl-shared_Makefile.PL,v 1.2 2015/08/18 12:29:44 mef Exp $
|
||||
|
||||
--- bindings/perl-shared/Makefile.PL.orig 2013-10-16 20:05:57.000000000 +0000
|
||||
+++ bindings/perl-shared/Makefile.PL
|
||||
@@ -30,9 +30,9 @@ if (($Config{'osname'} eq 'MSWin32' && $
|
||||
|
||||
--- 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 = "-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"};
|
||||
+ /bsd/ && do{ $R = "-Wl,-R$rp"};
|
||||
+ /aix/ && do{ $R = "-Wl,-blibpath:$rp"};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
15
databases/rrdtool/patches/patch-src_gettext.h
Normal file
15
databases/rrdtool/patches/patch-src_gettext.h
Normal file
@@ -0,0 +1,15 @@
|
||||
$NetBSD: patch-src_gettext.h,v 1.1 2015/08/26 22:03:38 joerg Exp $
|
||||
|
||||
--- src/gettext.h.orig 2015-08-23 14:11:04.000000000 +0000
|
||||
+++ src/gettext.h
|
||||
@@ -16,8 +16,8 @@
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||
USA. */
|
||||
|
||||
-#ifndef LIBGETTEXT_H_74E363E9F6924C7DBC4D0ED9C2FA33DF
|
||||
-#define LIBGETTEXT_H_74E363E9F6924C7DBC4D0ED9C2FA33DF 1
|
||||
+#ifndef _LIBGETTEXT_H
|
||||
+#define _LIBGETTEXT_H
|
||||
|
||||
/* NLS can be disabled through the configure --disable-nls option. */
|
||||
#if ENABLE_NLS
|
||||
Reference in New Issue
Block a user