diff options
| author | jlam <jlam@pkgsrc.org> | 2001-10-22 18:10:28 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-10-22 18:10:28 +0000 |
| commit | 2ed7a86f4217aa8d11b40381f9738c9788e6eee5 (patch) | |
| tree | 7c35d5711b1827b1296f8c71dd73861f76bdee11 /www/apache6/Makefile | |
| parent | 8b5f62044cdf2acf4d253a1af63b9d54b66c4247 (diff) | |
| download | pkgsrc-2ed7a86f4217aa8d11b40381f9738c9788e6eee5.tar.gz | |
Minimize the diffs between the apache and apache6 packages:
- Whitespace changes to Makefile
- From the commit log for apache/Makefile:
Don't do the dance with ROOT_GROUP. Apache extension modules installed by
apxs are now installed with "${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP}",
which should do the right thing regardless of the platform. ${INSTALL} is
replaced with the full path to the install program used by pkgsrc, which
should be /usr/bin/install on NetBSD, and /usr/ucb/install on Solaris.
This should fix pkg/14232 by Pierre Bourgin.
Diffstat (limited to 'www/apache6/Makefile')
| -rw-r--r-- | www/apache6/Makefile | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/www/apache6/Makefile b/www/apache6/Makefile index 1cab62a6969..8afb89fc35e 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2001/10/20 17:46:50 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2001/10/22 18:10:28 jlam Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -61,6 +61,10 @@ PLIST_SRC= ${PKGDIR}/PLIST.suexec BUILD_DEFS+= APACHE_USER APACHE_SUEXEC_DOCROOT .endif +# Note that there is NO static compile module hook here. This is intentional. +# Under Apache 1.3, modules can be compiled to link dynamically to the server +# using the "apxs" program. See apxs(8). + .if !defined(NOPIC) CONFIGURE_ARGS+= --enable-module=so # requires dlopen() CONFIGURE_ARGS+= --enable-shared=proxy @@ -117,14 +121,15 @@ FILES_SUBST+= RMDIR=${RMDIR:Q} FILES_SUBST+= TRUE=${TRUE:Q} FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/-e s!@/} -# Note that there is NO static compile module hook here. This is intentional. -# Under Apache 1.3, modules can be compiled to link dynamically to the server -# using the "apxs" program. See apxs(8). - pre-patch: ${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f post-patch: + cd ${WRKSRC}/src/support; \ + ${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 + for file in ${IPV6_PATCH}; do \ ${GZCAT} ${_DISTDIR}/$${file} | \ ${PATCH} ${PATCH_DIST_ARGS} \ @@ -132,8 +137,10 @@ post-patch: done ${CHMOD} +x ${CONFIGURE_SCRIPT} cp ${WRKSRC}/conf/httpd.conf-dist ${WRKSRC}/conf/httpd.conf-dist- - ${SED} -e 's/#Listen ::/Listen ::/' -e 's/#Listen 0.0.0.0/Listen 0.0.0.0/' \ - <${WRKSRC}/conf/httpd.conf-dist- >${WRKSRC}/conf/httpd.conf-dist + ${SED} -e "s|#Listen ::|Listen ::|" \ + -e "s|#Listen 0.0.0.0|Listen 0.0.0.0|" \ + ${WRKSRC}/conf/httpd.conf-dist- \ + > ${WRKSRC}/conf/httpd.conf-dist pre-configure: ${SED} ${FILES_SUBST_SED} \ @@ -157,6 +164,7 @@ post-install: done ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache + ${CHOWN} -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/httpd PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../textproc/expat/buildlink.mk" |