Index: head/devel/p5-Workflow/files/patch-lib-Workflow-Factory.pm
===================================================================
--- head/devel/p5-Workflow/files/patch-lib-Workflow-Factory.pm	(revision 256762)
+++ head/devel/p5-Workflow/files/patch-lib-Workflow-Factory.pm	(nonexistent)
@@ -1,74 +0,0 @@
---- lib/Workflow/Factory.pm.orig	2009-01-26 18:07:31.000000000 +0300
-+++ lib/Workflow/Factory.pm	2009-04-19 00:30:10.000000000 +0400
-@@ -1,6 +1,6 @@
- package Workflow::Factory;
- 
--# $Id: Factory.pm 454 2009-01-12 10:04:02Z jonasbn $
-+# $Id: Factory.pm 471 2009-04-18 20:29:51Z jonasbn $
- 
- use warnings;
- use strict;
-@@ -11,7 +11,7 @@
- use Carp qw(croak);
- use English qw( -no_match_vars );
- 
--$Workflow::Factory::VERSION = '1.18';
-+$Workflow::Factory::VERSION = '1.19';
- 
- my ($log);
- my (%INSTANCES);
-@@ -494,13 +494,20 @@
-     foreach my $actions (@all_action_config) {
-         next unless ( ref $actions eq 'HASH' );
- 
--        # Handle optional type.
-+        # TODO Handle optional type.
-         # Should we check here to see if this matches an existing
-         # workflow type? Maybe do a type check at the end of the config
-         # process?
-         my $type = exists $actions->{type} ? $actions->{type} : 'default';
- 
--        foreach my $action_config ( @{ $actions->{action} } ) {
-+        my $a;
-+        if ( exists $actions->{action} ) {
-+            $a = $actions->{action};
-+        } else {
-+            push @{$a}, $actions;
-+        }
-+
-+        foreach my $action_config ( @{$a} ) {
-             my $name = $action_config->{name};
-             $log->is_debug
-                 && $log->debug(
-@@ -612,7 +619,14 @@
-         my $type
-             = exists $conditions->{type} ? $conditions->{type} : 'default';
- 
--        foreach my $condition_config ( @{ $conditions->{condition} } ) {
-+        my $c;
-+        if ( exists $conditions->{condition} ) {
-+            $c = $conditions->{condition};
-+        } else {
-+            push @{$c}, $conditions;
-+        }
-+
-+        foreach my $condition_config ( @{$c} ) {
-             my $name = $condition_config->{name};
-             $log->is_debug
-                 && $log->debug("Adding configuration for condition '$name'");
-@@ -679,7 +693,14 @@
-     foreach my $validators (@all_validator_config) {
-         next unless ( ref $validators eq 'HASH' );
- 
--        for my $validator_config ( @{ $validators->{validator} } ) {
-+        my $v;
-+        if ( exists $validators->{validator} ) {
-+            $v = $validators->{validator};
-+        } else {
-+            push @{$v}, $validators;
-+        }
-+
-+        for my $validator_config ( @{$v} ) {
-             my $name = $validator_config->{name};
-             $log->is_debug
-                 && $log->debug("Adding configuration for validator '$name'");

Property changes on: head/devel/p5-Workflow/files/patch-lib-Workflow-Factory.pm
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/devel/p5-Workflow/Makefile
===================================================================
--- head/devel/p5-Workflow/Makefile	(revision 256762)
+++ head/devel/p5-Workflow/Makefile	(revision 256763)
@@ -1,100 +1,106 @@
 # New ports collection makefile for:	p5-Workflow
 # Date created:				8 June 2006
 # Whom:					svysh
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Workflow
-PORTVERSION=	1.32
-PORTREVISION=	2
+PORTVERSION=	1.33
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	svysh@pn.sinp.msu.ru
 COMMENT=	Simple, flexible system to implement workflows
 
-BUILD_DEPENDS=	\
-	${SITE_PERL}/Class/Observable.pm:${PORTSDIR}/devel/p5-Class-Observable \
-	${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor \
-	${SITE_PERL}/DBD/Mock.pm:${PORTSDIR}/databases/p5-DBD-Mock \
-	${SITE_PERL}/Class/Factory.pm:${PORTSDIR}/devel/p5-Class-Factory \
-	${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
-	${SITE_PERL}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class \
-	${SITE_PERL}/DateTime/Format/Strptime.pm:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-	${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
-	${SITE_PERL}/Log/Dispatch.pm:${PORTSDIR}/devel/p5-Log-Dispatch \
-	${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl \
-	${SITE_PERL}/${PERL_ARCH}/Data/UUID.pm:${PORTSDIR}/devel/p5-Data-UUID \
-	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
-	${SITE_PERL}/Test/Exception.pm:${PORTSDIR}/devel/p5-Test-Exception \
-	${SITE_PERL}/File/Slurp.pm:${PORTSDIR}/devel/p5-File-Slurp
+RUN_DEPENDS=	${SITE_PERL}/Class/Observable.pm:${PORTSDIR}/devel/p5-Class-Observable \
+		${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor \
+		${SITE_PERL}/DBD/Mock.pm:${PORTSDIR}/databases/p5-DBD-Mock \
+		${SITE_PERL}/Class/Factory.pm:${PORTSDIR}/devel/p5-Class-Factory \
+		${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
+		${SITE_PERL}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class \
+		${SITE_PERL}/DateTime/Format/Strptime.pm:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
+		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
+		${SITE_PERL}/Log/Dispatch.pm:${PORTSDIR}/devel/p5-Log-Dispatch \
+		${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl \
+		${SITE_PERL}/${PERL_ARCH}/Data/UUID.pm:${PORTSDIR}/devel/p5-Data-UUID \
+		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
+		${SITE_PERL}/Test/Exception.pm:${PORTSDIR}/devel/p5-Test-Exception \
+		${SITE_PERL}/File/Slurp.pm:${PORTSDIR}/devel/p5-File-Slurp
+BUILD_DEPENDS=	${SITE_PERL}/Class/Observable.pm:${PORTSDIR}/devel/p5-Class-Observable \
+		${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor \
+		${SITE_PERL}/DBD/Mock.pm:${PORTSDIR}/databases/p5-DBD-Mock \
+		${SITE_PERL}/Class/Factory.pm:${PORTSDIR}/devel/p5-Class-Factory \
+		${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
+		${SITE_PERL}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class \
+		${SITE_PERL}/DateTime/Format/Strptime.pm:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
+		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
+		${SITE_PERL}/Log/Dispatch.pm:${PORTSDIR}/devel/p5-Log-Dispatch \
+		${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl \
+		${SITE_PERL}/${PERL_ARCH}/Data/UUID.pm:${PORTSDIR}/devel/p5-Data-UUID \
+		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
+		${SITE_PERL}/Test/Exception.pm:${PORTSDIR}/devel/p5-Test-Exception \
+		${SITE_PERL}/File/Slurp.pm:${PORTSDIR}/devel/p5-File-Slurp
 
-RUN_DEPENDS=	${BUILD_DEPENDS}
+PERL_CONFIGURE=	5.8.9+
 
-PERL_CONFIGURE=	5.8.6+
-
 MAN3=	Workflow.3 \
 	Workflow::Action.3 \
 	Workflow::Action::InputField.3 \
 	Workflow::Action::Mailer.3 \
 	Workflow::Action::Null.3 \
 	Workflow::Base.3 \
 	Workflow::Condition.3 \
 	Workflow::Condition::Evaluate.3 \
 	Workflow::Condition::HasUser.3 \
 	Workflow::Config.3 \
 	Workflow::Config::Perl.3 \
 	Workflow::Config::XML.3 \
 	Workflow::Context.3 \
 	Workflow::Exception.3 \
 	Workflow::Factory.3 \
 	Workflow::History.3 \
 	Workflow::Persister.3 \
 	Workflow::Persister::DBI.3 \
 	Workflow::Persister::DBI::AutoGeneratedId.3 \
 	Workflow::Persister::DBI::ExtraData.3 \
 	Workflow::Persister::DBI::SequenceId.3 \
 	Workflow::Persister::File.3 \
 	Workflow::Persister::RandomId.3 \
 	Workflow::Persister::SPOPS.3 \
 	Workflow::Persister::UUID.3 \
 	Workflow::State.3 \
 	Workflow::Validator.3 \
 	Workflow::Validator::HasRequiredField.3 \
 	Workflow::Validator::InEnumeratedType.3 \
 	Workflow::Validator::MatchesDateFormat.3
 
-
 .if !defined(NOPORTEXAMPLES)
 PORTEXAMPLES=	*
 .endif
 .if !defined(NOPORTDATA)
 PORTDATA=	*
 .endif
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
 .endif
-
-post-patch:
-	${RM} ${WRKSRC}/lib/${PORTNAME}/Factory.pm.orig
 
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	@(cd ${WRKSRC}/eg && ${COPYTREE_SHARE} ticket/\* ${EXAMPLESDIR}/)
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 .endif
 .if !defined(NOPORTDATA)
 	@${MKDIR} ${DATADIR}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} struct/\* ${DATADIR}/)
 	@${ECHO_MSG} "===> SQL data structures installed in ${DATADIR}."
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@(cd ${WRKSRC}/ && ${CP} -R README Changes TODO doc ${DOCSDIR}/)
 	@${ECHO_MSG} "===> Docs are installed in ${DOCSDIR}."
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/devel/p5-Workflow/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.17
\ No newline at end of property
+1.18
\ No newline at end of property
Index: head/devel/p5-Workflow/distinfo
===================================================================
--- head/devel/p5-Workflow/distinfo	(revision 256762)
+++ head/devel/p5-Workflow/distinfo	(revision 256763)
@@ -1,3 +1,3 @@
-MD5 (Workflow-1.32.tar.gz) = fd82389980de5640b9b100c17a930f90
-SHA256 (Workflow-1.32.tar.gz) = bc088ec52403a10b581ee8f29bc1043a94ebda1960fb56826a9b43ab89519920
-SIZE (Workflow-1.32.tar.gz) = 115575
+MD5 (Workflow-1.33.tar.gz) = ae2dd2ffc5d2870c3f395f494618119c
+SHA256 (Workflow-1.33.tar.gz) = 6ac030f54c72148985b1be817cfdad1d7bca6c8f9f60e80b66f1ff07621d487f
+SIZE (Workflow-1.33.tar.gz) = 151132

Property changes on: head/devel/p5-Workflow/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property