wok-next rev 20188

collectd-apache: fix wget_url
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Nov 02 20:48:23 2017 +0100 (2017-11-02)
parents 143225e97e0f
children b716559664e1
files collectd-apache/receipt collectd-bind/receipt collectd-dev/process.log collectd-dev/receipt collectd/receipt
line diff
     1.1 --- a/collectd-apache/receipt	Thu Nov 02 20:06:45 2017 +0100
     1.2 +++ b/collectd-apache/receipt	Thu Nov 02 20:48:23 2017 +0100
     1.3 @@ -2,11 +2,12 @@
     1.4  
     1.5  PACKAGE="collectd-apache"
     1.6  VERSION="5.1.0"
     1.7 +SOURCE="collectd"
     1.8  CATEGORY="network"
     1.9  SHORT_DESC="Apache plugin for Collectd"
    1.10  MAINTAINER="erjo@slitaz.org"
    1.11  LICENSE="GPL2"
    1.12 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.13 +TARBALL="$SOURCE-$VERSION.tar.gz"
    1.14  WEB_SITE="http://collectd.org"
    1.15  WGET_URL="http://collectd.org/files/$TARBALL"
    1.16  #CONFIG_FILES="/etc/collectd/collectd.conf"
    1.17 @@ -17,7 +18,6 @@
    1.18  # Rules to configure and make the package.
    1.19  compile_rules()
    1.20  {
    1.21 -	cd $src
    1.22  	./configure \
    1.23  		--prefix=/usr \
    1.24  		--localstatedir=/var \
     2.1 --- a/collectd-bind/receipt	Thu Nov 02 20:06:45 2017 +0100
     2.2 +++ b/collectd-bind/receipt	Thu Nov 02 20:48:23 2017 +0100
     2.3 @@ -16,7 +16,6 @@
     2.4  # Rules to configure and make the package.
     2.5  compile_rules()
     2.6  {
     2.7 -	cd $src
     2.8  	sed -i 's/ipt_error_target/ipt2_error_target/' src/libiptc/libiptc.c
     2.9  	./configure \
    2.10  		--prefix=/usr \
     3.1 --- a/collectd-dev/process.log	Thu Nov 02 20:06:45 2017 +0100
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,13 +0,0 @@
     3.4 -executing genpkg_rules
     3.5 -collectd-4.7.0.tazpkg (done)
     3.6 -date 20090530 15:50:27
     3.7 -package collectd (compile)
     3.8 -no compile_rules
     3.9 -executing genpkg_rules
    3.10 -collectd-4.7.0.tazpkg (done)
    3.11 -executing genpkg_rules
    3.12 -collectd-4.7.0.tazpkg (done)
    3.13 -executing genpkg_rules
    3.14 -collectd-4.7.0.tazpkg (done)
    3.15 -executing genpkg_rules
    3.16 -collectd-4.7.0.tazpkg (done)
     4.1 --- a/collectd-dev/receipt	Thu Nov 02 20:06:45 2017 +0100
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,25 +0,0 @@
     4.4 -# SliTaz package receipt.
     4.5 -
     4.6 -PACKAGE="collectd-dev"
     4.7 -VERSION="5.1.0"
     4.8 -CATEGORY="network"
     4.9 -SHORT_DESC="System Stattistics Collection Daemon"
    4.10 -MAINTAINER="erjo@slitaz.org"
    4.11 -LICENSE="GPL2"
    4.12 -WEB_SITE="http://collectd.org"
    4.13 -WANTED="collectd"
    4.14 -# Rules to config
    4.15 -
    4.16 -DEPENDS="pkg-config"
    4.17 -
    4.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
    4.19 -genpkg_rules()
    4.20 -{
    4.21 -	mkdir -p $fs/usr/lib
    4.22 -
    4.23 -	cp -a $install/usr/include $fs/usr
    4.24 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    4.25 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    4.26 -
    4.27 -}
    4.28 -
     5.1 --- a/collectd/receipt	Thu Nov 02 20:06:45 2017 +0100
     5.2 +++ b/collectd/receipt	Thu Nov 02 20:48:23 2017 +0100
     5.3 @@ -1,4 +1,4 @@
     5.4 -# SliTaz package receipt.
     5.5 +# SliTaz package receipt v2.
     5.6  
     5.7  PACKAGE="collectd"
     5.8  VERSION="5.1.0"
     5.9 @@ -11,13 +11,12 @@
    5.10  WGET_URL="http://collectd.org/files/$TARBALL"
    5.11  CONFIG_FILES="/etc/collectd/collectd.conf"
    5.12  
    5.13 -DEPENDS="rrdtool perl"
    5.14  BUILD_DEPENDS="slitaz-toolchain rrdtool-dev"
    5.15 +SPLIT="collectd collectd-dev"
    5.16  
    5.17  # Rules to configure and make the package.
    5.18  compile_rules()
    5.19  {
    5.20 -	cd $src
    5.21  	./configure \
    5.22  		--prefix=/usr \
    5.23  		--localstatedir=/var \
    5.24 @@ -40,23 +39,33 @@
    5.25  # Rules to gen a SliTaz package suitable for Tazpkg.
    5.26  genpkg_rules()
    5.27  {
    5.28 -
    5.29 -	mkdir -p $fs/usr/lib/collectd \
    5.30 -		$fs/usr/share \
    5.31 -		$fs/etc/init.d
    5.32 +	case $PACKAGE in
    5.33 +	collectd)
    5.34 +		DEPENDS="rrdtool perl"
    5.35 +		mkdir -p $fs/usr/lib/collectd \
    5.36 +			$fs/usr/share \
    5.37 +			$fs/etc/init.d
    5.38  	
    5.39 +		cp -a $install/etc $fs/
    5.40 +		cp -a $install/var $fs/
    5.41 +		cp -a $install/usr/share/collectd $fs/usr/share
    5.42 +		cp -a $install/usr/bin $fs/usr
    5.43 +		cp -a $install/usr/sbin $fs/usr
    5.44 +		cp -a $install/usr/lib/*.so* $fs/usr/lib
    5.45 +		cp -a $install/usr/lib/collectd/*.so $fs/usr/lib/collectd
    5.46 +		cp -a $install/usr/lib/perl5 $fs/usr/lib
    5.47  	
    5.48 -	cp -a $install/etc $fs/
    5.49 -	cp -a $install/var $fs/
    5.50 -	cp -a $install/usr/share/collectd $fs/usr/share
    5.51 -	cp -a $install/usr/bin $fs/usr
    5.52 -	cp -a $install/usr/sbin $fs/usr
    5.53 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    5.54 -	cp -a $install/usr/lib/collectd/*.so $fs/usr/lib/collectd
    5.55 -	cp -a $install/usr/lib/perl5 $fs/usr/lib
    5.56 -	
    5.57 -	# Add init script and fixes
    5.58 -	install -g root -o root -m 0755 $stuff/collectd $fs/etc/init.d
    5.59 -	chmod 0644 $fs/etc/collectd/*
    5.60 +		# Add init script and fixes
    5.61 +		install -g root -o root -m 0755 $stuff/collectd $fs/etc/init.d
    5.62 +		chmod 0644 $fs/etc/collectd/*
    5.63 +		;;
    5.64 +	collectd-dev)
    5.65 +		CAT="network|System Stattistics Collection Daemon"
    5.66 +		DEPENDS="pkg-config"
    5.67 +		mkdir -p $fs/usr/lib
    5.68 +		cp -a $install/usr/include $fs/usr
    5.69 +		cp -a $install/usr/lib/*.*a $fs/usr/lib
    5.70 +		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    5.71 +		;;
    5.72 +	esac
    5.73  }
    5.74 -