diff --git a/srcpkgs/inetutils/template b/srcpkgs/inetutils/template index 03b9f67f7de..31b9faabbf1 100644 --- a/srcpkgs/inetutils/template +++ b/srcpkgs/inetutils/template @@ -1,7 +1,7 @@ # Template file for 'inetutils' pkgname=inetutils version=1.9.4 -revision=3 +revision=4 build_style=gnu-configure configure_args="--without-wrap --with-pam" makedepends="pam-devel readline-devel" @@ -50,20 +50,23 @@ inetutils-dnsdomainname_package() { inetutils-hostname_package() { short_desc+=" - hostname tool" alternatives=" - hostname:hostname:/usr/bin/hostname-inetutils - hostname:hostname.1:/usr/share/man/man1/hostname-inetutils.1 + hostname:hostname:/usr/bin/${pkgname} + hostname:hostname.1:/usr/share/man/man1/${pkgname}.1 " pkg_install() { - vbin src/hostname hostname-inetutils - vman man/hostname.1 hostname-inetutils.1 + vbin src/hostname ${pkgname} + vman man/hostname.1 ${pkgname}.1 } } inetutils-ifconfig_package() { short_desc+=" - ifconfig tool" - conflicts="net-tools>=0" + alternatives=" + ifconfig:ifconfig:/usr/bin/${pkgname} + ifconfig:ifconfig.1:/usr/share/man/man1/${pkgname}.1 + " pkg_install() { - vbin ifconfig/ifconfig - vman man/ifconfig.1 + vbin ifconfig/ifconfig ${pkgname} + vman man/ifconfig.1 ${pkgname}.1 } } inetutils-ftp_package() { @@ -78,12 +81,17 @@ inetutils-ftp_package() { } inetutils-ping_package() { short_desc+=" - ping tool (IPv4 and IPv6)" - conflicts="iputils>=0 base-system-busybox>=0" + alternatives=" + ping:ping:/usr/bin/${pkgname} + ping:ping.1:/usr/share/man/man1/${pkgname}.1 + ping6:ping6:/usr/bin/${pkgname}6 + ping6:ping6.1:/usr/share/man/man1/${pkgname}6.1 + " pkg_install() { - vbin ping/ping - vman man/ping.1 - vbin ping/ping6 - vman man/ping6.1 + vbin ping/ping ${pkgname} + vman man/ping.1 ${pkgname}.1 + vbin ping/ping6 ${pkgname}6 + vman man/ping6.1 ${pkgname}6.1 } } inetutils-rcp_package() { @@ -150,10 +158,13 @@ inetutils-telnet_package() { } inetutils-tftp_package() { short_desc+="- tftp client and server (trivial file transfer protocol)" - conflicts="tftp-hpa>=0" + alternatives=" + tftp:tftp:/usr/bin/${pkgname} + tftp:tftp.1:/usr/share/man/man1/${pkgname}.1 + " pkg_install() { - vbin src/tftp - vman man/tftp.1 + vbin src/tftp ${pkgname} + vman man/tftp.1 ${pkgname}.1 vbin src/tftpd vman man/tftpd.8 vinstall ${FILESDIR}/tftp.xinetd 644 etc/xninet.d @@ -162,18 +173,24 @@ inetutils-tftp_package() { } inetutils-traceroute_package() { short_desc+=" - traceroute tool" - conflicts="traceroute>=0" + alternatives=" + traceroute:traceroute:/usr/bin/${pkgname} + traceroute:traceroute.1:/usr/share/man/man1/${pkgname}.1 + " pkg_install() { - vbin src/traceroute - vman man/traceroute.1 + vbin src/traceroute ${pkgname} + vman man/traceroute.1 ${pkgname}.1 } } inetutils-whois_package() { short_desc+=" - whois tool" - conflicts="whois>=0" + alternatives=" + whois:whois:/usr/bin/${pkgname} + whois:whois.1:/usr/share/man/man1/${pkgname}.1 + " pkg_install() { - vbin whois/whois - vman man/whois.1 + vbin whois/whois ${pkgname} + vman man/whois.1 ${pkgname}.1 } } inetutils-inetd_package() { @@ -187,10 +204,13 @@ inetutils-inetd_package() { } inetutils-syslog_package() { short_desc+=" - logger tool and syslog daemon" - conflicts="util-linux>=0" + alternatives=" + logger:logger:/usr/bin/inetutils-logger + logger:logger.1:/usr/share/man/man1/inetutils-logger.1 + " pkg_install() { - vbin src/logger - vman man/logger.1 + vbin src/logger inetutils-logger + vman man/logger.1 inetutils-logger.1 vbin src/syslogd vman man/syslogd.8 }