From 31665a077c3976ea687e1aeb2736596da58b5f86 Mon Sep 17 00:00:00 2001 From: bsiegert Date: Sun, 16 Apr 2017 15:36:15 +0000 Subject: 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. --- www/apache24/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'www') diff --git a/www/apache24/Makefile b/www/apache24/Makefile index d1c58d05a06..4ecc0165f0a 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2017/01/28 04:57:57 ryoon Exp $ +# $NetBSD: Makefile,v 1.54.2.1 2017/04/16 15:36:15 bsiegert Exp $ # # When updating this package, make sure that no strings like # "PR 12345" are in the commit message. Upstream likes @@ -135,8 +135,6 @@ SUBST_FILES.confs+= docs/conf/extra/httpd-ssl.conf SUBST_SED.confs= -e "s|${EGDIR}|${PKG_SYSCONFDIR}|g" SUBST_SED.confs+= -e "s|${PREFIX}/htdocs|${PREFIX}/share/httpd/htdocs|g" SUBST_SED.confs+= -e "s|${PREFIX}/conf|${PKG_SYSCONFDIR}|g" -SUBST_SED.confs+= -e "s|logs/|${VARBASE}/log/httpd/|g" -SUBST_SED.confs+= -e 's|/var/log/httpd/foo\.log|logs/foo.log/|g' SUBST_SED.confs+= -e 's|^\(User[ ]\).*|\1${APACHE_USER}|g' SUBST_SED.confs+= -e 's|^\(Group[ ]\).*|\1${APACHE_GROUP}|g' SUBST_SED.confs+= -e 's|^Listen \(.*\)|Listen 0.0.0.0:\1|g' -- cgit v1.2.3