Sun Apr 16 15:36:15 2017 UTC ()
Pullup ticket #5287 - requested by sevan
www/apache24: build fix

Revisions pulled up:
- www/apache24/Makefile                                         1.55

---
   Module Name:    pkgsrc
   Committed By:   adam
   Date:           Fri Apr 14 18:18:24 UTC 2017

   Modified Files:
          pkgsrc/www/apache24: Makefile

   Log Message:
   Removed these two substituions:
   SUBST_SED.confs+=       -e "s|logs/|${VARBASE}/log/httpd/|g"
   SUBST_SED.confs+=       -e 's|/var/log/httpd/foo\.log|logs/foo.log/|g'
   The first one only applied to an instrucion in the comment at the top of
   the configuration file and made it meaningless.
   The second one has been useless.


(bsiegert)
diff -r1.54 -r1.54.2.1 pkgsrc/www/apache24/Makefile
cvs diff -r1.54 -r1.54.2.1 pkgsrc/www/apache24/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache24/Makefile 2017/01/28 04:57:57 1.54
+++ pkgsrc/www/apache24/Makefile 2017/04/16 15:36:15 1.54.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.54 2017/01/28 04:57:57 ryoon Exp $ 1# $NetBSD: Makefile,v 1.54.2.1 2017/04/16 15:36:15 bsiegert Exp $
2# 2#
3# When updating this package, make sure that no strings like 3# When updating this package, make sure that no strings like
4# "PR 12345" are in the commit message. Upstream likes 4# "PR 12345" are in the commit message. Upstream likes
5# to reference their own PRs this way, but this ends up 5# to reference their own PRs this way, but this ends up
6# in NetBSD GNATS. 6# in NetBSD GNATS.
7 7
8DISTNAME= httpd-2.4.25 8DISTNAME= httpd-2.4.25
9PKGNAME= ${DISTNAME:S/httpd/apache/} 9PKGNAME= ${DISTNAME:S/httpd/apache/}
10PKGREVISION= 2 10PKGREVISION= 2
11CATEGORIES= www 11CATEGORIES= www
12MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} 12MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/}
13MASTER_SITES+= http://archive.apache.org/dist/httpd/ 13MASTER_SITES+= http://archive.apache.org/dist/httpd/
14MASTER_SITES+= http://archive.eu.apache.org/dist/httpd/ 14MASTER_SITES+= http://archive.eu.apache.org/dist/httpd/
@@ -125,28 +125,26 @@ SUBST_CLASSES+= apr-lt @@ -125,28 +125,26 @@ SUBST_CLASSES+= apr-lt
125SUBST_STAGE.apr-lt= post-configure 125SUBST_STAGE.apr-lt= post-configure
126SUBST_MESSAGE.apr-lt= Fixing libtool references. 126SUBST_MESSAGE.apr-lt= Fixing libtool references.
127SUBST_FILES.apr-lt= build/config_vars.mk 127SUBST_FILES.apr-lt= build/config_vars.mk
128SUBST_SED.apr-lt= -e 's|^\(LIBTOOL =\) [^ ]*|\1 $$(SHELL) $$(top_builddir)/build/libtool|g' 128SUBST_SED.apr-lt= -e 's|^\(LIBTOOL =\) [^ ]*|\1 $$(SHELL) $$(top_builddir)/build/libtool|g'
129 129
130SUBST_CLASSES+= confs 130SUBST_CLASSES+= confs
131SUBST_STAGE.confs= post-configure 131SUBST_STAGE.confs= post-configure
132SUBST_MESSAGE.confs= Fixing configuration files. 132SUBST_MESSAGE.confs= Fixing configuration files.
133SUBST_FILES.confs= docs/conf/httpd.conf 133SUBST_FILES.confs= docs/conf/httpd.conf
134SUBST_FILES.confs+= docs/conf/extra/httpd-ssl.conf 134SUBST_FILES.confs+= docs/conf/extra/httpd-ssl.conf
135SUBST_SED.confs= -e "s|${EGDIR}|${PKG_SYSCONFDIR}|g" 135SUBST_SED.confs= -e "s|${EGDIR}|${PKG_SYSCONFDIR}|g"
136SUBST_SED.confs+= -e "s|${PREFIX}/htdocs|${PREFIX}/share/httpd/htdocs|g" 136SUBST_SED.confs+= -e "s|${PREFIX}/htdocs|${PREFIX}/share/httpd/htdocs|g"
137SUBST_SED.confs+= -e "s|${PREFIX}/conf|${PKG_SYSCONFDIR}|g" 137SUBST_SED.confs+= -e "s|${PREFIX}/conf|${PKG_SYSCONFDIR}|g"
138SUBST_SED.confs+= -e "s|logs/|${VARBASE}/log/httpd/|g" 
139SUBST_SED.confs+= -e 's|/var/log/httpd/foo\.log|logs/foo.log/|g' 
140SUBST_SED.confs+= -e 's|^\(User[ ]\).*|\1${APACHE_USER}|g' 138SUBST_SED.confs+= -e 's|^\(User[ ]\).*|\1${APACHE_USER}|g'
141SUBST_SED.confs+= -e 's|^\(Group[ ]\).*|\1${APACHE_GROUP}|g' 139SUBST_SED.confs+= -e 's|^\(Group[ ]\).*|\1${APACHE_GROUP}|g'
142SUBST_SED.confs+= -e 's|^Listen \(.*\)|Listen 0.0.0.0:\1|g' 140SUBST_SED.confs+= -e 's|^Listen \(.*\)|Listen 0.0.0.0:\1|g'
143 141
144# abs_srcdir in config_vars.mk is used during install so needs to reference 142# abs_srcdir in config_vars.mk is used during install so needs to reference
145# the work dir path, and by other packages such as ap2-fastcgi after install, 143# the work dir path, and by other packages such as ap2-fastcgi after install,
146# so we fix after install to reference the installed path 144# so we fix after install to reference the installed path
147SUBST_CLASSES+= abs_srcdir 145SUBST_CLASSES+= abs_srcdir
148SUBST_STAGE.abs_srcdir= post-install 146SUBST_STAGE.abs_srcdir= post-install
149SUBST_MESSAGE.abs_srcdir= Fixing abs_srcdir 147SUBST_MESSAGE.abs_srcdir= Fixing abs_srcdir
150SUBST_FILES.abs_srcdir= ${DESTDIR}${PREFIX}/share/httpd/build/config_vars.mk 148SUBST_FILES.abs_srcdir= ${DESTDIR}${PREFIX}/share/httpd/build/config_vars.mk
151SUBST_SED.abs_srcdir= -e 's|^\(abs_srcdir =\) .*|\1 ${PREFIX}/share/httpd|' 149SUBST_SED.abs_srcdir= -e 's|^\(abs_srcdir =\) .*|\1 ${PREFIX}/share/httpd|'
152 150