pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/textproc mdoclint and mdocml conflict with each other ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/641181bc348b
branches:  trunk
changeset: 555434:641181bc348b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Mar 02 09:39:53 2009 +0000

description:
mdoclint and mdocml conflict with each other because both have bin/mdoclint.

diffstat:

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

diffs (36 lines):

diff -r 4f47a52e74ac -r 641181bc348b textproc/mdoclint/Makefile
--- a/textproc/mdoclint/Makefile        Mon Mar 02 06:24:40 2009 +0000
+++ b/textproc/mdoclint/Makefile        Mon Mar 02 09:39:53 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/03/01 21:25:39 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2009/03/02 09:39:53 wiz Exp $
 
 DISTNAME=      mdoclint-1.0
 CATEGORIES=    textproc
@@ -12,6 +12,8 @@
 PKG_DESTDIR_SUPPORT=   user-destdir
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
+CONFLICTS=     mdocml-[0-9]*
+
 WRKSRC=                ${WRKDIR}
 NO_CHECKSUM=   yes
 NO_BUILD=      yes
diff -r 4f47a52e74ac -r 641181bc348b textproc/mdocml/Makefile
--- a/textproc/mdocml/Makefile  Mon Mar 02 06:24:40 2009 +0000
+++ b/textproc/mdocml/Makefile  Mon Mar 02 09:39:53 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/03/01 19:17:45 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/03/02 09:39:53 wiz Exp $
 
 DISTNAME=              mdocml-1.3.13
 CATEGORIES=            devel
@@ -10,6 +10,8 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+CONFLICTS=             mdoclint-[0-9]*
+
 INSTALL_MAKE_FLAGS=    PREFIX=${DESTDIR}${PREFIX}
 INSTALLATION_DIRS=     man/man3
 



Home | Main Index | Thread Index | Old Index