Fix build failure on FreeBSD 10.0, https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/31 by nigoro.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 59 insertions, 13 deletions

diff --git a/sys-process/pidof-bsd/ChangeLog b/sys-process/pidof-bsd/ChangeLog
index 4a478c572331..0e70a79ec397 100644
--- a/sys-process/pidof-bsd/ChangeLog
+++ b/sys-process/pidof-bsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-process/pidof-bsd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/pidof-bsd/ChangeLog,v 1.10 2012/05/24 13:10:40 ryao Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/pidof-bsd/ChangeLog,v 1.11 2015/02/21 16:10:24 mgorny Exp $
+
+  21 Feb 2015; Michał Górny <mgorny@gentoo.org>
+  +files/pidof-bsd-20050501-fbsd10.patch, pidof-bsd-20050501-r4.ebuild:
+  Fix build failure on FreeBSD 10.0, https://github.com/gentoo/gentoo-portage-
+  rsync-mirror/pull/31 by nigoro.
 
 *pidof-bsd-20050501-r4 (24 May 2012)
 
@@ -50,4 +55,3 @@
   +files/pidof-bsd-20050501-gfbsd.patch, +metadata.xml,
   +pidof-bsd-20050501-r1.ebuild:
   Initial import in portage, from gentoo-alt overlay.
