Merge branch 'master' of gparabola:abslibre-mips64el

1 files changed, 24 insertions, 23 deletions

diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD
index 28574ea92..affca856a 100644
--- a/core/inetutils/PKGBUILD
+++ b/core/inetutils/PKGBUILD
@@ -1,38 +1,40 @@
-# $Id: PKGBUILD 165908 2012-09-03 17:29:57Z eric $
+# $Id: PKGBUILD 185637 2013-05-16 17:56:59Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=inetutils
 pkgver=1.9.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A collection of common network programs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/inetutils/"
 license=('GPL3')
 groups=('base')
-depends=('readline' 'ncurses' 'pam')
-backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
+depends=('pam')
+backup=('etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
         'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh')
 options=('!emptydirs')
 install=inetutils.install
 source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \
-        ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \
+        telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \
         ftpd.service dnsdomainname)
 sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90'
-          'ff0aad9946a38915580b094dadf67e790e8a2f87'
-          '84dc802b5e57b5e04c847572225a3b9612017155'
-          '68a590083b45997dfdb80e666b2de762f494ba74'
-          'bfad98a4a62f1fff8779f076c6019ed07f9111af'
-          '27d99b910eec0fc26bd79ccc2c1de26608330298'
-          '81f10b3b688e3952f793b35bcef63b5bf257a92b'
-          '81f4a8da823cf0bb14284fc71ee6108849691eda'
-          'fb607dafe177f074e14891dd887ef9e9ab67a875'
+          'SKIP'
+          '2b2dd71eb3233e5090f4c2df8abe9b4924d323f3'
+          'b15ab4faa9d97652e182c98c1e3a3b3cbbf6383c'
+          'd9b8f8aab094ecb779d0f16f21b4683ab327516f'
+          '26763ae31b8a5be256666a0ba55746941d75d6ee'
+          'e4a764828b57f1e907ec96f4ae0e0cf0d3e2e802'
           'eb952b0b9c3e3d429d8e21b110249e495f0e0e63')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   sed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h
-  ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \
-    --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info \
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --libexec=/usr/bin \
+    --localstatedir=/var --sysconfdir=/etc \
     --without-wrap --with-pam \
     --enable-ftp --enable-ftpd \
     --enable-telnet --enable-telnetd \
@@ -50,20 +52,19 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -d "${pkgdir}/bin"
-  ln -s /usr/bin/hostname "${pkgdir}/bin/hostname"
-  install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname"
+  ln -s ../usr/bin/hostname "${pkgdir}/bin/hostname"
+  ln -s ../usr/bin/dnsdomainname "${pkgdir}/bin/dnsdomainname"
+  install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/usr/bin/dnsdomainname"
   echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1"
-  install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd"
-  install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd"
   install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet"
   install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk"
   install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin"