5 files changed, 93 insertions, 27 deletions

diff --git a/www/p5-RT-Extension-SLA/Makefile b/www/p5-RT-Extension-SLA/Makefile
index 78cfa8145174..bd95b7399013 100644
--- a/www/p5-RT-Extension-SLA/Makefile
+++ b/www/p5-RT-Extension-SLA/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	RT-Extension-SLA
-PORTVERSION=	0.02
-PORTREVISION=	1
+PORTVERSION=	0.03
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -22,12 +21,16 @@ OPTIONS=	RT36 "Install for rt-3.6.x (default rt-3.8.x)" off
 
 PERL_CONFIGURE=	yes
 
-MAN3=		RT::Action::SLA_SetDefault.3				 \
-		RT::Condition::SLA_RequireDueSet.3 RT::Condition::SLA.3	 \
-		RT::Condition::SLA_RequireDefault.3 RT::Extension::SLA.3 \
-		RT::Condition::SLA_RequireStartsSet.3 RT::Queue_SLA.3	 \
-		RT::Action::SLA_SetStarts.3 RT::Action::SLA.3 \
-		RT::Action::SLA_SetDue.3
+MAN3=		RT::Action::SLA.3                     \
+		RT::Action::SLA_SetDefault.3          \
+		RT::Action::SLA_SetDue.3              \
+		RT::Action::SLA_SetStarts.3           \
+		RT::Condition::SLA.3                  \
+		RT::Condition::SLA_RequireDefault.3   \
+		RT::Condition::SLA_RequireDueSet.3    \
+		RT::Condition::SLA_RequireStartsSet.3 \
+		RT::Extension::SLA.3                  \
+		RT::Queue_SLA.3
 
 PLIST_SUB+=	RTHOME=${RTHOME}
 
