Remove deprecated start-stop-daemon argument --oknodo, bug #377765

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

5 files changed, 17 insertions, 7 deletions

diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index 40cc481e8386..6c39e1c7c8d6 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.66 2011/07/06 06:09:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.67 2011/08/29 12:04:41 naota Exp $
+
+*freebsd-usbin-8.2-r1 (29 Aug 2011)
+*freebsd-usbin-8.0-r1 (29 Aug 2011)
+*freebsd-usbin-7.2-r1 (29 Aug 2011)
+
+  29 Aug 2011; Naohiro Aota <naota@gentoo.org> -freebsd-usbin-7.2.ebuild,
+  +freebsd-usbin-7.2-r1.ebuild, -freebsd-usbin-8.0.ebuild,
+  +freebsd-usbin-8.0-r1.ebuild, -freebsd-usbin-8.2.ebuild,
+  +freebsd-usbin-8.2-r1.ebuild, files/nfs.initd:
+  Remove deprecated start-stop-daemon argument --oknodo, bug #377765
 
 *freebsd-usbin-8.2 (06 Jul 2011)
 
diff --git a/sys-freebsd/freebsd-usbin/files/nfs.initd b/sys-freebsd/freebsd-usbin/files/nfs.initd
index 640095f140fc..e25ddea0d3bd 100755
--- a/sys-freebsd/freebsd-usbin/files/nfs.initd
+++ b/sys-freebsd/freebsd-usbin/files/nfs.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 #---------------------------------------------------------------------------
@@ -35,12 +35,12 @@ start() {
 
 stop() {
 	ebegin "Stopping NFS mountd"
-	start-stop-daemon --stop --quiet --oknodo --exec $mountd \
+	start-stop-daemon --stop --quiet --exec $mountd \
 		--pidfile /var/run/mountd.pid
 	eend $? "Error stopping NFS mountd"
 
 	ebegin "Stopping NFS daemon"
-	start-stop-daemon --stop --quiet --oknodo \
+	start-stop-daemon --stop --signal USR1 --quiet \
 		--name nfsd --user root
 	eend $? "Error stopping NFS daemon"
 }
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-7.2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-7.2-r1.ebuild
index d48818b69cfd..c3d7b6e6c88a 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-7.2.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-7.2.ebuild,v 1.7 2011/04/07 07:52:12 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-7.2-r1.ebuild,v 1.1 2011/08/29 12:04:41 naota Exp $
 
 EAPI=2
 
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0-r1.ebuild
index 31629408fa44..6ad097644292 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0.ebuild,v 1.4 2011/04/07 07:52:12 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-8.0-r1.ebuild,v 1.1 2011/08/29 12:04:41 naota Exp $
 
 EAPI=2
 
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r1.ebuild
index 3e122ac8a959..92c4b94979ea 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2.ebuild,v 1.1 2011/07/06 06:09:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r1.ebuild,v 1.1 2011/08/29 12:04:41 naota Exp $
 
 EAPI=2