From 6d3a35ad639cf80a572a677ecd7c311d4eff87be Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Sun, 11 Aug 1996 14:50:01 +0000
Subject: 1) Add the ability to build a secure (SSL'ed) server, conditionalised
    on the presence of SECURE_SERVER.

2) Clean up the installation in accordance with BSD religion:
   Now all the configs go in ${PREFIX}/etc/apache and the
   data (documents) stay in ${PREFIX}/www.
---
 www/apache13/Makefile       | 24 ++++++++++++++++++++++--
 www/apache13/files/md5.SSL  |  2 ++
 www/apache13/files/patch-ab |  2 +-
 www/apache13/pkg-plist      | 12 +++++-------
 4 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 www/apache13/files/md5.SSL

(limited to 'www/apache13')

diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 78777d258b80..0bbf3dd5f6b1 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -1,9 +1,9 @@
-# New ports collection makefile for:    apache HTTPD
+# New ports collection makefile for:    apache HTTPD and HTTPSD
 # Version required:     1.1.1
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.15 1996/07/12 06:41:05 pst Exp $
+# $Id: Makefile,v 1.16 1996/07/12 10:27:53 asami Exp $
 #
 
 DISTNAME=       apache_1.1.1
@@ -13,6 +13,26 @@ 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}
+DISTFILES=	${MAIN_SRC} ${SSL_EXTRAS}
+MASTER_SITES+=  ftp://ftp.ox.ac.uk/pub/crypto/SSL/
+EXTRACT_ONLY=	${MAIN_SRC}
+MD5_FILE=	${FILESDIR}/md5.SSL
+PATCHDIR=	${.CURDIR}/patches.SSL
+PKGDIR=		${.CURDIR}/pkg.SSL
+CONFIGURE_SCRIPT=	configure.SSL
+DEPENDS=	ssleay:${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.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
diff --git a/www/apache13/files/md5.SSL b/www/apache13/files/md5.SSL
new file mode 100644
index 000000000000..cac0b1f5916e
--- /dev/null
+++ b/www/apache13/files/md5.SSL
@@ -0,0 +1,2 @@
+MD5 (apache_1.1.1.tar.gz) = 0dc9c3a3148d2acf419dd926018003c3
+MD5 (apache_1.1.1+1.3.ssl.tar.gz) = bef929679760796eb9955ed941ace370
diff --git a/www/apache13/files/patch-ab b/www/apache13/files/patch-ab
index d1b72bd99cb4..e353e501c8dc 100644
--- a/www/apache13/files/patch-ab
+++ b/www/apache13/files/patch-ab
@@ -59,7 +59,7 @@
   # ServerRoot: The directory the server's config, error, and log files
   # are kept in
   
-! ServerRoot /usr/local/www/server
+! ServerRoot /usr/local/etc/apache
   
   # BindAddress: You can support virtual hosts with this option. This option
   # is used to tell the server which IP address to listen to. It can either
diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist
index 221287b34c7e..d8a356236faf 100644
--- a/www/apache13/pkg-plist
+++ b/www/apache13/pkg-plist
@@ -1,13 +1,11 @@
 etc/rc.d/apache.sh
+@exec mkdir %D/etc/apache/logs %D/www/cgi-bin %D/www/data
 @unexec rm %D/etc/rc.d/apache.sh
+etc/apache/conf/httpd.conf
+etc/apache/conf/srm.conf
+etc/apache/conf/access.conf
+etc/apache/conf/mime.types
 sbin/httpd
-www/cgi-bin
-www/data
-www/server/logs
-www/server/conf/httpd.conf
-www/server/conf/srm.conf
-www/server/conf/access.conf
-www/server/conf/mime.types
 www/icons/README
 www/icons/a.gif
 www/icons/alert.black.gif
-- 
cgit v1.2.3