summaryrefslogtreecommitdiff
path: root/x11/Xaw-Xpm
diff options
context:
space:
mode:
authormycroft <mycroft>1998-07-04 05:53:00 +0000
committermycroft <mycroft>1998-07-04 05:53:00 +0000
commita9801ac409a6ddeee1ac560927280c690fafb974 (patch)
treebae9e1bf39aaea61dec8bca833c61aea63876799 /x11/Xaw-Xpm
parent3d5a4c6975596c3aa19f1e391cdddde01bba0efa (diff)
downloadpkgsrc-a9801ac409a6ddeee1ac560927280c690fafb974.tar.gz
Add CONFLICTS for Xaw3d-1.5.
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 9623aeac05b..330d5586062 100644
--- a/x11/Xaw-Xpm/Makefile
+++ b/x11/Xaw-Xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/06/05 12:06:12 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1998/07/04 05:53:00 mycroft Exp $
#
DISTNAME= Xaw-Xpm-1.1
@@ -11,7 +11,7 @@ MAINTAINER= root@garbled.futureone.com
DEPENDS+= xpm-3.4j:../../graphics/xpm
-CONFLICTS= Xaw3d-1.3
+CONFLICTS= Xaw3d-1.3 Xaw3d-1.5
USE_IMAKE= yes