From 631229df75d19a6673c94ebc8df7cb7adaffe65e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Tue, 2 Jun 2015 10:56:21 +0200
Subject: [PATCH] nfs-utils: move to usr/bin.

---
 srcpkgs/nfs-utils/files/blkmapd.service     | 2 +-
 srcpkgs/nfs-utils/files/nfsd.service        | 8 ++++----
 srcpkgs/nfs-utils/files/rpc-gssd.service    | 2 +-
 srcpkgs/nfs-utils/files/rpc-idmapd.service  | 2 +-
 srcpkgs/nfs-utils/files/rpc-mountd.service  | 2 +-
 srcpkgs/nfs-utils/files/rpc-statd.service   | 2 +-
 srcpkgs/nfs-utils/files/rpc-svcgssd.service | 2 +-
 srcpkgs/nfs-utils/template                  | 7 +++----
 8 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/nfs-utils/files/blkmapd.service b/srcpkgs/nfs-utils/files/blkmapd.service
index 757745ce1b6..81f7945bfa4 100644
--- a/srcpkgs/nfs-utils/files/blkmapd.service
+++ b/srcpkgs/nfs-utils/files/blkmapd.service
@@ -5,7 +5,7 @@ Requires=var-lib-nfs-rpc_pipefs.mount
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/blkmapd
+ExecStart=/usr/bin/blkmapd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/srcpkgs/nfs-utils/files/nfsd.service b/srcpkgs/nfs-utils/files/nfsd.service
index 0b15adf217a..adeb8fc3360 100644
--- a/srcpkgs/nfs-utils/files/nfsd.service
+++ b/srcpkgs/nfs-utils/files/nfsd.service
@@ -5,10 +5,10 @@ Requires=rpcbind.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/sbin/rpc.nfsd
-ExecStartPost=/usr/sbin/exportfs -a
-ExecStop=/usr/sbin/rpc.nfsd 0
-ExecStopPost=/usr/sbin/exportfs -a -u
+ExecStart=/usr/bin/rpc.nfsd
+ExecStartPost=/usr/bin/exportfs -a
+ExecStop=/usr/bin/rpc.nfsd 0
+ExecStopPost=/usr/bin/exportfs -a -u
 RemainAfterExit=yes
 
 [Install]
diff --git a/srcpkgs/nfs-utils/files/rpc-gssd.service b/srcpkgs/nfs-utils/files/rpc-gssd.service
index 107e58b5508..83370c2c9b8 100644
--- a/srcpkgs/nfs-utils/files/rpc-gssd.service
+++ b/srcpkgs/nfs-utils/files/rpc-gssd.service
@@ -6,7 +6,7 @@ Before=remote-fs-pre.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/rpc.gssd
+ExecStart=/usr/bin/rpc.gssd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/srcpkgs/nfs-utils/files/rpc-idmapd.service b/srcpkgs/nfs-utils/files/rpc-idmapd.service
index cc2589aa5d4..5198e460ac8 100644
--- a/srcpkgs/nfs-utils/files/rpc-idmapd.service
+++ b/srcpkgs/nfs-utils/files/rpc-idmapd.service
@@ -6,7 +6,7 @@ Before=remote-fs-pre.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/rpc.idmapd
+ExecStart=/usr/bin/rpc.idmapd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/srcpkgs/nfs-utils/files/rpc-mountd.service b/srcpkgs/nfs-utils/files/rpc-mountd.service
index d8e444298b7..7e4900000b5 100644
--- a/srcpkgs/nfs-utils/files/rpc-mountd.service
+++ b/srcpkgs/nfs-utils/files/rpc-mountd.service
@@ -5,7 +5,7 @@ Requires=rpcbind.service nfsd.service
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/rpc.mountd
+ExecStart=/usr/bin/rpc.mountd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/srcpkgs/nfs-utils/files/rpc-statd.service b/srcpkgs/nfs-utils/files/rpc-statd.service
index fe2d86d1742..050c2064f75 100644
--- a/srcpkgs/nfs-utils/files/rpc-statd.service
+++ b/srcpkgs/nfs-utils/files/rpc-statd.service
@@ -6,7 +6,7 @@ Before=remote-fs-pre.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/rpc.statd
+ExecStart=/usr/bin/rpc.statd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/srcpkgs/nfs-utils/files/rpc-svcgssd.service b/srcpkgs/nfs-utils/files/rpc-svcgssd.service
index 04917cc1ade..97fca434d50 100644
--- a/srcpkgs/nfs-utils/files/rpc-svcgssd.service
+++ b/srcpkgs/nfs-utils/files/rpc-svcgssd.service
@@ -5,7 +5,7 @@ Requires=rpcbind.service
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/rpc.svcgssd
+ExecStart=/usr/bin/rpc.svcgssd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index d097e2722d1..e8159364dfc 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'nfs-utils'
 pkgname=nfs-utils
 version=1.3.2
-revision=2
+revision=3
 short_desc="Network File System utilities"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
@@ -28,7 +28,7 @@ do_configure() {
 	configure_args+=" --with-statduser=nobody --enable-gss --enable-nfsv4
 		--with-statedir=/var/lib/nfs --enable-libmount-mount
 		--with-gssglue --without-tcp-wrappers --enable-ipv6
-		--sbindir=/usr/sbin "
+		--sbindir=/usr/bin "
 
 	./configure ${configure_args} \
 		--with-tirpcinclude=$XBPS_CROSS_BASE/usr/include/tirpc \
@@ -42,8 +42,7 @@ do_build() {
 do_install() {
 	make DESTDIR=${DESTDIR} install
 
-	vmkdir usr/sbin
-	mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/sbin
+	mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin
 	# conffiles
 	vconf ${FILESDIR}/exports
 	vconf ${FILESDIR}/idmapd.conf