| 1 |
commit: 76ffe60f3bf3d859e2d498df435b4758e44846b1 |
| 2 |
Author: Yuta Satoh <nigoro.dev <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Oct 2 09:18:48 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 10 11:06:26 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76ffe60f |
| 7 |
|
| 8 |
sys-process/pidof-bsd: Fix build failure on FreeBSD 11.0. |
| 9 |
|
| 10 |
.../pidof-bsd/files/pidof-bsd-20050501-fbsd10.patch | 18 ------------------ |
| 11 |
.../pidof-bsd/files/pidof-bsd-20050501-fbsd11.patch | 14 ++++++++++++++ |
| 12 |
sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild | 9 +++++++-- |
| 13 |
3 files changed, 21 insertions(+), 20 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd10.patch b/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd10.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index 5c7382e..00000000 |
| 18 |
--- a/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd10.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,18 +0,0 @@ |
| 21 |
-share/mk/bsd.compat.mk has been removed from FreeBSD 10.0. |
| 22 |
-An old style NOMAN is not supported anymore. |
| 23 |
- |
| 24 |
-https://bugs.gentoo.org/show_bug.cgi?id=483044 |
| 25 |
- |
| 26 |
-diff --git a/Makefile b/Makefile |
| 27 |
-index d2d760b..446bd6f 100644 |
| 28 |
---- a/Makefile |
| 29 |
-+++ b/Makefile |
| 30 |
-@@ -2,7 +2,7 @@ |
| 31 |
- |
| 32 |
- PROG= pidof |
| 33 |
- SRCS= pidof.c |
| 34 |
--NOMAN= yes |
| 35 |
-+NO_MAN= yes |
| 36 |
- LDADD= -lkvm |
| 37 |
- LINKS= ${BINDIR}/pidof |
| 38 |
- |
| 39 |
|
| 40 |
diff --git a/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd11.patch b/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd11.patch |
| 41 |
new file mode 100644 |
| 42 |
index 00000000..4a1b162 |
| 43 |
--- /dev/null |
| 44 |
+++ b/sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd11.patch |
| 45 |
@@ -0,0 +1,14 @@ |
| 46 |
+diff --git a/pidof/Makefile b/pidof/Makefile |
| 47 |
+index d2d760b..67d2725 100644 |
| 48 |
+--- a/pidof/Makefile |
| 49 |
++++ b/pidof/Makefile |
| 50 |
+@@ -2,8 +2,7 @@ |
| 51 |
+ |
| 52 |
+ PROG= pidof |
| 53 |
+ SRCS= pidof.c |
| 54 |
+-NOMAN= yes |
| 55 |
++NO_MAN= yes |
| 56 |
+ LDADD= -lkvm |
| 57 |
+-LINKS= ${BINDIR}/pidof |
| 58 |
+ |
| 59 |
+ .include <bsd.prog.mk> |
| 60 |
|
| 61 |
diff --git a/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild b/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild |
| 62 |
index 65fd527..3f3d74c 100644 |
| 63 |
--- a/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild |
| 64 |
+++ b/sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild |
| 65 |
@@ -2,7 +2,8 @@ |
| 66 |
# Distributed under the terms of the GNU General Public License v2 |
| 67 |
# $Id$ |
| 68 |
|
| 69 |
-inherit base bsdmk |
| 70 |
+EAPI=5 |
| 71 |
+inherit bsdmk |
| 72 |
|
| 73 |
DESCRIPTION="pidof(1) utility for *BSD" |
| 74 |
HOMEPAGE="http://people.freebsd.org/~novel/pidof.html" |
| 75 |
@@ -21,7 +22,11 @@ S="${WORKDIR}/pidof" |
| 76 |
PATCHES=( "${FILESDIR}/${P}-gfbsd.patch" |
| 77 |
"${FILESDIR}/${P}-firstarg.patch" |
| 78 |
"${FILESDIR}/${P}-pname.patch" |
| 79 |
- "${FILESDIR}/${P}-fbsd10.patch" ) |
| 80 |
+ "${FILESDIR}/${P}-fbsd11.patch" ) |
| 81 |
+ |
| 82 |
+src_prepare() { |
| 83 |
+ epatch "${PATCHES[@]}" |
| 84 |
+} |
| 85 |
|
| 86 |
src_install() { |
| 87 |
into / |
Archives