[pkgsrc/trunk]: pkgsrc/graphics/xpm Conflict with libXpm. Bump revision.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9d41d6099958
branches:  trunk
changeset: 522704:9d41d6099958
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Dec 18 10:13:38 2006 +0000

description:
Conflict with libXpm. Bump revision.

diffstat:

 graphics/xpm/Makefile |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r 280bb88f0a13 -r 9d41d6099958 graphics/xpm/Makefile
--- a/graphics/xpm/Makefile     Mon Dec 18 07:14:51 2006 +0000
+++ b/graphics/xpm/Makefile     Mon Dec 18 10:13:38 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2006/10/28 21:29:47 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2006/12/18 10:13:38 joerg Exp $
 
 DISTNAME=       xpm-3.4k
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    graphics x11
 MASTER_SITES=  http://koala.ilog.fr/ftp/pub/xpm/ \
                ${MASTER_SITE_XCONTRIB:=libraries/}
@@ -12,6 +12,8 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
+CONFLICTS+=            libXpm-[0-9]*
+
 USE_IMAKE=     yes
 
 .include "../../mk/bsd.prefs.mk"