pkg/48939: www/apache24/patches/patch-am is wrong

[ishit%oak.dti.ne.jp@localhost]

>Number:         48939
>Category:       pkg
>Synopsis:       www/apache24/patches/patch-am is wrong
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Jun 23 10:15:00 +0000 2014
>Originator:     ISIHARA Takanori
>Release:        pkgsrc-2014Q1
>Organization:
Nagoya *BSD Users' Group :-)
>Environment:
NetBSD newsearch.ombudsman.jp 6.1_STABLE NetBSD 6.1_STABLE (GENERIC) #0: Thu 
Jun 19 22:32:31 JST 2014  
sysbuild%ishitPc9.home@localhost:/opt/sysbuild/netbsd-6/obj/amd64/sys/arch/amd64/compile/GENERIC
 amd64

>Description:
www/apache24/patches/patch-am (include/scoreboard.h patch) is wrong.
"/" is required for after "DEFAULT_REL_RUNTIMEDIR", I think.

The result of "httpd -V" is as follows.
% /usr/pkg/sbin/httpd -V
Server version: Apache/2.4.9 (Unix)
Server built:   Jun 23 2014 07:55:19
Server's Module Magic Number: 20120211:31
Server loaded:  APR 1.5.0, APR-UTIL 1.5.3
Compiled using: APR 1.5.0, APR-UTIL 1.5.3
Architecture:   64-bit
Server MPM:     prefork
  threaded:     no
    forked:     yes (variable process count)
Server compiled with....
 -D APR_HAS_MMAP
 -D APR_HAVE_IPV6 (IPv4-mapped addresses disabled)
 -D APR_USE_SYSVSEM_SERIALIZE
 -D APR_USE_PTHREAD_SERIALIZE
 -D SINGLE_LISTEN_UNSERIALIZED_ACCEPT
 -D APR_HAS_OTHER_CHILD
 -D AP_HAVE_RELIABLE_PIPED_LOGS
 -D DYNAMIC_MODULE_LIMIT=256
 -D HTTPD_ROOT="/usr/pkg"
 -D SUEXEC_BIN="/usr/pkg/bin/suexec"
 -D DEFAULT_PIDLOG="/var/run/httpd.pid"
 -D DEFAULT_SCOREBOARD="/var/runlogs/apache_runtime_status"   <<<<< Here!!
 -D DEFAULT_ERRORLOG="/var/log/httpd/error.log"
 -D AP_TYPES_CONFIG_FILE="etc/httpd/mime.types"
 -D SERVER_CONFIG_FILE="etc/httpd/httpd.conf"

>How-To-Repeat:
cd /usr/pkgsrc/www/apache24
make install
/usr/pkg/sbin/httpd -V

>Fix:
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache24/distinfo,v
retrieving revision 1.13
diff -u -u -r1.13 distinfo
--- distinfo    18 Mar 2014 20:09:08 -0000      1.13
+++ distinfo    23 Jun 2014 10:07:07 -0000
@@ -11,7 +11,7 @@
 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
Index: patches/patch-am
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache24/patches/patch-am,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 patch-am
--- patches/patch-am    13 Apr 2012 18:50:49 -0000      1.1.1.1
+++ patches/patch-am    23 Jun 2014 10:07:07 -0000
@@ -7,7 +7,7 @@
  /* 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 ---