svn commit: r451248 - in head/textproc: p5-RTF-Parser rtf2html

[Emanuel Haupt]

Author: ehaupt
Date: Wed Oct  4 20:40:22 2017
New Revision: 451248
URL: https://svnweb.freebsd.org/changeset/ports/451248

Log:
  - Register conflicts
  - While here specify license of textproc/rtf2html
  
  Notified by:	rodrigo (conflicts scanner)

Modified:
  head/textproc/p5-RTF-Parser/Makefile
  head/textproc/rtf2html/Makefile

Modified: head/textproc/p5-RTF-Parser/Makefile
==============================================================================
--- head/textproc/p5-RTF-Parser/Makefile	Wed Oct  4 20:37:34 2017	(r451247)
+++ head/textproc/p5-RTF-Parser/Makefile	Wed Oct  4 20:40:22 2017	(r451248)
@@ -3,6 +3,7 @@
 
 PORTNAME=	RTF-Parser
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,6 +16,8 @@ LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	p5-RTF-Tokenizer>=1.16:textproc/p5-RTF-Tokenizer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
+
+CONFLICTS_INSTALL=	rtf2html-[0-9]*
 
 USES=		perl5
 USE_PERL5=	configure

Modified: head/textproc/rtf2html/Makefile
==============================================================================
--- head/textproc/rtf2html/Makefile	Wed Oct  4 20:37:34 2017	(r451247)
+++ head/textproc/rtf2html/Makefile	Wed Oct  4 20:40:22 2017	(r451248)
@@ -3,11 +3,16 @@
 
 PORTNAME=	rtf2html
 DISTVERSION=	1.1b
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	LOCAL/ehaupt
 
 MAINTAINER=	ehaupt at FreeBSD.org
 COMMENT=	Simple rtf2html converter
+
+LICENSE=	BSD2CLAUSE
+
+CONFLICTS_INSTALL=	p5-RTF-Parser-[0-9]*
 
 PLIST_FILES=	bin/rtf2html