Deal with situation where ICONV_TYPE isn't defined until after bsd.pkg.mk

is included by not checking its value explicitly.

4 files changed, 21 insertions, 28 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index afb119ce311..dd37f7fc3b3 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2004/02/15 13:43:41 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2004/03/10 17:58:22 jlam Exp $
 
 DISTNAME=		glib-2.2.3
 PKGNAME=		${DISTNAME:S/glib/glib2/}
@@ -20,6 +20,7 @@ USE_PKGLOCALEDIR=	yes
 USE_GNU_TOOLS+=		make
 USE_PERL5=		yes
 USE_LIBTOOL=		yes
+TEST_TARGET=		check
 
 PKGCONFIG_OVERRIDE=	glib-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gmodule-2.0.pc.in
@@ -31,15 +32,11 @@ CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
 
-TEST_TARGET=		check
+CONFIGURE_ARGS.gnu-iconv=	--with-libiconv=gnu
 
 .include "../../converters/libiconv/buildlink3.mk"
-
-.if defined(ICONV_TYPE) && (${ICONV_TYPE} == "gnu")
-CONFIGURE_ARGS+=	--with-libiconv=gnu
-.endif
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/editors/abiword1/Makefile b/editors/abiword1/Makefile
index 0d503b528c1..edbd19d9a6c 100644
--- a/editors/abiword1/Makefile
+++ b/editors/abiword1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/02/11 12:20:03 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/10 17:58:22 jlam Exp $
 #
 # According to AbiSource's explanation of their trademark rights,
 # compilations/distributions of AbiWord not provided by AbiSource must
@@ -35,6 +35,9 @@ CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat}
 CONFIGURE_ARGS+=	--without-libwmf
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
+CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
+
+CONFIGURE_ARGS.gnu-iconv=	--with-libiconv=${BUILDLINK_PREFIX.iconv}
 
 OS_CFLAGS=	${CFLAGS}
 
@@ -48,11 +51,6 @@ MAKE_FLAGS+=	ABI_BUILD_VERSION="${ABIWORD_VERS}"
 MAKE_FLAGS+=	UNIX_CAN_BUILD_STATIC=0
 
 .include "../../converters/libiconv/buildlink2.mk"
-
-.if defined(ICONV_TYPE) && (${ICONV_TYPE} == "gnu")
-CONFIGURE_ARGS+=	--with-libiconv=${BUILDLINK_PREFIX.iconv}
-.endif
-
 .include "../../converters/psiconv/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../textproc/expat/buildlink2.mk"
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 5be40952310..229d2bbd441 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2004/02/21 18:28:06 kristerw Exp $
+# $NetBSD: Makefile,v 1.40 2004/03/10 17:58:22 jlam Exp $
 
 DISTNAME=		gnome-vfs-1.0.5
 PKGREVISION=		5
@@ -20,14 +20,12 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
+CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
 
-.include "../../converters/libiconv/buildlink2.mk"
-
-.if defined(ICONV_TYPE) && (${ICONV_TYPE} == "gnu")
-CONFIGURE_ARGS+=	--with-libiconv=yes
-.endif
+CONFIGURE_ARGS.gnu-iconv=	--with-libiconv=yes
 
 .include "../../archivers/bzip2/buildlink2.mk"
+.include "../../converters/libiconv/buildlink2.mk"
 .include "../../databases/gnome-mime-data/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
diff --git a/textproc/xerces-c/Makefile b/textproc/xerces-c/Makefile
index df024c48db6..2cc8030bbb6 100644
--- a/textproc/xerces-c/Makefile
+++ b/textproc/xerces-c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/02/18 20:30:31 minskim Exp $
+# $NetBSD: Makefile,v 1.20 2004/03/10 17:58:22 jlam Exp $
 #
 
 DISTNAME=	xerces-c-src_2_3_0
@@ -34,19 +34,19 @@ CONFIGURE_ARGS+=	-p ${XERCES_PLATFORM}	# platform
 CONFIGURE_ARGS+=	-n socket		# net accessor
 CONFIGURE_ARGS+=	-m inmem		# message loader
 CONFIGURE_ARGS+=	-r none			# threading
+CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
 
-.include "../../converters/libiconv/buildlink3.mk"
+CONFIGURE_ARGS.gnu-iconv=	-t IconvGNU	# transcoder
+PLIST_SUBST.gnu-iconv=		NATIVEICONV="@comment " GNUICONV=""
 
-.if defined(ICONV_TYPE) && (${ICONV_TYPE} == "gnu")
-CONFIGURE_ARGS+=	-t IconvGNU		# transcoder
-PLIST_SUBST+=		NATIVEICONV="@comment " GNUICONV=""
-.else
-CONFIGURE_ARGS+=	-t native		# transcoder
-PLIST_SUBST+=		NATIVEICONV="" GNUICONV="@comment "
-.endif
+CONFIGURE_ARGS.native-iconv=	-t native	# transcoder
+PLIST_SUBST.native-iconv=	NATIVEICONV="" GNUICONV="@comment "
 
 CONFIGURE_ENV+=		${XERCES_ENV}
 MAKE_ENV+=		${XERCES_ENV}
+PLIST_SUBST+=		${PLIST_SUBST.${ICONV_TYPE}-iconv}
+
+.include "../../converters/libiconv/buildlink3.mk"
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/dom/impl/*.hpp \