From 05234b75b251dae67e19d7de5027cdc48d44bb01 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Tue, 19 Nov 2002 23:03:53 +0000
Subject: Bump PKGREVISION of ap-ssl: no longer install apache_start.conf;
 Apache/SSL users should just add:

	apache_start="startssl"

to /etc/rc.conf.
---
 www/ap-ssl/MESSAGE                 | 16 ++++++++++++----
 www/ap-ssl/Makefile                |  7 +++----
 www/ap-ssl/PLIST                   |  3 +--
 www/ap-ssl/files/apache_start.conf |  5 -----
 4 files changed, 16 insertions(+), 15 deletions(-)
 delete mode 100644 www/ap-ssl/files/apache_start.conf

(limited to 'www')

diff --git a/www/ap-ssl/MESSAGE b/www/ap-ssl/MESSAGE
index 0ce96677497..1d5a1cabb69 100644
--- a/www/ap-ssl/MESSAGE
+++ b/www/ap-ssl/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:45 wiz Exp $
+$NetBSD: MESSAGE,v 1.4 2002/11/19 23:03:53 jlam Exp $
 
 You will need to generate certificates and keys for your server before
 Apache will start with mod_ssl support.  Please read
@@ -8,11 +8,19 @@ Apache will start with mod_ssl support.  Please read
 
 for more information on how to do this.
 
-In order to start Apache with mod_ssl support, you need to run Apache
-with "apachectl startssl" instead of "apachectl start".  The SSL-specific
-configuration parts of the default httpd.conf are bracketed by:
+The SSL-specific configuration parts of the default httpd.conf are
+bracketed by:
 
   <IfDefine SSL>
   </IfDefine>
 
+In order to start Apache with mod_ssl support, you need to run Apache
+with "apachectl startssl" instead of "apachectl start".  This may be done
+by adding:
+
+	apache=YES
+	apache_start="startssl"
+
+to /etc/rc.conf.
+
 ===========================================================================
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index c0bdb06a547..4eac9b11ff1 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2002/11/18 08:15:19 martti Exp $
+# $NetBSD: Makefile,v 1.65 2002/11/19 23:03:53 jlam Exp $
 
 DISTNAME=		mod_ssl-2.8.12-1.3.27
 PKGNAME=		ap-ssl-2.8.12
+PKGREVISION=		1
 CATEGORIES=		www security
 MASTER_SITES=		http://www.modssl.org/source/ \
 			ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/ \
@@ -27,6 +28,7 @@ CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
 MAKE_ENV+=		SSL_RPATH_LDFLAGS="-R${SSLBASE}/lib"
 .endif
 
+PKG_SYSCONFVAR=		apache
 PKG_SYSCONFSUBDIR?=	httpd
 
 EGDIR=			${PREFIX}/share/examples/mod_ssl
@@ -37,8 +39,6 @@ OWN_DIRS+=		${PKG_SYSCONFDIR}/ssl.prm
 OWN_DIRS_PERMS=		${PKG_SYSCONFDIR}/ssl.key			\
 			${ROOT_USER} ${ROOT_GROUP} 0700
 
-CONF_FILES=		${EGDIR}/apache_start.conf			\
-			${PKG_SYSCONFDIR}/apache_start.conf
 SUPPORT_FILES=		# empty
 SUPPS=			ssl.crl/Makefile.crl ssl.crl/README.CRL		\
 			ssl.crt/Makefile.crt ssl.crt/README.CRT		\
@@ -75,7 +75,6 @@ post-install:
 	cd ${PREFIX}/lib/httpd; ${MV} -f libssl.so mod_ssl.so
 	cd ${WRKSRC}/pkg.sslsup; ${INSTALL_SCRIPT} mkcert.sh		\
 		${PREFIX}/sbin/mkcert
-	${INSTALL_DATA} ${FILESDIR}/apache_start.conf ${EGDIR}
 
 	${INSTALL_DATA_DIR} ${PREFIX}/share/httpd/htdocs/manual/mod/mod_ssl
 	cd ${WRKSRC}/pkg.ssldoc; ${INSTALL_DATA} *.html *.gif *.jpg	\
diff --git a/www/ap-ssl/PLIST b/www/ap-ssl/PLIST
index 83b264bbe7a..3e0bdcf5b2e 100644
--- a/www/ap-ssl/PLIST
+++ b/www/ap-ssl/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:00 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/11/19 23:03:53 jlam Exp $
 lib/httpd/mod_ssl.so
 sbin/mkcert
 share/doc/mod_ssl/README.mkcert
-share/examples/mod_ssl/apache_start.conf
 share/examples/mod_ssl/ssl.crl/Makefile.crl
 share/examples/mod_ssl/ssl.crl/README.CRL
 share/examples/mod_ssl/ssl.crt/Makefile.crt
diff --git a/www/ap-ssl/files/apache_start.conf b/www/ap-ssl/files/apache_start.conf
deleted file mode 100644
index 5269edd8fba..00000000000
--- a/www/ap-ssl/files/apache_start.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: apache_start.conf,v 1.1 2001/02/02 16:41:22 jlam Exp $
-#
-# Start Apache with "startssl" instead of "start".
-#
-apache_start=startssl
-- 
cgit v1.2.3