-
diff --git a/sys-process/pidof-bsd/Manifest b/sys-process/pidof-bsd/Manifest
index f25652ee843d..7636dfa2561e 100644
--- a/sys-process/pidof-bsd/Manifest
+++ b/sys-process/pidof-bsd/Manifest
@@ -1,7 +1,30 @@
-AUX pidof-bsd-20050501-firstarg.patch 485 RMD160 5959417c6ac48e808cf77d27bc4b91690c7d8523 SHA1 a194e8c0c4d702e796a7440ef07dde23f27e77dd SHA256 40bc0e215cce2b963c949bc84ac615970d10dd5f6e820a2bb826b5307ee9aee3
-AUX pidof-bsd-20050501-gfbsd.patch 2898 RMD160 e62fa1d1c714014b51be61b95e2e599c92ec1622 SHA1 6afdce1e965a57b4cc8b28f09658ae5687974540 SHA256 333984dcdfe27db0478e168366ee31449e5b457764530a840908890d31a688eb
-AUX pidof-bsd-20050501-pname.patch 1374 RMD160 48fa60d17fd607cd9ca284939d74f6db995fa7df SHA1 5d58351d06f842cc52a0cad452fba9729a93c0e1 SHA256 04fdaa9de91dafa6fc1e12443e30ec532315f74cfdffcf074fd5d8583ec322fe
-DIST pidof-bsd-20050501.tar.gz 1769 RMD160 1306e7f4b2d6231358d10b45705a16c925bb1d51 SHA1 408cf9d2ff486acb8e90de4fdec138554fd71868 SHA256 c3ed8826178debe872f7717b8810d477d4611ab19af73bed97c5af1c552d20e6
-EBUILD pidof-bsd-20050501-r4.ebuild 702 RMD160 5c59c7a6349a02e5c4db370b27de5c85d4b4429a SHA1 a80cc686813844e55f4504d3fd55329b2f69fc16 SHA256 967c148d1a8891ba18c53499770b08597101bd9a48ea52b469a44f39e449b50b
-MISC ChangeLog 1902 RMD160 8d264fd93a8f9f6f18529dce90b1818cd236df7e SHA1 c4f424e9414d5cea0d313cf8439305b692ad0545 SHA256 f5cf49b1ada8d7dd30d7041f523751bf67b47bc873c70d73fc46625feea7b9a8
-MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX pidof-bsd-20050501-fbsd10.patch 357 SHA256 d6e5624dae04ef0f76c52eef3f9017fff0d777e907c5057a4252371fc8709ab7 SHA512 ae99d2bb302f96039887fce425446a8c8918543f492b5471be03d03013d6fd4e530cfd6bf8b1d8d5b56ed2611955390b9b9a32c6aea6055d78be427991e7e0b9 WHIRLPOOL 7cbc8a7aa04d822e81f57109caedc5ad9cb2f6263df86ef8ada9b61bbd06d4d068b5954805468de1603907532275b9eede053de1145fbab48740ce9d95ee595a
+AUX pidof-bsd-20050501-firstarg.patch 485 SHA256 40bc0e215cce2b963c949bc84ac615970d10dd5f6e820a2bb826b5307ee9aee3 SHA512 c7dd9d9c7d2d90c41b0c612284c9f23990e11d598ee6815480b2a31c2910703030511077781e9fc24e5054cc88fc6c50b6bf8eae1a9141a671f78c1be3cf9f09 WHIRLPOOL cf8ca9a8b7e1207c9275f925a03252b253076595041ef20b627d00c335b239f5623df9bf3ab51f19183f2bf101da476fafa3c782234d866f6c954ee86a950256
+AUX pidof-bsd-20050501-gfbsd.patch 2898 SHA256 333984dcdfe27db0478e168366ee31449e5b457764530a840908890d31a688eb SHA512 499099f3b07c250939cba58fe573e5962a3faa66c941d42e3d6fb6cf387f600dcb26642b35aaf83396efb5d0a5b7afc24e7f920d2c54bd4396bbf5e0b3141e6d WHIRLPOOL 2a282d9c253c429988fe7d0cc65c870766bcd79457890dfa776d5387c666f84a0cc4995a007024fa19520e431ef8a05b41fe0ae86b9c623ca5724dd56936053c
+AUX pidof-bsd-20050501-pname.patch 1374 SHA256 04fdaa9de91dafa6fc1e12443e30ec532315f74cfdffcf074fd5d8583ec322fe SHA512 5f3912a0f48db867181def6a6bb36f3544b069be89af0d0290d073f7d92041abda449c8b84694fed45e1d35a50bfa4bd157d695ab166fb61cc3b6c8d99e5f417 WHIRLPOOL aaf31effa8cfd1dd86ce684d8be8657bb3d3f3baa7c2adc44cfab5d30f7ed5340a9bb5a0cc563e020a2836790050dfd9eb35d4c8c25579ae3eb14f70b5291241
+DIST pidof-bsd-20050501.tar.gz 1769 SHA256 c3ed8826178debe872f7717b8810d477d4611ab19af73bed97c5af1c552d20e6
+EBUILD pidof-bsd-20050501-r4.ebuild 737 SHA256 8e6ce3e2d57a66918ce8bf466c6e1c05f830fbfc65c7b1c68ff9328241554400 SHA512 7ac4687bac846582c140a716f0d4d10f3db4cf8d4ebc2796a6b225adca03db6db698523eef00dfaf587c8cbf2878b3a7cd1a3e9d9d7785a36261f1135a14d2a4 WHIRLPOOL cde63b1a8ae49912b6dbda1739c9e0f5ce5019ad0b05d75d93c9c31f9e4dd7db4e8ed6c7e59141194de60c9e6f333a1757f7d90160c010a8288715cd7ec72d93
+MISC ChangeLog 2139 SHA256 fb1885d45c286e20d80134b8ec828618c3dfcf4ca418da9bbe7683a509f6a0c0 SHA512 e054b0fee6991132e566a090e1b14333ae0ab7ddf39a2f5f02412a8b91e62808cc01e2b14fc6d23c49e9d071cda2b157954437ecf04a9c04ca4d4517c3888f26 WHIRLPOOL 3f6f69436b1902f753ddcf25ce05114ac060346f42425b45040a4f35d3aa5299359ce6b115db42bac56920d4d57f850f0af7afe749a51671429433cb5eb8b4d1
+MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJU6K3xXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOciAP/ic5bImJdJM9FeM5VYVMr+gL
+FLpEbfhZvp7j0Guk7226Hq12PYHZ+2ZOYjgjP16QlhZtJljoWr19KR4eKgNOM2m1
+nmuIINwm1z5M1qQrCZAoUpANYVgTp3MkL/m9ms6Xkh4fJSlTZpj5+5sVLIkjT5ix
+qs67pJb1A5x4euAlZ+8z+CZfRzNzZFnXsVKQS3ay4z1axalBh+OlIgHEqUtNAaIr
+ePIrCW0uXld+Jejhw1Md/SjFoU2FYX6A2sdXuqg+3spy6T5T/1SYl27GymfraHTm
+5XdRd/NAqNmkZ9VIS61w6eKX9c5b7A8z++qmkYCDLci16DJXjLavuJOe/ppg3ogd
+nQ7JPpBol0nqZ6a/e35TtDXz4qWoaXd9cd6+sI+h2421ni6wHsbaqBsReA/7tzxR
+oqm2HVVuyMLrFQvytDRWYHvVXODRpZl0d/byl8qyzZtyVSzX1WGPm8qsqsIN+s2v
+Fg9JJPbfs1w9SeRb9IofXO3IKlGmX9z5g2PqB5erQ/EbGy10SS5xDrSMoovhXRAV
+x6/zECmeyHkh6ik2HuYAaMYP5AF5aOP7lr3J7za6kU6L5uNUJQ/AvFrChHeOIjHU
+2vTDLNYcojEhl6fnO3ZmPdpMLIB6qSIVHNtVwf6E+nLfAFu1FEwyjGRX7HpWO7ta
+ZoekUcwsTdm34q+mhVwO
+=hTv+
+-----END PGP SIGNATURE-----
diff --git a/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd10.patch b/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd10.patch
new file mode 100644
index 000000000000..5c7382e1344f
--- /dev/null
+++ b/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd10.patch
@@ -0,0 +1,18 @@
+share/mk/bsd.compat.mk has been removed from FreeBSD 10.0.
+An old style NOMAN is not supported anymore.
+
+https://bugs.gentoo.org/show_bug.cgi?id=483044
+
+diff --git a/Makefile b/Makefile
+index d2d760b..446bd6f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,7 +2,7 @@
+ 
+ PROG=	pidof
+ SRCS=	pidof.c
+-NOMAN=	yes
++NO_MAN=	yes
+ LDADD=	-lkvm
+ LINKS=	${BINDIR}/pidof
+ 
diff --git a/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild b/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild
index e4b180a9bfd6..30ce2338d2e0 100644
--- a/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild
+++ b/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild,v 1.1 2012/05/24 13:10:40 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild,v 1.2 2015/02/21 16:10:24 mgorny Exp $
 
 inherit base bsdmk
 
@@ -20,7 +20,8 @@ S="${WORKDIR}/pidof"
 
 PATCHES=( "${FILESDIR}/${P}-gfbsd.patch"
 	"${FILESDIR}/${P}-firstarg.patch"
-	"${FILESDIR}/${P}-pname.patch" )
+	"${FILESDIR}/${P}-pname.patch"
+	"${FILESDIR}/${P}-fbsd10.patch" )
 
 src_install() {
 	into /