summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2008-06-25 12:09:43 +0000
committertron <tron@pkgsrc.org>2008-06-25 12:09:43 +0000
commit6c32ab4b9b785033628e4a093ce167af854de294 (patch)
tree67c7b1934791e8b834bb138fe41d812cc0e9a7ff
parentc4bdd0fcfd3d077b21f1c40d6dee3ff2209b6e3a (diff)
downloadpkgsrc-6c32ab4b9b785033628e4a093ce167af854de294.tar.gz
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.
-rw-r--r--devel/apr0/Makefile3
-rw-r--r--www/apache2/Makefile3
-rw-r--r--www/apache2/Makefile.common3
3 files changed, 5 insertions, 4 deletions
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index a2ff19947ee..0d47d4be163 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -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 --git a/www/apache2/Makefile b/www/apache2/Makefile
index eb469418273..0506635e882 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -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 --git a/www/apache2/Makefile.common b/www/apache2/Makefile.common
index 2f7e32080b3..8b6c0b05f9e 100644
--- a/www/apache2/Makefile.common
+++ b/www/apache2/Makefile.common
@@ -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 @@ EXTRACT_SUFX= .tar.bz2
# 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/} \