add CONFLICTS (thanks wiz@ for the reminder)

add a missing LICENSE and fix a few COMMENT

10 files changed, 45 insertions, 15 deletions

diff --git a/www/p5-HTML-Form/Makefile b/www/p5-HTML-Form/Makefile
index f6565552fe6..67b3ac74967 100644
--- a/www/p5-HTML-Form/Makefile
+++ b/www/p5-HTML-Form/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/07/10 12:41:12 spz Exp $
+# $NetBSD: Makefile,v 1.2 2011/07/14 21:47:34 spz Exp $
 #
 
 DISTNAME=		HTML-Form-6.00
 PKGNAME=		p5-${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		www perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=HTML/}
 
@@ -11,11 +12,13 @@ HOMEPAGE=		http://search.cpan.org/dist/HTML-Form/
 COMMENT=		HTML Form Class that represents an HTML form element
 LICENSE=		${PERL5_LICENSE}
 
+CONFLICTS+=		p5-libwww-[0-5]*
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	p5-HTTP-Date>=6.00:../../www/p5-HTTP-Date
+DEPENDS+=		p5-HTTP-Date>=6.00:../../www/p5-HTTP-Date
 
-USE_LANGUAGES= # empty
+USE_LANGUAGES=		# empty
 
 PERL5_PACKLIST=		auto/HTML/Form/.packlist
 
diff --git a/www/p5-HTTP-Cookies/Makefile b/www/p5-HTTP-Cookies/Makefile
index c42583797fe..29620a379c9 100644
--- a/www/p5-HTTP-Cookies/Makefile
+++ b/www/p5-HTTP-Cookies/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/07/10 12:42:52 spz Exp $
+# $NetBSD: Makefile,v 1.2 2011/07/14 21:47:34 spz Exp $
 #
 
 DISTNAME=	HTTP-Cookies-6.00
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=HTTP/}
 
@@ -11,6 +12,8 @@ HOMEPAGE=	http://search.cpan.org/dist/HTTP-Cookies/
 COMMENT=	HTTP cookie jars
 LICENSE=	${PERL5_LICENSE}
 
+CONFLICTS+=	p5-libwww-[0-5]*
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	p5-HTTP-Message>=6.02:../../www/p5-HTTP-Message
diff --git a/www/p5-HTTP-Daemon/Makefile b/www/p5-HTTP-Daemon/Makefile
index cb34674c110..81da2134599 100644
--- a/www/p5-HTTP-Daemon/Makefile
+++ b/www/p5-HTTP-Daemon/Makefile
@@ -1,16 +1,19 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/07/10 12:43:32 spz Exp $
+# $NetBSD: Makefile,v 1.2 2011/07/14 21:47:35 spz Exp $
 #
 
 DISTNAME=	HTTP-Daemon-6.00
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=HTTP/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/HTTP-Daemon/
-COMMENT=	construct HTTP style messages
+COMMENT=	a simple http server class
 LICENSE=	${PERL5_LICENSE}
 
+CONFLICTS+=	p5-libwww-[0-5]*
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	p5-HTTP-Message>=6.02:../../www/p5-HTTP-Message
diff --git a/www/p5-HTTP-Date/Makefile b/www/p5-HTTP-Date/Makefile
index 79638f2cf67..0d10a35aa43 100644
--- a/www/p5-HTTP-Date/Makefile
+++ b/www/p5-HTTP-Date/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/07/10 12:39:37 spz Exp $
+# $NetBSD: Makefile,v 1.2 2011/07/14 21:47:34 spz Exp $
 
 DISTNAME=	HTTP-Date-6.00
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=HTTP/}
 
@@ -10,6 +11,8 @@ HOMEPAGE=	http://search.cpan.org/dist/HTTP-Date/
 COMMENT=	Perl 5 module providing date conversion routines
 LICENSE=	${PERL5_LICENSE}
 
+CONFLICTS+=	p5-libwww-[0-5]*
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	# empty
diff --git a/www/p5-HTTP-Message/Makefile b/www/p5-HTTP-Message/Makefile
index 807cc89f7e6..f2e6bcbb678 100644
--- a/www/p5-HTTP-Message/Makefile
+++ b/www/p5-HTTP-Message/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/07/10 12:41:57 spz Exp $
+# $NetBSD: Makefile,v 1.2 2011/07/14 21:47:34 spz Exp $
 #
 
 DISTNAME=	HTTP-Message-6.02
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=HTTP/}
 
@@ -11,6 +12,8 @@ HOMEPAGE=	http://search.cpan.org/dist/HTTP-Message/
 COMMENT=	construct HTTP style messages
 LICENSE=	${PERL5_LICENSE}
 
