From 158c72f2862bbe3d5cc088ba5adbeb885600e521 Mon Sep 17 00:00:00 2001
From: simon <simon@openbsd.org>
Date: Wed, 21 Nov 2007 21:10:53 +0000
Subject: [PATCH] update to version 5.701003 and remove conflict marker

---
 devel/p5-Catalyst-Manual/Makefile  |  4 ++--
 devel/p5-Catalyst-Manual/distinfo  | 10 +++++-----
 devel/p5-Catalyst-Manual/pkg/PLIST |  9 +++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/devel/p5-Catalyst-Manual/Makefile b/devel/p5-Catalyst-Manual/Makefile
index 07f4655dd2e..9f82ec3d542 100644
--- a/devel/p5-Catalyst-Manual/Makefile
+++ b/devel/p5-Catalyst-Manual/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2007/09/16 02:53:03 merdely Exp $
+# $OpenBSD: Makefile,v 1.6 2007/11/21 21:10:53 simon Exp $
 
 COMMENT=	catalyst documentation
 
 MODULES=	cpan
-DISTNAME=	Catalyst-Manual-5.700701
+DISTNAME=	Catalyst-Manual-5.701003
 CATEGORIES=	devel
 
 # perl
diff --git a/devel/p5-Catalyst-Manual/distinfo b/devel/p5-Catalyst-Manual/distinfo
index d7bfa05916d..a460e3e58b1 100644
--- a/devel/p5-Catalyst-Manual/distinfo
+++ b/devel/p5-Catalyst-Manual/distinfo
@@ -1,5 +1,5 @@
-MD5 (Catalyst-Manual-5.700701.tar.gz) = cPhyySUzo5ymiThx7E0yIw==
-RMD160 (Catalyst-Manual-5.700701.tar.gz) = /kZWw521/7DISmPBRqTHIj/70sI=
-SHA1 (Catalyst-Manual-5.700701.tar.gz) = GFpsmaO/HLutsOjpwF7n5/ocGpQ=
-SHA256 (Catalyst-Manual-5.700701.tar.gz) = gNJQOZOdZzjY2X1e9im7Eqz6L1gYtEA4hejFi2DgH7s=
-SIZE (Catalyst-Manual-5.700701.tar.gz) = 113028
+MD5 (Catalyst-Manual-5.701003.tar.gz) = U2P46rUK9eDJhe+J1xGvRA==
+RMD160 (Catalyst-Manual-5.701003.tar.gz) = ucGajL2+W0IwjzpJgeIwSKyempw=
+SHA1 (Catalyst-Manual-5.701003.tar.gz) = +ruOPLqVDzV+5zSMEKrufbpHav8=
+SHA256 (Catalyst-Manual-5.701003.tar.gz) = 5kn12AeaJ28dWh3Pp67Zp9QFJwqO0+rnY8n5bci9A+E=
+SIZE (Catalyst-Manual-5.701003.tar.gz) = 130529
diff --git a/devel/p5-Catalyst-Manual/pkg/PLIST b/devel/p5-Catalyst-Manual/pkg/PLIST
index 6f581dcc727..6df3134cf8a 100644
--- a/devel/p5-Catalyst-Manual/pkg/PLIST
+++ b/devel/p5-Catalyst-Manual/pkg/PLIST
@@ -1,8 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.3 2007/04/21 09:27:54 espie Exp $
-@conflict p5-Catalyst-Runtime-<5.7005
+@comment $OpenBSD: PLIST,v 1.4 2007/11/21 21:10:53 simon Exp $
 ${P5SITE}/Catalyst/
 ${P5SITE}/Catalyst/Manual/
-${P5SITE}/Catalyst/Manual.pm
 ${P5SITE}/Catalyst/Manual/About.pod
 ${P5SITE}/Catalyst/Manual/Actions.pod
 ${P5SITE}/Catalyst/Manual/Cookbook.pod
@@ -22,7 +20,8 @@ ${P5SITE}/Catalyst/Manual/Tutorial/CatalystBasics.pod
 ${P5SITE}/Catalyst/Manual/Tutorial/Debugging.pod
 ${P5SITE}/Catalyst/Manual/Tutorial/Intro.pod
 ${P5SITE}/Catalyst/Manual/Tutorial/Testing.pod
-@man man/man3p/Catalyst::Manual.3p
+${P5SITE}/Catalyst/Manual/WritingPlugins.pod
+${P5SITE}/Catalyst/ManualPlaceholder.pm
 @man man/man3p/Catalyst::Manual::About.3p
 @man man/man3p/Catalyst::Manual::Actions.3p
 @man man/man3p/Catalyst::Manual::Cookbook.3p
@@ -41,3 +40,5 @@ ${P5SITE}/Catalyst/Manual/Tutorial/Testing.pod
 @man man/man3p/Catalyst::Manual::Tutorial::Debugging.3p
 @man man/man3p/Catalyst::Manual::Tutorial::Intro.3p
 @man man/man3p/Catalyst::Manual::Tutorial::Testing.3p
+@man man/man3p/Catalyst::Manual::WritingPlugins.3p
+@man man/man3p/Catalyst::ManualPlaceholder.3p