cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to rrdtool-1.5.5

Browse Source
This commit is contained in:
sthen 2015-11-23 11:41:02 +00:00
parent 5bd2a921a8
commit 9ba28a8ad7
14 changed files with 127 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
net/rrdtool/Makefile
View File

@ -1,6 +1,4 @@
# $OpenBSD: Makefile,v 1.91 2015/08/25 14:17:45 sthen Exp $
PORTROACH_COMMENT= rrdcached crashes at startup in 1.5.0 to at least 1.5.3
# $OpenBSD: Makefile,v 1.92 2015/11/23 11:41:02 sthen Exp $
SHARED_ONLY= Yes
@ -10,17 +8,15 @@ COMMENT-python= python interface to librrd
COMMENT-ruby= ruby interface to librrd
MODPY_EGG_VERSION= 0.2.2
VERSION= 1.4.9
REVISION-main= 0
VERSION= 1.5.5
DISTNAME= rrdtool-${VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-update= rrdupdate-${VERSION}
PKGNAME-python= py-rrd-${VERSION}
PKGNAME-ruby= ruby-rrd-${VERSION}
REVISION-ruby= 1
SHARED_LIBS += rrd 4.0 # 6.1
SHARED_LIBS += rrd_th 4.0 # 6.1
SHARED_LIBS += rrd 5.0 # 7.0
SHARED_LIBS += rrd_th 5.0 # 7.0
CATEGORIES= net databases
@ -29,7 +25,7 @@ MAINTAINER= Stuart Henderson <sthen@openbsd.org>
HOMEPAGE= http://oss.oetiker.ch/rrdtool/
MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
# GPLv2+, with exceptions for use of the library with certain
# GPLv2+, with exemptions for use of the library with certain
# named open-source licenses; see COPYRIGHT
PERMIT_PACKAGE_CDROM= Yes
@ -39,6 +35,7 @@ PSEUDO_FLAVORS= no_ruby no_python
MULTI_PACKAGES= -main -python -ruby -update
MODULES= devel/gettext lang/python lang/ruby
MODPY_SETUPTOOLS= Yes
CONFIGURE_STYLE= gnu
CPPFLAGS+= -I${X11BASE}/include/ \
@ -73,7 +70,7 @@ MODPY_RUNDEP= No
# needs checking before enabling mmap; is it safe without UBC?
CONFIGURE_ARGS+= --disable-mmap
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -DDEBUG" \
LDFLAGS="${LDFLAGS}"
# autoconf insists on these, but the docs are pre-formatted in the distfile,
# so they aren't needed.
@ -81,7 +78,7 @@ CONFIGURE_ENV+= NROFF="/usr/bin/true" \
TROFF="/usr/bin/true"
cWANTLIB= pthread
WANTLIB-update= ${cWANTLIB} c m
WANTLIB-update= ${cWANTLIB} ${MODGETTEXT_WANTLIB} c glib-2.0 m pcre
WANTLIB-python= ${cWANTLIB} ${MODPY_WANTLIB} rrd
WANTLIB-ruby= ${cWANTLIB} ${MODRUBY_WANTLIB} c gmp m rrd
# depends on Perl ABI
@ -92,12 +89,15 @@ WANTLIB-main += harfbuzz lzma m pango-1.0 pangocairo-1.0
WANTLIB-main += pangoft2-1.0 pcre pixman-1 png pthread-stubs xcb
WANTLIB-main += xcb-render xcb-shm xml2 z
LIB_DEPENDS-main= graphics/png \
LIB_DEPENDS-main= devel/glib2 \
devel/pango \
graphics/png \
textproc/libxml
RUN_DEPENDS-main= rrdupdate-${VERSION}:net/rrdtool,-update
LIB_DEPENDS-update=
LIB_DEPENDS-update= ${MODGETTEXT_LIB_DEPENDS} \
devel/glib2 \
devel/pcre
RUN_DEPENDS-update=
LIB_DEPENDS-python= rrdtool-${VERSION}:net/rrdtool
@ -108,8 +108,8 @@ LIB_DEPENDS-ruby= rrdtool-${VERSION}:net/rrdtool \
RUN_DEPENDS-ruby= ${MODRUBY_RUN_DEPENDS}
post-install:
cd ${WRKSRC}; ${INSTALL_DATA} CHANGES CONTRIBUTORS COPYRIGHT \
NEWS README ${PREFIX}/share/doc/rrdtool
cd ${WRKSRC}; ${INSTALL_DATA} CHANGES COPYRIGHT \
NEWS ${PREFIX}/share/doc/rrdtool
rm -r ${PREFIX}/share/doc/rrdtool/txt
${SUBST_PROGRAM} ${FILESDIR}/rrdtool-chroot.sh \
${PREFIX}/share/examples/rrdtool/rrdtool-chroot

4
net/rrdtool/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (rrdtool-1.4.9.tar.gz) = Pigm4NYKr4UxPaNbPA06kmdI/kgrStp2ajJag7YBJcw=
SIZE (rrdtool-1.4.9.tar.gz) = 1385640
SHA256 (rrdtool-1.5.5.tar.gz) = OihtRJwF1lfj/Drcqly08M+sj0ZTJLFPNkpF1P+MpvY=
SIZE (rrdtool-1.5.5.tar.gz) = 2187685

11
net/rrdtool/patches/patch-bindings_Makefile_in Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-bindings_Makefile_in,v 1.4 2015/11/23 11:41:02 sthen Exp $
--- bindings/Makefile.in.orig Sun Aug 9 16:17:18 2015
+++ bindings/Makefile.in Wed Aug 12 16:27:51 2015
@@ -725,6 +725,7 @@ install-data-local:
&& ( cd ${builddir}/python \
&& env BUILDLIBDIR=${abs_top_builddir}/src/.libs \
$(PYTHON) ${abs_srcdir}/python/setup.py install \
+ --single-version-externally-managed \
--skip-build --root=$(DESTDIR) --prefix=$(prefix) \
--exec-prefix=$(exec_prefix)) \
|| true

11
net/rrdtool/patches/patch-bindings_ruby_extconf_rb
View File

@ -1,10 +1,11 @@
$OpenBSD: patch-bindings_ruby_extconf_rb,v 1.3 2013/11/05 17:49:01 sthen Exp $
--- bindings/ruby/extconf.rb.orig Thu May 23 08:55:07 2013
+++ bindings/ruby/extconf.rb Thu May 23 20:20:56 2013
@@ -14,5 +14,5 @@ elsif /aix/ =~ RUBY_PLATFORM
$OpenBSD: patch-bindings_ruby_extconf_rb,v 1.4 2015/11/23 11:41:02 sthen Exp $
--- bindings/ruby/extconf.rb.orig Thu Mar 26 12:34:34 2015
+++ bindings/ruby/extconf.rb Mon Apr 20 09:37:21 2015
@@ -14,5 +14,6 @@ elsif /aix/ =~ RUBY_PLATFORM
end
dir_config("rrd","../../src","../../src/.libs")
dir_config("rrd",['$(ABS_TOP_BUILDDIR)/src', '$(ABS_TOP_SRCDIR)/src'],'$(ABS_TOP_BUILDDIR)/src/.libs')
-have_library("rrd", "rrd_create")
+# have_library("rrd", "rrd_create")
+$LDFLAGS+= ' -lrrd'
create_makefile("RRD")

8
net/rrdtool/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.9 2014/10/02 13:27:33 sthen Exp $
--- configure.orig Mon Sep 29 23:46:41 2014
+++ configure Wed Oct 1 21:46:35 2014
@@ -24039,15 +24039,10 @@ $as_echo_n "checking in... " >&6; }
$OpenBSD: patch-configure,v 1.10 2015/11/23 11:41:02 sthen Exp $
--- configure.orig Sun Aug 9 16:17:15 2015
+++ configure Wed Aug 12 16:27:51 2015
@@ -27445,15 +27445,10 @@ $as_echo_n "checking in... " >&6; }
$as_echo "and out again" >&6; }
echo $ECHO_N "ordering CD from http://tobi.oetiker.ch/wish $ECHO_C" 1>&6

