From 5b11ac8c7e99791cc71d89bd1805c4fb358f1c87 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 6 May 2005 00:14:21 +0000 Subject: 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. --- www/apache/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'www') diff --git a/www/apache/Makefile b/www/apache/Makefile index 838212a8d63..8c8d2ebbb08 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -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 @@ pre-patch: 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 -- cgit v1.2.3