From 6f3424413a1092cdf3ee9ca44093a5a17a21e26f Mon Sep 17 00:00:00 2001 From: alek Date: Fri, 27 Jan 2006 20:57:02 +0000 Subject: [PATCH] Mark conflict --- www/p5-HTML-Lint/Makefile | 4 ++-- www/p5-HTML-Lint/pkg/PLIST | 3 ++- www/weblint/Makefile | 3 ++- www/weblint/pkg/PLIST | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/www/p5-HTML-Lint/Makefile b/www/p5-HTML-Lint/Makefile index cb6f1ab279d..2e3c1f5d915 100644 --- a/www/p5-HTML-Lint/Makefile +++ b/www/p5-HTML-Lint/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2005/12/20 22:06:00 sturm Exp $ +# $OpenBSD: Makefile,v 1.2 2006/01/27 20:57:02 alek Exp $ # Original from: Andy Lester COMMENT= "check for HTML errors in a string or file" DISTNAME= HTML-Lint-2.02 -PKGNAME= p5-${DISTNAME} +PKGNAME= p5-${DISTNAME}p0 CATEGORIES= www perl5 MAINTAINER= Alexander von Gernler diff --git a/www/p5-HTML-Lint/pkg/PLIST b/www/p5-HTML-Lint/pkg/PLIST index 67b4f025ac8..7f877214757 100644 --- a/www/p5-HTML-Lint/pkg/PLIST +++ b/www/p5-HTML-Lint/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2005/12/20 22:06:00 sturm Exp $ +@comment $OpenBSD: PLIST,v 1.2 2006/01/27 20:57:02 alek Exp $ +@conflict weblint-* bin/weblint ${P5SITE}/HTML/ ${P5SITE}/HTML/Lint/ diff --git a/www/weblint/Makefile b/www/weblint/Makefile index 6cbb5ce1dca..68b0d19c536 100644 --- a/www/weblint/Makefile +++ b/www/weblint/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.12 2004/02/01 20:22:18 sturm Exp $ +# $OpenBSD: Makefile,v 1.13 2006/01/27 20:57:02 alek Exp $ COMMENT= "perl lint program for html" DISTNAME= weblint-1.020 +PKGNAME= ${DISTNAME}p0 CATEGORIES= www MASTER_SITES= http://www.perl.com/CPAN/authors/id/NEILB/ diff --git a/www/weblint/pkg/PLIST b/www/weblint/pkg/PLIST index 9d4518c6ba6..52b72274df8 100644 --- a/www/weblint/pkg/PLIST +++ b/www/weblint/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.4 2004/09/15 18:49:53 espie Exp $ +@comment $OpenBSD: PLIST,v 1.5 2006/01/27 20:57:02 alek Exp $ +@conflict p5-HTML-Lint-* bin/weblint @man man/man1/weblint.1 share/examples/weblint/