summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2013-09-12 10:39:24 +0000
committerjperkin <jperkin@pkgsrc.org>2013-09-12 10:39:24 +0000
commit3a347b4c4c768b3d5aa51b32a1ac04bd7b0f5b28 (patch)
tree40c875d35994b9903a138ec03ab9a1b23623675a
parent399a475f09934d29db9edf6f896ca40689f2993d (diff)
downloadpkgsrc-3a347b4c4c768b3d5aa51b32a1ac04bd7b0f5b28.tar.gz
Adjust CONFLICTS with mdocml, versions after and including 1.12.0nb3
no longer conflict with this package. Bump PKGREVISION.
-rw-r--r--textproc/groff/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 5274e17286d..ab84bae5d88 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2013/05/31 12:42:07 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2013/09/12 10:39:24 jperkin Exp $
#
DISTNAME= groff-1.20.1
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNU:=groff/}
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnu.org/software/groff/groff.html
COMMENT= GNU roff text processing suite
LICENSE= gnu-gpl-v3
-CONFLICTS= mdocml-[0-9]* ja-groff-[0-9]*
+CONFLICTS= mdocml<1.12.0nb3 ja-groff-[0-9]*
CHECK_PERMS= NO
MAKE_JOBS_SAFE= NO