wok rev 22608

updated collectd, collectd-apache and collectd-dev (5.8.1 -> 5.10.0)
author Hans-G?nter Theisgen
date Thu Jan 09 17:57:27 2020 +0100 (2020-01-09)
parents ff56d6426891
children bf3436efb3ae
files collectd-apache/receipt collectd-dev/receipt collectd/receipt
line diff
     1.1 --- a/collectd-apache/receipt	Thu Jan 09 16:57:59 2020 +0100
     1.2 +++ b/collectd-apache/receipt	Thu Jan 09 17:57:27 2020 +0100
     1.3 @@ -1,27 +1,28 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="collectd-apache"
     1.7 -VERSION="5.8.1"
     1.8 +VERSION="5.10.0"
     1.9  CATEGORY="network"
    1.10 -SHORT_DESC="Apache plugin for Collectd"
    1.11 +SHORT_DESC="Apache plugin for Collectd."
    1.12  MAINTAINER="erjo@slitaz.org"
    1.13  LICENSE="GPL2"
    1.14 -WEB_SITE="http://collectd.org"
    1.15 +WEB_SITE="https://collectd.org"
    1.16 +
    1.17 +DEPENDS="apache libcurl"
    1.18 +BUILD_DEPENDS="curl-dev"
    1.19 +WANTED="collectd"
    1.20  
    1.21  #CONFIG_FILES="/etc/collectd/collectd.conf"
    1.22 -WANTED="collectd"
    1.23 -DEPENDS="libcurl apache"
    1.24 -BUILD_DEPENDS="curl-dev"
    1.25  
    1.26  # Rules to configure and make the package.
    1.27  compile_rules()
    1.28  {
    1.29 -	./configure \
    1.30 -		--prefix=/usr \
    1.31 -		--localstatedir=/var \
    1.32 -		--enable-apache \
    1.33 -		--disable-all-plugins \
    1.34 -		--sysconfdir=/etc/collectd \
    1.35 +	./configure				\
    1.36 +		--prefix=/usr			\
    1.37 +		--localstatedir=/var		\
    1.38 +		--enable-apache			\
    1.39 +		--disable-all-plugins		\
    1.40 +		--sysconfdir=/etc/collectd	\
    1.41  		$CONFIGURE_ARGS &&
    1.42  	make &&
    1.43  	make DESTDIR=$DESTDIR install
    1.44 @@ -31,6 +32,5 @@
    1.45  genpkg_rules()
    1.46  {
    1.47  	mkdir -p $fs/usr/lib/collectd
    1.48 -
    1.49 -	cp -a $install/usr/lib/collectd/*.so* $fs/usr/lib/collectd
    1.50 +	cp -a $install/usr/lib/collectd/*.so*	$fs/usr/lib/collectd
    1.51  }
     2.1 --- a/collectd-dev/receipt	Thu Jan 09 16:57:59 2020 +0100
     2.2 +++ b/collectd-dev/receipt	Thu Jan 09 17:57:27 2020 +0100
     2.3 @@ -1,25 +1,22 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="collectd-dev"
     2.7 -VERSION="5.8.1"
     2.8 +VERSION="5.10.0"
     2.9  CATEGORY="network"
    2.10 -SHORT_DESC="System Stattistics Collection Daemon"
    2.11 +SHORT_DESC="System Statistics Collection Daemon - development files."
    2.12  MAINTAINER="erjo@slitaz.org"
    2.13  LICENSE="GPL2"
    2.14 -WEB_SITE="http://collectd.org"
    2.15 -
    2.16 -WANTED="collectd"
    2.17 -# Rules to config
    2.18 +WEB_SITE="https://collectd.org"
    2.19  
    2.20  DEPENDS="pkg-config"
    2.21 +WANTED="collectd"
    2.22  
    2.23  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.24  genpkg_rules()
    2.25  {
    2.26  	mkdir -p $fs/usr/lib
    2.27  
    2.28 -	cp -a $install/usr/include $fs/usr
    2.29 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    2.30 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    2.31 -
    2.32 +	cp -a $install/usr/include		$fs/usr
    2.33 +	cp -a $install/usr/lib/*.*a		$fs/usr/lib
    2.34 +	cp -a $install/usr/lib/pkgconfig	$fs/usr/lib
    2.35  }
     3.1 --- a/collectd/receipt	Thu Jan 09 16:57:59 2020 +0100
     3.2 +++ b/collectd/receipt	Thu Jan 09 17:57:27 2020 +0100
     3.3 @@ -1,38 +1,39 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="collectd"
     3.7 -VERSION="5.8.1"
     3.8 +VERSION="5.10.0"
     3.9  CATEGORY="network"
    3.10 -SHORT_DESC="System Stattistics Collection Daemon"
    3.11 +SHORT_DESC="System Statistics Collection Daemon."
    3.12  MAINTAINER="erjo@slitaz.org"
    3.13  LICENSE="GPL2"
    3.14 -WEB_SITE="http://collectd.org"
    3.15 +WEB_SITE="https://collectd.org"
    3.16  
    3.17  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    3.18  WGET_URL="http://collectd.org/files/$TARBALL"
    3.19 +
    3.20 +DEPENDS="perl rrdtool"
    3.21 +BUILD_DEPENDS="rrdtool-dev slitaz-toolchain"
    3.22 +
    3.23  CONFIG_FILES="/etc/collectd/collectd.conf"
    3.24  
    3.25 -DEPENDS="rrdtool perl"
    3.26 -BUILD_DEPENDS="slitaz-toolchain rrdtool-dev"
    3.27 -
    3.28  # Rules to configure and make the package.
    3.29  compile_rules()
    3.30  {
    3.31 -	./configure \
    3.32 -		--prefix=/usr \
    3.33 -		--localstatedir=/var \
    3.34 -		--enable-interface \
    3.35 -		--enable-load \
    3.36 -		--enable-cpu \
    3.37 -		--enable-disk \
    3.38 -		--enable-logfile \
    3.39 -		--enable-syslog \
    3.40 -		--enable-csv\
    3.41 -		--enable-rrdtool \
    3.42 -		--with-librrdtool=/usr/include \
    3.43 -		--disable-all-plugins \
    3.44 -		--sysconfdir=/etc/collectd \
    3.45 -		--localstatedir=/var \
    3.46 +	./configure				\
    3.47 +		--prefix=/usr			\
    3.48 +		--localstatedir=/var		\
    3.49 +		--enable-interface		\
    3.50 +		--enable-load			\
    3.51 +		--enable-cpu			\
    3.52 +		--enable-disk			\
    3.53 +		--enable-logfile		\
    3.54 +		--enable-syslog			\
    3.55 +		--enable-csv			\
    3.56 +		--enable-rrdtool		\
    3.57 +		--with-librrdtool=/usr/include	\
    3.58 +		--disable-all-plugins		\
    3.59 +		--sysconfdir=/etc/collectd	\
    3.60 +		--localstatedir=/var		\
    3.61  		$CONFIGURE_ARGS &&
    3.62  	make &&
    3.63  	make DESTDIR=$DESTDIR install
    3.64 @@ -42,20 +43,21 @@
    3.65  genpkg_rules()
    3.66  {
    3.67  
    3.68 -	mkdir -p $fs/usr/lib/collectd \
    3.69 -		$fs/usr/share \
    3.70 -		$fs/etc/init.d
    3.71 -	
    3.72 -	cp -a $install/etc $fs/
    3.73 -	cp -a $install/var $fs/
    3.74 -	cp -a $install/usr/share/collectd $fs/usr/share
    3.75 -	cp -a $install/usr/bin $fs/usr
    3.76 -	cp -a $install/usr/sbin $fs/usr
    3.77 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    3.78 -	cp -a $install/usr/lib/collectd/*.so $fs/usr/lib/collectd
    3.79 -	cp -a $install/usr/lib/perl5 $fs/usr/lib
    3.80 -	
    3.81 +	mkdir -p $fs/usr/lib/collectd
    3.82 +	mkdir -p $fs/usr/share
    3.83 +	mkdir -p $fs/etc/init.d
    3.84 +
    3.85 +	cp -a $install/etc			$fs
    3.86 +	cp -a $install/var			$fs
    3.87 +	cp -a $install/usr/share/collectd	$fs/usr/share
    3.88 +	cp -a $install/usr/bin			$fs/usr
    3.89 +	cp -a $install/usr/sbin			$fs/usr
    3.90 +	cp -a $install/usr/lib/*.so*		$fs/usr/lib
    3.91 +	cp -a $install/usr/lib/collectd/*.so	$fs/usr/lib/collectd
    3.92 +	cp -a $install/usr/lib/perl5		$fs/usr/lib
    3.93 +
    3.94  	# Add init script and fixes
    3.95 -	install -g root -o root -m 0755 $stuff/collectd $fs/etc/init.d
    3.96 -	chmod 0644 $fs/etc/collectd/*
    3.97 +	install -g root -o root -m 0755 $stuff/collectd \
    3.98 +						$fs/etc/init.d
    3.99 +	chmod 0644				$fs/etc/collectd/*
   3.100  }