FINALLY - commit the SSL'ed version of this. (ye gods, this has been a while

:-) )

9 files changed, 135 insertions, 27 deletions

diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index 0bbf3dd5f6b1..57d8b9ff514c 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.16 1996/07/12 10:27:53 asami Exp $
+# $Id: Makefile,v 1.17 1996/08/11 14:49:21 markm Exp $
 #
 
 DISTNAME=       apache_1.1.1
@@ -14,6 +14,7 @@ MASTER_SITES=   ftp://www.apache.org/apache/dist/
 MAINTAINER=	ache@freebsd.org
 
 .if defined(SECURE_SERVER)
+
 PKGNAME=        apache_SSL-1.1.1
 MAIN_SRC=	${DISTNAME}${EXTRACT_SUFX}
 SSL_EXTRAS=	${DISTNAME}+1.3.ssl${EXTRACT_SUFX}
@@ -24,14 +25,23 @@ MD5_FILE=	${FILESDIR}/md5.SSL
 PATCHDIR=	${.CURDIR}/patches.SSL
 PKGDIR=		${.CURDIR}/pkg.SSL
 CONFIGURE_SCRIPT=	configure.SSL
-DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
+#DEPENDS=	${PORTSDIR}/security/SSLeay
 
 post-extract:
 	@cd ${WRKSRC} && tar xzf ${DISTDIR}/${SSL_EXTRAS}
 
 pre-patch:
 	@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch
-.endif
+
+post-install:
+	@if [ ! -f ${PREFIX}/etc/rc.d/apache_ssl.sh ]; then \
+		echo "Installing ${PREFIX}/etc/rc.d/apache_ssl.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		echo "[ -x /usr/local/sbin/httpsd ] && /usr/local/sbin/httpsd && echo -n ' httpsd'" >> ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		chmod 751 ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+	fi
+
+.else
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
@@ -41,4 +51,6 @@ post-install:
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
+.endif
+
 .include <bsd.port.mk>
diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 0bbf3dd5f6b1..57d8b9ff514c 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.16 1996/07/12 10:27:53 asami Exp $
+# $Id: Makefile,v 1.17 1996/08/11 14:49:21 markm Exp $
 #
 
 DISTNAME=       apache_1.1.1
@@ -14,6 +14,7 @@ MASTER_SITES=   ftp://www.apache.org/apache/dist/
 MAINTAINER=	ache@freebsd.org
 
 .if defined(SECURE_SERVER)
+
 PKGNAME=        apache_SSL-1.1.1
 MAIN_SRC=	${DISTNAME}${EXTRACT_SUFX}
 SSL_EXTRAS=	${DISTNAME}+1.3.ssl${EXTRACT_SUFX}
@@ -24,14 +25,23 @@ MD5_FILE=	${FILESDIR}/md5.SSL
 PATCHDIR=	${.CURDIR}/patches.SSL
 PKGDIR=		${.CURDIR}/pkg.SSL
 CONFIGURE_SCRIPT=	configure.SSL
-DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
+#DEPENDS=	${PORTSDIR}/security/SSLeay
 
 post-extract:
 	@cd ${WRKSRC} && tar xzf ${DISTDIR}/${SSL_EXTRAS}
 
 pre-patch:
 	@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch
-.endif
+
+post-install:
+	@if [ ! -f ${PREFIX}/etc/rc.d/apache_ssl.sh ]; then \
+		echo "Installing ${PREFIX}/etc/rc.d/apache_ssl.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		echo "[ -x /usr/local/sbin/httpsd ] && /usr/local/sbin/httpsd && echo -n ' httpsd'" >> ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		chmod 751 ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+	fi
+
+.else
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
@@ -41,4 +51,6 @@ post-install:
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
+.endif
+
 .include <bsd.port.mk>
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 0bbf3dd5f6b1..57d8b9ff514c 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.16 1996/07/12 10:27:53 asami Exp $
+# $Id: Makefile,v 1.17 1996/08/11 14:49:21 markm Exp $
 #
 
 DISTNAME=       apache_1.1.1
