summaryrefslogtreecommitdiff
path: root/graphics/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 /graphics/xpm
parent2821cb11104fb7319e84b4cd1808cf56f3604a54 (diff)
downloadpkgsrc-2a95ad9c6be52511880e6ee241b087af70706624.tar.gz
Fix CONFLICTS (remove redundancy, mostly)
Diffstat (limited to 'graphics/xpm')
-rw-r--r--graphics/xpm/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index c2a59e1350d..af3882c105f 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/08/20 15:17:03 tsarna Exp $
+# $NetBSD: Makefile,v 1.13 1999/02/20 22:48:32 hubertf Exp $
#
DISTNAME= xpm-3.4k
@@ -8,8 +8,6 @@ MASTER_SITES= ftp://avahi.inria.fr/pub/xpm/
MAINTAINER= mycroft@netbsd.org
HOMEPAGE= http://www.inria.fr/koala/lehors/xpm.html
-CONFLICTS= xpm-3.4j
-
USE_IMAKE= yes
.include "../../mk/bsd.pkg.mk"