Mon Oct 3 20:37:53 2016 UTC ()
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.


(kamil)
diff -r1.4 -r1.5 pkgsrc/devel/man-pages/Makefile
cvs diff -r1.4 -r1.5 pkgsrc/devel/man-pages/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/man-pages/Makefile 2016/04/29 12:07:55 1.4
+++ pkgsrc/devel/man-pages/Makefile 2016/10/03 20:37:53 1.5
@@ -1,40 +1,39 @@ @@ -1,40 +1,39 @@
1# $NetBSD: Makefile,v 1.4 2016/04/29 12:07:55 mef Exp $ 1# $NetBSD: Makefile,v 1.5 2016/10/03 20:37:53 kamil Exp $
2# 2#
3 3
4DISTNAME= man-pages-4.05 4DISTNAME= man-pages-4.05
 5PKGREVISION= 1
5CATEGORIES= devel 6CATEGORIES= devel
6MASTER_SITES= http://www.kernel.org/pub/linux/docs/man-pages/ 7MASTER_SITES= http://www.kernel.org/pub/linux/docs/man-pages/
7EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.kernel.org/doc/man-pages/ 11HOMEPAGE= http://www.kernel.org/doc/man-pages/
11COMMENT= The Linux man-pages project for Linux kernel and C library interface 12COMMENT= The Linux man-pages project for Linux kernel and C library interface
12#LICENSE= many, and not even upstream cares about sorting them out 13#LICENSE= many, and not even upstream cares about sorting them out
13 14
14NO_BUILD= # This package only installs files. 15NO_BUILD= # This package only installs files.
15 16
16USE_LANGUAGES= # none 17USE_LANGUAGES= # none
17MAKE_FLAGS+= prefix=${PREFIX} DESTDIR=${DESTDIR} 18MAKE_FLAGS+= prefix=${PREFIX} DESTDIR=${DESTDIR}
18 19
19# iconv.3, iconv_close.3, iconv_open.3 20# iconv.3, iconv_close.3, iconv_open.3
20CONFLICTS+= libiconv-[0-9]* 21CONFLICTS+= libiconv-[0-9]*
21# dladdr.3, dlcose.3, dlerror.3, dlopen.3, dlsym.3 22# dladdr.3, dlcose.3, dlerror.3, dlopen.3, dlsym.3
22CONFLICTS+= dlcompat-[0-9]* 23CONFLICTS+= dlcompat-[0-9]*
23# getopt_long.3 24# getopt_long.3
24CONFLICTS+= libgetopt-[0-9]* 25CONFLICTS+= libgetopt-[0-9]*
25# sem_destroy.3, sem_getvalue.3, sem_init.3, sem_post.3, sem_trywait.3, 26# sem_destroy.3, sem_getvalue.3, sem_init.3, sem_post.3, sem_trywait.3,
26# sem_wait.3 27# sem_wait.3
27CONFLICTS+= pthread-sem-[0-9]* 28CONFLICTS+= pthread-sem-[0-9]*
28# security.2 
29CONFLICTS+= cint-[0-9]* 
30# getaddrinfo.3, gethostbyname.3, getipnodebyname.3, getnameinfo.3, 29# getaddrinfo.3, gethostbyname.3, getipnodebyname.3, getnameinfo.3,
31# getnetent.3, resolver.3, resolver.5, hostname.7 30# getnetent.3, resolver.3, resolver.5, hostname.7
32CONFLICTS+= libbind-[0-9]* 31CONFLICTS+= libbind-[0-9]*
33# ftpusers.5 32# ftpusers.5
34CONFLICTS+= tnftpd-[0-9]* 33CONFLICTS+= tnftpd-[0-9]*
35# des_crypt.3 (when des option is enabled) 34# des_crypt.3 (when des option is enabled)
36CONFLICTS+= kth-krb4-[0-9]* 35CONFLICTS+= kth-krb4-[0-9]*
37# man.7, mdoc.7 36# man.7, mdoc.7
38CONFLICTS+= mdocml-[0-9]* 37CONFLICTS+= mdocml-[0-9]*
39 38
40.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"