@@ -14,6 +14,7 @@ MASTER_SITES=   ftp://www.apache.org/apache/dist/
 MAINTAINER=	ache@freebsd.org
 
 .if defined(SECURE_SERVER)
+
 PKGNAME=        apache_SSL-1.1.1
 MAIN_SRC=	${DISTNAME}${EXTRACT_SUFX}
 SSL_EXTRAS=	${DISTNAME}+1.3.ssl${EXTRACT_SUFX}
@@ -24,14 +25,23 @@ MD5_FILE=	${FILESDIR}/md5.SSL
 PATCHDIR=	${.CURDIR}/patches.SSL
 PKGDIR=		${.CURDIR}/pkg.SSL
 CONFIGURE_SCRIPT=	configure.SSL
-DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
+#DEPENDS=	${PORTSDIR}/security/SSLeay
 
 post-extract:
 	@cd ${WRKSRC} && tar xzf ${DISTDIR}/${SSL_EXTRAS}
 
 pre-patch:
 	@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch
-.endif
+
+post-install:
+	@if [ ! -f ${PREFIX}/etc/rc.d/apache_ssl.sh ]; then \
+		echo "Installing ${PREFIX}/etc/rc.d/apache_ssl.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		echo "[ -x /usr/local/sbin/httpsd ] && /usr/local/sbin/httpsd && echo -n ' httpsd'" >> ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		chmod 751 ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+	fi
+
+.else
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
@@ -41,4 +51,6 @@ post-install:
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
+.endif
+
 .include <bsd.port.mk>
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 0bbf3dd5f6b1..57d8b9ff514c 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.16 1996/07/12 10:27:53 asami Exp $
+# $Id: Makefile,v 1.17 1996/08/11 14:49:21 markm Exp $
 #
 
 DISTNAME=       apache_1.1.1
@@ -14,6 +14,7 @@ MASTER_SITES=   ftp://www.apache.org/apache/dist/
 MAINTAINER=	ache@freebsd.org
 
 .if defined(SECURE_SERVER)
+
 PKGNAME=        apache_SSL-1.1.1
 MAIN_SRC=	${DISTNAME}${EXTRACT_SUFX}
 SSL_EXTRAS=	${DISTNAME}+1.3.ssl${EXTRACT_SUFX}
@@ -24,14 +25,23 @@ MD5_FILE=	${FILESDIR}/md5.SSL
 PATCHDIR=	${.CURDIR}/patches.SSL
 PKGDIR=		${.CURDIR}/pkg.SSL
 CONFIGURE_SCRIPT=	configure.SSL
-DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
+#DEPENDS=	${PORTSDIR}/security/SSLeay
 
 post-extract:
 	@cd ${WRKSRC} && tar xzf ${DISTDIR}/${SSL_EXTRAS}
 
 pre-patch:
 	@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch
-.endif
+
+post-install:
+	@if [ ! -f ${PREFIX}/etc/rc.d/apache_ssl.sh ]; then \
+		echo "Installing ${PREFIX}/etc/rc.d/apache_ssl.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		echo "[ -x /usr/local/sbin/httpsd ] && /usr/local/sbin/httpsd && echo -n ' httpsd'" >> ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		chmod 751 ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+	fi
+
+.else
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
@@ -41,4 +51,6 @@ post-install:
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
+.endif
+
 .include <bsd.port.mk>
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 0bbf3dd5f6b1..57d8b9ff514c 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.16 1996/07/12 10:27:53 asami Exp $
+# $Id: Makefile,v 1.17 1996/08/11 14:49:21 markm Exp $
 #
 
 DISTNAME=       apache_1.1.1
@@ -14,6 +14,7 @@ MASTER_SITES=   ftp://www.apache.org/apache/dist/
 MAINTAINER=	ache@freebsd.org
 
 .if defined(SECURE_SERVER)
+
 PKGNAME=        apache_SSL-1.1.1
 MAIN_SRC=	${DISTNAME}${EXTRACT_SUFX}
 SSL_EXTRAS=	${DISTNAME}+1.3.ssl${EXTRACT_SUFX}
