From cf2069b86990e32353b09df5c3044ace2e76d57e Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sat, 12 May 2012 07:37:50 +0000
Subject: Add CONFLICTS with new man-pages package. For details, see
 man-pages/Makefile.

---
 converters/libiconv/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'converters')

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index e78285eab27..cc281bbe906 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2011/09/08 16:29:48 bsiegert Exp $
+# $NetBSD: Makefile,v 1.61 2012/05/12 07:37:50 wiz Exp $
 
 DISTNAME=	libiconv-1.14
 PKGREVISION=	2
@@ -18,6 +18,8 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=	pax
 GNU_CONFIGURE=		yes
 
+CONFLICTS=	man-pages-[0-9]*
+
 # Explicitly disable NLS since libiconv is a dependency for gettext-lib
 # and we don't want libiconv to pick up any NLS functions from libc
 # if they exist.
-- 
cgit v1.2.3