summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2012-03-21 07:39:43 +0000
committerwiz <wiz@pkgsrc.org>2012-03-21 07:39:43 +0000
commitc6754c40179c6387d94ec8acb8d3bbd25a7f24e9 (patch)
tree801bfc7f24dac62b07173a38404000b3a46cb7c8 /textproc
parent33513d3b307cf05a83439fee3dbf388e30635c27 (diff)
downloadpkgsrc-c6754c40179c6387d94ec8acb8d3bbd25a7f24e9.tar.gz
raptor and raptor2 packages conflict with due to bin/rapper and its
man page.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/raptor/Makefile4
-rw-r--r--textproc/raptor2/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index 3b88d8f57c7..a58c1806a5b 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2012/03/03 00:14:01 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2012/03/21 07:39:43 wiz Exp $
#
DISTNAME= raptor-1.4.21
@@ -16,6 +16,8 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
+CONFLICTS= raptor2-[0-9]*
+
PKGCONFIG_OVERRIDE+= raptor.pc.in
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index a936235743b..ef13e36e7b7 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2012/03/19 09:12:26 markd Exp $
+# $NetBSD: Makefile,v 1.2 2012/03/21 07:39:44 wiz Exp $
#
DISTNAME= raptor2-2.0.6
@@ -15,6 +15,8 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
+CONFLICTS= raptor-[0-9]*
+
PKGCONFIG_OVERRIDE+= raptor2.pc.in
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc