pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc raptor and raptor2 packages conflict with due...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f60f7482baac
branches:  trunk
changeset: 601389:f60f7482baac
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Mar 21 07:39:43 2012 +0000

description:
raptor and raptor2 packages conflict with due to bin/rapper and its
man page.

diffstat:

 textproc/raptor/Makefile  |  4 +++-
 textproc/raptor2/Makefile |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r c43518f6b634 -r f60f7482baac textproc/raptor/Makefile
--- a/textproc/raptor/Makefile  Tue Mar 20 23:38:26 2012 +0000
+++ b/textproc/raptor/Makefile  Wed Mar 21 07:39:43 2012 +0000
@@ -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 @@
 USE_LIBTOOL=   YES
 GNU_CONFIGURE= YES
 
+CONFLICTS=     raptor2-[0-9]*
+
 PKGCONFIG_OVERRIDE+=   raptor.pc.in
 CONFIGURE_ARGS+=       --with-html-dir=${PREFIX}/share/doc
 
diff -r c43518f6b634 -r f60f7482baac textproc/raptor2/Makefile
--- a/textproc/raptor2/Makefile Tue Mar 20 23:38:26 2012 +0000
+++ b/textproc/raptor2/Makefile Wed Mar 21 07:39:43 2012 +0000
@@ -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 @@
 USE_LIBTOOL=   YES
 GNU_CONFIGURE= YES
 
+CONFLICTS=     raptor-[0-9]*
+
 PKGCONFIG_OVERRIDE+=   raptor2.pc.in
 CONFIGURE_ARGS+=       --with-html-dir=${PREFIX}/share/doc
 



Home | Main Index | Thread Index | Old Index