- Check configuration variables properly so that enabling "suexec" support

  really works.
- Add proxy module, "suexec" binary and manual page to package list
  dynamically.

2 files changed, 17 insertions, 7 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index 688480faeb3..7bc472e90b0 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 1999/04/30 23:51:39 tv Exp $
+# $NetBSD: Makefile,v 1.32 1999/05/11 16:04:03 tron Exp $
 #
 # The fourth number in the PKGNAME version indicates a NetBSD pkg revision
 # (to indicate changes in the shipped third party patches such as the mod_ssl
@@ -39,7 +39,9 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} --libexecdir=${PREFIX}/lib/httpd \
 			--with-perl=${PREFIX}/bin/perl
 CONFIGURE_ENV+=		OPTIM="${OPTIM}"
 
-.if defined(APACHE_SUEXEC)
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
 CONFIGURE_ARGS+=	--enable-suexec --suexec-caller=www \
 			--suexec-safepath='/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin'
 .endif
@@ -50,6 +52,8 @@ OPTIM+=			-DBUFFERED_LOGS
 CFLAGS+=		-O6 -fomit-frame-pointer -fexpensive-optimizations
 .endif
 
+PLIST_SRC=		${WRKDIR}/PLIST
+
 # 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).
@@ -74,8 +78,16 @@ post-patch:
 	@find ${WRKSRC}/htdocs -name '*.orig' | xargs ${RM}
 
 post-install:
-	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
-	@${MV} ${PREFIX}/lib/httpd/libproxy.so ${PREFIX}/lib/httpd/mod_proxy.so 2>/dev/null || ${MKDIR} ${PREFIX}/lib/httpd
+	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
+	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif \
+	  ${PREFIX}/share/httpd/htdocs
+	@${MV} ${PREFIX}/lib/httpd/libproxy.so \
+	  ${PREFIX}/lib/httpd/mod_proxy.so 2>/dev/null || \
+	  ${MKDIR} ${PREFIX}/lib/httpd
+.for FILE in lib/httpd/mod_proxy.so man/man8/suexec.8 sbin/suexec
+	@${TEST} -e ${PREFIX}/${FILE} && ${ECHO} ${FILE} >>${PLIST_SRC}
+.endfor
+	@${ECHO} @dirrm lib/httpd >>${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/www/apache/pkg/PLIST b/www/apache/pkg/PLIST
index a3913e85a7c..8ef4b2687fd 100644
--- a/www/apache/pkg/PLIST
+++ b/www/apache/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 1999/04/30 17:05:20 tv Exp $
+@comment $NetBSD: PLIST,v 1.9 1999/05/11 16:04:03 tron Exp $
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -45,7 +45,6 @@ include/httpd/util_script.h
 include/httpd/util_uri.h
 libexec/cgi-bin/printenv
 libexec/cgi-bin/test-cgi
-lib/httpd/mod_proxy.so
 man/man1/dbmmanage.1
 man/man1/htdigest.1
 man/man1/htpasswd.1
@@ -306,7 +305,6 @@ share/httpd/icons/world2.gif
 @dirrm etc/httpd/ssl.key
 @unexec rmdir %D/etc/httpd 2>/dev/null || true
 @dirrm include/httpd
-@dirrm lib/httpd
 @dirrm libexec/cgi-bin
 @dirrm share/httpd/htdocs/manual/images
 @dirrm share/httpd/htdocs/manual/misc