commit: 76ffe60f3bf3d859e2d498df435b4758e44846b1 Author: Yuta Satoh <nigoro.dev <AT> gmail <DOT> com> AuthorDate: Sun Oct 2 09:18:48 2016 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Mon Oct 10 11:06:26 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76ffe60f
sys-process/pidof-bsd: Fix build failure on FreeBSD 11.0. .../pidof-bsd/files/pidof-bsd-20050501-fbsd10.patch | 18 ------------------ .../pidof-bsd/files/pidof-bsd-20050501-fbsd11.patch | 14 ++++++++++++++ sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild | 9 +++++++-- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd10.patch b/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd10.patch deleted file mode 100644 index 5c7382e..00000000 --- a/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd10.patch +++ /dev/null @@ -1,18 +0,0 @@ -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/files/pidof-bsd-20050501-fbsd11.patch b/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd11.patch new file mode 100644 index 00000000..4a1b162 --- /dev/null +++ b/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd11.patch @@ -0,0 +1,14 @@ +diff --git a/pidof/Makefile b/pidof/Makefile +index d2d760b..67d2725 100644 +--- a/pidof/Makefile ++++ b/pidof/Makefile +@@ -2,8 +2,7 @@ + + PROG= pidof + SRCS= pidof.c +-NOMAN= yes ++NO_MAN= yes + LDADD= -lkvm +-LINKS= ${BINDIR}/pidof + + .include <bsd.prog.mk> diff --git a/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild b/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild index 65fd527..3f3d74c 100644 --- a/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild +++ b/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -inherit base bsdmk +EAPI=5 +inherit bsdmk DESCRIPTION="pidof(1) utility for *BSD" HOMEPAGE="http://people.freebsd.org/~novel/pidof.html"; @@ -21,7 +22,11 @@ S="${WORKDIR}/pidof" PATCHES=( "${FILESDIR}/${P}-gfbsd.patch" "${FILESDIR}/${P}-firstarg.patch" "${FILESDIR}/${P}-pname.patch" - "${FILESDIR}/${P}-fbsd10.patch" ) + "${FILESDIR}/${P}-fbsd11.patch" ) + +src_prepare() { + epatch "${PATCHES[@]}" +} src_install() { into /