8
net/rrdtool/patches/patch-doc_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.9 2014/10/02 13:27:33 sthen Exp $
--- doc/Makefile.in.orig Mon Sep 29 23:46:44 2014
+++ doc/Makefile.in Wed Oct 1 21:46:35 2014
@@ -260,7 +260,7 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
$OpenBSD: patch-doc_Makefile_in,v 1.10 2015/11/23 11:41:02 sthen Exp $
--- doc/Makefile.in.orig Sat Feb 21 16:07:56 2015
+++ doc/Makefile.in Fri Feb 27 14:31:45 2015
@@ -264,7 +264,7 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@

14
net/rrdtool/patches/patch-examples_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-examples_Makefile_in,v 1.9 2014/10/02 13:27:33 sthen Exp $
--- examples/Makefile.in.orig Mon Sep 29 23:46:44 2014
+++ examples/Makefile.in Wed Oct 1 21:46:35 2014
@@ -416,7 +416,7 @@ top_builddir = @top_builddir@
$OpenBSD: patch-examples_Makefile_in,v 1.10 2015/11/23 11:41:02 sthen Exp $
--- examples/Makefile.in.orig Sun Aug 9 16:17:18 2015
+++ examples/Makefile.in Wed Aug 12 16:28:37 2015
@@ -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 = $(datadir)/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

