diff options
author | Michał Górny <mgorny@gentoo.org> | 2015-02-21 16:10:24 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2015-02-21 16:10:24 +0000 |
commit | f3e1a3b255ab62e13d10f01efead817d76f227dc (patch) | |
tree | 4116704489f617672199bbe0dd0bbe5dbd53512b /sys-process/pidof-bsd | |
parent | Transfer stable keywords and drop old (diff) | |
download | gentoo-2-f3e1a3b255ab62e13d10f01efead817d76f227dc.tar.gz gentoo-2-f3e1a3b255ab62e13d10f01efead817d76f227dc.tar.bz2 gentoo-2-f3e1a3b255ab62e13d10f01efead817d76f227dc.zip |
Fix build failure on FreeBSD 10.0, https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/31 by nigoro.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'sys-process/pidof-bsd')
-rw-r--r-- | sys-process/pidof-bsd/ChangeLog | 10 | ||||
-rw-r--r-- | sys-process/pidof-bsd/files/pidof-bsd-20050501-fbsd10.patch | 18 | ||||
-rw-r--r-- | sys-process/pidof-bsd/pidof-bsd-20050501-r4.ebuild | 7 |
3 files changed, 29 insertions, 6 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/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 / |