[pkgsrc/trunk]: pkgsrc/devel/man-pages The conflict of devel/man-pages with l...

[kamil <kamil%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/619e8ecd0c9a
branches:  trunk
changeset: 353378:619e8ecd0c9a
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Mon Oct 03 20:37:53 2016 +0000

description:
The conflict of devel/man-pages with lang/cint has been resolved

The lang/cint package renamed its man-page to cint_security.2.

Bump PKGREVISION to 1.

diffstat:

 devel/man-pages/Makefile |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r 73b9b1de238b -r 619e8ecd0c9a devel/man-pages/Makefile
--- a/devel/man-pages/Makefile  Mon Oct 03 20:07:55 2016 +0000
+++ b/devel/man-pages/Makefile  Mon Oct 03 20:37:53 2016 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2016/04/29 12:07:55 mef Exp $
+# $NetBSD: Makefile,v 1.5 2016/10/03 20:37:53 kamil Exp $
 #
 
 DISTNAME=      man-pages-4.05
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  http://www.kernel.org/pub/linux/docs/man-pages/
 EXTRACT_SUFX=  .tar.xz
@@ -25,8 +26,6 @@
 # sem_destroy.3, sem_getvalue.3, sem_init.3, sem_post.3, sem_trywait.3,
 # sem_wait.3
 CONFLICTS+=    pthread-sem-[0-9]*
-# security.2
-CONFLICTS+=    cint-[0-9]*
 # getaddrinfo.3, gethostbyname.3, getipnodebyname.3, getnameinfo.3,
 # getnetent.3, resolver.3, resolver.5, hostname.7
 CONFLICTS+=    libbind-[0-9]*