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

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

6 files changed, 26 insertions, 16 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/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index 703e5eed9daf..83ed0cb060c8 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -7,7 +7,7 @@ AUX mountd.patch 542 RMD160 f68fb1bdc53705a392bbb92d91fc44991f19e742 SHA1 c5fb79
 AUX moused.confd 827 RMD160 a9d0822aa3894caed9efa9df93ef25ec6ec6fb8e SHA1 e09f3f44ee29fa75a1ce6fbe9cdbfe503eaa11d6 SHA256 7c15a534c0b10a553848b13e1fccd27fad1684ddc1b252133269257e864d769e
 AUX moused.initd 1783 RMD160 46241b5cf795ad06460e4053f8a76726af70c665 SHA1 02b5c22b7c35439a4c59ddadfd5bb7910cf3cdff SHA256 84f2d221ce16f5ffce43170fdcf86675dae79a776e1f2abf3b1b490b585f6d0e
 AUX nfs.confd 303 RMD160 84d62252bbdd6a5d8c65f537e0cf44495101ebef SHA1 108c14ef72c8ce9cf932ec52b7c0850c0c1b5d07 SHA256 5714e0cbcc45a077ab2348ee4fea521ce9f739927094dccb4b91817f1edaccb8
-AUX nfs.initd 1409 RMD160 b08b7924373be188d584786e925c50b9a601d907 SHA1 2141cb037c87889891240e2fd5057b31f7b5368b SHA256 9d1be14058ed2ac5932e9b2b04f853118eddcf544551bce3e95ec7a48a6ba109
+AUX nfs.initd 1405 RMD160 65d3aa6ab9b360636f87e6daef2851c6f5290948 SHA1 2eff28ec1b5ba6bae3d833d6813ce2860547923d SHA256 03920f64182089b4f79fcd311cc71c9d3c83197fb9406710ceeced2d623ae661
 AUX nfsmount.initd 1596 RMD160 8f47abac7148ad8c35fe314dad6ae2fdffc73cb3 SHA1 5a839e1b4f135619ec1b6c614e9a1cf8d018f0d6 SHA256 0cea497d66d41d093792f8bb2590c45b6b8f965cef9c148b835b362f2a172cbe
 AUX powerd.confd 368 RMD160 4273367b5b1956080d70c300f071ccb7aa614672 SHA1 6cbebc62910ff2d45079f8430d2494ebd7293546 SHA256 989e31b98daacb3d6ecddf8788ee496f3c100d549e7a210e387f03d69c3c8e98
 AUX powerd.initd 774 RMD160 650b7f09be40db75e03c086bc70491c2ce18c40d SHA1 89186f3894357b466d438d7b7b23b7f1228058d6 SHA256 2ee95ad25206716b6043407c6fbb412513fcbd0893d7f2faf2c927c55990fb03
@@ -50,15 +50,15 @@ DIST freebsd-ubin-8.2.tar.bz2 1808012 RMD160 b927dcb67de4367ea148643203e0056dd90
 DIST freebsd-usbin-7.2.tar.bz2 2654480 RMD160 af0a94e0affce332cf30532ea45251563e65632e SHA1 b52db981e0250357b40d10ebc7ffd6ca3ea9cc4c SHA256 56574e81ac4ab54a20d83d9a2d1ba3a42b5677691675f1db162fde161da0907f
 DIST freebsd-usbin-8.0.tar.bz2 2411151 RMD160 f162437ab2e3c89c6635e5c567e39b60974ce3c1 SHA1 be7b4ccd767e64fa0dedced631c18a1c3969b417 SHA256 c38230af5d667a254ddcce0b77100ada2b7af6e17309f033950c2852f70cc1dd
 DIST freebsd-usbin-8.2.tar.bz2 2443024 RMD160 972723becd1ab16615bc45f9beab8483533cbf81 SHA1 16bcb5528f14cfeccb9f4c913a629b01d9873ebf SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603
-EBUILD freebsd-usbin-7.2.ebuild 5278 RMD160 83d9056ddd753bba7eea6922477d7137aa41cb44 SHA1 1097a3110a2f4b601ce3271779ba7cd6a91749ba SHA256 a7a490a4bfff126ed37eef9a90b8bc896e01c5bf58c54d66ac097c807c80cdcd
-EBUILD freebsd-usbin-8.0.ebuild 5346 RMD160 8a4863ffa3b5ee11c40900252afb001314b3218d SHA1 9c10b04e4bd398273cc4bf448abed559643da816 SHA256 394de0e6de98b14876cb81f2007ebdd6c68edcf2d34cbf2dc02594c7df2d9b5b
-EBUILD freebsd-usbin-8.2.ebuild 5374 RMD160 ee5582f245a5976787b6608bc31ec72951738138 SHA1 86f8ce03f3e27c4a9ce2137b628148f624128e34 SHA256 21bf96b8e6705d66086cd21544087d00291ab16d88260fbd2a2a83e85e977da7
-MISC ChangeLog 17940 RMD160 278d289468f700ce696613c38b5a82edf128c1af SHA1 c10f44d703cc6ebf16a75301d3d79585eefcbf96 SHA256 d3b9628af4aa7f15aa9e452d177669265b5a878c3c018e49de9a9ed6c369f00f
+EBUILD freebsd-usbin-7.2-r1.ebuild 5278 RMD160 fe22f027d29f6a435b4ec8355933c9348f08be95 SHA1 530fffda2a82bab7d6ab93673df9daa1e0daae1d SHA256 3e635b2b34749e224185e10ca87f7644cf0b1688093ec4974d0e5cf9bd786aa6
+EBUILD freebsd-usbin-8.0-r1.ebuild 5346 RMD160 b485010627c843313b3c5d9be70d2626154eea18 SHA1 7558779bbbb1b498da9a803f5e00ebc16a4a3d42 SHA256 2c1d1b55b9dfa4f7c85de5b8e64f56c4fc1b546ee23f9de598a3715b209935cd
+EBUILD freebsd-usbin-8.2-r1.ebuild 5374 RMD160 58bc2b624f017225d42f6ceb3280274b5a8abeba SHA1 a873a54c9d7138f5d9e748dae747770c413e962b SHA256 eb2cc9b340bf7396a904120c9d86ebcec97cbd19c1d4c028659845a0688fe221
+MISC ChangeLog 18357 RMD160 315a430ee43afa0075763ebe6dc00fbb4d8cf183 SHA1 c99dc9b7c5f11d7f1f7d0c203578659df05aaafa SHA256 f72ed99c20211a105cde5f81dca96629fd303c46165770dc647b52b7bc8d133a
 MISC metadata.xml 511 RMD160 159e8a06a03c2b27a64a3ca54de4373a5aae5c6a SHA1 1d4f7993fe8c31a4f7478c91df9103b69b29148e SHA256 ad3d3afca8e209c42d1767c5d1dab12eef47c9016c0ce9aaa3490942bd185bac
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4T/DQACgkQvFcC4BYPU0qOzACfWecvpLwDBT5uFV1+myJ8UA+1
-A4gAoKk7IGi9HvncyIcgae1TCWaf31b0
-=w9AI
+iEYEARECAAYFAk5bgFcACgkQGpDnPLSHuMCAoQCaAm3dx+xKAo2iN/03sB3Cb75o
+9VsAn3IYTMN4cIgAZjoOxUzupEwFX65j
+=Hy1f
 -----END PGP SIGNATURE-----
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