diff options
| author | wiz <wiz> | 2005-05-06 00:14:21 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2005-05-06 00:14:21 +0000 |
| commit | fcf42a7f6f4e9705fe6b187cfc65ce8d583a9b08 (patch) | |
| tree | 1eea05de9e5a8f8ddb68644730c6e3584e1b8b59 /www/apache/Makefile | |
| parent | f1d4849f1ac546b674bd9dc999fdea597de28be3 (diff) | |
| download | pkgsrc-fcf42a7f6f4e9705fe6b187cfc65ce8d583a9b08.tar.gz | |
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 (limited to 'www/apache/Makefile')
| -rw-r--r-- | www/apache/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
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 |