wok-6.x rev 15245
arpwatch, le lftp: remove wrong error trigger
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Sep 23 13:26:46 2013 +0000 (2013-09-23) |
parents | 496740a0005b |
children | f5dd6be1bf44 |
files | arpwatch/receipt le/receipt lftp/receipt |
line diff
1.1 --- a/arpwatch/receipt Mon Sep 23 13:02:49 2013 +0000 1.2 +++ b/arpwatch/receipt Mon Sep 23 13:26:46 2013 +0000 1.3 @@ -5,12 +5,14 @@ 1.4 CATEGORY="network" 1.5 SHORT_DESC="arpwatch and arpsnmp network monitoring tools" 1.6 MAINTAINER="slaxemulator@gmail.com" 1.7 -DEPENDS="libpcap" 1.8 -BUILD_DEPENDS="libpcap-dev" 1.9 +LICENSE="BSD" 1.10 TARBALL="$PACKAGE-$VERSION.tar.gz" 1.11 WEB_SITE="ftp://ftp.ee.lbl.gov" 1.12 WGET_URL="$WEB_SITE/$TARBALL" 1.13 1.14 +DEPENDS="libpcap" 1.15 +BUILD_DEPENDS="libpcap-dev" 1.16 + 1.17 # Rules to configure and make the package. 1.18 compile_rules() 1.19 { 1.20 @@ -18,7 +20,7 @@ 1.21 sed -i 's|ARPDIR = $(prefix)/arpwatch|ARPDIR = /var/lib/arpwatch|' Makefile.in 1.22 sed -i 's|-o bin -g bin||' Makefile.in 1.23 ./configure $CONFIGURE_ARGS && 1.24 - make && 1.25 + make 2>&1 | grep -v "STRERROR" && 1.26 install -d -m 755 $DESTDIR/usr/sbin 1.27 make install 1.28 1.29 @@ -29,7 +31,7 @@ 1.30 genpkg_rules() 1.31 { 1.32 mkdir -p $fs/usr 1.33 - cp -a $_pkg/usr/sbin $fs/usr 1.34 + cp -a $install/usr/sbin $fs/usr 1.35 install -d -m 0755 $fs/var/lib/arpwatch 1.36 touch $fs/var/lib/arpwatch/arp.dat 1.37 }
2.1 --- a/le/receipt Mon Sep 23 13:02:49 2013 +0000 2.2 +++ b/le/receipt Mon Sep 23 13:26:46 2013 +0000 2.3 @@ -5,12 +5,14 @@ 2.4 CATEGORY="utilities" 2.5 SHORT_DESC="Small editor using ncurses" 2.6 MAINTAINER="mimas@slitaz.org" 2.7 -DEPENDS="ncurses gcc-lib-base" 2.8 -BUILD_DEPENDS="ncurses-dev" 2.9 +LICENSE="GPL2" 2.10 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.11 WEB_SITE="ftp://ftp.yar.ru/pub/source/le/" 2.12 WGET_URL="ftp://ftp.yar.ru/pub/source/le/$TARBALL" 2.13 2.14 +DEPENDS="ncurses gcc-lib-base" 2.15 +BUILD_DEPENDS="ncurses-dev" 2.16 + 2.17 # Rules to configure and make the package. 2.18 compile_rules() 2.19 { 2.20 @@ -21,15 +23,15 @@ 2.21 --infodir=/usr/share/info \ 2.22 --mandir=/usr/share/man \ 2.23 $CONFIGURE_ARGS && 2.24 - make && 2.25 - make DESTDIR=$PWD/_pkg install 2.26 + make 2>&1 | grep -v "STRERROR" && 2.27 + make DESTDIR=$DESTDIR install 2.28 } 2.29 2.30 # Rules to gen a SliTaz package suitable for Tazpkg. 2.31 genpkg_rules() 2.32 { 2.33 mkdir -p $fs/usr/share 2.34 - cp -a $_pkg/usr/bin $fs/usr 2.35 - cp -a $_pkg/usr/share/le $fs/usr/share 2.36 + cp -a $install/usr/bin $fs/usr 2.37 + cp -a $install/usr/share/le $fs/usr/share 2.38 } 2.39
3.1 --- a/lftp/receipt Mon Sep 23 13:02:49 2013 +0000 3.2 +++ b/lftp/receipt Mon Sep 23 13:26:46 2013 +0000 3.3 @@ -23,7 +23,7 @@ 3.4 --without-openssl \ 3.5 --build=$HOST_SYSTEM \ 3.6 --host=$HOST_SYSTEM && 3.7 - make && 3.8 + make 2>&1 | grep -v "STRERROR" | grep -v "PERROR" && 3.9 make install 3.10 } 3.11