From 89ac654ed94a1d85731fbe6f550c06bd6a71392b Mon Sep 17 00:00:00 2001
From: mycroft <mycroft>
Date: Sat, 4 Jul 1998 05:53:00 +0000
Subject: Add CONFLICTS for Xaw3d-1.5.

---
 x11/Xaw-Xpm/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'x11/Xaw-Xpm')

diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile
index 9623aeac05b..330d5586062 100644
--- a/x11/Xaw-Xpm/Makefile
+++ b/x11/Xaw-Xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/06/05 12:06:12 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1998/07/04 05:53:00 mycroft Exp $
 #
 
 DISTNAME=			Xaw-Xpm-1.1
@@ -11,7 +11,7 @@ MAINTAINER=			root@garbled.futureone.com
 
 DEPENDS+=			xpm-3.4j:../../graphics/xpm
 
-CONFLICTS=			Xaw3d-1.3
+CONFLICTS=			Xaw3d-1.3 Xaw3d-1.5
 
 USE_IMAKE=			yes
 
-- 
cgit v1.2.3