From a4cbe4cb0445443d02c5d3c6f788d17367537b92 Mon Sep 17 00:00:00 2001
From: hubertf <hubertf>
Date: Sat, 20 Feb 1999 22:48:24 +0000
Subject: Fix CONFLICTS (remove redundancy, mostly)

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

(limited to 'x11/Xaw3d')

diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index ce5b488244c..fe8f4e6320b 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1998/07/15 10:45:35 agc Exp $
+# $NetBSD: Makefile,v 1.18 1999/02/20 22:48:46 hubertf Exp $
 #
 
 DISTNAME=	Xaw3d-1.5
@@ -8,7 +8,7 @@ MASTER_SITE_SUBDIR=	widgets/Xaw3d/R6.3
 
 MAINTAINER=	tron@netbsd.org
 
-CONFLICTS=	Xaw-Xpm-1.1 Xaw3d-1.3
+CONFLICTS=	Xaw-Xpm-*
 
 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
-- 
cgit v1.2.3