From 1db8d3edd328da2a24e156b37413d5aecb3ac0ea Mon Sep 17 00:00:00 2001
From: frueauf <frueauf>
Date: Fri, 5 Jun 1998 12:06:11 +0000
Subject: Add CONFLICTS where its needed so far.

---
 x11/Xaw3d/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'x11/Xaw3d')

diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index 49527b9d667..25b755dcc10 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/04/15 10:38:52 agc Exp $
+# $NetBSD: Makefile,v 1.13 1998/06/05 12:06:12 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/06/19 09:33:26 asami Exp
 #
 
@@ -9,6 +9,8 @@ MASTER_SITE_SUBDIR=	widgets/Xaw3d/R6.1
 
 MAINTAINER=	tron@netbsd.org
 
+CONFLICTS=	Xaw-Xpm-1.1
+
 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
 PLIST_SRC=	${WRKDIR}/PLIST-src
-- 
cgit v1.2.3