SliTaz Repositories

     1.1 --- a/ntop/receipt	Sat Apr 21 18:20:53 2012 +0200
     1.2 +++ b/ntop/receipt	Tue May 08 00:04:31 2012 +0200
     1.3 @@ -11,9 +11,11 @@
     1.4  CONFIG_FILES="/etc/ntop"
     1.5  TAGS="network"
     1.6  
     1.7 -DEPENDS="zlib openssl libpng libpcap glibc gdbm rrdtool perl pcre geoip libwrap"
     1.8 -BUILD_DEPENDS="zlib-dev openssl-dev libpng-dev libpcap-dev libtool glibc-dev gdbm-dev rrdtool \
     1.9 - autoconf automake rrdtool-dev wget geoip-dev libwrap libtool"
    1.10 +DEPENDS="zlib openssl libpng libpcap glibc gdbm rrdtool perl pcre geoip\
    1.11 +libwrap"
    1.12 +BUILD_DEPENDS="zlib-dev openssl-dev libpng-dev libpcap-dev libtool \
    1.13 +glibc-dev gdbm-dev rrdtool autoconf automake rrdtool-dev wget geoip-dev \
    1.14 +libwrap libtool"
    1.15  
    1.16  # Rules to configure and make the package.
    1.17  compile_rules()
    1.18 @@ -21,10 +23,10 @@
    1.19  	cd $src
    1.20  	./autogen.sh --prefix=/usr	\
    1.21  		--sysconfdir=/etc \
    1.22 -		--localstatedir=/var/lib $CONFIGURE_ARGS &&
    1.23 -	make &&
    1.24 -make DESTDIR=$PWD/_pkg install 
    1.25 -#~ && make install-data-as
    1.26 +		--localstatedir=/var/lib \
    1.27 +		$CONFIGURE_ARGS &&
    1.28 +	make && install
    1.29 +	#~ && make install-data-as
    1.30  }
    1.31  
    1.32  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.33 @@ -34,15 +36,15 @@
    1.34  		$fs/usr/share \
    1.35  		$fs/var/log/ntop
    1.36  
    1.37 -	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    1.38 -	cp -a $_pkg/usr/lib/ntop $fs/usr/lib
    1.39 -	cp -a $_pkg/usr/bin $fs/usr
    1.40 -	cp -a $_pkg/usr/share/ntop $fs/usr/share
    1.41 +	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.42 +	cp -a $install/usr/lib/ntop $fs/usr/lib
    1.43 +	cp -a $install/usr/bin $fs/usr
    1.44 +	cp -a $install/usr/share/ntop $fs/usr/share
    1.45  	chown -R www.www $fs/usr/share/ntop
    1.46 -	cp -a $_pkg/usr/bin $fs
    1.47 -	cp -a $_pkg/etc $fs
    1.48 -	cp -a $_pkg/var $fs
    1.49 -	
    1.50 +	cp -a $install/usr/bin $fs
    1.51 +	cp -a $install/etc $fs
    1.52 +	cp -a $install/var $fs
    1.53 +
    1.54  	# Copy startup script and fix perms
    1.55  	cp -a stuff/etc $fs
    1.56  	chown root.root $fs/etc/init.d/ntop
    1.57 @@ -52,20 +54,20 @@
    1.58  {
    1.59  	user=ntop
    1.60  	group=ntop
    1.61 -	
    1.62 +
    1.63  	if ! grep -q $user: $1/etc/passwd; then
    1.64  		echo -n "Adding user/group $user..."
    1.65  		chroot $1/ addgroup -S $user
    1.66  		chroot $1/ adduser -S -D -H -G $group $user
    1.67  		status
    1.68  	fi
    1.69 -	
    1.70 +
    1.71  	# Fix perms for files and directories
    1.72  	chroot $1/ chown -R ${user}.${group} /var/lib/ntop /var/log/ntop
    1.73 -		
    1.74 +
    1.75  	# Start package daemon if we are  on running system
    1.76  	[ -z $1 ] && /etc/init.d/$PACKAGE start
    1.77 -	
    1.78 +
    1.79  	# post_install messges
    1.80  	echo -e "\nTo starts $PACKAGE server you can run :\n"
    1.81  	echo "/etc/init.d/$PACKAGE start"