[arch-commits] Commit in ndisc6/trunk (PKGBUILD rdnssd.service)

[Sébastien Luttringer]

    Date: Monday, May 13, 2013 @ 02:17:30
  Author: seblu
Revision: 90525

upgpkg: ndisc6 1.0.2-7

https://www.archlinux.org/todo/move-files-to-usrbin-if-possible/

Modified:
  ndisc6/trunk/PKGBUILD
  ndisc6/trunk/rdnssd.service

----------------+
 PKGBUILD       |   20 ++++++++++++++------
 rdnssd.service |    2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 00:06:48 UTC (rev 90524)
+++ PKGBUILD	2013-05-13 00:17:30 UTC (rev 90525)
@@ -5,7 +5,7 @@
 
 pkgname=ndisc6
 pkgver=1.0.2
-pkgrel=6
+pkgrel=7
 pkgdesc='Collection of IPv6 networking utilities'
 arch=('i686' 'x86_64')
 url='http://www.remlab.net/ndisc6/'
@@ -13,17 +13,25 @@
 depends=('glibc' 'perl')
 makedepends=('glibc' 'gcc')
 options=(!emptydirs)
-install=ndisc6.install
+install=$pkgname.install
 source=("http://www.remlab.net/files/ndisc6/$pkgname-$pkgver.tar.bz2"
 	      'rdnssd.service')
 md5sums=('50cb4c19606cf6ff2b7388e71832f579'
-         'beeb4f033e9eb951e2de962f609c7c2a')
+         '88a290cbcf51ac5e10ed5f995a8ba4b9')
 
+prepare() {
+  # patch invalid path
+  sed -ri 's,PATH=/sbin:/bin,PATH=/sbin:/bin:/usr/sbin:/usr/bin,' \
+    $pkgname-$pkgver/rdnssd/merge-hook.in
+}
+
 build() {
   cd $pkgname-$pkgver
-  # patch invalid path
-  sed -ri 's,PATH=/sbin:/bin,PATH=/sbin:/bin:/usr/sbin:/usr/bin,' rdnssd/merge-hook.in
-  ./configure --localstatedir=/var --sysconfdir=/etc --prefix=/usr
+  ./configure \
+    --prefix=/usr \
+    --sbindir=/usr/bin \
+    --localstatedir=/var \
+    --sysconfdir=/etc
   make
 }
 

Modified: rdnssd.service
===================================================================
--- rdnssd.service	2013-05-13 00:06:48 UTC (rev 90524)
+++ rdnssd.service	2013-05-13 00:17:30 UTC (rev 90525)
@@ -6,7 +6,7 @@
 [Service]
 Type=forking
 PIDFile=/run/rdnssd.pid
-ExecStart=/usr/sbin/rdnssd -H /etc/rdnssd/merge-hook
+ExecStart=/usr/bin/rdnssd -H /etc/rdnssd/merge-hook
 
 [Install]
 WantedBy=multi-user.target