From 79dd59d61e2507cb1301251cbe1906d2cd16a041 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 10 Apr 2003 08:25:21 +0000
Subject: Update to 1.3.27nb4: compile with mod-ssl-2.8.14. Remove quite some
 lint while here.

---
 www/apache/Makefile | 20 +++++++-------------
 www/apache/distinfo |  6 +++---
 2 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'www/apache')

diff --git a/www/apache/Makefile b/www/apache/Makefile
index 72ffd3a9f0f..3748f6976bf 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,37 +1,31 @@
-# $NetBSD: Makefile,v 1.122 2003/03/14 19:38:00 jlam Exp $
+# $NetBSD: Makefile,v 1.123 2003/04/10 08:25:21 wiz Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
 
 DISTNAME=		apache_${APACHE_VERSION}
 PKGNAME=		apache-${APACHE_VERSION}
-PKGREVISION=		3
+PKGREVISION=		4
 APACHE_VERSION=		1.3.27
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
 			${MASTER_SITE_APACHE:=httpd/old/}
-# This must be defined, before it may be referred to on the LHS.
-EXTRACT_SUFX=		.tar.gz
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${NETBSD_LOGO} ${MODSSL_DIST}
 
-APACHE_DIST=		${DISTNAME}${EXTRACT_SUFX}
-DISTFILES=		${APACHE_DIST}
+MAINTAINER=		jlam@netbsd.org
+HOMEPAGE=		http://httpd.apache.org/
+COMMENT=		Apache HTTP (Web) server
 
 NETBSD_LOGO=		sitedrivenby.gif
 SITES_${NETBSD_LOGO}=	http://www.netbsd.org/images/logos/
-DISTFILES+=		${NETBSD_LOGO}
 
-MODSSL_VERSION=		2.8.12
+MODSSL_VERSION=		2.8.14
 MODSSL_DISTNAME=	mod_ssl-${MODSSL_VERSION}-${APACHE_VERSION}
 MODSSL_DIST=		${MODSSL_DISTNAME}${EXTRACT_SUFX}
 MODSSL_SRC=		${WRKDIR}/${MODSSL_DISTNAME}
 SITES_${MODSSL_DIST}=	http://www.modssl.org/source/ \
 			ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/ \
 			ftp://ftp.funet.fi/pub/crypt/cryptography/libs/modssl/source/
-DISTFILES+=		${MODSSL_DIST}
-
-MAINTAINER=		jlam@netbsd.org
-HOMEPAGE=		http://httpd.apache.org/
-COMMENT=		Apache HTTP (Web) server
 
 CONFLICTS=		apache-*ssl-[0-9]* apache6-[0-9]*
 
diff --git a/www/apache/distinfo b/www/apache/distinfo
index a220cd27425..06446788385 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.25 2003/01/20 22:58:26 jschauma Exp $
+$NetBSD: distinfo,v 1.26 2003/04/10 08:25:21 wiz Exp $
 
 SHA1 (apache_1.3.27.tar.gz) = 2e3a2c8acd546d84f0c4a42de2b1f69dca6828f8
 Size (apache_1.3.27.tar.gz) = 2306052 bytes
 SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
 Size (sitedrivenby.gif) = 8519 bytes
-SHA1 (mod_ssl-2.8.12-1.3.27.tar.gz) = 76842c9cb12442d845bfb8e6920da28809da74bd
-Size (mod_ssl-2.8.12-1.3.27.tar.gz) = 753529 bytes
+SHA1 (mod_ssl-2.8.14-1.3.27.tar.gz) = 9a9d783d096fd7312481c03421db56ee73b49546
+Size (mod_ssl-2.8.14-1.3.27.tar.gz) = 754179 bytes
 SHA1 (patch-aa) = 6b6d52025ac8625421f209c42da866557719b282
 SHA1 (patch-ab) = 71ea1f3a59e0f7bc37175b0eefd462a1f7ca4fb6
 SHA1 (patch-ac) = 12347c7a306d3e898b032c2b4b3b01670b62d4fd
-- 
cgit v1.2.3