Thu Sep 12 10:39:24 2013 UTC ()
Adjust CONFLICTS with mdocml, versions after and including 1.12.0nb3
no longer conflict with this package.

Bump PKGREVISION.


(jperkin)
diff -r1.69 -r1.70 pkgsrc/textproc/groff/Makefile
cvs diff -r1.69 -r1.70 pkgsrc/textproc/groff/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/groff/Makefile 2013/05/31 12:42:07 1.69
+++ pkgsrc/textproc/groff/Makefile 2013/09/12 10:39:24 1.70
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.69 2013/05/31 12:42:07 wiz Exp $ 1# $NetBSD: Makefile,v 1.70 2013/09/12 10:39:24 jperkin Exp $
2# 2#
3 3
4DISTNAME= groff-1.20.1 4DISTNAME= groff-1.20.1
5PKGREVISION= 10 5PKGREVISION= 11
6CATEGORIES= textproc 6CATEGORIES= textproc
7MASTER_SITES= ${MASTER_SITE_GNU:=groff/} 7MASTER_SITES= ${MASTER_SITE_GNU:=groff/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnu.org/software/groff/groff.html 10HOMEPAGE= http://www.gnu.org/software/groff/groff.html
11COMMENT= GNU roff text processing suite 11COMMENT= GNU roff text processing suite
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14CONFLICTS= mdocml-[0-9]* ja-groff-[0-9]* 14CONFLICTS= mdocml<1.12.0nb3 ja-groff-[0-9]*
15 15
16CHECK_PERMS= NO 16CHECK_PERMS= NO
17MAKE_JOBS_SAFE= NO 17MAKE_JOBS_SAFE= NO
18 18
19INSTALLATION_DIRS= share/groff/site-tmac 19INSTALLATION_DIRS= share/groff/site-tmac
20 20
21USE_LANGUAGES= c c++ 21USE_LANGUAGES= c c++
22GNU_CONFIGURE= YES 22GNU_CONFIGURE= YES
23CONFIGURE_ENV+= PERLPATH=${PERL5:Q} 23CONFIGURE_ENV+= PERLPATH=${PERL5:Q}
24USE_TOOLS+= perl:run sed:run awk:run 24USE_TOOLS+= perl:run sed:run awk:run
25USE_FEATURES= getopt_long 25USE_FEATURES= getopt_long
26 26
27INFO_FILES= YES 27INFO_FILES= YES