+CONFLICTS+=	p5-libwww-[0-5]*
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
diff --git a/www/p5-HTTP-Negotiate/Makefile b/www/p5-HTTP-Negotiate/Makefile
index 81fbf6a3855..a7c211c3d9b 100644
--- a/www/p5-HTTP-Negotiate/Makefile
+++ b/www/p5-HTTP-Negotiate/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/07/10 12:44:55 spz Exp $
+# $NetBSD: Makefile,v 1.2 2011/07/14 21:47:35 spz Exp $
 #
 
 DISTNAME=	HTTP-Negotiate-6.00
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=HTTP/}
 
@@ -11,6 +12,8 @@ HOMEPAGE=	http://search.cpan.org/dist/HTTP-Negotiate/
 COMMENT=	negotiate HTTP service parameters
 LICENSE=	${PERL5_LICENSE}
 
+CONFLICTS+=	p5-libwww-[0-5]*
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	p5-HTTP-Message>=6.02:../../www/p5-HTTP-Message
diff --git a/www/p5-LWP-MediaTypes/Makefile b/www/p5-LWP-MediaTypes/Makefile
index 666cb363e6d..e19b2dfb53a 100644
--- a/www/p5-LWP-MediaTypes/Makefile
+++ b/www/p5-LWP-MediaTypes/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/07/10 12:40:29 spz Exp $
+# $NetBSD: Makefile,v 1.2 2011/07/14 21:47:34 spz Exp $
 #
 
 DISTNAME=	LWP-MediaTypes-6.01
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=LWP/}
 
@@ -11,6 +12,8 @@ HOMEPAGE=	http://search.cpan.org/dist/LWP-MediaTypes/
 COMMENT=	guess media type for a file or a URL
 LICENSE=	${PERL5_LICENSE}
 
+CONFLICTS+=	p5-libwww-[0-5]*
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		# empty
diff --git a/www/p5-LWP-Protocol-https/Makefile b/www/p5-LWP-Protocol-https/Makefile
index ea75630b6fe..06e93cd5fff 100644
--- a/www/p5-LWP-Protocol-https/Makefile
+++ b/www/p5-LWP-Protocol-https/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/07/10 14:19:03 spz Exp $
+# $NetBSD: Makefile,v 1.2 2011/07/14 21:47:35 spz Exp $
 #
 
 DISTNAME=	LWP-Protocol-https-6.02
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=LWP/}
 
@@ -11,6 +12,8 @@ HOMEPAGE=	http://search.cpan.org/dist/LWP-Protocol-https/
 COMMENT=	Provide https support for LWP::UserAgent
 LICENSE=	${PERL5_LICENSE}
 
+CONFLICTS+=	p5-libwww-[0-5]*
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		# empty
diff --git a/www/p5-Net-HTTP/Makefile b/www/p5-Net-HTTP/Makefile
index f470b91b8c1..334143a3fdb 100644
--- a/www/p5-Net-HTTP/Makefile
+++ b/www/p5-Net-HTTP/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/07/10 12:46:04 spz Exp $
+# $NetBSD: Makefile,v 1.2 2011/07/14 21:47:35 spz Exp $
 
 DISTNAME=	Net-HTTP-6.01
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	www perl5 net
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
 
@@ -10,6 +11,8 @@ HOMEPAGE=	http://search.cpan.org/dist/Net-HTTP/
 COMMENT=	Perl 5 module for low-level HTTP connections (client)
 LICENSE=	${PERL5_LICENSE}
 
+CONFLICTS+=	p5-libwww-[0-5]*
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	# empty
diff --git a/www/p5-WWW-RobotRules/Makefile b/www/p5-WWW-RobotRules/Makefile
index e2dfd1898ae..402e4e6032d 100644
--- a/www/p5-WWW-RobotRules/Makefile
+++ b/www/p5-WWW-RobotRules/Makefile
@@ -1,14 +1,17 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/07/10 12:47:38 spz Exp $
+# $NetBSD: Makefile,v 1.2 2011/07/14 21:47:35 spz Exp $
 
 DISTNAME=	WWW-RobotRules-6.01
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=WWW/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/WWW-RobotRules/
-COMMENT=	Perl 5 module interface to URL shortening sites
+COMMENT=	Perl 5 module database of robots.txt-derived permissions
+LICENSE=	${PERL5_LICENSE}
+
+CONFLICTS+=	p5-libwww-[0-5]*
 
 PKG_DESTDIR_SUPPORT=	user-destdir