[pkgsrc/pkgsrc-2008Q1]: pkgsrc Pullup ticket #2434 - requested by he

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6d6044e24b47
branches:  pkgsrc-2008Q1
changeset: 540435:6d6044e24b47
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Jun 25 12:09:43 2008 +0000

description:
Pullup ticket #2434 - requested by he
Security patch for apache2

Revisions pulled up:
- devel/apr0/Makefile           1.5
- www/apache2/Makefile          1.124
- www/apache2/Makefile.common   1.26
---
    Module Name:        pkgsrc
    Committed By:       he
    Date:               Sun Jun 22 23:01:19 UTC 2008

    Modified Files:
        pkgsrc/devel/apr0: Makefile
        pkgsrc/www/apache2: Makefile Makefile.common

    Log Message:
    As indicated by comments on pkgsrc-c, move PKGREVISION setting to
    individual Makefile files and out of Makefile.common.

diffstat:

 devel/apr0/Makefile         |  3 ++-
 www/apache2/Makefile        |  3 ++-
 www/apache2/Makefile.common |  3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r 849818b73a82 -r 6d6044e24b47 devel/apr0/Makefile
--- a/devel/apr0/Makefile       Wed Jun 25 10:36:40 2008 +0000
+++ b/devel/apr0/Makefile       Wed Jun 25 12:09:43 2008 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2007/11/18 16:22:06 adrianp Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2008/06/25 12:09:43 tron Exp $
 
 .include "../../www/apache2/Makefile.common"
 
 PKGNAME=       apr-${APR_VERSION}.${APACHE_VERSION}
+PKGREVISION=   1
 CATEGORIES=    devel
 
 HOMEPAGE=      http://apr.apache.org/
diff -r 849818b73a82 -r 6d6044e24b47 www/apache2/Makefile
--- a/www/apache2/Makefile      Wed Jun 25 10:36:40 2008 +0000
+++ b/www/apache2/Makefile      Wed Jun 25 12:09:43 2008 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.121 2008/01/21 14:37:22 taca Exp $
+# $NetBSD: Makefile,v 1.121.2.1 2008/06/25 12:09:43 tron Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       apache-${APACHE_VERSION}
+PKGREVISION=   1
 CATEGORIES=    www
 
 HOMEPAGE=      http://httpd.apache.org/
diff -r 849818b73a82 -r 6d6044e24b47 www/apache2/Makefile.common
--- a/www/apache2/Makefile.common       Wed Jun 25 10:36:40 2008 +0000
+++ b/www/apache2/Makefile.common       Wed Jun 25 12:09:43 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24.2.1 2008/06/25 10:35:40 tron Exp $
+# $NetBSD: Makefile.common,v 1.24.2.2 2008/06/25 12:09:43 tron Exp $
 
 # used by devel/apr0/Makefile
 
@@ -7,7 +7,6 @@
 # When updating this version be sure to update the checksum and remove
 # any PKGREVISION for devel/apr also.
 APACHE_VERSION=                2.0.63
-PKGREVISION=           1
 APR_VERSION=           0.9.17
 MASTER_SITES=          ${MASTER_SITE_APACHE:=httpd/} \
                        ${MASTER_SITE_APACHE:=httpd/old/} \