summaryrefslogtreecommitdiff
path: root/x11/Xaw3d
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>1999-02-20 22:48:24 +0000
committerhubertf <hubertf@pkgsrc.org>1999-02-20 22:48:24 +0000
commit2a95ad9c6be52511880e6ee241b087af70706624 (patch)
treef0ac98b899382f539e1e39385f1316edd18626bd /x11/Xaw3d
parent2821cb11104fb7319e84b4cd1808cf56f3604a54 (diff)
downloadpkgsrc-2a95ad9c6be52511880e6ee241b087af70706624.tar.gz
Fix CONFLICTS (remove redundancy, mostly)
Diffstat (limited to 'x11/Xaw3d')
-rw-r--r--x11/Xaw3d/Makefile4
1 files changed, 2 insertions, 2 deletions
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