[pkgsrc/trunk]: pkgsrc Teach these package Makefiles about ICONV_TYPE.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3e9ac9ad0b5b
branches:  trunk
changeset: 468235:3e9ac9ad0b5b
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Feb 11 12:20:03 2004 +0000

description:
Teach these package Makefiles about ICONV_TYPE.

diffstat:

 devel/glib2/Makefile        |  4 ++--
 editors/abiword1/Makefile   |  4 ++--
 sysutils/gnome-vfs/Makefile |  4 ++--
 textproc/xerces-c/Makefile  |  5 +++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diffs (73 lines):

diff -r 617fb096a629 -r 3e9ac9ad0b5b devel/glib2/Makefile
--- a/devel/glib2/Makefile      Wed Feb 11 12:18:10 2004 +0000
+++ b/devel/glib2/Makefile      Wed Feb 11 12:20:03 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/02/11 01:46:30 abs Exp $
+# $NetBSD: Makefile,v 1.38 2004/02/11 12:20:03 jlam Exp $
 
 DISTNAME=              glib-2.2.3
 PKGREVISION=           1
@@ -37,7 +37,7 @@
 
 .include "../../converters/libiconv/buildlink3.mk"
 
-.if defined(ICONV_IS_GNU)
+.if defined(ICONV_TYPE) && (${ICONV_TYPE} == "gnu")
 CONFIGURE_ARGS+=       --with-libiconv=gnu
 .endif
 
diff -r 617fb096a629 -r 3e9ac9ad0b5b editors/abiword1/Makefile
--- a/editors/abiword1/Makefile Wed Feb 11 12:18:10 2004 +0000
+++ b/editors/abiword1/Makefile Wed Feb 11 12:20:03 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/22 08:30:30 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/11 12:20:03 jlam Exp $
 #
 # According to AbiSource's explanation of their trademark rights,
 # compilations/distributions of AbiWord not provided by AbiSource must
@@ -49,7 +49,7 @@
 
 .include "../../converters/libiconv/buildlink2.mk"
 
-.if defined(ICONV_IS_GNU)
+.if defined(ICONV_TYPE) && (${ICONV_TYPE} == "gnu")
 CONFIGURE_ARGS+=       --with-libiconv=${BUILDLINK_PREFIX.iconv}
 .endif
 
diff -r 617fb096a629 -r 3e9ac9ad0b5b sysutils/gnome-vfs/Makefile
--- a/sysutils/gnome-vfs/Makefile       Wed Feb 11 12:18:10 2004 +0000
+++ b/sysutils/gnome-vfs/Makefile       Wed Feb 11 12:20:03 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2004/01/24 15:06:57 grant Exp $
+# $NetBSD: Makefile,v 1.37 2004/02/11 12:20:03 jlam Exp $
 
 DISTNAME=              gnome-vfs-1.0.5
 PKGREVISION=           5
@@ -25,7 +25,7 @@
 
 .include "../../converters/libiconv/buildlink2.mk"
 
-.if defined(ICONV_IS_GNU)
+.if defined(ICONV_TYPE) && (${ICONV_TYPE} == "gnu")
 CONFIGURE_ARGS+=       --with-libiconv=yes
 .endif
 
diff -r 617fb096a629 -r 3e9ac9ad0b5b textproc/xerces-c/Makefile
--- a/textproc/xerces-c/Makefile        Wed Feb 11 12:18:10 2004 +0000
+++ b/textproc/xerces-c/Makefile        Wed Feb 11 12:20:03 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/02/11 04:06:04 minskim Exp $
+# $NetBSD: Makefile,v 1.17 2004/02/11 12:20:03 jlam Exp $
 #
 
 DISTNAME=      xerces-c-src_2_3_0
@@ -35,7 +35,8 @@
 CONFIGURE_ARGS+=       -r none                 # threading
 
 .include "../../converters/libiconv/buildlink3.mk"
-.if defined(ICONV_IS_GNU)
+
+.if defined(ICONV_TYPE) && (${ICONV_TYPE} == "gnu")
 CONFIGURE_ARGS+=       -t IconvGNU             # transcoder
 PLIST_SUBST+=          NATIVEICONV="@comment " GNUICONV=""
 .else