Use versioned prefix and fix build with Apache 2.

4 files changed, 61 insertions, 10 deletions

diff --git a/www/ap2-suphp/Makefile b/www/ap2-suphp/Makefile
index d7bf0ae92d1..9d82a353cee 100644
--- a/www/ap2-suphp/Makefile
+++ b/www/ap2-suphp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/05/29 22:17:19 schmonz Exp $
+# $NetBSD: Makefile,v 1.10 2007/06/30 15:05:08 joerg Exp $
 #
 
 DISTNAME=		suphp-0.6.0
-PKGNAME=		ap2-${DISTNAME}
+PKGNAME=		${APACHE_PKG_PREFIX}-${DISTNAME}
 PKGREVISION=		3
 CATEGORIES=		www
 MASTER_SITES=		http://www.suphp.org/download/
diff --git a/www/ap2-suphp/distinfo b/www/ap2-suphp/distinfo
index 967851330b4..c1f51923817 100644
--- a/www/ap2-suphp/distinfo
+++ b/www/ap2-suphp/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/10/11 18:58:44 joerg Exp $
+$NetBSD: distinfo,v 1.3 2007/06/30 15:05:08 joerg Exp $
 
 SHA1 (suphp-0.6.0.tar.gz) = 7ec81c132355e6f508e6a3017947a870072d6eb8
 RMD160 (suphp-0.6.0.tar.gz) = 953f3be08d7e33ff64e327ee34bb84639888aa5f
 Size (suphp-0.6.0.tar.gz) = 247534 bytes
-SHA1 (patch-aa) = a952f6fda134d4e84af083bb185a1cdcfe89fa07
-SHA1 (patch-ab) = 1ec87e3fc46dc73f9dd01e86c437b08bc87bdb46
+SHA1 (patch-aa) = 85fdde4e2b170a1e9cf3d2dc297903486475bd73
+SHA1 (patch-ab) = 35f054add18241ee7dedc10e780afd6b77e3463e
diff --git a/www/ap2-suphp/patches/patch-aa b/www/ap2-suphp/patches/patch-aa
index ebacbb77ef2..f013b4efea1 100644
--- a/www/ap2-suphp/patches/patch-aa
+++ b/www/ap2-suphp/patches/patch-aa
@@ -1,9 +1,10 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/08/03 16:43:38 rillig Exp $
+$NetBSD: patch-aa,v 1.2 2007/06/30 15:05:08 joerg Exp $
 
 Allow the directives to be set in the global configuration file, too.
+Fix APR 1.2 build.
 
---- src/apache2/mod_suphp.c.orig	Sun Feb 27 18:56:37 2005
-+++ src/apache2/mod_suphp.c	Wed Aug  3 13:19:12 2005
+--- src/apache2/mod_suphp.c.orig	2005-02-27 17:56:37.000000000 +0000
++++ src/apache2/mod_suphp.c
 @@ -313,8 +313,8 @@ static const command_rec suphp_cmds[] =
      AP_INIT_TAKE2("suPHP_UserGroup", suphp_handle_cmd_user_group, NULL, RSRC_CONF | ACCESS_CONF,
                    "User and group scripts shall be run as"),
@@ -15,3 +16,36 @@ Allow the directives to be set in the global configuration file, too.
      {NULL}
  };
  
+@@ -558,7 +558,9 @@ static int suphp_handler(request_rec *r)
+             return rv;
+         }
+         
+-        APR_BRIGADE_FOREACH(bucket, bb)
++	for (bucket = APR_BRIGADE_FIRST(bb);
++	     bucket != APR_BRIGADE_SENTINEL(bb);
++	     bucket = APR_BUCKET_NEXT(bucket))
+         {
+             const char *data;
+             apr_size_t len;
+@@ -629,7 +631,9 @@ static int suphp_handler(request_rec *r)
+             
+             const char *buf;
+             apr_size_t blen;
+-            APR_BRIGADE_FOREACH(b, bb)
++
++	    for (b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb);
++		 b = APR_BUCKET_NEXT(b))
+             {
+                 if (APR_BUCKET_IS_EOS(b))
+                     break;
+@@ -650,7 +654,9 @@ static int suphp_handler(request_rec *r)
+             /* empty brigade (script output) */
+             const char *buf;
+             apr_size_t blen;
+-            APR_BRIGADE_FOREACH(b, bb)
++
++            for (b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb);
++		 b = APR_BUCKET_NEXT(b))
+             {
+                 if (APR_BUCKET_IS_EOS(b))
+                     break;
diff --git a/www/ap2-suphp/patches/patch-ab b/www/ap2-suphp/patches/patch-ab
index 955ade24eb5..bc320c8cbce 100644
--- a/www/ap2-suphp/patches/patch-ab
+++ b/www/ap2-suphp/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2005/10/11 19:01:01 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2007/06/30 15:05:08 joerg Exp $
 
---- configure.orig	2005-10-11 18:46:20.000000000 +0000
+--- configure.orig	2005-06-01 21:01:19.000000000 +0000
 +++ configure
 @@ -3960,13 +3960,13 @@ darwin* | rhapsody*)
    esac
@@ -36,3 +36,20 @@ $NetBSD: patch-ab,v 1.1 2005/10/11 19:01:01 joerg Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
+@@ -9022,12 +9022,12 @@ if test -n "$APXS"; then
+                     | cut -f2 -d"/" \
+                     | cut -f1 -d" "`
+     major_version=`echo $APACHE_VERSION|cut -f1,2 -d.`
+-    if test "$major_version" = "2.0"; then
+-      APACHE_VERSION_2=true
+-      APACHE_VERSION_1_3=false
+-    else
++    if test "$major_version" = "1.3"; then
+       APACHE_VERSION_2=false
+       APACHE_VERSION_1_3=true
++    else
++      APACHE_VERSION_2=true
++      APACHE_VERSION_1_3=false
+     fi
+ 
+