Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/www/apache/Attic/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/www/apache/Attic/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.139.2.3
retrieving revision 1.140
diff -u -p -r1.139.2.3 -r1.140
--- pkgsrc/www/apache/Attic/Makefile	2004/05/31 10:37:26	1.139.2.3
+++ pkgsrc/www/apache/Attic/Makefile	2004/04/07 19:53:27	1.140
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.139.2.3 2004/05/31 10:37:26 grant Exp $
+# $NetBSD: Makefile,v 1.140 2004/04/07 19:53:27 reed 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_1.3.31
-PKGNAME=		${DISTNAME:S/_/-/}
+DISTNAME=		apache_${APACHE_VERSION}
+PKGNAME=		apache-${APACHE_VERSION}
 PKGREVISION=		1
+APACHE_VERSION=		1.3.29
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
 			${MASTER_SITE_APACHE:=httpd/old/}
@@ -18,8 +19,8 @@ COMMENT=		Apache HTTP (Web) server
 NETBSD_LOGO=		sitedrivenby.gif
 SITES_${NETBSD_LOGO}=	http://www.NetBSD.org/images/logos/
 
-MODSSL_VERSION=		2.8.18
-MODSSL_DISTNAME=	mod_ssl-${MODSSL_VERSION}-1.3.31
+MODSSL_VERSION=		2.8.16
+MODSSL_DISTNAME=	mod_ssl-${MODSSL_VERSION}-1.3.29
 MODSSL_DIST=		${MODSSL_DISTNAME}.tar.gz
 MODSSL_SRC=		${WRKDIR}/${MODSSL_DISTNAME}
 SITES_${MODSSL_DIST}=	http://www.modssl.org/source/ \