diff options
| author | frueauf <frueauf> | 1998-03-06 13:08:54 +0000 |
|---|---|---|
| committer | frueauf <frueauf> | 1998-03-06 13:08:54 +0000 |
| commit | a633c85e6da23a7970520fd6e0b1c164cd6cee72 (patch) | |
| tree | bbabe783d4f8bd00a24cc3aab9384824f9e77375 /www | |
| parent | 746f8deead82cc7a7991ec96b74b8d3250dc526a (diff) | |
| download | pkgsrc-a633c85e6da23a7970520fd6e0b1c164cd6cee72.tar.gz | |
portlint: sed->${SED}; mv->${MV}; install->${INSTALL}; reorder HTTP_ROOT;
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache/Makefile | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 348516622c7..e4fd29d5faa 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -4,7 +4,7 @@ # Date created: Sun Mar 1 13:41:17 PST 1998 # Whom: cjs@netbsd.org # -# $NetBSD: Makefile,v 1.2 1998/03/05 11:42:42 cjs Exp $ +# $NetBSD: Makefile,v 1.3 1998/03/06 13:08:54 frueauf Exp $ # FreeBSD Id: Makefile,v 1.45 1998/02/25 06:23:55 asami Exp # @@ -15,13 +15,13 @@ WRKSRC= ${WRKROOT}/src CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/ -HTTP_ROOT= ${PREFIX}/http - MAINTAINER= cjs@netbsd.org CONFIGURE_SCRIPT=Configure HAS_CONFIGURE= YES +HTTP_ROOT= ${PREFIX}/http + CONF_DIR= ${HTTP_ROOT}/conf MAN1= apachectl.1 htpasswd.1 MAN8= httpd.8 @@ -34,32 +34,32 @@ post-build: post-patch: @cd ${WRKSRC} && \ - sed -e 's#^EXTRA_CFLAGS=#& -DHTTPD_ROOT=\\"${HTTP_ROOT}\\"#' \ + ${SED} -e 's#^EXTRA_CFLAGS=#& -DHTTPD_ROOT=\\"${HTTP_ROOT}\\"#' \ < Configuration > Configuration.new && \ - mv Configuration.new Configuration + ${MV} Configuration.new Configuration @cd ${WRKROOT}/conf && \ for I in httpd.conf-dist access.conf-dist srm.conf-dist; do \ - sed -e 's#@@ServerRoot@@#${HTTP_ROOT}#g' < $${I} > $${I}.new && \ - mv $${I}.new $${I}; \ + ${SED} -e 's#@@ServerRoot@@#${HTTP_ROOT}#g' < $${I} > $${I}.new && \ + ${MV} $${I}.new $${I}; \ done @cd ${WRKROOT}/conf && \ - sed -e "s#^PidFile .*/#PidFile /var/run/#" < httpd.conf-dist \ + ${SED} -e "s#^PidFile .*/#PidFile /var/run/#" < httpd.conf-dist \ >httpd.conf-dist.new && \ - mv httpd.conf-dist.new httpd.conf-dist + ${MV} httpd.conf-dist.new httpd.conf-dist @cd ${WRKSRC}/support && \ - sed -e 's#/usr/local/apache/logs/#/var/run/#' \ + ${SED} -e 's#/usr/local/apache/logs/#/var/run/#' \ -e 's#/usr/local/apache/src/#/usr/pkg/sbin/#' \ < apachectl >apachectl.new && \ - mv apachectl.new apachectl + ${MV} apachectl.new apachectl .if defined(VERS_ID) @cd ${WRKSRC} && \ - mv Configuration Configuration.old && \ - sed 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \ + ${MV} Configuration Configuration.old && \ + ${SED} 's;^#*OPTIM=.*;OPTIM= -DSERVER_SUBVERSION=\\"${VERS_ID}\\";' \ < Configuration.old > Configuration .endif do-install: - install -d -m 755 -o bin -g bin ${CONF_DIR} ${HTTP_ROOT}/htdocs \ + ${INSTALL} -d -m 755 -o bin -g bin ${CONF_DIR} ${HTTP_ROOT}/htdocs \ ${HTTP_ROOT}/icons ${HTTP_ROOT}/cgi-bin ${INSTALL_PROGRAM} ${WRKSRC}/httpd ${PREFIX}/sbin cd ${WRKSRC}/support && \ |