[arch-commits] CVS update of arch/build/base/iputils (PKGBUILD)

[Aaron Griffin]

    Date: Sunday, May 13, 2007 @ 02:22:12
  Author: aaron
    Path: /home/cvs-arch/arch/build/base/iputils

Modified: PKGBUILD (1.28 -> 1.29)

upgpkg: iputils 20070202-1
Updated to more recent iputils
Moved services and protocols to filesystem package where they are more appropriate


----------+
 PKGBUILD |   76 ++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 53 insertions(+), 23 deletions(-)


Index: arch/build/base/iputils/PKGBUILD
diff -u arch/build/base/iputils/PKGBUILD:1.28 arch/build/base/iputils/PKGBUILD:1.29
--- arch/build/base/iputils/PKGBUILD:1.28	Wed Aug  2 13:17:44 2006
+++ arch/build/base/iputils/PKGBUILD	Sun May 13 02:22:11 2007
@@ -1,36 +1,66 @@
-# $Id: PKGBUILD,v 1.28 2006/08/02 17:17:44 judd Exp $
-# Maintainer: Judd Vinet <jvinet at zeroflux.org>
+# $Id: PKGBUILD,v 1.29 2007/05/13 06:22:11 aaron Exp $
+# Maintainer: Aaron Griffin <aaron at archlinux.org>
+
 pkgname=iputils
-pkgver=021109
-pkgrel=5
+pkgver=20070202
+_traceroutever=1.4a12
+pkgrel=1
 pkgdesc="IP Configuration Utilities (and Ping)"
 arch=(i686 x86_64)
+license=('GPL')
 url="ftp://ftp.inr.ac.ru/ip-routing/"
 depends=('glibc')
-conflicts=('netkit-base' 'arping')
-replaces=('netkit-base')
-backup=('etc/services')
-source=(http://www.tux.org/pub/net/ip-routing/iputils-ss${pkgver}-try.tar.bz2 \
-        iputils-ss${pkgver}-try.patch iputils.patch protocols services)
-md5sums=('dd10ef3d76480990a2174d2bb0daddaf' '4868d9f4866fb58fb59f152cb9a79990'\
-         'bb0d0464a7a52776de0ad08836c43d40' 'ebd069f419d70bee91717491ae0a21f6'\
-         '7d5a2e50fe108be113f20b90687c7599')
-
-build() {
-  cd $startdir/src/iputils
-  patch -Np1 -i ../iputils-ss${pkgver}-try.patch || return 1
-  patch -Np1 -i ../iputils.patch || return 1
+makedepends=('jade')
+conflicts=('netkit-base' 'arping' 'netkit-tftpd' 'traceroute')
+replaces=('netkit-base' 'traceroute')
+source=(http://www.skbuff.net/iputils/$pkgname-s$pkgver.tar.bz2
+        ftp://ftp.ee.lbl.gov/traceroute-$_traceroutever.tar.gz)
+md5sums=('1d38fb3cfc2b71496e43cf646bfc1d6e'
+         '964d599ef696efccdeebe7721cd4828d')
+
+build()
+{
+  #build iptuils
+  cd $startdir/src/$pkgname-s$pkgver
   make KERNEL_INCLUDE=/usr/include || return 1   # for i686
-  for i in arping clockdiff rarpd rdisc tftpd tracepath tracepath6 traceroute6; do
+  for i in arping clockdiff rarpd rdisc tftpd tracepath tracepath6; do
     install -D -m755 $i $startdir/pkg/usr/sbin/$i
   done
-  for i in ping ping6; do
+  for i in ping ping6 traceroute6; do
     install -D -m4755 $i $startdir/pkg/bin/$i
   done
-  install -D -m644 ../services $startdir/pkg/etc/services
-  install -D -m644 ../protocols $startdir/pkg/etc/protocols
+
+  msg ":: building docs"
+  # good god, these docs are a pain
+  # special thanks to  Michael(tm) Smith <mike at w3.org> - http://people.w3.org/mike/
+  # from #docbook on freenode.org for figuring this out
   cd doc
-  for i in arping clockdiff ping rarpd rdisc tftpd tracepath traceroute6; do
-    install -D -m644 $i.8 $startdir/pkg/usr/man/man8/$i.8
+  for file in *.sgml; do
+      xf=${file/.sgml/.xml}
+      sx -xlower -xno-nl-in-tag $file > $xf
+      sed -i "s|<refname>\(.*\), \(.*\)</refname>|<refname>\1</refname>, <refname>\2</refname>|g" $xf
+      xsltproc /usr/share/xml/docbook/manpages/docbook.xsl $xf
   done
+
+  mkdir -p $startdir/pkg/usr/man/man8
+  install -m644 arping.8 clockdiff.8 ping.8 ping6.8 rarpd.8 rdisc.8 \
+                    tftpd.8 tracepath.8 tracepath6.8 traceroute6 \
+                    $startdir/pkg/usr/man/man8/
+  #make man
+  #for i in arping clockdiff ping rarpd rdisc tftpd tracepath traceroute6; do
+  #  install -D -m644 $i.8 $startdir/pkg/usr/man/man8/$i.8
+  #done
+
+  # build traceroute
+  # this is combined in this package because it's awkward as a separate package
+  cd ${startdir}/src/traceroute-$_traceroutever
+  ./configure --prefix=/usr --sbindir=/bin
+  #if [ "${CARCH}" = "x86_64" ]; then
+    make CFLAGS="${CFLAGS} -Ilinux-include/" || return 1
+  #else
+  #  make || return 1
+  #fi
+  make DESTDIR=${startdir}/pkg install install-man
+
+  chmod 4775 ${startdir}/pkg/bin/traceroute
 }