[pkgsrc/trunk]: pkgsrc/www/ap2-perl revert previous commit: apache22 was fixe...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3fe02c2e38f6
branches:  trunk
changeset: 560437:3fe02c2e38f6
user:      spz <spz%pkgsrc.org@localhost>
date:      Fri Jun 12 20:54:22 2009 +0000

description:
revert previous commit: apache22 was fixed to provide backwards compat
for its dependents, so the removed patches are no longer necessary.

diffstat:

 www/ap2-perl/Makefile         |   4 ++--
 www/ap2-perl/distinfo         |   4 +---
 www/ap2-perl/patches/patch-ab |  14 --------------
 www/ap2-perl/patches/patch-ac |  22 ----------------------
 4 files changed, 3 insertions(+), 41 deletions(-)

diffs (69 lines):

diff -r 7217e143af0d -r 3fe02c2e38f6 www/ap2-perl/Makefile
--- a/www/ap2-perl/Makefile     Fri Jun 12 20:26:30 2009 +0000
+++ b/www/ap2-perl/Makefile     Fri Jun 12 20:54:22 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2009/06/07 20:25:00 spz Exp $
+# $NetBSD: Makefile,v 1.33 2009/06/12 20:54:22 spz Exp $
 
 DISTNAME=      mod_perl-2.0.4
-PKGREVISION=   3
+PKGREVISION=   4
 PKGNAME=       ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
 CATEGORIES=    www perl5
 MASTER_SITES=  http://perl.apache.org/dist/
diff -r 7217e143af0d -r 3fe02c2e38f6 www/ap2-perl/distinfo
--- a/www/ap2-perl/distinfo     Fri Jun 12 20:26:30 2009 +0000
+++ b/www/ap2-perl/distinfo     Fri Jun 12 20:54:22 2009 +0000
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.11 2009/06/07 20:25:00 spz Exp $
+$NetBSD: distinfo,v 1.12 2009/06/12 20:54:22 spz Exp $
 
 SHA1 (mod_perl-2.0.4.tar.gz) = 65299a16ec414a690a48a2bbe63acaa3c6bb897b
 RMD160 (mod_perl-2.0.4.tar.gz) = 111b8f33e2dcc43ef7a0a7d557ceb467f0c55c6d
 Size (mod_perl-2.0.4.tar.gz) = 3727717 bytes
-SHA1 (patch-ab) = 2a96a0e18f84f940c544c3cb160862e69a93b48d
-SHA1 (patch-ac) = 75691f6d861e7066b5c13cda1aed2383ce574cea
diff -r 7217e143af0d -r 3fe02c2e38f6 www/ap2-perl/patches/patch-ab
--- a/www/ap2-perl/patches/patch-ab     Fri Jun 12 20:26:30 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/06/07 20:25:00 spz Exp $
-
---- ./lib/ModPerl/Code.pm.orig 2007-12-31 07:50:47.000000000 +0000
-+++ ./lib/ModPerl/Code.pm
-@@ -833,6 +833,9 @@ sub constants_ifdef {
-     if ($ifdef{$name}) {
-         return ("#ifdef $name\n", "#endif /* $name */\n");
-     }
-+    if ($name =~ /OPT_INCNOEXEC/) {
-+      return ("#if AP_SERVER_MAJORVERSION_NUMBER==2 && AP_SERVER_MINORVERSION_NUMBER<2\n", "#endif /* AP version < 2.2 */\n");
-+    }
- 
-     ("", "");
- }
diff -r 7217e143af0d -r 3fe02c2e38f6 www/ap2-perl/patches/patch-ac
--- a/www/ap2-perl/patches/patch-ac     Fri Jun 12 20:26:30 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/06/07 20:25:00 spz Exp $
-
---- src/modules/perl/modperl_apache_compat.h.orig      2007-12-31 07:23:36.000000000 +0000
-+++ src/modules/perl/modperl_apache_compat.h
-@@ -65,10 +65,17 @@ AP_DECLARE(const char *) ap_get_server_v
- #define MP_HTTPD_OVERRIDE_HTACCESS (OR_LIMIT|OR_OPTIONS|OR_FILEINFO|OR_AUTHCFG|OR_INDEXES)
- 
- #define MP_HTTPD_OVERRIDE_OPTS_UNSET (-1)
-+#if AP_SERVER_MAJORVERSION_NUMBER==2 && AP_SERVER_MINORVERSION_NUMBER<2
- #define MP_HTTPD_OVERRIDE_OPTS_DEFAULT (OPT_UNSET | \
-                                         OPT_ALL | \
-                                         OPT_INCNOEXEC | \
-                                         OPT_SYM_OWNER | \
-                                         OPT_MULTI)
-+#else
-+#define MP_HTTPD_OVERRIDE_OPTS_DEFAULT (OPT_UNSET | \
-+                                        OPT_ALL | \
-+                                        OPT_SYM_OWNER | \
-+                                        OPT_MULTI)
-+#endif
- 
- #endif /* MODPERL_APACHE_COMPAT_H */