wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-02 02:42:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #5030 from CMB/alternative-conflicts

Browse source 
Fix various packages that conflict with inetutils alternatives.
This commit is contained in:
Michael Gehring 2016-12-08 16:23:58 +01:00 • committed by GitHub
commit 09d243ee90
3 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
srcpkgs/net-tools/template
View file

@ -1,7 +1,7 @@
# Template file for 'net-tools' # Template file for 'net-tools'
pkgname=net-tools pkgname=net-tools
version=1.60.20150526git version=1.60.20150526git
revision=2 revision=3
hostmakedepends="git" hostmakedepends="git"
short_desc="Basic networking tools" short_desc="Basic networking tools"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
@ -10,7 +10,7 @@ license="GPL-2"
alternatives=" alternatives="
ifconfig:ifconfig:/usr/bin/${pkgname}-ifconfig ifconfig:ifconfig:/usr/bin/${pkgname}-ifconfig
ifconfig:ifconfig.8:/usr/share/man/man1/${pkgname}-ifconfig.8" ifconfig:/usr/share/man/man1/ifconfig.1:/usr/share/man/man8/${pkgname}-ifconfig.8"
do_fetch() { do_fetch() {
git clone git://git.code.sf.net/p/net-tools/code ${pkgname}-${version} git clone git://git.code.sf.net/p/net-tools/code ${pkgname}-${version}

15
srcpkgs/traceroute/template
View file

@ -1,7 +1,7 @@
# Template file for 'traceroute' # Template file for 'traceroute'
pkgname=traceroute pkgname=traceroute
version=2.1.0 version=2.1.0
revision=1 revision=2
short_desc="Traces the route taken by packets over an IPv4/IPv6 network" short_desc="Traces the route taken by packets over an IPv4/IPv6 network"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2" license="GPL-2"
@ -9,6 +9,11 @@ homepage="http://traceroute.sourceforge.net"
distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.gz" distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.gz"
checksum=3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6 checksum=3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6
alternatives="
traceroute:traceroute:/usr/bin/linux-traceroute
traceroute:traceroute.1:/usr/share/man/man1/linux-traceroute.1
"
do_build() { do_build() {
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
make LDFLAGS="-L${wrksrc}/libsupp $LDFLAGS" CFLAGS="$CFLAGS $CPPFLAGS" CROSS=${XBPS_CROSS_TRIPLET}- ${makejobs} make LDFLAGS="-L${wrksrc}/libsupp $LDFLAGS" CFLAGS="$CFLAGS $CPPFLAGS" CROSS=${XBPS_CROSS_TRIPLET}- ${makejobs}
@ -17,9 +22,9 @@ do_build() {
fi fi
} }
do_install() { do_install() {
vbin traceroute/traceroute vbin traceroute/traceroute linux-traceroute
vman traceroute/traceroute.8 vman traceroute/traceroute.8 linux-traceroute.8
ln -s traceroute $DESTDIR/usr/bin/traceroute6 ln -s linux-traceroute $DESTDIR/usr/bin/traceroute6
ln -s traceroute.8 $DESTDIR/usr/share/man/man8/traceroute6.8 ln -s linux-traceroute.8 $DESTDIR/usr/share/man/man8/traceroute6.8
} }

9
srcpkgs/util-linux/template
View file

@ -1,7 +1,7 @@
# Template file for 'util-linux' # Template file for 'util-linux'
pkgname=util-linux pkgname=util-linux
version=2.28.2 version=2.28.2
revision=2 revision=3
short_desc="Miscellaneous linux utilities" short_desc="Miscellaneous linux utilities"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="https://www.kernel.org/pub/linux/utils/util-linux/" homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
@ -25,6 +25,11 @@ provides="eject-${version}_1"
# XXX musl needs this for switch_root(8). # XXX musl needs this for switch_root(8).
CFLAGS="-D_DIRENT_HAVE_D_TYPE" CFLAGS="-D_DIRENT_HAVE_D_TYPE"
alternatives="
logger:logger:/usr/bin/${pkgname}-logger
logger:logger.1:/usr/share/man/man1/${pkgname}-logger.1
"
pre_configure() { pre_configure() {
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
} }
@ -49,6 +54,8 @@ do_install() {
# Correct perms for newgrp, chfn, chsh, wall and write. # Correct perms for newgrp, chfn, chsh, wall and write.
chmod u+s $DESTDIR/usr/bin/{newgrp,chsh,chfn} chmod u+s $DESTDIR/usr/bin/{newgrp,chsh,chfn}
mv ${DESTDIR}/usr/bin/{logger,${pkgname}-logger}
mv ${DESTDIR}/usr/share/man/man1/{logger,${pkgname}-logger}.1
# pam login utils. # pam login utils.
vinstall $FILESDIR/login.pam 644 etc/pam.d login vinstall $FILESDIR/login.pam 644 etc/pam.d login
vinstall $FILESDIR/su.pam 644 etc/pam.d su vinstall $FILESDIR/su.pam 644 etc/pam.d su