wok rev 12546
Up: libtool and make ntop build a bit more :-/ (busybox install bug now)
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Thu Apr 26 14:13:34 2012 +0200 (2012-04-26) |
parents | f14bfaef9634 |
children | 63c4a422f5c7 |
files | libltdl/receipt libtool/receipt ntop/receipt |
line diff
1.1 --- a/libltdl/receipt Thu Apr 26 13:40:02 2012 +0200 1.2 +++ b/libltdl/receipt Thu Apr 26 14:13:34 2012 +0200 1.3 @@ -1,11 +1,10 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="libltdl" 1.7 -VERSION="2.4" 1.8 +VERSION="2.4.1" 1.9 CATEGORY="system-tools" 1.10 SHORT_DESC="The GNU Portable Library Tool." 1.11 MAINTAINER="pankso@slitaz.org" 1.12 -BUILD_DEPENDS="libtool" 1.13 WEB_SITE="http://www.gnu.org/software/libtool/" 1.14 WANTED="libtool" 1.15 1.16 @@ -13,6 +12,5 @@ 1.17 genpkg_rules() 1.18 { 1.19 mkdir -p $fs/usr/lib 1.20 - 1.21 - cp -a $_pkg/usr/lib/*.so* $fs/usr/lib 1.22 + cp -a $install/usr/lib/*.so* $fs/usr/lib 1.23 }
2.1 --- a/libtool/receipt Thu Apr 26 13:40:02 2012 +0200 2.2 +++ b/libtool/receipt Thu Apr 26 14:13:34 2012 +0200 2.3 @@ -1,22 +1,25 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="libtool" 2.7 -VERSION="2.4" 2.8 +VERSION="2.4.2" 2.9 CATEGORY="development" 2.10 SHORT_DESC="The GNU Portable Library Tool." 2.11 MAINTAINER="pankso@slitaz.org" 2.12 -DEPENDS="libltdl automake autoconf" 2.13 -BUILD_DEPENDS="automake autoconf" 2.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.15 WEB_SITE="http://www.gnu.org/software/libtool/" 2.16 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 2.17 2.18 +DEPENDS="libltdl automake autoconf" 2.19 +BUILD_DEPENDS="automake autoconf" 2.20 + 2.21 # Rules to configure and make the package. 2.22 compile_rules() 2.23 { 2.24 cd $src 2.25 - ./configure --enable-shared $CONFIGURE_ARGS && 2.26 - make && make install 2.27 + ./configure \ 2.28 + --enable-shared \ 2.29 + $CONFIGURE_ARGS && 2.30 + make && make install 2.31 } 2.32 2.33 # Rules to gen a SliTaz package suitable for Tazpkg. 2.34 @@ -25,9 +28,9 @@ 2.35 mkdir -p $fs/usr \ 2.36 $fs/usr/share $fs/usr/lib 2.37 2.38 - cp -a $_pkg/usr/lib/*.*a $fs/usr/lib 2.39 - cp -a $_pkg/usr/include $fs/usr 2.40 - cp -a $_pkg/usr/share/aclocal $fs/usr/share 2.41 - cp -a $_pkg/usr/share/libtool $fs/usr/share 2.42 - cp -a $_pkg/usr/bin $fs/usr 2.43 + cp -a $install/usr/lib/*.*a $fs/usr/lib 2.44 + cp -a $install/usr/include $fs/usr 2.45 + cp -a $install/usr/share/aclocal $fs/usr/share 2.46 + cp -a $install/usr/share/libtool $fs/usr/share 2.47 + cp -a $install/usr/bin $fs/usr 2.48 }
3.1 --- a/ntop/receipt Thu Apr 26 13:40:02 2012 +0200 3.2 +++ b/ntop/receipt Thu Apr 26 14:13:34 2012 +0200 3.3 @@ -11,9 +11,11 @@ 3.4 CONFIG_FILES="/etc/ntop" 3.5 TAGS="network" 3.6 3.7 -DEPENDS="zlib openssl libpng libpcap glibc gdbm rrdtool perl pcre geoip libwrap" 3.8 -BUILD_DEPENDS="zlib-dev openssl-dev libpng-dev libpcap-dev libtool glibc-dev gdbm-dev rrdtool \ 3.9 - autoconf automake rrdtool-dev wget geoip-dev libwrap libtool" 3.10 +DEPENDS="zlib openssl libpng libpcap glibc gdbm rrdtool perl pcre geoip\ 3.11 +libwrap" 3.12 +BUILD_DEPENDS="zlib-dev openssl-dev libpng-dev libpcap-dev libtool \ 3.13 +glibc-dev gdbm-dev rrdtool autoconf automake rrdtool-dev wget geoip-dev \ 3.14 +libwrap libtool" 3.15 3.16 # Rules to configure and make the package. 3.17 compile_rules() 3.18 @@ -21,10 +23,10 @@ 3.19 cd $src 3.20 ./autogen.sh --prefix=/usr \ 3.21 --sysconfdir=/etc \ 3.22 - --localstatedir=/var/lib $CONFIGURE_ARGS && 3.23 - make && 3.24 -make DESTDIR=$PWD/_pkg install 3.25 -#~ && make install-data-as 3.26 + --localstatedir=/var/lib \ 3.27 + $CONFIGURE_ARGS && 3.28 + make && install 3.29 + #~ && make install-data-as 3.30 } 3.31 3.32 # Rules to gen a SliTaz package suitable for Tazpkg. 3.33 @@ -34,15 +36,15 @@ 3.34 $fs/usr/share \ 3.35 $fs/var/log/ntop 3.36 3.37 - cp -a $_pkg/usr/lib/*.so* $fs/usr/lib 3.38 - cp -a $_pkg/usr/lib/ntop $fs/usr/lib 3.39 - cp -a $_pkg/usr/bin $fs/usr 3.40 - cp -a $_pkg/usr/share/ntop $fs/usr/share 3.41 + cp -a $install/usr/lib/*.so* $fs/usr/lib 3.42 + cp -a $install/usr/lib/ntop $fs/usr/lib 3.43 + cp -a $install/usr/bin $fs/usr 3.44 + cp -a $install/usr/share/ntop $fs/usr/share 3.45 chown -R www.www $fs/usr/share/ntop 3.46 - cp -a $_pkg/usr/bin $fs 3.47 - cp -a $_pkg/etc $fs 3.48 - cp -a $_pkg/var $fs 3.49 - 3.50 + cp -a $install/usr/bin $fs 3.51 + cp -a $install/etc $fs 3.52 + cp -a $install/var $fs 3.53 + 3.54 # Copy startup script and fix perms 3.55 cp -a stuff/etc $fs 3.56 chown root.root $fs/etc/init.d/ntop 3.57 @@ -52,20 +54,20 @@ 3.58 { 3.59 user=ntop 3.60 group=ntop 3.61 - 3.62 + 3.63 if ! grep -q $user: $1/etc/passwd; then 3.64 echo -n "Adding user/group $user..." 3.65 chroot $1/ addgroup -S $user 3.66 chroot $1/ adduser -S -D -H -G $group $user 3.67 status 3.68 fi 3.69 - 3.70 + 3.71 # Fix perms for files and directories 3.72 chroot $1/ chown -R ${user}.${group} /var/lib/ntop /var/log/ntop 3.73 - 3.74 + 3.75 # Start package daemon if we are on running system 3.76 [ -z $1 ] && /etc/init.d/$PACKAGE start 3.77 - 3.78 + 3.79 # post_install messges 3.80 echo -e "\nTo starts $PACKAGE server you can run :\n" 3.81 echo "/etc/init.d/$PACKAGE start"