summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz>2014-06-23 11:49:36 +0000
committerwiz <wiz>2014-06-23 11:49:36 +0000
commitb95f2e6c88743fbe4abc1eb458686b4fbb0f385e (patch)
treecc8b484fe904e44880eac3f1dabbcf676ebc010f
parent26fdb7a58d80b495a9dd48e80f1b7c59b49827eb (diff)
downloadpkgsrc-b95f2e6c88743fbe4abc1eb458686b4fbb0f385e.tar.gz
Fix path to apache_runtime_status file.
From ISIHARA Takanori in PR 48939. Bump PKGREVISION.
-rw-r--r--www/apache24/Makefile4
-rw-r--r--www/apache24/distinfo4
-rw-r--r--www/apache24/patches/patch-am4
3 files changed, 6 insertions, 6 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index e363d3ef21b..4e2129ec3f7 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2014/05/29 23:37:56 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2014/06/23 11:49:36 wiz Exp $
DISTNAME= httpd-2.4.9
PKGNAME= ${DISTNAME:S/httpd/apache/}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
http://archive.apache.org/dist/httpd/ \
diff --git a/www/apache24/distinfo b/www/apache24/distinfo
index 44ce722de1e..2b0e4c25a81 100644
--- a/www/apache24/distinfo
+++ b/www/apache24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2014/03/18 20:09:08 adam Exp $
+$NetBSD: distinfo,v 1.14 2014/06/23 11:49:36 wiz Exp $
SHA1 (httpd-2.4.9.tar.bz2) = 646aedbf59519e914c424b3a85d846bf189be3f4
RMD160 (httpd-2.4.9.tar.bz2) = 2d8095d7ce9298d813aed849cc1cb3272a4acb5a
@@ -11,7 +11,7 @@ SHA1 (patch-ae) = 5bd3bf54e792bf8a2916d7e1b49b1702b02c6903
SHA1 (patch-ag) = 50c7f0fab1cb90ac573f1c47f2d37f9c2a6247e1
SHA1 (patch-ai) = 867ac81fd14b1bd6af048ec57390d915956e9568
SHA1 (patch-al) = 02d9ade5aac4270182063d5ad413970c832ee911
-SHA1 (patch-am) = f14b260ffad2c7e8d26e5b614d4aeaf8506e195b
+SHA1 (patch-am) = acdf7198ae8b4353cfc70c8015a0f09de036b777
SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df
SHA1 (patch-include_ap__config.h) = 1d056e2d4db80ec97aaf755b6dd6aff69ed2cd96
SHA1 (patch-server_core__filters.c) = 331672c9a65691229518f31dcdae64382b392287
diff --git a/www/apache24/patches/patch-am b/www/apache24/patches/patch-am
index 978df9062a8..62f86dda428 100644
--- a/www/apache24/patches/patch-am
+++ b/www/apache24/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
+$NetBSD: patch-am,v 1.2 2014/06/23 11:49:36 wiz Exp $
--- include/scoreboard.h.orig 2012-02-01 13:36:37.000000000 +0000
+++ include/scoreboard.h
@@ -7,7 +7,7 @@ $NetBSD: patch-am,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
/* Scoreboard file, if there is one */
#ifndef DEFAULT_SCOREBOARD
-#define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
-+#define DEFAULT_SCOREBOARD DEFAULT_REL_RUNTIMEDIR "logs/apache_runtime_status"
++#define DEFAULT_SCOREBOARD DEFAULT_REL_RUNTIMEDIR "/logs/apache_runtime_status"
#endif
/* Scoreboard info on a process is, for now, kept very brief ---