From 0497bd9e9f286577c716be63f0e8cd5c526e040b Mon Sep 17 00:00:00 2001
From: "Philip M. Gollucci" <pgollucci@FreeBSD.org>
Date: Thu, 13 May 2010 01:13:19 +0000
Subject: [PATCH] - Dupliate $] fix in apxs in www/apache22 - Rename rc.d
 script apache2.sh -> apache2 - Bump PORTREVISION

With Hat:   apache@
---
 UPDATING                                         | 10 ++++++++++
 www/apache20/Makefile                            |  4 ++--
 www/apache20/files/{apache2.sh.in => apache2.in} |  0
 www/apache20/files/patch-support__apxs.in        | 14 +++++++++++---
 4 files changed, 23 insertions(+), 5 deletions(-)
 rename www/apache20/files/{apache2.sh.in => apache2.in} (100%)

diff --git a/UPDATING b/UPDATING
index 52530e2d4b1e..1b5bba2e5c9e 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,16 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20100512:
+  AFFECTS: users of www/apache20
+  AUTHOR: pgollucci@FreeBSD.org
+
+  Two rc.d script has been renamed
+
+    apache2.sh -> apache2
+
+  You'll need to update any crons wrappers, etc. for the new paths.
+
 20100511:
   AFFECTS: users of KDE SC 4
   AUTHOR: kde@FreeBSD.org
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 5eb9d5285746..b5245e8934e5 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.0.63
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITE_LOCAL:S/$/:powerlogo/}
@@ -60,7 +60,7 @@ SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 USE_ICONV=		yes
 USE_AUTOTOOLS=		autoconf:262 libtool:22
 USE_PERL5=		yes
-USE_RC_SUBR=		apache2.sh
+USE_RC_SUBR=		apache2
 USE_APACHE=		common20
 LIBTOOLFILES=		configure
 USE_LDCONFIG=		${PREFIX}/lib/apache2
diff --git a/www/apache20/files/apache2.sh.in b/www/apache20/files/apache2.in
similarity index 100%
rename from www/apache20/files/apache2.sh.in
rename to www/apache20/files/apache2.in
diff --git a/www/apache20/files/patch-support__apxs.in b/www/apache20/files/patch-support__apxs.in
index c91f83a6ed6e..01dee80427ff 100644
--- a/www/apache20/files/patch-support__apxs.in
+++ b/www/apache20/files/patch-support__apxs.in
@@ -1,6 +1,14 @@
 --- ./support/apxs.in.orig	2006-07-12 03:40:55.000000000 -0400
 +++ ./support/apxs.in	2010-05-06 16:06:03.795832133 -0400
-@@ -548,7 +548,10 @@
+@@ -83,7 +83,6 @@
+     my ($argumentative, @ARGV) = @_;
+     my $errs = 0;
+     local $_;
+-    local $[ = 0;
+ 
+     my @args = split / */, $argumentative;
+     while (@ARGV && ($_ = $ARGV[0]) =~ /^-(.)(.*)/) {
+@@ -548,7 +547,10 @@
          $c = '#' if ($opt_A);
          foreach $lmd (@lmd) {
              my $what = $opt_A ? "preparing" : "activating";
@@ -12,7 +20,7 @@
                  # check for open <containers>, so that the new LoadModule
                  # directive always appears *outside* of an <container>.
  
-@@ -611,7 +614,13 @@
+@@ -611,7 +613,13 @@
                  }
              } else {
                  # replace already existing LoadModule line
@@ -27,7 +35,7 @@
              }
              $lmd =~ m|LoadModule\s+(.+?)_module.*|;
              notice("[$what module `$1' in $CFG_SYSCONFDIR/$CFG_TARGET.conf]");
-@@ -628,8 +637,7 @@
+@@ -628,8 +636,7 @@
              if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) {
                  print FP $content;
                  close(FP);