summaryrefslogtreecommitdiff
path: root/www/apache22
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1997-08-12 11:49:12 +0000
committerPeter Wemm <peter@FreeBSD.org>1997-08-12 11:49:12 +0000
commitc91e427134d76ca3b022e457820c0ee74602fda0 (patch)
tree1924082869a4c01f4afc24a30f199d11f986d647 /www/apache22
parentUpdate MASTER_SITES. Now requires Motif. (diff)
The great apache shuffle, part 1.. Revive files and break out SSL..
Notes
Notes: svn path=/head/; revision=7544
Diffstat (limited to 'www/apache22')
-rw-r--r--www/apache22/Makefile41
1 files changed, 2 insertions, 39 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index f233e82d32ed..6fb5c8770b4f 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,9 +1,9 @@
-# New ports collection makefile for: apache HTTPD and HTTPSD
+# New ports collection makefile for: apache HTTPD
# Version required: 1.2.1
# Date created: Fri Aug 25 16:42:36 CDT 1995
# Whom: erich@rrnet.com
#
-# $Id: Makefile,v 1.34 1997/06/06 13:45:07 ache Exp $
+# $Id: Makefile,v 1.35 1997/07/08 13:04:09 ache Exp $
#
DISTNAME= apache_1.2.1
@@ -11,11 +11,7 @@ PKGNAME= apache-1.2.1
CATEGORIES= www
MASTER_SITES= ftp://www.apache.org/apache/dist/
-.if !defined(SECURE_SERVER)
MAINTAINER= ache@freebsd.org
-.else
-MAINTAINER= markm@freebsd.org
-.endif
# User-controlled variables list
# DIR_ACHE - add SuppressHTMLPreamble option to directory index
@@ -36,37 +32,6 @@ post-patch:
< Configuration.old > Configuration
.endif
-.if defined(SECURE_SERVER)
-
-BROKEN= "SSLeay has changed, and the patches for apache need more work"
-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= ${PORTSDIR}/security/SSLeay
-
-post-extract:
- @cd ${WRKSRC} && tar xzf ${DISTDIR}/${SSL_EXTRAS}
-
-pre-patch:
- @cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch
-
-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 \
echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \
@@ -75,6 +40,4 @@ post-install:
chmod 751 ${PREFIX}/etc/rc.d/apache.sh; \
fi
-.endif
-
.include <bsd.port.mk>