Attachment #115890 for bug #157772

View | Details | Raw Unified | Return to bug 157772
Collapse All | Expand All




#

PORTNAME=	RT-Extension-SLA
PORTVERSION=	0.04
PORTREVISION=	3
CATEGORIES=	www perl5
MASTER_SITES=	CPAN
PKGNAMEPREFIX=	p5-

MAINTAINER=	m.seaman@infracaninophile.co.uk
COMMENT=	RT extension to automate due dates using service levels

LICENSE=	GPLv2

BUILD_DEPENDS=	${SITE_PERL}/Business/Hours.pm:${PORTSDIR}/misc/p5-Business-Hours
RUN_DEPENDS=	${BUILD_DEPENDS}


Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (RT-Extension-SLA-0.03.tar.gz) = 8ce76da627f42870f5aff351c8df030844a7e85229c060a06ab46e1939db1f6f	1	SHA256 (RT-Extension-SLA-0.04.tar.gz) = 1e024a353cdeec0b1ef0dc0e1711129a678add8530fee67466e40c0095c774ab
2	SIZE (RT-Extension-SLA-0.03.tar.gz) = 37029	2	SIZE (RT-Extension-SLA-0.04.tar.gz) = 41584




--- 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

Return to bug 157772

Lines 6-13 Link Here

(-)Makefile (-2 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= RT-Extension-SLA	8	PORTNAME= RT-Extension-SLA
9	PORTVERSION= 0.03	9	PORTVERSION= 0.04
10	PORTREVISION= 3
11	CATEGORIES= www perl5	10	CATEGORIES= www perl5
12	MASTER_SITES= CPAN	11	MASTER_SITES= CPAN
13	PKGNAMEPREFIX= p5-	12	PKGNAMEPREFIX= p5-
Lines 15-20 Link Here
15	MAINTAINER= m.seaman@infracaninophile.co.uk	14	MAINTAINER= m.seaman@infracaninophile.co.uk
16	COMMENT= RT extension to automate due dates using service levels	15	COMMENT= RT extension to automate due dates using service levels
17		16
		17	LICENSE= GPLv2
		18
18	BUILD_DEPENDS= ${SITE_PERL}/Business/Hours.pm:${PORTSDIR}/misc/p5-Business-Hours	19	BUILD_DEPENDS= ${SITE_PERL}/Business/Hours.pm:${PORTSDIR}/misc/p5-Business-Hours
19	RUN_DEPENDS= ${BUILD_DEPENDS}	20	RUN_DEPENDS= ${BUILD_DEPENDS}
20		21

Removed Link Here

(-)files/patch-inc-module_autoinstall.pm (-79 lines)
1	--- inc/Module/AutoInstall.pm-old 2009-04-24 22:01:47.000000000 +0100
2	+++ inc/Module/AutoInstall.pm 2009-05-03 08:15:51.000000000 +0100
3	@@ -115,8 +115,6 @@
4	)[0]
5	);
6
7	- $UnderCPAN = _check_lock(1); # check for $UnderCPAN
8	-
9	while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) {
10	my ( @required, @tests, @skiptests );
11	my $default = 1;
12	@@ -186,7 +184,6 @@
13	!$SkipInstall
14	and (
15	$CheckOnly
16	- or ($mandatory and $UnderCPAN)
17	or _prompt(
18	qq{==> Auto-install the }
19	. ( @required / 2 )
20	@@ -217,6 +214,8 @@
21	}
22	}
23
24	+ $UnderCPAN = _check_lock(); # check for $UnderCPAN
25	+
26	if ( @Missing and not( $CheckOnly or $UnderCPAN ) ) {
27	require Config;
28	print
29	@@ -238,7 +237,7 @@
30	# Check to see if we are currently running under CPAN.pm and/or CPANPLUS;
31	# if we are, then we simply let it taking care of our dependencies
32	sub _check_lock {
33	- return unless @Missing or @_;
34	+ return unless @Missing;
35
36	if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) {
37	print <<'END_MESSAGE';
38	@@ -314,7 +313,7 @@
39	@modules = @newmod;
40	}
41
42	- if ( _has_cpanplus() and not $ENV{PERL_AUTOINSTALL_PREFER_CPAN} ) {
43	+ if ( _has_cpanplus() ) {
44	_install_cpanplus( \@modules, \@config );
45	} else {
46	_install_cpan( \@modules, \@config );
47	@@ -707,7 +706,7 @@
48	if $Config;
49
50	$PostambleActions = (
51	- ($missing and not $UnderCPAN)
52	+ $missing
53	? "\$(PERL) $0 --config=$config --installdeps=$missing"
54	: "\$(NOECHO) \$(NOOP)"
55	);
56	@@ -747,7 +746,7 @@
57	sub postamble {
58	$PostambleUsed = 1;
59
60	- return <<"END_MAKE";
61	+ return << ".";
62
63	config :: installdeps
64	\t\$(NOECHO) \$(NOOP)
65	@@ -758,7 +757,7 @@
66	installdeps ::
67	\t$PostambleActions
68
69	-END_MAKE
70	+.
71
72	}
73
74	@@ -766,4 +765,4 @@
75
76	__END__
77
78	-#line 1004
79	+#line 1003