14
net/rrdtool/patches/patch-examples_rrdcached_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-examples_rrdcached_Makefile_in,v 1.2 2014/10/02 13:27:33 sthen Exp $
--- examples/rrdcached/Makefile.in.orig Mon Sep 29 23:46:44 2014
+++ examples/rrdcached/Makefile.in Wed Oct 1 21:46:35 2014
@@ -349,7 +349,7 @@ target_vendor = @target_vendor@
$OpenBSD: patch-examples_rrdcached_Makefile_in,v 1.3 2015/11/23 11:41:02 sthen Exp $
--- examples/rrdcached/Makefile.in.orig Tue Nov 10 16:59:27 2015
+++ examples/rrdcached/Makefile.in Wed Nov 11 21:19:43 2015
@@ -356,7 +356,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-examplesdir = $(pkgdatadir)/examples/rrdcached
+examplesdir = $(datadir)/examples/rrdtool/rrdcached
examples_SCRIPTS = RRDCached.pm rrdcached-size.pl
EXTRA_DIST = RRDCached.pm rrdcached-size.pl
all: all-am
examples_SCRIPTS = rrdcached-size.pl
examples_DATA = RRDCached.pm
EXTRA_DIST = $(examples_DATA) $(examples_SCRIPTS)

8
net/rrdtool/patches/patch-src_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.13 2014/10/02 13:27:33 sthen Exp $
--- src/Makefile.in.orig Mon Sep 29 23:46:44 2014
+++ src/Makefile.in Wed Oct 1 21:46:35 2014
@@ -542,7 +542,7 @@ include_HEADERS = rrd.h rrd_format.h rrd_client.h
$OpenBSD: patch-src_Makefile_in,v 1.14 2015/11/23 11:41:02 sthen Exp $
--- src/Makefile.in.orig Sun Aug 9 16:17:18 2015
+++ src/Makefile.in Wed Aug 12 16:27:51 2015
@@ -576,7 +576,7 @@ include_HEADERS = rrd.h rrd_format.h rrd_client.h
rrdcgi_SOURCES = rrd_cgi.c
rrdcgi_LDADD = librrd.la
rrdupdate_SOURCES = rrdupdate.c

8
net/rrdtool/patches/patch-src_rrd_config_bottom_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_rrd_config_bottom_h,v 1.1 2013/11/05 17:49:01 sthen Exp $
--- src/rrd_config_bottom.h.orig Thu May 23 08:55:07 2013
+++ src/rrd_config_bottom.h Thu May 23 19:34:50 2013
@@ -15,12 +15,21 @@
$OpenBSD: patch-src_rrd_config_bottom_h,v 1.2 2015/11/23 11:41:02 sthen Exp $
--- src/rrd_config_bottom.h.orig Fri May 1 09:45:47 2015
+++ src/rrd_config_bottom.h Fri May 15 14:37:54 2015
@@ -16,12 +16,21 @@
#endif
/* FreeBSD 4.8 wants this included BEFORE sys/types.h */

51
net/rrdtool/patches/patch-src_rrd_daemon_c Normal file
View File

