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/editors/pico/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/editors/pico/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pkgsrc/editors/pico/Makefile	1998/07/19 03:49:13	1.5
+++ pkgsrc/editors/pico/Makefile	1998/07/21 19:44:27	1.6
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 1998/07/19 03:49:13 tv Exp $
+# $NetBSD: Makefile,v 1.6 1998/07/21 19:44:27 tv Exp $
 #
 
-DISTNAME=	pine4.00
-PKGNAME=	pico-3.0
+DISTNAME=	pine4.01
+PKGNAME=	pico-3.1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 
@@ -10,7 +10,7 @@ MAINTAINER=	root@garbled.net
 
 BUILD_DEPENDS=	${PREFIX}/bin/libtool:../../devel/libtool
 
-CONFLICTS=	pico-2.9 pine-3.96
+CONFLICTS=	pico-2.9 pine-3.96 pico-3.0
 
 do-build:
 	cd ${WRKSRC} && ./build neb CC="${PREFIX}/bin/libtool ${CC}" PREFIX=${PREFIX}