@@ -24,14 +25,23 @@ MD5_FILE=	${FILESDIR}/md5.SSL
 PATCHDIR=	${.CURDIR}/patches.SSL
 PKGDIR=		${.CURDIR}/pkg.SSL
 CONFIGURE_SCRIPT=	configure.SSL
-DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
+#DEPENDS=	${PORTSDIR}/security/SSLeay
 
 post-extract:
 	@cd ${WRKSRC} && tar xzf ${DISTDIR}/${SSL_EXTRAS}
 
 pre-patch:
 	@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch
-.endif
+
+post-install:
+	@if [ ! -f ${PREFIX}/etc/rc.d/apache_ssl.sh ]; then \
+		echo "Installing ${PREFIX}/etc/rc.d/apache_ssl.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		echo "[ -x /usr/local/sbin/httpsd ] && /usr/local/sbin/httpsd && echo -n ' httpsd'" >> ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		chmod 751 ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+	fi
+
+.else
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
@@ -41,4 +51,6 @@ post-install:
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
+.endif
+
 .include <bsd.port.mk>
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 0bbf3dd5f6b1..57d8b9ff514c 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.16 1996/07/12 10:27:53 asami Exp $
+# $Id: Makefile,v 1.17 1996/08/11 14:49:21 markm Exp $
 #
 
 DISTNAME=       apache_1.1.1
@@ -14,6 +14,7 @@ MASTER_SITES=   ftp://www.apache.org/apache/dist/
 MAINTAINER=	ache@freebsd.org
 
 .if defined(SECURE_SERVER)
+
 PKGNAME=        apache_SSL-1.1.1
 MAIN_SRC=	${DISTNAME}${EXTRACT_SUFX}
 SSL_EXTRAS=	${DISTNAME}+1.3.ssl${EXTRACT_SUFX}
@@ -24,14 +25,23 @@ MD5_FILE=	${FILESDIR}/md5.SSL
 PATCHDIR=	${.CURDIR}/patches.SSL
 PKGDIR=		${.CURDIR}/pkg.SSL
 CONFIGURE_SCRIPT=	configure.SSL
-DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
+#DEPENDS=	${PORTSDIR}/security/SSLeay
 
 post-extract:
 	@cd ${WRKSRC} && tar xzf ${DISTDIR}/${SSL_EXTRAS}
 
 pre-patch:
 	@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch
-.endif
+
+post-install:
+	@if [ ! -f ${PREFIX}/etc/rc.d/apache_ssl.sh ]; then \
+		echo "Installing ${PREFIX}/etc/rc.d/apache_ssl.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		echo "[ -x /usr/local/sbin/httpsd ] && /usr/local/sbin/httpsd && echo -n ' httpsd'" >> ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		chmod 751 ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+	fi
+
+.else
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
@@ -41,4 +51,6 @@ post-install:
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
+.endif
+
 .include <bsd.port.mk>
diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index 0bbf3dd5f6b1..57d8b9ff514c 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.16 1996/07/12 10:27:53 asami Exp $
+# $Id: Makefile,v 1.17 1996/08/11 14:49:21 markm Exp $
 #
 
 DISTNAME=       apache_1.1.1
@@ -14,6 +14,7 @@ MASTER_SITES=   ftp://www.apache.org/apache/dist/
 MAINTAINER=	ache@freebsd.org
 
 .if defined(SECURE_SERVER)
+
 PKGNAME=        apache_SSL-1.1.1
 MAIN_SRC=	${DISTNAME}${EXTRACT_SUFX}
 SSL_EXTRAS=	${DISTNAME}+1.3.ssl${EXTRACT_SUFX}
@@ -24,14 +25,23 @@ MD5_FILE=	${FILESDIR}/md5.SSL
 PATCHDIR=	${.CURDIR}/patches.SSL
 PKGDIR=		${.CURDIR}/pkg.SSL
 CONFIGURE_SCRIPT=	configure.SSL
-DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
+#DEPENDS=	${PORTSDIR}/security/SSLeay
 
 post-extract:
 	@cd ${WRKSRC} && tar xzf ${DISTDIR}/${SSL_EXTRAS}
 
 pre-patch:
 	@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch
