From 6589c7d1960243af5e9dcefdd231bad751ee6d6b Mon Sep 17 00:00:00 2001 From: Piraty Date: Mon, 10 Feb 2020 15:51:40 +0100 Subject: [PATCH] net-tools: cleanup template * fix license * switching to vsed revealed useless leftovers --- srcpkgs/net-tools/template | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/srcpkgs/net-tools/template b/srcpkgs/net-tools/template index 8d789397499..02a006233a7 100644 --- a/srcpkgs/net-tools/template +++ b/srcpkgs/net-tools/template @@ -7,7 +7,7 @@ wrksrc="${pkgname}-${_githash}" hostmakedepends="git" short_desc="Basic networking tools" maintainer="Orphaned " -license="GPL-2.0-only" +license="GPL-2.0-or-later" homepage="https://github.com/ecki/net-tools" distfiles="https://github.com/ecki/net-tools/archive/${_githash}.tar.gz" checksum=795cb4dd2618ed7ff9a48b9cb63b33780b47dfd7464c8e52ba734e6796cbab17 @@ -19,30 +19,19 @@ alternatives=" hostname:/usr/share/man/man1/hostname.1:/usr/share/man/man8/${pkgname}-hostname.1" pre_build() { - sed -i "s#/sbin#/bin#" Makefile - sed -i "s#/usr##" man/Makefile + vsed -i "s#/sbin#/bin#" Makefile + vsed -i "s#/usr##" man/Makefile case "$XBPS_TARGET_MACHINE" in *-musl) - - # Include file is - sed -i ${wrksrc}/lib/inet6_gr.c \ - -e "s#netinet6/#linux/#" - sed -i ${wrksrc}/lib/inet6_sr.c \ - -e "s#netinet6/#linux/#" - # HZ is defined in - sed -i ${wrksrc}/lib/inet_sr.c \ + vsed -i ${wrksrc}/lib/inet_sr.c \ -e "/#include /a #include " - sed -i ${wrksrc}/netstat.c \ + vsed -i ${wrksrc}/netstat.c \ -e "/#include /a #include " # Need for tty constants and structure - sed -i ${wrksrc}/slattach.c \ + vsed -i ${wrksrc}/slattach.c \ -e "/#include /a #include " - - # Disable obsolete non-glibc includes - sed -i ${wrksrc}/mii-tool.c \ - -e "s/#ifndef __GLIBC__/#if 0/" esac }