Mail archive
alpine-aports

[alpine-aports] Re: [PATCH] main/rrdtool: fix makedepends, split to subpackages

From: Valery Kartel <valery.kartel_at_gmail.com>
Date: Mon, 25 Jan 2016 17:19:44 +0200

I forgot to specify that I upgrade it to 1.5.5

2016-01-25 17:17 GMT+02:00 Valery Kartel <valery.kartel_at_gmail.com>:

> - add libxml2-dev to makedepends
> - libraries are moved to librrd subpackage
> - rrdcgi web-page template parser moved to -cgi subpackage
> - rrdcached daemon moved to -cached subpackage with init script and needed
> filders created
> - standalone utilities (rrdcreate,rrdupdate,rrdinfo) are moved to -utils
> subpackage
> ---
> main/rrdtool/APKBUILD | 51
> +++++++++++++++++++++++++++++++++++---------
> main/rrdtool/rrdcached.initd | 17 +++++++++++++++
> 2 files changed, 58 insertions(+), 10 deletions(-)
> create mode 100644 main/rrdtool/rrdcached.initd
>
> diff --git a/main/rrdtool/APKBUILD b/main/rrdtool/APKBUILD
> index 7fa5287..2fcc0e7 100644
> --- a/main/rrdtool/APKBUILD
> +++ b/main/rrdtool/APKBUILD
> _at__at_ -1,20 +1,23 @@
> +# Contributor: Valery Kartel <valery.kartel_at_gmail.com>
> # Maintainer: Natanael Copa <ncopa_at_alpinelinux.org>
> pkgname=rrdtool
> -pkgver=1.5.4
> -pkgrel=0
> +pkgver=1.5.5
> +pkgrel=1
> pkgdesc="Data logging and graphing application"
> url="http://www.rrdtool.org"
> arch="all"
> license="GPL"
> depends="font-sony-misc"
> -makedepends="libart-lgpl-dev libpng-dev freetype-dev perl-dev cairo-dev
> +makedepends="libart-lgpl-dev libpng-dev freetype-dev perl-dev cairo-dev
> libxml2-dev
> pango-dev lua lua-dev python-dev groff
> autoconf automake libtool"
> -subpackages="$pkgname-dev $pkgname-doc perl-rrd:perl_rrd lua-rrd:lua_rrd
> py-rrd:py_rrd"
> +subpackages="$pkgname-dev $pkgname-doc $pkgname-cached $pkgname-cgi
> $pkgname-utils librrd:libs
> + perl-rrd:perl_rrd lua-rrd:lua_rrd py-rrd:py_rrd"
> source="http://oss.oetiker.ch/$pkgname/pub/$pkgname-$pkgver.tar.gz
> lua-install-cmod.patch
> libm-underlinking.patch
> no-posix-fallocate.patch
> + rrdcached.initd
> "
>
> _builddir="$srcdir"/$pkgname-$pkgver
> _at__at_ -42,6 +45,7 @@ build() {
> --enable-perl-site-install \
> --enable-lua-site-install \
> --with-perl-options="INSTALLDIRS=vendor" \
> + --with-pic \
> || return 1
> make || return 1
> }
> _at__at_ -60,6 +64,30 @@ dev() {
> mv "$pkgdir"/usr/share/$pkgname/examples
> "$subpkgdir"/usr/share/$pkgname/
> }
>
> +cached() {
> + pkgdesc="RRDtool data caching daemon"
> + mkdir -p "$subpkgdir"/usr/sbin \
> + "$subpkgdir"/var/lib/rrdcached/db \
> + "$subpkgdir"/var/lib/rrdcached/journal
> + mv "$pkgdir"/usr/bin/rrdcached "$subpkgdir"/usr/sbin
> + install -Dm755 "$srcdir"/rrdcached.initd
> "$subpkgdir"/etc/init.d/rrdcached
> +}
> +
> +cgi() {
> + pkgdesc="create web pages containing RRD graphs based on templates"
> + mkdir -p "$subpkgdir"/usr/bin
> + mv "$pkgdir"/usr/bin/rrdcgi "$subpkgdir"/usr/bin
> +}
> +
> +utils() {
> + pkgdesc="RRDtool standalone create,update,info utilities"
> + mkdir -p "$subpkgdir"/usr/bin
> + mv "$pkgdir"/usr/bin/rrdinfo \
> + "$pkgdir"/usr/bin/rrdcreate \
> + "$pkgdir"/usr/bin/rrdupdate \
> + "$subpkgdir"/usr/bin
> +}
> +
> perl_rrd() {
> pkgdesc="Perl interface for rrdtool"
> mkdir -p "$subpkgdir"/usr/lib \
> _at__at_ -80,15 +108,18 @@ py_rrd() {
> mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
> }
>
> -md5sums="4daea1e628e1c70d91800d6a06427dc1 rrdtool-1.5.4.tar.gz
> +md5sums="d8b3dcb3d193c2d6ad0a282bde69ee11 rrdtool-1.5.5.tar.gz
> f94e916381af48dcf5687aa046b35aac lua-install-cmod.patch
> ab92a2b87f71d59e3830dac3b227c357 libm-underlinking.patch
> -e14d13f10fa575733e791bcb8b0711fe no-posix-fallocate.patch"
> -sha256sums="3feea3da87c02128a27083f1c7b2cb797ef673e946564c0ce008c1c25a5c3f99
> rrdtool-1.5.4.tar.gz
> +e14d13f10fa575733e791bcb8b0711fe no-posix-fallocate.patch
> +d1a4b08c484b9dfd120c9691f8204919 rrdcached.initd"
> +sha256sums="3a286d449c05d657e3fc3adcaa5cb4f0cfac8f465324b14f364a45d4ff8ca6f6
> rrdtool-1.5.5.tar.gz
> 1e49eeca4561d29da3975f84e06b27f0f305e566bb26922397d938eede678b71
> lua-install-cmod.patch
> 0495bd122941bcd635ca2a2b7c3f01a6eb3ca3e00b7e40c257862b7071b7738a
> libm-underlinking.patch
> -8b32dcf1b8c7f9967934e25ab05ef6a9384cb6096d32dd5d63046bafd7cac1ad
> no-posix-fallocate.patch"
> -sha512sums="1b28db23d138677210e396c2eea48f88839847d0e08a7048b6ffa83384de612c1e71cfd10da0ef59ebc87a2707a72b226153f0d73c78c74f68bb9f721b7ad665
> rrdtool-1.5.4.tar.gz
> +8b32dcf1b8c7f9967934e25ab05ef6a9384cb6096d32dd5d63046bafd7cac1ad
> no-posix-fallocate.patch
> +b05b61a7d2ef4db480b276c1351b50eea5d73c9d0c0223d32ab548d6476926f7
> rrdcached.initd"
> +sha512sums="07fb0edb5fbc0b491f8a40844d4a914f26c6269b2d07ab91f4d54fdcfeb7899348362044ac632223341f30fc10e6748a59863977496801530f5cdd2d61f0e88c
> rrdtool-1.5.5.tar.gz
> 0be4ebb864233cf32fa70c872f5421b2da50ad39d6a265c2f5869337b40647c0b88011ccf41fe17a8d35de915ca1c38d04d67696118e1e32ff774221b1816ab6
> lua-install-cmod.patch
> 94449972ccc7d1a057c2b827c041a16de1667c280a47ef30c1323ec9168812a96374704cc42dd832a30b8cc08d7fad94da44ff3695c66f3a0d324a87158fc23c
> libm-underlinking.patch
> -00d079161551a75f8d4fe5085741d45d9c6b06be0a5163090143c6ab47710e29633414bee4dd68bbf950bf0ba1796bf4623b4f307477265a48f49514c8b790ab
> no-posix-fallocate.patch"
> +00d079161551a75f8d4fe5085741d45d9c6b06be0a5163090143c6ab47710e29633414bee4dd68bbf950bf0ba1796bf4623b4f307477265a48f49514c8b790ab
> no-posix-fallocate.patch
> +c0c27b2c2dfa8e7ec1cb1160d2bda8d7996bbea67f4ce7779da029f583c35e5e415cf46e2a1e5cb8ed2e63d2c58a68fd7471ee6bd820db4c0f4eeeb5c252f8a3
> rrdcached.initd"
> diff --git a/main/rrdtool/rrdcached.initd b/main/rrdtool/rrdcached.initd
> new file mode 100644
> index 0000000..6459d1f
> --- /dev/null
> +++ b/main/rrdtool/rrdcached.initd
> _at__at_ -0,0 +1,17 @@
> +#!/sbin/openrc-run
> +
> +description="RRDtool data caching daemon"
> +pidfile=${pidfile:-/run/rrdcached/rrdcached.pid}
> +socket=${socket:-unix:/run/rrdcached/rrdcached.sock}
> +command="/usr/sbin/rrdcached"
> +command_args="-l $socket -j /var/lib/rrdcached/journal/ -F -b
> /var/lib/rrdcached/db/ -B -p $pidfile"
> +start_stop_daemon_args="--quiet"
> +
> +depend() {
> + need localmount net
> + use logger
> +}
> +
> +start_pre() {
> + checkpath --directory ${pidfile%/*}
> +}
> --
> 2.7.0
>
>



---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Mon Jan 25 2016 - 17:19:44 GMT