prep:
rename libc/iconv/iconv.c to libc/iconv/bsd_iconv.c
mv libc_nonshared/*conv* to libc/iconv/

Index: lib/libc/Makefile
===================================================================
--- lib/libc/Makefile	(revision 258569)
+++ lib/libc/Makefile	(working copy)
@@ -50,6 +50,9 @@ LDADD+= -lgcc
 LDADD+= -lssp_nonshared
 .endif
 
+# Extras that live in either libc.a or libc_nonshared.a
+LIBC_NONSHARED_SRCS=
+
 # Define (empty) variables so that make doesn't give substitution
 # errors if the included makefiles don't change these:
 MDSRCS=
@@ -114,6 +117,8 @@ CFLAGS+= -DNS_CACHING
 CFLAGS+=-D_FREEFALL_CONFIG
 .endif
 
+STATICOBJS+=${LIBC_NONSHARED_SRCS:S/.c$/.o/}
+
 VERSION_DEF=${.CURDIR}/Versions.def
 SYMBOL_MAPS=${SYM_MAPS}
 CFLAGS+= -DSYMBOL_VERSIONING
Index: lib/libc/iconv/Makefile.inc
===================================================================
--- lib/libc/iconv/Makefile.inc	(revision 258569)
+++ lib/libc/iconv/Makefile.inc	(working copy)
@@ -14,5 +14,9 @@ SRCS+=	citrus_bcs.c citrus_bcs_strtol.c citrus_bcs
 	citrus_esdb.c citrus_hash.c citrus_iconv.c citrus_lookup.c \
 	citrus_lookup_factory.c citrus_mapper.c citrus_memstream.c \
 	citrus_mmap.c citrus_module.c citrus_none.c citrus_pivot_factory.c \
-	citrus_prop.c citrus_stdenc.c iconv.c iconv_compat.c
+	citrus_prop.c citrus_stdenc.c bsd_iconv.c iconv_compat.c
 SYM_MAPS+= ${.CURDIR}/iconv/Symbol.map
+
+.if ${MK_ICONV} == yes
+.include "${.CURDIR}/../libc_nonshared/Makefile.iconv"
+.endif
Index: lib/libc_nonshared/Makefile
===================================================================
--- lib/libc_nonshared/Makefile	(revision 258569)
+++ lib/libc_nonshared/Makefile	(working copy)
@@ -12,16 +12,18 @@ CFLAGS+=${PICFLAG} -DPIC -fvisibility=hidden
 
 LIB=	c_nonshared
 
+LIBC_NONSHARED_SRCS=
+
 # So that an empty .a file doesn't cause errors.
 SRCS=	__stub.c
 
 .if ${MK_ICONV} == "yes"
-SRCS+=	__iconv.c __iconv_free_list.c __iconv_get_list.c \
-	iconv.c iconv_canonicalize.c iconv_close.c \
-	iconv_open.c iconv_open_into.c \
-	iconv_set_relocation_prefix.c iconvctl.c iconvlist.c
+.PATH: ${.CURDIR}/../libc/iconv
+.include "Makefile.iconv"
 CFLAGS+=-I${.CURDIR}/../libc/iconv
 .endif
 
+SRCS+=	${LIBC_NONSHARED_SRCS}
+
 .include <bsd.lib.mk>
 
Index: lib/libc_nonshared/Makefile.iconv
===================================================================
--- lib/libc_nonshared/Makefile.iconv	(revision 0)
+++ lib/libc_nonshared/Makefile.iconv	(working copy)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+.if ${MK_ICONV} == "yes"
+LIBC_NONSHARED_SRCS+=	\
+	__iconv.c __iconv_free_list.c __iconv_get_list.c \
+	iconv.c iconv_canonicalize.c iconv_close.c \
+	iconv_open.c iconv_open_into.c \
+	iconv_set_relocation_prefix.c iconvctl.c iconvlist.c
+.endif