[pkgsrc/trunk]: pkgsrc/www/apache Revert:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ecf3280aac9e
branches:  trunk
changeset: 493430:ecf3280aac9e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri May 06 00:14:21 2005 +0000

description:
Revert:
Remove an instance of ${TYPE} from pkgsrc.  The use of the private
variable _INSTALL_CMD is only temporary until we switch over to the
new tools framework.

The committed version has an additional | (pipe) character in it,
breaking the sed and causing an empty apxs file.
Replacing the pipes with commas does not help either, because then
the backquoted command gets embedded into apxs instead of the
correct pathname.

Bump PKGREVISION because this broke at least ap-php and ap-ssl.

diffstat:

 www/apache/Makefile |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r e0735813450a -r ecf3280aac9e www/apache/Makefile
--- a/www/apache/Makefile       Fri May 06 00:03:25 2005 +0000
+++ b/www/apache/Makefile       Fri May 06 00:14:21 2005 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.163 2005/05/03 22:17:17 jlam Exp $
+# $NetBSD: Makefile,v 1.164 2005/05/06 00:14:21 wiz Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
 
 DISTNAME=              apache_1.3.33
 PKGNAME=               ${DISTNAME:S/_/-/}
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            www
 MASTER_SITES=          ${MASTER_SITE_APACHE:=httpd/} \
                        ${MASTER_SITE_APACHE:=httpd/old/}
@@ -186,7 +186,7 @@
 
 post-patch:
        @cd ${WRKSRC}/src/support;                                      \
-       ${SED}  -e "s|@INSTALL@|"${_INSTALL_CMD:Q}" -c -o ${LIBOWN} -g ${LIBGRP}|" \
+       ${SED}  -e "s|@INSTALL@|"`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'`" -c -o ${LIBOWN} -g ${LIBGRP}|" \
                apxs.pl > apxs.pl.sed;                                  \
        ${MV} apxs.pl.sed apxs.pl