diff --git a/www/p5-RT-Extension-SLA/distinfo b/www/p5-RT-Extension-SLA/distinfo
index 3c80960a0ba7..34bf70c9521c 100644
--- a/www/p5-RT-Extension-SLA/distinfo
+++ b/www/p5-RT-Extension-SLA/distinfo
@@ -1,3 +1,3 @@
-MD5 (RT-Extension-SLA-0.02.tar.gz) = 076d254fcbfaa43d07390c5dc0c21017
-SHA256 (RT-Extension-SLA-0.02.tar.gz) = 0e130026186de869bd76d5e2d3c832e2a78eaa3d2bc38b0f8e738035942dc8d6
-SIZE (RT-Extension-SLA-0.02.tar.gz) = 33468
+MD5 (RT-Extension-SLA-0.03.tar.gz) = 839b4603e91a6cf52d6bc56345757006
+SHA256 (RT-Extension-SLA-0.03.tar.gz) = 8ce76da627f42870f5aff351c8df030844a7e85229c060a06ab46e1939db1f6f
+SIZE (RT-Extension-SLA-0.03.tar.gz) = 37029
diff --git a/www/p5-RT-Extension-SLA/files/patch-inc-module_autoinstall.pm b/www/p5-RT-Extension-SLA/files/patch-inc-module_autoinstall.pm
new file mode 100644
index 000000000000..9f4aed6232be
--- /dev/null
+++ b/www/p5-RT-Extension-SLA/files/patch-inc-module_autoinstall.pm
@@ -0,0 +1,79 @@
+--- inc/Module/AutoInstall.pm-old	2009-04-24 22:01:47.000000000 +0100
++++ inc/Module/AutoInstall.pm	2009-05-03 08:15:51.000000000 +0100
+@@ -115,8 +115,6 @@
+         )[0]
+     );
+ 
+-    $UnderCPAN = _check_lock(1);    # check for $UnderCPAN
+-
+     while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) {
+         my ( @required, @tests, @skiptests );
+         my $default  = 1;
+@@ -186,7 +184,6 @@
+             !$SkipInstall
+             and (
+                 $CheckOnly
+-                or ($mandatory and $UnderCPAN)
+                 or _prompt(
+                     qq{==> Auto-install the }
+                       . ( @required / 2 )
+@@ -217,6 +214,8 @@
+         }
+     }
+ 
++    $UnderCPAN = _check_lock();    # check for $UnderCPAN
++
+     if ( @Missing and not( $CheckOnly or $UnderCPAN ) ) {
+         require Config;
+         print
+@@ -238,7 +237,7 @@
+ # Check to see if we are currently running under CPAN.pm and/or CPANPLUS;
+ # if we are, then we simply let it taking care of our dependencies
+ sub _check_lock {
+-    return unless @Missing or @_;
++    return unless @Missing;
+ 
+     if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) {
+         print <<'END_MESSAGE';
+@@ -314,7 +313,7 @@
+         @modules = @newmod;
+     }
+ 
+-    if ( _has_cpanplus() and not $ENV{PERL_AUTOINSTALL_PREFER_CPAN} ) {
++    if ( _has_cpanplus() ) {
+         _install_cpanplus( \@modules, \@config );
+     } else {
+         _install_cpan( \@modules, \@config );
+@@ -707,7 +706,7 @@
+       if $Config;
+ 
+     $PostambleActions = (
+-        ($missing and not $UnderCPAN)
++        $missing
+         ? "\$(PERL) $0 --config=$config --installdeps=$missing"
+         : "\$(NOECHO) \$(NOOP)"
+     );
+@@ -747,7 +746,7 @@
+ sub postamble {
+     $PostambleUsed = 1;
+ 
+-    return <<"END_MAKE";
++    return << ".";
+ 
+ config :: installdeps
+ \t\$(NOECHO) \$(NOOP)
+@@ -758,7 +757,7 @@
+ installdeps ::
+ \t$PostambleActions
+ 
+-END_MAKE
++.
+ 
+ }
+ 
+@@ -766,4 +765,4 @@
+ 
+ __END__
+ 
+-#line 1004
++#line 1003
diff --git a/www/p5-RT-Extension-SLA/pkg-plist.rt36 b/www/p5-RT-Extension-SLA/pkg-plist.rt36
index be97f4cd19af..17f251f59899 100644
--- a/www/p5-RT-Extension-SLA/pkg-plist.rt36
+++ b/www/p5-RT-Extension-SLA/pkg-plist.rt36
@@ -11,12 +11,10 @@
 %%RTHOME%%/local/lib/RT/Queue_SLA.pm
 %%RTHOME%%/local/man/auto/RT/Extension/SLA/.packlist
 @dirrm %%RTHOME%%/local/etc/Extension-SLA
-@dirrmtry %%RTHOME%%/local/etc
 @dirrmtry %%RTHOME%%/local/lib/RT/Extension
 @dirrmtry %%RTHOME%%/local/lib/RT/Condition
 @dirrmtry %%RTHOME%%/local/lib/RT/Action
 @dirrmtry %%RTHOME%%/local/lib/RT
-@dirrmtry %%RTHOME%%/local/lib
 @dirrmtry %%RTHOME%%/local/man/man3
 @dirrm %%RTHOME%%/local/man/auto/RT/Extension/SLA
 @dirrmtry %%RTHOME%%/local/man/auto/RT/Extension
diff --git a/www/p5-RT-Extension-SLA/pkg-plist.rt38 b/www/p5-RT-Extension-SLA/pkg-plist.rt38
index a58e419839cf..00dd06d8f14e 100644
--- a/www/p5-RT-Extension-SLA/pkg-plist.rt38
+++ b/www/p5-RT-Extension-SLA/pkg-plist.rt38
@@ -1,13 +1,3 @@
-lib/RT/Action/SLA.pm
-lib/RT/Action/SLA_SetDefault.pm
-lib/RT/Action/SLA_SetDue.pm
-lib/RT/Action/SLA_SetStarts.pm
-lib/RT/Condition/SLA.pm
-lib/RT/Condition/SLA_RequireDefault.pm
-lib/RT/Condition/SLA_RequireDueSet.pm
-lib/RT/Condition/SLA_RequireStartsSet.pm
-lib/RT/Extension/SLA.pm
-lib/RT/Queue_SLA.pm
 man/auto/RT/Extension/SLA/.packlist
 %%RTHOME%%/plugins/RT-Extension-SLA/etc/initialdata
 %%RTHOME%%/plugins/RT-Extension-SLA/lib/RT/Action/SLA.pm
@@ -31,7 +21,3 @@ man/auto/RT/Extension/SLA/.packlist
 @dirrmtry man/auto/RT/Extension
 @dirrmtry man/auto/RT
 @dirrmtry man/auto
-@dirrmtry lib/RT/Extension
-@dirrmtry lib/RT/Condition
-@dirrmtry lib/RT/Action
-@dirrmtry lib/RT