@ -0,0 +1,51 @@
$OpenBSD: patch-src_rrd_daemon_c,v 1.1 2015/11/23 11:41:02 sthen Exp $
From 2a1731043212a8fa623566f7550c052f9c031860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Michel=20Vourg=C3=A8re?= <nirgal@debian.org>
Date: Wed, 26 Aug 2015 12:10:59 +0200
Subject: [PATCH] Fixed compilation when there's no sigwaitinfo
* Fixed pointer in call to sigwait
* Don't print pid when we don't have it
* Fixed unused variable warning
--- src/rrd_daemon.c.orig Tue Nov 10 17:15:18 2015
+++ src/rrd_daemon.c Mon Nov 23 11:26:04 2015
@@ -335,16 +335,16 @@ static void sig_common (const char *sig) /* {{{ */
static void* signal_receiver (void UNUSED(*args))
{
- siginfo_t signal_info;
int status;
while (1)
{
#if defined(HAVE_SIGWAITINFO)
+ siginfo_t signal_info;
status = sigwaitinfo(&signal_set, &signal_info);
#elif defined(HAVE_SIGWAIT)
status = -1;
- if (sigwait(signal_set, &status) < 0 ){
+ if (sigwait(&signal_set, &status) < 0 ){
status = -1;
}
#else
@@ -408,11 +408,18 @@ static void* signal_receiver (void UNUSED(*args))
break;
default:
+#if defined(HAVE_SIGWAITINFO)
RRDD_LOG(LOG_NOTICE,
"%s: Signal %d was received from process %u.\n",
__func__,
status,
signal_info.si_pid);
+#else
+ RRDD_LOG(LOG_NOTICE,
+ "%s: Signal %d was received.\n",
+ __func__,
+ status);
+#endif
}
}

19
net/rrdtool/patches/patch-src_rrdupdate_c
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-src_rrdupdate_c,v 1.1 2013/11/05 17:49:01 sthen Exp $
https://github.com/oetiker/rrdtool-1.x/pull/401
--- src/rrdupdate.c.orig Sat Jun 15 10:07:57 2013
+++ src/rrdupdate.c Sat Jun 15 10:08:13 2013
@@ -15,7 +15,12 @@
#endif
#include "rrd.h"
+/* for basename */
+#ifdef HAVE_LIBGEN_H
+# include <libgen.h>
+#else
#include "plbasename.h"
+#endif
int main(
int argc,

11
net/rrdtool/pkg/PLIST-main
View File

@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST-main,v 1.5 2014/06/14 10:34:45 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.6 2015/11/23 11:41:02 sthen Exp $
@conflict p5-RRD-*
@pkgpath net/rrdtool,-perl
@newgroup _rrdcached:726
@newuser _rrdcached:726:_rrdcached:daemon:rrdcached user:/nonexistent:/sbin/nologin
@conflict p5-RRD-*
@extraunexec rm -f /var/db/rrd/*.rrd /var/db/rrd/journal/*
@pkgpath net/rrdtool,-perl
@bin bin/rrdcached
@bin bin/rrdcgi
@bin bin/rrdtool
@ -22,7 +22,6 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/RRDs.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/RRDs/
@comment libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/RRDs/RRDs.bs
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/RRDs/RRDs.so
@man man/man1/bin_dec_hex.1
@man man/man1/cdeftutorial.1
@ -55,10 +54,8 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/RRDs/RRDs.so
share/doc/pkg-readmes/${FULLPKGNAME}
share/doc/rrdtool/
share/doc/rrdtool/CHANGES
share/doc/rrdtool/CONTRIBUTORS
share/doc/rrdtool/COPYRIGHT
share/doc/rrdtool/NEWS
share/doc/rrdtool/README
share/examples/rrdtool/
share/examples/rrdtool/4charts.pl
share/examples/rrdtool/bigtops.pl
@ -72,8 +69,8 @@ share/examples/rrdtool/rrdcached/rrdcached-size.pl
share/examples/rrdtool/rrdtool-chroot
share/examples/rrdtool/shared-demo.pl
share/examples/rrdtool/stripes.pl
@owner _rrdcached
@mode 750
@owner _rrdcached
@sample /var/db/rrd/
@sample /var/db/rrd/journal/
@mode

13
net/rrdtool/pkg/PLIST-python
View File

@ -1,5 +1,8 @@
@comment $OpenBSD: PLIST-python,v 1.2 2009/01/26 21:26:32 sthen Exp $
lib/python${MODPY_VERSION}/
lib/python${MODPY_VERSION}/site-packages/
lib/python${MODPY_VERSION}/site-packages/py_rrdtool-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/rrdtoolmodule.so
@comment $OpenBSD: PLIST-python,v 1.3 2015/11/23 11:41:02 sthen Exp $
lib/python${MODPY_VERSION}/site-packages/py_rrdtool-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/py_rrdtool-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/py_rrdtool-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/py_rrdtool-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/py_rrdtool-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/rrdtool.so
share/examples/rrdtool/stripes.py