summaryrefslogtreecommitdiff
path: root/x11/Xaw3d
diff options
context:
space:
mode:
authormycroft <mycroft>1998-07-04 05:53:12 +0000
committermycroft <mycroft>1998-07-04 05:53:12 +0000
commit62798eedf46b26b9e64cd5d01a05b1af1f4bf372 (patch)
treecb581d175214e08d886421fa6796e67302b3dc6f /x11/Xaw3d
parenta9801ac409a6ddeee1ac560927280c690fafb974 (diff)
downloadpkgsrc-62798eedf46b26b9e64cd5d01a05b1af1f4bf372.tar.gz
Add CONFLICTS.
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 78df7eb4503..ebd7615dfbc 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/07/04 05:50:24 mycroft Exp $
+# $NetBSD: Makefile,v 1.15 1998/07/04 05:53:12 mycroft Exp $
# FreeBSD Id: Makefile,v 1.14 1997/06/19 09:33:26 asami Exp
#
@@ -9,7 +9,7 @@ MASTER_SITE_SUBDIR= widgets/Xaw3d/R6.3
MAINTAINER= tron@netbsd.org
-CONFLICTS= Xaw-Xpm-1.1
+CONFLICTS= Xaw-Xpm-1.1 Xaw3d-1.3
USE_IMAKE= yes
WRKSRC= ${WRKDIR}/xc/lib/Xaw3d