summaryrefslogtreecommitdiff
path: root/x11/Xaw-Xpm
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/Xaw-Xpm
parent2821cb11104fb7319e84b4cd1808cf56f3604a54 (diff)
downloadpkgsrc-2a95ad9c6be52511880e6ee241b087af70706624.tar.gz
Fix CONFLICTS (remove redundancy, mostly)
Diffstat (limited to 'x11/Xaw-Xpm')
-rw-r--r--x11/Xaw-Xpm/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile
index 690cb351429..661ca7b51e6 100644
--- a/x11/Xaw-Xpm/Makefile
+++ b/x11/Xaw-Xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/09/13 19:35:05 garbled Exp $
+# $NetBSD: Makefile,v 1.8 1999/02/20 22:48:46 hubertf Exp $
#
DISTNAME= Xaw-Xpm-1.1
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.zip.com.au/~bb/XawXpm/
DEPENDS+= xpm-3.4k:../../graphics/xpm
-CONFLICTS= Xaw3d-1.3 Xaw3d-1.5
+CONFLICTS= Xaw3d-*
USE_IMAKE= yes