diff options
| author | adam <adam@pkgsrc.org> | 2011-05-12 07:04:02 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2011-05-12 07:04:02 +0000 |
| commit | dca499eb67d7059c592fd6256b8b032d2e6e9b48 (patch) | |
| tree | 1988c11cf65d9a7d96d36fa2d31dec387ab8931b /www/apache22 | |
| parent | fa6a35c123e2dae23e9accfd182755b34cc4c09b (diff) | |
| download | pkgsrc-dca499eb67d7059c592fd6256b8b032d2e6e9b48.tar.gz | |
Replaced ugly AWK with single SUBST_SED
Diffstat (limited to 'www/apache22')
| -rw-r--r-- | www/apache22/Makefile | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 516a086ca9f..f8f2973bd55 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2011/05/12 06:50:44 tron Exp $ +# $NetBSD: Makefile,v 1.65 2011/05/12 07:04:02 adam Exp $ DISTNAME= httpd-2.2.18 PKGNAME= ${DISTNAME:S/httpd/apache/} @@ -160,6 +160,7 @@ 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' # abs_srcdir in config_vars.mk is used during install so needs to reference # the work dir path, and by other packages such as ap2-fastcgi after install, @@ -219,25 +220,6 @@ INSTALL_MAKE_FLAGS+= sysconfdir="${EGDIR}" post-install: ${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build - cd ${DESTDIR}${EGDIR} && \ - for file in \ - httpd.conf \ - extra/httpd-ssl.conf; \ - do \ - ${AWK} ' \ - /^Listen[ ]*80/ { \ - printf "%s", "Listen 0.0.0.0:80\n"; \ - next; \ - } \ - /^Listen[ ]*443/ { \ - printf "%s", "Listen 0.0.0.0:443\n"; \ - next; \ - } \ - { print; } \ - ' < "$${file}" >> $${file}.new; \ - ${MV} -f $${file}.new $${file}; \ - done - ${LN} -sf ${SBINDIR}/envvars-std ${DESTDIR}${SBINDIR}/envvars ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/sbin |