wok-6.x rev 14383
connman: fix deps+bdeps
author | Dominique Corbex <domcox@slitaz.org> |
---|---|
date | Tue Apr 23 06:56:06 2013 +0200 (2013-04-23) |
parents | 01ad1e61b761 |
children | 85df37098f42 |
files | connman/receipt connman/stuff/etc/init.d/connman |
line diff
1.1 --- a/connman/receipt Mon Apr 22 23:05:52 2013 +0200 1.2 +++ b/connman/receipt Tue Apr 23 06:56:06 2013 +0200 1.3 @@ -9,9 +9,11 @@ 1.4 WEB_SITE="http://connman.net/" 1.5 WGET_URL="http://linux-kernel.uio.no/pub/linux/network/$PACKAGE/$TARBALL" 1.6 1.7 -DEPENDS="glib dbus iptables gnutls libnl udev wpa_supplicant" 1.8 -BUILD_DEPENDS="glib-dev dbus-dev iptables iptables-dev gnutls-dev libnl-dev \ 1.9 -openconnect udev-dev wpa_supplicant readline-dev ncursesw-dev openvpn bluez-dev" 1.10 +DEPENDS="glib dbus iptables gnutls libnl udev wpa_supplicant dbus-helper" 1.11 +BUILD_DEPENDS="glib-dev dbus-dev iptables-dev gnutls-dev libnl-dev 1.12 +openconnect udev-dev wpa_supplicant readline-dev ncursesw-dev openvpn 1.13 +bluez-dev ppp-dev" 1.14 +SUGGESTED="xl2tpd pptpclient" 1.15 1.16 # Rules to configure and make the package. 1.17 compile_rules() 1.18 @@ -28,11 +30,12 @@ 1.19 --disable-gtk-doc \ 1.20 --disable-neard \ 1.21 --enable-threads \ 1.22 + --enable-polkit \ 1.23 --enable-openconnect \ 1.24 --enable-vpnc \ 1.25 --enable-openvpn \ 1.26 - --enable-polkit \ 1.27 --enable-client \ 1.28 + --enable-test \ 1.29 $CONFIGURE_ARGS && 1.30 make && make DESTDIR=$DESTDIR install 1.31 } 1.32 @@ -67,13 +70,13 @@ 1.33 echo '' >> $root/etc/daemons.conf 1.34 fi 1.35 if [ -z "$root" ]; then 1.36 - /etc/init.d/connmand start || continue 1.37 + /etc/init.d/connman start || /etc/init.d/connman restart 1.38 fi 1.39 } 1.40 1.41 pre_remove() 1.42 { 1.43 if [ -z "$1" ]; then 1.44 - /etc/init.d/connmand stop 1.45 + /etc/init.d/connman stop 1.46 fi 1.47 }
2.1 --- a/connman/stuff/etc/init.d/connman Mon Apr 22 23:05:52 2013 +0200 2.2 +++ b/connman/stuff/etc/init.d/connman Tue Apr 23 06:56:06 2013 +0200 2.3 @@ -28,6 +28,7 @@ 2.4 stop) 2.5 if [ -z "$(pidof connmand)" ] ; then 2.6 echo "$NAME is not running." 2.7 + rm -rf $PIDFILE 2.8 exit 1 2.9 fi 2.10 echo -n "Stopping $DESC: $NAME... " 2.11 @@ -48,9 +49,8 @@ 2.12 status 2.13 ;; 2.14 *) 2.15 - echo "" 2.16 - echo -e "\033[1mUsage:\033[0m /etc/init.d/$(basename $0) [start|stop|restart]" 2.17 - echo "" 2.18 + printf "\n\033[1mUsage:\033[0m /etc/init.d/%b [start|stop|restart]\n" \ 2.19 + "$(basename $0)" 2.20 exit 1 2.21 ;; 2.22 esac