# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1335442414 -7200
# Node ID bf6520485b0b89ddd302420da623d9d7ef749848
# Parent  f14bfaef96341dbf5a6c3efab4e1867fc629a753
Up: libtool and make ntop build a bit more :-/ (busybox install bug now)

diff -r f14bfaef9634 -r bf6520485b0b libltdl/receipt
--- a/libltdl/receipt	Thu Apr 26 13:40:02 2012 +0200
+++ b/libltdl/receipt	Thu Apr 26 14:13:34 2012 +0200
@@ -1,11 +1,10 @@
 # SliTaz package receipt.
 
 PACKAGE="libltdl"
-VERSION="2.4"
+VERSION="2.4.1"
 CATEGORY="system-tools"
 SHORT_DESC="The GNU Portable Library Tool."
 MAINTAINER="pankso@slitaz.org"
-BUILD_DEPENDS="libtool"
 WEB_SITE="http://www.gnu.org/software/libtool/"
 WANTED="libtool"
 
@@ -13,6 +12,5 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	
-	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
+	cp -a $install/usr/lib/*.so* $fs/usr/lib
 }
diff -r f14bfaef9634 -r bf6520485b0b libtool/receipt
--- a/libtool/receipt	Thu Apr 26 13:40:02 2012 +0200
+++ b/libtool/receipt	Thu Apr 26 14:13:34 2012 +0200
@@ -1,22 +1,25 @@
 # SliTaz package receipt.
 
 PACKAGE="libtool"
-VERSION="2.4"
+VERSION="2.4.2"
 CATEGORY="development"
 SHORT_DESC="The GNU Portable Library Tool."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="libltdl automake autoconf"
-BUILD_DEPENDS="automake autoconf"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.gnu.org/software/libtool/"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
+DEPENDS="libltdl automake autoconf"
+BUILD_DEPENDS="automake autoconf"
+
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
-	./configure --enable-shared $CONFIGURE_ARGS &&
-	make && make install 
+	./configure \
+		--enable-shared \
+		$CONFIGURE_ARGS &&
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -25,9 +28,9 @@
 	mkdir -p $fs/usr \
 		$fs/usr/share $fs/usr/lib
 
-	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
-	cp -a $_pkg/usr/include $fs/usr
-	cp -a $_pkg/usr/share/aclocal $fs/usr/share
-	cp -a $_pkg/usr/share/libtool $fs/usr/share
-	cp -a $_pkg/usr/bin $fs/usr
+	cp -a $install/usr/lib/*.*a $fs/usr/lib
+	cp -a $install/usr/include $fs/usr
+	cp -a $install/usr/share/aclocal $fs/usr/share
+	cp -a $install/usr/share/libtool $fs/usr/share
+	cp -a $install/usr/bin $fs/usr
 }
diff -r f14bfaef9634 -r bf6520485b0b ntop/receipt
--- a/ntop/receipt	Thu Apr 26 13:40:02 2012 +0200
+++ b/ntop/receipt	Thu Apr 26 14:13:34 2012 +0200
@@ -11,9 +11,11 @@
 CONFIG_FILES="/etc/ntop"
 TAGS="network"
 
-DEPENDS="zlib openssl libpng libpcap glibc gdbm rrdtool perl pcre geoip libwrap"
-BUILD_DEPENDS="zlib-dev openssl-dev libpng-dev libpcap-dev libtool glibc-dev gdbm-dev rrdtool \
- autoconf automake rrdtool-dev wget geoip-dev libwrap libtool"
+DEPENDS="zlib openssl libpng libpcap glibc gdbm rrdtool perl pcre geoip\
+libwrap"
+BUILD_DEPENDS="zlib-dev openssl-dev libpng-dev libpcap-dev libtool \
+glibc-dev gdbm-dev rrdtool autoconf automake rrdtool-dev wget geoip-dev \
+libwrap libtool"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -21,10 +23,10 @@
 	cd $src
 	./autogen.sh --prefix=/usr	\
 		--sysconfdir=/etc \
-		--localstatedir=/var/lib $CONFIGURE_ARGS &&
-	make &&
-make DESTDIR=$PWD/_pkg install 
-#~ && make install-data-as
+		--localstatedir=/var/lib \
+		$CONFIGURE_ARGS &&
+	make && install
+	#~ && make install-data-as
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -34,15 +36,15 @@
 		$fs/usr/share \
 		$fs/var/log/ntop
 
-	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
-	cp -a $_pkg/usr/lib/ntop $fs/usr/lib
-	cp -a $_pkg/usr/bin $fs/usr
-	cp -a $_pkg/usr/share/ntop $fs/usr/share
+	cp -a $install/usr/lib/*.so* $fs/usr/lib
+	cp -a $install/usr/lib/ntop $fs/usr/lib
+	cp -a $install/usr/bin $fs/usr
+	cp -a $install/usr/share/ntop $fs/usr/share
 	chown -R www.www $fs/usr/share/ntop
-	cp -a $_pkg/usr/bin $fs
-	cp -a $_pkg/etc $fs
-	cp -a $_pkg/var $fs
-	
+	cp -a $install/usr/bin $fs
+	cp -a $install/etc $fs
+	cp -a $install/var $fs
+
 	# Copy startup script and fix perms
 	cp -a stuff/etc $fs
 	chown root.root $fs/etc/init.d/ntop
@@ -52,20 +54,20 @@
 {
 	user=ntop
 	group=ntop
-	
+
 	if ! grep -q $user: $1/etc/passwd; then
 		echo -n "Adding user/group $user..."
 		chroot $1/ addgroup -S $user
 		chroot $1/ adduser -S -D -H -G $group $user
 		status
 	fi
-	
+
 	# Fix perms for files and directories
 	chroot $1/ chown -R ${user}.${group} /var/lib/ntop /var/log/ntop
-		
+
 	# Start package daemon if we are  on running system
 	[ -z $1 ] && /etc/init.d/$PACKAGE start
-	
+
 	# post_install messges
 	echo -e "\nTo starts $PACKAGE server you can run :\n"
 	echo "/etc/init.d/$PACKAGE start"