CVS commit: pkgsrc/www

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Jul 23 04:07:58 UTC 2020

Modified Files:
        pkgsrc/www/p5-HTML-Lint: Makefile
        pkgsrc/www/weblint: Makefile

Log Message:
p5-HTML-Lint & weblint: note these packages conflict

Issue reported by Stefan Schaeckeler in PR pkg/55511.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/p5-HTML-Lint/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/www/weblint/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/p5-HTML-Lint/Makefile
diff -u pkgsrc/www/p5-HTML-Lint/Makefile:1.23 pkgsrc/www/p5-HTML-Lint/Makefile:1.24
--- pkgsrc/www/p5-HTML-Lint/Makefile:1.23       Mon Nov  4 22:10:04 2019
+++ pkgsrc/www/p5-HTML-Lint/Makefile    Thu Jul 23 04:07:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/11/04 22:10:04 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2020/07/23 04:07:58 gutteridge Exp $
 
 DISTNAME=      HTML-Lint-2.32
 PKGNAME=       p5-${DISTNAME}
@@ -11,6 +11,8 @@ HOMEPAGE=     https://metacpan.org/release/H
 COMMENT=       Perl 5 module to check for HTML errors in a string or file
 LICENSE=       artistic-2.0
 
+CONFLICTS=     weblint-[0-9]*
+
 USE_LANGUAGES= # empty
 PERL5_PACKLIST=        auto/HTML/Lint/.packlist
 

Index: pkgsrc/www/weblint/Makefile
diff -u pkgsrc/www/weblint/Makefile:1.30 pkgsrc/www/weblint/Makefile:1.31
--- pkgsrc/www/weblint/Makefile:1.30    Wed Jul 22 21:45:41 2020
+++ pkgsrc/www/weblint/Makefile Thu Jul 23 04:07:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2020/07/22 21:45:41 gutteridge Exp $
+# $NetBSD: Makefile,v 1.31 2020/07/23 04:07:58 gutteridge Exp $
 
 DISTNAME=      weblint-1.020
 PKGREVISION=   8
@@ -9,6 +9,8 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 #HOMEPAGE=     http://www.weblint.org/
 COMMENT=       HTML validator and sanity checker
 
+CONFLICTS=     p5-HTML-Lint-[0-9]*
+
 USE_TOOLS+=            perl:run
 INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1