[arch-commits] Commit in iputils/trunk (PKGBUILD)

[Tobias Powalowski]

    Date: Wednesday, November 16, 2016 @ 08:00:19
  Author: tpowa
Revision: 280874

upgpkg: iputils 20161105.1f2bb12-1

bump to latest version

Modified:
  iputils/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-16 02:10:33 UTC (rev 280873)
+++ PKGBUILD	2016-11-16 08:00:19 UTC (rev 280874)
@@ -5,8 +5,8 @@
 
 pkgname=iputils
 # Commit date + git rev-parse --short origin/master
-_rev=0db72a4
-pkgver=20160308.${_rev}
+_rev=1f2bb12
+pkgver=20161105.${_rev}
 pkgrel=1
 pkgdesc="Network monitoring tools, including ping"
 arch=('i686' 'x86_64')
@@ -13,9 +13,9 @@
 license=('GPL')
 url="http://www.skbuff.net/iputils/"
 groups=('base')
-depends=('openssl' 'sysfsutils' 'libcap')
+depends=('openssl' 'sysfsutils' 'libcap' 'libidn')
 optdepends=('xinetd: for tftpd')
-makedepends=('docbook2x' 'opensp' 'git')
+makedepends=('docbook-utils' 'perl-sgmls' 'git')
 conflicts=('netkit-base' 'arping' 'netkit-tftpd')
 replaces=('netkit-base')
 backup=(etc/xinetd.d/tftp)
@@ -28,15 +28,10 @@
 build() {
   cd "${srcdir}/${pkgname}"
 
-  make USE_GNUTLS=no CCOPTOPT="$CFLAGS"
-
-  cd doc
-  for file in *.sgml; do
-    xf=${file/.sgml/.xml}
-    osx -xlower -xno-nl-in-tag $file > $xf || true
-    sed -i "s|<refname>\(.*\), \(.*\)</refname>|<refname>\1</refname>, <refname>\2</refname>|g" $xf
-    docbook2man $xf
-  done
+  make USE_NETTLE=no USE_GNUTLS=no CCOPTOPT="$CFLAGS"
+  # fix perl-sgmls
+  sed -i -e 's#sgmlspl#sgmlspl.pl#g' "${srcdir}/${pkgname}/doc/Makefile"
+  make -C doc man
 }
 
 package() {
@@ -44,15 +39,12 @@
 
   install -dm755 "${pkgdir}"/usr/bin
 
-  install -m755 arping clockdiff ping rarpd rdisc tftpd tracepath tracepath6 "${pkgdir}"/usr/bin/
+  install -m755 arping clockdiff ping rarpd rdisc tftpd tracepath "${pkgdir}"/usr/bin/
 
   install -dm755 "${pkgdir}"/usr/share/man/man8
   install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \
      "${pkgdir}"/usr/share/man/man8/
 
-  cd "${pkgdir}"/usr/share/man/man8
-  ln -sf tracepath.8.gz tracepath6.8.gz
-
   # FS#24768
   install -dm755 "${pkgdir}"/etc/xinetd.d/
   install -m644 "${srcdir}"/tftp.xinetd "${pkgdir}"/etc/xinetd.d/tftp