Update to Apache 1.2.4 and SSL patches 1.9

3 files changed, 29 insertions, 32 deletions

diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index 5efee1aed64a..3519815d988d 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -1,52 +1,49 @@
 # New ports collection makefile for:    apache HTTPSD
-# Version required:     1.2.1
+# Version required:     1.2.4
 # Date created:     	15th August 1997
 # Whom:			Richard Seaman <dick@tar.com>
 #
-# $Id: Makefile,v 1.38 1997/08/16 04:45:27 peter Exp $
+# $Id: Makefile,v 1.39 1997/08/16 16:01:10 andreas Exp $
 
-DISTNAME=       apache_1.2.1
-PKGNAME=        apacheSSL-1.2.1
+DISTNAME=       apache_1.2.4
+PKGNAME=        apacheSSL-1.2.4
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/ \
 		ftp://ftp.ox.ac.uk/pub/crypto/SSL/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} apache_1.2.4+ssl_1.9.tar.gz
+
+MAINTAINER=	markm@freebsd.org
+
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAIN_SRC=	${DISTNAME}${EXTRACT_SUFX}
-SSL_EXTRAS=	apache_1.2.0+ssl_1.8.tar.gz
-DISTFILES=	${MAIN_SRC} ${SSL_EXTRAS}
-EXTRACT_ONLY=	${MAIN_SRC}
 BUILD_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
-RESTRICTED=     "Contains cryptography"
 
-MAINTAINER=	markm@freebsd.org
+RESTRICTED=     "Contains cryptography"
 
 post-extract:
-	@cd ${WRKSRC} && tar xzf ${DISTDIR}/${SSL_EXTRAS}
+	@cd ${WRKSRC} && tar xzf ${DISTDIR}/apache_1.2.4+ssl_1.9.tar.gz
 
-# SSLpatch from SSL_EXTRAS is for apache_1.2.0 ... if/when it is upgraded
-# we can revert to the commented out line.  There are only minor tweaks needed
-# to get to SSLpatch-1.2.1 
 pre-patch:
-#       @cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} < SSLpatch
-	@cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} \
-		< ${FILESDIR}/SSLpatch-1.2.1
+	@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; \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/apache_ssl.sh startup file."; \
+		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache_ssl.sh; \
+		${ECHO} "[ -x ${PREFIX}/sbin/httpsd ] && ${PREFIX}/sbin/httpsd && ${ECHO} -n ' httpsd'" >> ${PREFIX}/etc/rc.d/apache_ssl.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/apache_ssl.sh; \
 	fi
-	@echo "Please note: in order to install a certificate you have to type:"
-	@echo "    make certificate"
+	@${ECHO} "Please note: in order to install a certificate you have to"
+	@${ECHO} "type:"
+	@${ECHO} "    make certificate"
 
 .if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
 pre-fetch:
-	@echo
-	@echo You must set variable USA_RESIDENT to YES, if you are USA resident
-	@echo or to NO, if you aren\'t USA resident to build this package.
-	@echo You must also have installed RSAREF if you are USA resident.
+	@${ECHO}
+	@${ECHO} You must set variable USA_RESIDENT to YES, if you are USA
+	@${ECHO} resident or to NO, if you aren\'t USA resident to build
+	@${ECHO} this package.
+	@${ECHO} You must also have installed RSAREF if you are USA resident.
 	@false
 .elif defined(USA_RESIDENT)
 .if ${USA_RESIDENT} == YES
@@ -57,6 +54,6 @@ pre-build:
 
 certificate:
 	cd ${WRKSRC}; ${MAKE} ${MAKE_ENV} $@
-	cp ${WRKSRC}/SSLconf/conf/httpsd.pem ${PREFIX}/certs/cert.pem
+	${CP} ${WRKSRC}/SSLconf/conf/httpsd.pem ${PREFIX}/certs/cert.pem
 
 .include <bsd.port.mk>
diff --git a/www/apache13-ssl/distinfo b/www/apache13-ssl/distinfo
index fc7c3f739d88..5b736969bf49 100644
--- a/www/apache13-ssl/distinfo
+++ b/www/apache13-ssl/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.2.1.tar.gz) = 387add2881934555b2d2fed1172849ec
-MD5 (apache_1.2.0+ssl_1.8.tar.gz) = 36bb9b85dbc6f3e195ba964ae848c8a5
+MD5 (apache_1.2.4.tar.gz) = d97b54896454d85d39d9aa60df0eeab1
+MD5 (apache_1.2.4+ssl_1.9.tar.gz) = fa90a48b20397e53e5969256c9cd672c
diff --git a/www/apache13-ssl/pkg-plist b/www/apache13-ssl/pkg-plist
index e4a0bbc896d6..9e7dd9d80078 100644
--- a/www/apache13-ssl/pkg-plist
+++ b/www/apache13-ssl/pkg-plist
@@ -1,10 +1,11 @@
 etc/rc.d/apache_ssl.sh
-etc/apache-SSL/httpd.conf
-etc/apache-SSL/srm.conf
+@exec mkdir -p %D/www/cgi-bin %D/www/data
 etc/apache-SSL/access.conf
+etc/apache-SSL/httpd.conf
 etc/apache-SSL/httpd.conf-SSL
 etc/apache-SSL/mime.types
 etc/apache-SSL/mime.types-SSL
+etc/apache-SSL/srm.conf
 sbin/httpsd
 www/icons/README
 www/icons/a.gif
@@ -82,4 +83,3 @@ www/icons/uu.gif
 www/icons/uuencoded.gif
 www/icons/world1.gif
 www/icons/world2.gif
-@unexec rmdir %B