summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2012-05-12 07:37:50 +0000
committerwiz <wiz@pkgsrc.org>2012-05-12 07:37:50 +0000
commitcf2069b86990e32353b09df5c3044ace2e76d57e (patch)
tree5fd0537a27c6445bf07ff39056b843dd5a8ce38e /converters
parent43509b2b1c655bcc3f2e9e41fb6c1b692876963a (diff)
downloadpkgsrc-cf2069b86990e32353b09df5c3044ace2e76d57e.tar.gz
Add CONFLICTS with new man-pages package. For details, see
man-pages/Makefile.
Diffstat (limited to 'converters')
-rw-r--r--converters/libiconv/Makefile4
1 files changed, 3 insertions, 1 deletions
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.