From 3ef51f40f9e8d0a43a4849e268df1ef5d745bbb9 Mon Sep 17 00:00:00 2001
From: tv <tv>
Date: Sun, 19 Jul 1998 03:49:13 +0000
Subject: Re-add pine-3.96 to the CONFLICTS list.

---
 editors/pico/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'editors')

diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index bbf683a6111..39c56abf73d 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/07/19 03:37:46 tv Exp $
+# $NetBSD: Makefile,v 1.5 1998/07/19 03:49:13 tv Exp $
 #
 
 DISTNAME=	pine4.00
@@ -10,7 +10,7 @@ MAINTAINER=	root@garbled.net
 
 BUILD_DEPENDS=	${PREFIX}/bin/libtool:../../devel/libtool
 
-CONFLICTS=	pico-2.9
+CONFLICTS=	pico-2.9 pine-3.96
 
 do-build:
 	cd ${WRKSRC} && ./build neb CC="${PREFIX}/bin/libtool ${CC}" PREFIX=${PREFIX}
-- 
cgit v1.2.3