wok-current rev 22576

updated c_icap and c_icap-dev (0.5.5 -> 0.5.6)
author Hans-G?nter Theisgen
date Mon Jan 06 16:48:08 2020 +0100 (2020-01-06)
parents ea31fefd3ec4
children b2c3caa4e31c
files c_icap-dev/receipt c_icap/receipt
line diff
     1.1 --- a/c_icap-dev/receipt	Mon Jan 06 16:31:02 2020 +0100
     1.2 +++ b/c_icap-dev/receipt	Mon Jan 06 16:48:08 2020 +0100
     1.3 @@ -1,25 +1,25 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="c_icap-dev"
     1.7 -VERSION="0.5.5"
     1.8 +VERSION="0.5.6"
     1.9  CATEGORY="development"
    1.10 -SHORT_DESC="Implementation of an ICAP server."
    1.11 +SHORT_DESC="Implementation of an ICAP server - development files."
    1.12  MAINTAINER="erjo@slitaz.org"
    1.13  LICENSE="LGPL2.1"
    1.14  WEB_SITE="http://c-icap.sourceforge.net/"
    1.15  
    1.16 -WANTED="c_icap"
    1.17  DEPENDS="c_icap"
    1.18  BUILD_DEPENDS=""
    1.19 +WANTED="c_icap"
    1.20  
    1.21  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.22  genpkg_rules()
    1.23  {
    1.24 -	mkdir -p $fs/usr/lib/c_icap \
    1.25 -		$fs/usr/bin
    1.26 -	
    1.27 -	cp -a $install/usr/bin/c-icap-config $fs/usr/bin
    1.28 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    1.29 -	cp -a $install/usr/lib/c_icap/*.*a $fs/usr/lib/c_icap
    1.30 -	cp -a $install/usr/include $fs/usr
    1.31 +	mkdir -p $fs/usr/lib/c_icap
    1.32 +	mkdir -p $fs/usr/bin
    1.33 +
    1.34 +	cp -a $install/usr/bin/c-icap-config	$fs/usr/bin
    1.35 +	cp -a $install/usr/lib/*.*a		$fs/usr/lib
    1.36 +	cp -a $install/usr/lib/c_icap/*.*a	$fs/usr/lib/c_icap
    1.37 +	cp -a $install/usr/include		$fs/usr
    1.38  }
     2.1 --- a/c_icap/receipt	Mon Jan 06 16:31:02 2020 +0100
     2.2 +++ b/c_icap/receipt	Mon Jan 06 16:48:08 2020 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="c_icap"
     2.7 -VERSION="0.5.5"
     2.8 +VERSION="0.5.6"
     2.9  CATEGORY="network"
    2.10  SHORT_DESC="Implementation of an ICAP server."
    2.11  MAINTAINER="erjo@slitaz.org"
    2.12 @@ -17,9 +17,9 @@
    2.13  # Rules to configure and make the package.
    2.14  compile_rules()
    2.15  {
    2.16 -	./configure \
    2.17 -		--sysconfdir=/etc/c-icap \
    2.18 -		--enable-large-files \
    2.19 +	./configure				\
    2.20 +		--sysconfdir=/etc/c-icap	\
    2.21 +		--enable-large-files		\
    2.22  		$CONFIGURE_ARGS &&
    2.23  	make &&
    2.24  	make install
    2.25 @@ -28,33 +28,33 @@
    2.26  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.27  genpkg_rules()
    2.28  {
    2.29 -	mkdir -p $fs/usr/lib/$PACKAGE \
    2.30 -		$fs/etc/init.d \
    2.31 -		$fs/var/log/c-icap
    2.32 -						
    2.33 -	cp -a $install/usr/bin $fs/usr
    2.34 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    2.35 -	cp -a $install/usr/lib/$PACKAGE/*.so* $fs/usr/lib/$PACKAGE
    2.36 -	
    2.37 -	cp -pa $install/etc $fs/
    2.38 -	cp -pa $stuff/c-icapd $fs/etc/init.d
    2.39 -	
    2.40 +	mkdir -p $fs/usr/lib/$PACKAGE
    2.41 +	mkdir -p $fs/etc/init.d
    2.42 +	mkdir -p $fs/var/log/c-icap
    2.43 +
    2.44 +	cp -a $install/usr/bin			$fs/usr
    2.45 +	cp -a $install/usr/lib/*.so*		$fs/usr/lib
    2.46 +	cp -a $install/usr/lib/$PACKAGE/*.so*	$fs/usr/lib/$PACKAGE
    2.47 +	cp -pa $install/etc			$fs/
    2.48 +	cp -pa $stuff/c-icapd			$fs/etc/init.d
    2.49 +
    2.50  	# Cleanup
    2.51  	rm -f $fs/usr/bin/c-icap-config
    2.52 -	
    2.53 -	# Fix config file
    2.54 -	sed -i -e "s|YourServerName|localhost|" \
    2.55 -		-e "s|/usr/var/log|/var/log/c-icap/|" \
    2.56 -		-e "s|/usr/var/run/|/var/run/c-icap|" \
    2.57 -		-e "s|/usr/etc|/etc/c-icap|" $fs/etc/c-icap/c-icap.conf
    2.58 +
    2.59 +	# Fix configuration file
    2.60 +	sed -i	-e "s|YourServerName|localhost|"	\
    2.61 +		-e "s|/usr/var/log|/var/log/c-icap/|"	\
    2.62 +		-e "s|/usr/var/run/|/var/run/c-icap|"	\
    2.63 +		-e "s|/usr/etc|/etc/c-icap|"		\
    2.64 +		$fs/etc/c-icap/c-icap.conf
    2.65  	chmod -x $fs/etc/c-icap/*
    2.66 -		
    2.67  }
    2.68  
    2.69  post_install()
    2.70  {
    2.71 -	[ -z "$1" -a ! -s /aufs-umount.sh ] && /etc/init.d/c-icapd start
    2.72 -			
    2.73 +	[ -z "$1" -a ! -s /aufs-umount.sh ] &&
    2.74 +	/etc/init.d/c-icapd start
    2.75 +
    2.76  	cat <<EOF
    2.77  	
    2.78  ----
    2.79 @@ -67,13 +67,15 @@
    2.80  EOF
    2.81  }
    2.82  
    2.83 -pre_remove(){
    2.84 -		
    2.85 +pre_remove()
    2.86 +{
    2.87  		echo "Stopping daemon..."
    2.88 -		if (ps | grep -q c-icap); then
    2.89 +		if (ps | grep -q c-icap)
    2.90 +		  then
    2.91  			chroot "$1/" /etc/init.d/c-icapd stop
    2.92  		fi
    2.93  }
    2.94 +
    2.95  post_remove()
    2.96  {
    2.97  	echo "Removing stalled files..."