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.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- pkgsrc/www/apache/Attic/Makefile	1998/12/03 22:26:52	1.26
+++ pkgsrc/www/apache/Attic/Makefile	1998/12/04 17:23:19	1.27
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 1998/12/03 22:26:52 tv Exp $
+# $NetBSD: Makefile,v 1.27 1998/12/04 17:23:19 tv Exp $
 #
 # The fourth number in the PKGNAME version indicates a NetBSD pkg revision
 # (to indicate changes in the shipped third party patches such as the mod_ssl
@@ -9,7 +9,7 @@
 #
 
 DISTNAME=		apache_1.3.3
-PKGNAME=		apache-1.3.3.1
+PKGNAME=		apache-1.3.3.2
 CATEGORIES=		www
 MASTER_SITES=		http://www.apache.org/dist/ \
 			http://www.engelschall.com/sw/mod_ssl/distrib/ \
@@ -21,7 +21,7 @@ DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=		cjs@netbsd.org
 HOMEPAGE=		http://www.apache.org/
 
-CONFLICTS=		apache-1.3.[012] apache-*modssl-*
+CONFLICTS=		apache-1.3.[012] apache-*modssl-* apache-1.3.3.[01]
 
 SSL_DISTNAME=		mod_ssl-2.1.2-1.3.3