-.endif
+
+post-install:
+	@if [ ! -f ${PREFIX}/etc/rc.d/apache_ssl.sh ]; then \
+		echo "Installing ${PREFIX}/etc/rc.d/apache_ssl.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		echo "[ -x /usr/local/sbin/httpsd ] && /usr/local/sbin/httpsd && echo -n ' httpsd'" >> ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		chmod 751 ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+	fi
+
+.else
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
@@ -41,4 +51,6 @@ post-install:
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
+.endif
+
 .include <bsd.port.mk>
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 0bbf3dd5f6b1..57d8b9ff514c 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.16 1996/07/12 10:27:53 asami Exp $
+# $Id: Makefile,v 1.17 1996/08/11 14:49:21 markm Exp $
 #
 
 DISTNAME=       apache_1.1.1
@@ -14,6 +14,7 @@ MASTER_SITES=   ftp://www.apache.org/apache/dist/
 MAINTAINER=	ache@freebsd.org
 
 .if defined(SECURE_SERVER)
+
 PKGNAME=        apache_SSL-1.1.1
 MAIN_SRC=	${DISTNAME}${EXTRACT_SUFX}
 SSL_EXTRAS=	${DISTNAME}+1.3.ssl${EXTRACT_SUFX}
@@ -24,14 +25,23 @@ MD5_FILE=	${FILESDIR}/md5.SSL
 PATCHDIR=	${.CURDIR}/patches.SSL
 PKGDIR=		${.CURDIR}/pkg.SSL
 CONFIGURE_SCRIPT=	configure.SSL
-DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
+#DEPENDS=	${PORTSDIR}/security/SSLeay
 
 post-extract:
 	@cd ${WRKSRC} && tar xzf ${DISTDIR}/${SSL_EXTRAS}
 
 pre-patch:
 	@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch
-.endif
+
+post-install:
+	@if [ ! -f ${PREFIX}/etc/rc.d/apache_ssl.sh ]; then \
+		echo "Installing ${PREFIX}/etc/rc.d/apache_ssl.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		echo "[ -x /usr/local/sbin/httpsd ] && /usr/local/sbin/httpsd && echo -n ' httpsd'" >> ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		chmod 751 ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+	fi
+
+.else
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
@@ -41,4 +51,6 @@ post-install:
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
+.endif
+
 .include <bsd.port.mk>
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 0bbf3dd5f6b1..57d8b9ff514c 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.16 1996/07/12 10:27:53 asami Exp $
+# $Id: Makefile,v 1.17 1996/08/11 14:49:21 markm Exp $
 #
 
 DISTNAME=       apache_1.1.1
@@ -14,6 +14,7 @@ MASTER_SITES=   ftp://www.apache.org/apache/dist/
 MAINTAINER=	ache@freebsd.org
 
 .if defined(SECURE_SERVER)
+
 PKGNAME=        apache_SSL-1.1.1
 MAIN_SRC=	${DISTNAME}${EXTRACT_SUFX}
 SSL_EXTRAS=	${DISTNAME}+1.3.ssl${EXTRACT_SUFX}
@@ -24,14 +25,23 @@ MD5_FILE=	${FILESDIR}/md5.SSL
 PATCHDIR=	${.CURDIR}/patches.SSL
 PKGDIR=		${.CURDIR}/pkg.SSL
 CONFIGURE_SCRIPT=	configure.SSL
-DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
+#DEPENDS=	${PORTSDIR}/security/SSLeay
 
 post-extract:
 	@cd ${WRKSRC} && tar xzf ${DISTDIR}/${SSL_EXTRAS}
 
 pre-patch:
 	@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch
-.endif
+
+post-install:
+	@if [ ! -f ${PREFIX}/etc/rc.d/apache_ssl.sh ]; then \
+		echo "Installing ${PREFIX}/etc/rc.d/apache_ssl.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		echo "[ -x /usr/local/sbin/httpsd ] && /usr/local/sbin/httpsd && echo -n ' httpsd'" >> ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		chmod 751 ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+	fi
+
+.else
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
@@ -41,4 +51,6 @@ post-install:
 		chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
 
+.endif
+
 .include <bsd.port.mk>