diff options
| -rw-r--r-- | user/mtr/APKBUILD | 38 | ||||
| -rw-r--r-- | user/mtr/handle-program-suffix.patch | 15 |
2 files changed, 37 insertions, 16 deletions
diff --git a/user/mtr/APKBUILD b/user/mtr/APKBUILD index 5bb39cb8a..b2483b326 100644 --- a/user/mtr/APKBUILD +++ b/user/mtr/APKBUILD @@ -1,24 +1,28 @@ # Contributor: John Keith Hohm <john@hohm.net> # Maintainer: pkgname=mtr -pkgver=0.92 -pkgrel=1 +pkgver=0.93 +pkgrel=0 pkgdesc="Full screen ncurses traceroute tool" url="https://www.bitwizard.nl/mtr/" arch="all" options="!check suid" # Tests need networking. license="GPL-2.0-only AND LGPL-3.0-only AND BSD-3-Clause" depends="ncurses" -makedepends="gtk+2.0-dev libcap-dev ncurses-dev" +makedepends="autoconf automake gtk+2.0-dev libcap-dev ncurses-dev" subpackages="$pkgname-doc $pkgname-gtk" -source="https://www.bitwizard.nl/$pkgname/files/$pkgname-$pkgver.tar.gz +source="$pkgname-$pkgver.tar.gz::https://github.com/traviscross/mtr/archive/v$pkgver.tar.gz + handle-program-suffix.patch mtr-gtk.desktop " build() { - cd "$builddir" + msg "Creating build system..." + ./bootstrap.sh + mkdir -p mtr curses gtk + msg "Building curses variant..." export GIT_DIR="$builddir" export LIBS="-ltinfo" cd "$builddir"/curses @@ -26,9 +30,11 @@ build() { --without-gtk make + msg "Building GTK+ variant..." cd "$builddir"/gtk ../configure --prefix=/usr \ --with-gtk \ + --without-ncurses \ --program-suffix=-gtk make unset LIBS GIT_DIR @@ -37,21 +43,21 @@ build() { package() { cd "$builddir"/curses make DESTDIR="$pkgdir" install - cd "$builddir"/gtk - make DESTDIR="$pkgdir" install - install -D -m 644 "$srcdir"/mtr-gtk.desktop \ - "$pkgdir"/usr/share/applications/mtr-gtk.desktop - install -D -m 644 "$builddir"/img/mtr_icon.xpm \ - "$pkgdir"/usr/share/pixmaps/mtr_icon.xpm } gtk() { pkgdesc="Graphical traceroute tool" - mkdir -p "$subpkgdir"/usr/sbin "$subpkgdir"/usr/share - mv "$pkgdir"/usr/sbin/mtr*-gtk "$subpkgdir"/usr/sbin/ - mv "$pkgdir"/usr/share/applications "$subpkgdir"/usr/share/ - mv "$pkgdir"/usr/share/pixmaps "$subpkgdir"/usr/share/ + depends="" + cd "$builddir"/gtk + make DESTDIR="$subpkgdir" install + install -D -m 644 "$srcdir"/mtr-gtk.desktop \ + "$subpkgdir"/usr/share/applications/mtr-gtk.desktop + install -D -m 644 "$builddir"/img/mtr_icon.xpm \ + "$subpkgdir"/usr/share/pixmaps/mtr_icon.xpm + mv "$subpkgdir"/usr/share/man/man8/* "$pkgdir"/../mtr-doc/usr/share/man/man8/ + rm -r "$subpkgdir"/usr/share/man } -sha512sums="d362a418b6c17fd2d08da1ed9e033fa3330e4c0497e1bb0644f6193d23f4e20dd8ee181942c2a20ec0025a8b96c521394a21be5a1d9036f8a0a8c4cddfbe381f mtr-0.92.tar.gz +sha512sums="865c394d8dfa234c472832dc205ddc9ec3cf0552475f565782fd4f4e878251c03f1473e2d28d6799e59da4fcb33c5355049f1e6f02e8610c6bbf681ffb78f53e mtr-0.93.tar.gz +60c11b27c4d20a75010cadc31d5c1ac94094aaaee0c2f0ad14246b00b0d5301f581ef55eaefa48692d4449a8e7580e67abbb58ea3183fae8f449f7969242f1a9 handle-program-suffix.patch ecf7543e0125fad6d3f17c30f29f1fc8a3b1e2e477802fe8464e436c3cdfa30d0630b8543cc3f022c475228e94ac8f92981df4d8fb08fe01d004be3d78d6da77 mtr-gtk.desktop" diff --git a/user/mtr/handle-program-suffix.patch b/user/mtr/handle-program-suffix.patch new file mode 100644 index 000000000..283966ff4 --- /dev/null +++ b/user/mtr/handle-program-suffix.patch @@ -0,0 +1,15 @@ +--- mtr-0.93/Makefile.am.old 2019-08-03 08:31:26.000000000 +0000 ++++ mtr-0.93/Makefile.am 2019-08-06 03:44:08.329829268 +0000 +@@ -40,9 +40,10 @@ + dist_man_MANS = mtr.8 mtr-packet.8 + PATHFILES += man/mtr.8 man/mtr-packet.8 + + install-exec-hook: +- `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/mtr-packet` \ +- || chmod u+s $(DESTDIR)$(sbindir)/mtr-packet ++ f="`echo mtr-packet | sed '$(transform)'`"; \ ++ `setcap cap_net_raw+ep $(DESTDIR)$(sbindir)/$$f` \ ++ || chmod u+s $(DESTDIR)$(sbindir)/$$f + + mtr_SOURCES = ui/mtr.c ui/mtr.h \ + ui/net.c ui/net.h \ |