- Make ports use the libc provided iconv implementation on 10-CURRENT

after r254273 - Fix a bunch of ports to properly work after this - Mark converters/libiconv as IGNORE for systems with iconv in libc Reviewed by: bapt Approved by: portmgr (bapt) Discussed with: bapt, bsam (who both contributed ideas and code)
svn path=/head/; revision=326307
2013-09-04 18:06:07 +00:00 · 2013-09-04 18:06:07 +00:00 · 642be1b81d · 2021-03-31 03:12:20 +00:00
parent bcaced2c93
commit 642be1b81d
129 changed files with 326 additions and 134 deletions
--- a/18
+++ b/18
@ -10,6 +10,24 @@ in the release notes and/or placed into UPDATING.

 All ports committers are allowed to commit to this file.

+20130904:
+AUTHOR: madpilot@FreeBSD.org
+
+  To allow ports to work with the iconv implementation in 10-CURRENT after commit r254273 the USES=iconv options now conditionally adds a dependency depending on the FreeBSD version. It also defines a few utility variables which can be used in the ports:
+
+  ICONV_CMD:	location of the iconv binary.
+		after r254273: /usr/bin/iconv
+		before: ${LOCALBASE}/bin/iconv
+
+  ICONV_LIB:	ld(1) flags to get the iconv DSO.
+		after r254273: empty
+		before: -liconv
+
+  ICONV_CONFIGURE_ARG:  String that can be passed to configure
+  			scripts to hint the location of the libiconv library.
+			after r254273: empty
+			before: --with-libiconv-prefix=${LOCALBASE}
+
 20130902:
 AUTHOR: bapt@FreeBSD.org

--- a/Mk/Uses/iconv.mk
+++ b/Mk/Uses/iconv.mk
@ -12,12 +12,16 @@
 .if !defined(_INCLUDE_USES_ICONV_MK)
 _INCLUDE_USES_ICONV_MK=	yes

-ICONV_CMD=	${LOCALBASE}/bin/iconv
-
 .if !defined(iconv_ARGS)
 iconv_ARGS=     lib
 .endif

+.if !exists(/usr/include/iconv.h) && ${OSVERSION} < 1000043
+
+ICONV_CMD=	${LOCALBASE}/bin/iconv
+ICONV_LIB=	-liconv
+ICONV_CONFIGURE_ARG=	--with-libiconv-prefix=${LOCALBASE}
+
 .if ${iconv_ARGS} == "lib"
 LIB_DEPENDS+=	libiconv.so.3:${PORTSDIR}/converters/libiconv
 .elif ${iconv_ARGS} == "build"
@ -26,4 +30,12 @@ BUILD_DEPENDS+=	${ICONV_CMD}:${PORTSDIR}/converters/libiconv
 PATCH_DEPENDS+=	${ICONV_CMD}:${PORTSDIR}/converters/libiconv
 .endif

+.else
+
+ICONV_CMD=	/usr/bin/iconv
+ICONV_LIB=
+ICONV_CONFIGURE_ARG=
+
+.endif
+
 .endif
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@ -546,7 +546,7 @@ intltool_BUILD_DEPENDS=	${intltool_DETECT}:${PORTSDIR}/textproc/intltool
 intlhack_PRE_PATCH=		${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} -e \
 				's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \
 				 s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";| ; \
-				 s|/usr/bin/iconv|${LOCALBASE}/bin/iconv|g ; \
+				 s|/usr/bin/iconv|${ICONV_CMD}|g ; \
 				 s|unpack *[(]'"'"'U\*'"'"'|unpack ('"'"'C*'"'"'|'
 intlhack_USE_GNOME_IMPL=intltool

--- a/29
+++ b/29
@ -5,6 +5,35 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.

+20130904:
+  AFFECTS: 10-CURRENT users with any port depending on converters/iconv
+  AUTHOR: madpilot@FreeBSD.org
+
+  10-CURRENT after r254273 (committed on August 13, 2013) has an
+  implementation of iconv enabled by default in libc.
+
+  Due to this change some major overhauling of the ports tree has
+  been necessary to move the ports to using that implementation.
+
+  People using pkgng should have little problems, "pkg upgrade"
+  will update all sofware to not depend on libivconv anymore, once
+  updated packages are available. Please make sure to perform a
+  "pkg autoremove" after that and check that libiconv is correctly
+  removed by it.
+
+  If you are using ports the update requires some manual intervention.
+  The following procedure should be followed:
+
+  # pkg query %ro libiconv >ports_to_update
+  # pkg delete -f libiconv
+  # cat ports_to_update | xargs portmaster
+
+  or:
+
+  # pkg query %ro libiconv >ports_to_update
+  # pkg delete -f libiconv
+  # cat ports_to_update | xargs portupgrade -f
+
 20130831:
  AFFECTS: users of graphics/gdal
  AUTHOR: sunpoet@FreeBSD.org
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@ -28,7 +28,7 @@ MAKE_ENV=	OLD_PO_FILE_INPUT=1
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl -liconv"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl ${ICONV_LIB}"
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
--- a/archivers/unrar-iconv/Makefile
+++ b/archivers/unrar-iconv/Makefile
@ -14,7 +14,7 @@ MASTERDIR=	${.CURDIR}/../unrar
 EXTRA_PATCHES=	${.CURDIR}/files/patch-iconv

 CPPFLAGS+=	-DWITH_ICONV -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 USES+=		iconv

 CONFLICTS=	unrar-[0-9]* zh-unrar-[0-9]*
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@ -21,7 +21,7 @@ CONFLICTS?=	zh-unrar-[0-9].* unrar-iconv-[0-9].*

 MAKE_ARGS=	STRIP=${STRIP_CMD}
 MAKEFILE=	makefile.unix
-USES=		gmake
+USES+=		gmake
 WRKSRC=		${WRKDIR}/${PORTNAME}

 PLIST_FILES=	bin/unrar
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@ -48,7 +48,7 @@ PATCHFILES+=		unzip60-alt-iconv-utf8.patch
 PATCH_DIST_STRIP+=	-p1
 USES=			iconv
 CFLAGS+=		-I${LOCALBASE}/include -DNATIVE
-MAKE_ARGS+=		LFLAGS1="-L${LOCALBASE}/lib -liconv"
+MAKE_ARGS+=		LFLAGS1="-L${LOCALBASE}/lib ${ICONV_LIB}"
 .endif

 MAKE_ENV=	LOCAL_UNZIP="${LOCAL_UNZIP}" \
--- a/audio/julius/Makefile
+++ b/audio/julius/Makefile
@ -22,7 +22,7 @@ GNU_CONFIGURE=	yes
 USES=		iconv

 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 MANLANG=	"" ja
 MAN1=	accept_check.1 \
 	adinrec.1 \
--- a/audio/mp3unicode/Makefile
+++ b/audio/mp3unicode/Makefile
@ -15,7 +15,7 @@ USE_BZIP2=	yes
 USES=		iconv pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ICONV_CFLAGS="-I${LOCALBASE}/include" \
-		ICONV_LIBS="-L${LOCALBASE}/lib -liconv"
+		ICONV_LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}"

 MAN1=		mp3unicode.1
 PLIST_FILES=	bin/mp3unicode
--- a/audio/mpc/Makefile
+++ b/audio/mpc/Makefile
@ -38,7 +38,7 @@ CONFIGURE_ARGS+=--disable-iconv
 .endif

 post-patch:
-	@${REINPLACE_CMD} -e 's|-lintl|-liconv|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lintl|-l${ICONV_LIB}|g' ${WRKSRC}/configure

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin
--- a/audio/mpiosh/Makefile
+++ b/audio/mpiosh/Makefile
@ -23,7 +23,7 @@ USE_AUTOTOOLS=	aclocal automake autoconf libtool
 ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}

 .include <bsd.port.pre.mk>

@ -31,5 +31,6 @@ EXTRA_PATCHES=	${FILESDIR}/extra-patch-configure.in

 post-patch:
 	${RM} -f ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's/%%ICONV_LIB%%/${ICONV_LIB}/' ${WRKSRC}/mpiosh/Makefile.am

 .include <bsd.port.post.mk>
--- a/audio/mpiosh/files/patch-mpiosh_Makefile.am
+++ b/audio/mpiosh/files/patch-mpiosh_Makefile.am
@ -5,7 +5,7 @@
 AM_CFLAGS=-DSYSCONFDIR=\"@sysconfdir@\"
 
 -mpiosh_LDADD=../libmpio/libmpio.la -lreadline -lncurses
-+mpiosh_LDADD=../libmpio/libmpio.la -lreadline -lncurses -liconv
+mpiosh_LDADD=../libmpio/libmpio.la -lreadline -lncurses %%ICONV_LIB%%
 
 noinst_HEADERS = mpiosh.h \
 		callback.h \
--- a/audio/osd-lyrics/Makefile
+++ b/audio/osd-lyrics/Makefile
@ -27,7 +27,7 @@ USE_GNOME=	gtk20
 USE_SQLITE=	yes
 INSTALLS_ICONS=	yes
 PORTDOCS=	AUTHORS ChangeLog NEWS README
-LDFLAGS=	-liconv
+LDFLAGS=	${ICONV_LIB}

 OPTIONS_DEFINE=	DOCS MPD XMMS2 AMAROK
 MPD_DESC=	Enable MPD support
--- a/audio/praat/Makefile
+++ b/audio/praat/Makefile
@ -13,7 +13,7 @@ COMMENT=	Phonetics by Computer

 USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=	.*Makefile
-USES=		motif
+USES=		iconv motif
 WRKSRC=		${WRKDIR}/sources_4639
 MAKEFILE=	makefile
 PLIST_FILES=	bin/praat
@ -25,6 +25,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's/ log2/ NUMlog2/' ${WRKSRC}/dwtools/Sound_extensions.c
 	@${FIND} ${WRKSRC} -name Makefile -exec \
 		${REINPLACE_CMD} -e 's|^CFLAGS =|CFLAGS +=|' "{}" \;
+	@${REINPLACE_CMD} -e 's/%%ICONV_LIB%%/${ICONV_LIB}/' \
+		${WRKSRC}/makefiles/makefile.defs.freebsd.dynamic
 	@${CP} ${WRKSRC}/makefiles/makefile.defs.freebsd.dynamic \
 		${WRKSRC}/makefile.defs

--- a/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic
+++ b/audio/praat/files/patch-makefiles_makefile.defs.freebsd.dynamic
@ -8,7 +8,7 @@
 +CC += -std=gnu99 -DUNIX -Dlinux -I${LOCALBASE}/include -Wimplicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized
 
 -LIBS = /usr/X11R6/lib/libXm.a -L /usr/X11R6/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm 
-+LIBS = ${LOCALBASE}/lib/libXm.a -L${LOCALBASE}/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm -lpng -ljpeg -liconv -lXft
+LIBS = ${LOCALBASE}/lib/libXm.a -L${LOCALBASE}/lib -lXmu -lXp -lXt -lSM -lICE -lXext -lX11 -lm -lpng -ljpeg %%ICONV_LIB%% -lXft
 
 RANLIB = ls
 ICON =
--- a/biology/ncbi-toolkit/Makefile
+++ b/biology/ncbi-toolkit/Makefile
@ -13,7 +13,7 @@ COMMENT=	NCBI development toolkit, including BLAST 2 and GenBank/Entrez support

 OPTIONS_DEFINE=	DOCS

-USES=		motif
+USES=		iconv motif
 MAKE_JOBS_UNSAFE=	yes

 SUB_FILES=	pkg-message
@ -66,6 +66,8 @@ post-patch:
 		 s|/usr/local|${LOCALBASE}|g ; \
 		 s|-Wl,-Bstatic|| ; \
 		 s|-Wl,-Bdynamic||' ${WRKSRC}/platform/freebsd.ncbi.mk
+	@${REINPLACE_CMD} -e 's/%%ICONV_LIB%%/${ICONV_LIB}/' \
+		${WRKSRC}/make/makeall.unx ${WRKSRC}/make/makenet.unx

 # the ncbi-toolkit provides a shell script to drive the build
 # and we use it
--- a/biology/ncbi-toolkit/files/patch-make-makeall.unx
+++ b/biology/ncbi-toolkit/files/patch-make-makeall.unx
@ -6,7 +6,7 @@
 AR=ar
 -OTHERLIBS = -lm
 -VIBLIBS = 
-+OTHERLIBS = -lm -liconv
+OTHERLIBS = -lm %%ICONV_LIB%%
 +VIBLIBS = -lXft -lpng -ljpeg
 VIBFLAG =
 LIBCOPY = cp -p
--- a/biology/ncbi-toolkit/files/patch-make-makenet.unx
+++ b/biology/ncbi-toolkit/files/patch-make-makenet.unx
@ -4,7 +4,7 @@
 VIB =
 VIBLIBS= -lXm -lXmu -lXt -lX11
 VIBLIBS=
-+USERLIBS = -lXft -lpng -ljpeg -liconv
+USERLIBS = -lXft -lpng -ljpeg %%ICONV_LIB%%
 SEQUIN_OPTS =
 LIBCOPY = cp -p
 SRCCOPY = ./ln-if-absent
--- a/chinese/docproj/Makefile
+++ b/chinese/docproj/Makefile
@ -34,4 +34,8 @@ do-fetch:
 pre-patch:
 	@${CP} -R ${SRC} ${WRKDIR}

+post-patch:
+	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' \
+		${WRKSRC}/cjktexsty/Makefile
+
 .include <bsd.port.mk>
--- a/chinese/oto/Makefile
+++ b/chinese/oto/Makefile
@ -17,7 +17,7 @@ USES=		iconv
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -liconv"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}"

 post-patch:
 	@${FIND} ${WRKSRC}/src/ -type f -print0 | \
--- a/chinese/oxim/Makefile
+++ b/chinese/oxim/Makefile
@ -26,7 +26,7 @@ WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 CONFIGURE_ARGS+=--disable-bimsphone-module \
 		--disable-static \
 		--with-conf-dir=${PREFIX}/etc/${PORTNAME} \
--- a/comms/anyremote/Makefile
+++ b/comms/anyremote/Makefile
@ -15,7 +15,7 @@ USES=		pkgconfig
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}

 OPTIONS_DEFINE=	DOCS DBUS X11
 OPTIONS_DEFAULT=	DBUS X11
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--enable-dfl-baud=57600 \
 			--sysconfdir=${PREFIX}/etc/minicom \
 			--enable-lock-dir=/var/spool/lock \
 			--enable-dfl-port=/dev/cuau0
-MAKE_ARGS+=	LIBS+="-liconv -lcurses"
+MAKE_ARGS+=	LIBS+="${ICONV_LIB} -lcurses"

 MAN1=		minicom.1 runscript.1 ascii-xfr.1 xminicom.1

--- a/comms/obexapp/Makefile
+++ b/comms/obexapp/Makefile
@ -26,4 +26,7 @@ MAKE_ENV+=	NO_MAN=yes

 MAKE_ENV+=	NO_WERROR=yes

+post-patch:
+	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/Makefile
+
 .include <bsd.port.mk>
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@ -49,4 +49,11 @@ post-patch:
 		${WRKSRC}/libcharset/configure \
 		${WRKSRC}/preload/configure

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 1000043
+IGNORE=		converters/libiconv should not be used with OSVERSION > 1000050. \
+Please fix the port which tries to use it
+.endif
+
+.include <bsd.port.post.mk>
--- a/converters/lua-iconv/Makefile
+++ b/converters/lua-iconv/Makefile
@ -21,7 +21,9 @@ USES=		pkgconfig iconv
 PLIST_FILES=	%%LUA_MODLIBDIR%%/iconv.so

 post-patch:
-	@${REINPLACE_CMD} -e 's|%%INCDIR%%|-I${PREFIX}/include|;s|%%LIBDIR%%|-L${PREFIX}/lib|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|%%INCDIR%%|-I${PREFIX}/include| ; \
+		s|%%LIBDIR%%|-L${PREFIX}/lib|; \
+		s|%%ICONV_LIB%%|${ICONV_LIB}|' ${WRKSRC}/Makefile

 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/iconv.so ${LUA_MODLIBDIR}
--- a/converters/lua-iconv/files/patch-Makefile
+++ b/converters/lua-iconv/files/patch-Makefile
@ -8,7 +8,7 @@
 -CFLAGS = `pkg-config $(LUAPKG) --cflags` -fPIC -O3 -Wall
 +LUAPKG = lua-5.1
 +CFLAGS += `pkg-config $(LUAPKG) --cflags` -fPIC %%INCDIR%%
-+LIBS = `pkg-config $(LUAPKG) --libs` -liconv %%LIBDIR%%
+LIBS = `pkg-config $(LUAPKG) --libs` %%ICONV_LIB%% %%LIBDIR%%
 LFLAGS = -shared $(OMIT_FRAME_POINTER)
 INSTALL_PATH = `pkg-config $(LUAPKG) --variable=INSTALL_CMOD`
 
--- a/converters/p5-Text-Iconv/Makefile
+++ b/converters/p5-Text-Iconv/Makefile
@ -13,7 +13,7 @@ COMMENT=	Perl interface to iconv() codeset conversion function
 USES=		perl5 iconv
 USE_PERL5=	configure
 CONFIGURE_ARGS+=	INC="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -liconv"
+		LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}"

 MAN3=		Text::Iconv.3

--- a/converters/py-iconv/Makefile
+++ b/converters/py-iconv/Makefile
@ -21,11 +21,18 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||g}

+.include <bsd.port.pre.mk>
+
+.if empty(ICONV_LIB)
+SETUPINFO=	,library_dirs=["${LOCALBASE}/lib"],\
+		include_dirs=["${LOCALBASE}/include"]
+.else
 SETUPINFO=	,libraries=["iconv"],library_dirs=["${LOCALBASE}/lib"],\
 		include_dirs=["${LOCALBASE}/include"]
+.endif

 post-patch:
 	cd ${WRKSRC} && ${SED} 's!^\(.*ext_mod.*\)\()]\)$$!\1${SETUPINFO}\2!g'\
 		setup.py > setup.py.tmp && ${CAT} setup.py.tmp > setup.py

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@ -93,7 +93,8 @@ post-patch:
 		 s|/freetds.conf|/freetds.conf.dist|g ; \
 		 s|/locales.conf|/locales.conf.dist|g ; \
 		 s|/pool.conf|/pool.conf.dist|g ; \
-		 s| common.h||g'
+		 s| common.h||g ; \
+		 s|%%ICONV_LIB%%|${ICONV_LIB}|'

 post-install:
 .if !defined(NOPORTDOCS)
--- a/databases/freetds-devel/files/patch-src-tds-Makefile
+++ b/databases/freetds-devel/files/patch-src-tds-Makefile
@ -5,7 +5,7 @@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 -LIBS = @LIBS@
-+LIBS = @LIBS@ -liconv
+LIBS = @LIBS@ %%ICONV_LIB%%
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
--- a/databases/postgis/Makefile
+++ b/databases/postgis/Makefile
@ -58,7 +58,7 @@ MAKE_ARGS+=	NOPORTDOCS=yes
 .endif

 post-extract:
-	@${REINPLACE_CMD} -e 's#@ICONV_LDFLAGS@#-liconv -L${LOCALBASE}/lib#g' \
+	@${REINPLACE_CMD} -e 's#@ICONV_LDFLAGS@#${ICONV_LIB} -L${LOCALBASE}/lib#g' \
 		${WRKSRC}/loader/Makefile.in

 post-patch:
--- a/databases/qdbm/Makefile
+++ b/databases/qdbm/Makefile
@ -45,7 +45,7 @@ post-patch:

 post-build:
 	cd ${WRKSRC}/lab; \
-	${MAKE} CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" fmtcnv031127
+	${MAKE} CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${ICONV_LIB}" fmtcnv031127

 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lab/fmtcnv031127 ${PREFIX}/bin
--- a/databases/ruby-sybct/Makefile
+++ b/databases/ruby-sybct/Makefile
@ -24,6 +24,7 @@ USES=		iconv

 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+		-e 's|%%ICONV_LIB%%|${ICONV_LIB}|' \
 		${WRKSRC}/extconf.rb

 post-install:
--- a/databases/ruby-sybct/files/patch-extconf.rb
+++ b/databases/ruby-sybct/files/patch-extconf.rb
@ -11,7 +11,7 @@
 + sybase = "%%LOCALBASE%%"
 + $CFLAGS = "-g -Wall -DFREETDS -I#{sybase}/include"
 + $LDFLAGS = " -L#{sybase}/lib " 
-+ $LOCAL_LIBS = "-lct  -lsybdb -ltds -rdynamic -lm -liconv"
+ $LOCAL_LIBS = "-lct  -lsybdb -ltds -rdynamic -lm %%ICONV_LIB%%"
 
 ### mac-osx-tiger + Free TDS (freetds-0.64 ) ################
 # sybase = "/usr/local/freetds"
--- a/databases/spatialite_gui/Makefile
+++ b/databases/spatialite_gui/Makefile
@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USES=		pkgconfig iconv
 CPPFLAGS+=	-I${LOCALBASE}/include `${WX_CONFIG} --cppflags`
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv `${WX_CONFIG} --libs`
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB} `${WX_CONFIG} --libs`
 CONFIGURE_ARGS+=CFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes

--- a/deskutils/adesklets/Makefile
+++ b/deskutils/adesklets/Makefile
@ -33,7 +33,7 @@ INFO=		adesklets \

 SUB_FILES=	pkg-message
 INSTALLS_EGGINFO=	yes
-LDFLAGS+=	-liconv
+LDFLAGS+=	${ICONV_LIB}

 .if !defined(WITHOUT_PERL)
 USE_PERL5=	yes
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@ -56,7 +56,7 @@ post-patch:
 	@${REINPLACE_CMD} -e '/^CFLAGS/s,-pipe.*$$,${CFLAGS} -DDO_ICONV_CAST -DLIBICONV_PLUG,' \
 		-e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},;s,libpng ,libpng15 ,' \
 		${WRKSRC}/makefiles/arch/desktop.mk
-	@${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,-liconv,' \
+	@${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,${ICONV_LIB},' \
 		${WRKSRC}/makefiles/config.mk ${WRKSRC}/zlibrary/core/Makefile
 	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},' ${WRKSRC}/fbreader/desktop/Makefile
 	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \
--- a/devel/cgit/Makefile
+++ b/devel/cgit/Makefile
@ -33,6 +33,7 @@ SUB_LIST+=	PORTNAME=${PORTNAME}
 PLIST_SUB+=	PORTNAME=${PORTNAME} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}

 .include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>

 post-extract:
 	@${RMDIR} ${WRKSRC}/git
@ -44,6 +45,11 @@ post-patch:
 		${WRKSRC}/git/Makefile
 	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' \
 		-e 's,-Igit,-I.,g' ${WRKSRC}/Makefile
+.if empty(ICONV_LIB)
+	@${REINPLACE_CMD} -e '/NEEDS_LIBICONV = YesPlease/d' \
+		-e '/OLD_ICONV = YesPlease/d' \
+		${WRKSRC}/git/config.mak.uname
+.endif

 post-install:
 	@${MKDIR} /var/cache/${PORTNAME}
@ -54,4 +60,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}rc.5.txt ${DOCSDIR}/
 .endif

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@ -77,7 +77,7 @@ PLIST_FILES+=	bin/doxywizard

 pre-configure:
 	@cd ${WRKSRC};for pro in src/*.pro.in addon/doxywizard/doxywizard.pro.in;do \
-		${ECHO} "unix:LIBS += -liconv" >> $$pro; done
+		${ECHO} "unix:LIBS += ${ICONV_LIB}" >> $$pro; done
 	@${CHMOD} +x ${WRKSRC}/configure

 post-configure:
--- a/devel/gdb66/Makefile
+++ b/devel/gdb66/Makefile
@ -27,7 +27,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CONFIGURED_M4=m4 CONFIGURED_BISON=byacc
 CONFIGURE_ARGS=	--program-suffix=${PORTVERSION:S/.//g} \
 		--enable-target=all \
-		--enable-tui --with-libiconv-prefix=${LOCALBASE}
+		--enable-tui
 CFLAGS:=	${CFLAGS:C/ +$//}	# blanks at EOL creep in sometimes
 CFLAGS+=	-DRL_NO_COMPAT
 EXCLUDE=	dejagnu expect readline sim texinfo intl
@ -38,6 +38,10 @@ MAN1=	gdb${VER}.1

 .include <bsd.port.options.mk>

+.if empty(ICONV_LIB)
+CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
+.endif
+
 .if ${PORT_OPTIONS:MINSIGHT}
 PKGNAMESUFFIX=	-insight
 USE_TK=	84+
@ -87,7 +91,7 @@ post-patch:
 		${WRKSRC}/gdb/version.in
 	@${REINPLACE_CMD} -e 's/^READLINE/#READLINE/' \
 		-e 's/^readline/#readline/' \
-		-e 's,^LIBICONV =.*,LIBICONV=-L${LOCALBASE}/lib -liconv,' \
+		-e 's,^LIBICONV =.*,LIBICONV=-L${LOCALBASE}/lib ${ICONV_LIB},' \
 		${WRKSRC}/gdb/Makefile.in
 	${ECHO} 'READLINE = -lreadline' >> ${WRKSRC}/gdb/Makefile.in

--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@ -29,7 +29,7 @@ USES=		gettext gmake iconv pathfix pkgconfig shebangfix
 USE_GNOME=	ltverhack
 USE_PYTHON=	2.5+
 USE_PERL5=	yes
-CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu \
+CONFIGURE_ARGS=	--enable-static \
 		--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
 		--disable-man --without-xml-catalog \
 		--with-pcre=system \
@ -54,6 +54,12 @@ CONFIGURE_ARGS+=--disable-dtrace
 #CONFIGURE_ARGS+=--enable-dtrace
 #.endif

+.if exists(/usr/include/iconv.h) && ${OSVERSION} >= 1000043 
+CONFIGURE_ARGS+=	--with-libiconv=native
+.else
+CONFIGURE_ARGS+=	--with-libiconv=gnu
+.endif
+
 .if ${ARCH} == powerpc64
 EXTRA_PATCHES=	${FILESDIR}/extra-arch-powerpc64
 .endif
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@ -1,5 +1,5 @@
--- configure.orig	2013-03-28 02:59:16.000000000 +0000
-+++ configure	2013-03-28 03:00:20.000000000 +0000
+--- configure.orig	2013-08-29 23:29:13.255661322 +0200
+++ configure	2013-08-29 23:48:08.845647995 +0200
@@ -603,6 +603,9 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
@ -10,7 +10,7 @@
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-@@ -5699,7 +5702,7 @@
+@@ -5778,7 +5781,7 @@
 fi
 
 GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@ -19,7 +19,31 @@
 
 
  if test "x$with_runtime_libdir" != "x"; then
-@@ -23089,7 +23092,7 @@
+@@ -7444,13 +7447,12 @@
+ 
+       ;;
+     native)
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5
+-$as_echo_n "checking for iconv_open in -liconv... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open" >&5
+$as_echo_n "checking for iconv_open... " >&6; }
+ if ${ac_cv_lib_iconv_iconv_open+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-liconv  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -8648,6 +8650,7 @@
+     ;;
+   native)
+ 
+ICONV_LIBS=""
+ $as_echo "#define USE_LIBICONV_NATIVE 1" >>confdefs.h
+ 
+     ;;
+@@ -23201,7 +23204,7 @@
 fi
 done
 
@ -28,7 +52,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-@@ -26629,10 +26632,10 @@
+@@ -26741,10 +26744,10 @@
 #  b) FreeBSD doesn't do this either.
 #
 case $host in
--- a/devel/libhtp/Makefile
+++ b/devel/libhtp/Makefile
@ -18,12 +18,17 @@ ACLOCAL_ARGS=	-Im4
 USE_LDCONFIG=	yes
 USES=		pkgconfig pathfix iconv

-CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE}
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib \
-		-liconv
+		${ICONV_LIB}
+
+.include <bsd.port.pre.mk>
+
+.if empty(ICONV_LIB)
+CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE}
+.endif

 pre-configure:
 	@${REINPLACE_CMD} -Ee 's,^(pkgconfigdir = ).*,\1$$(exec_prefix)/libdata/pkgconfig,' ${WRKSRC}/Makefile.am
 	@cd ${WRKSRC} && ${SH} ./autogen.sh

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/devel/libparserutils/Makefile
+++ b/devel/libparserutils/Makefile
@ -25,7 +25,7 @@ OPTIONS_DEFAULT=	ICONV STATIC TEST DOXYGEN

 .if ${PORT_OPTIONS:MICONV}
 CFLAGS+=	-DWITH_ICONV_FILTER
-LDFLAGS+=	-liconv
+LDFLAGS+=	${ICONV_LIB}
 .endif

 .if ${PORT_OPTIONS:MSTATIC}
--- a/devel/py-fusefs/Makefile
+++ b/devel/py-fusefs/Makefile
@ -24,7 +24,7 @@ DOCSDIR?=	${PREFIX}/share/doc/py-fusefs
 EXAMPLESDIR?=	${PREFIX}/share/examples/py-fusefs

 post-patch:
-	@${REINPLACE_CMD} -e '/libs =/s|$$| + " -liconv"|'\
+	@${REINPLACE_CMD} -e '/libs =/s|$$| + " ${ICONV_LIB}"|'\
 		${WRKSRC}/setup.py

 post-install:
--- a/devel/styx/Makefile
+++ b/devel/styx/Makefile
@ -20,7 +20,7 @@ USES=		iconv
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/${PORTNAME}
 USE_LDCONFIG=	yes

--- a/dns/idnkit2/Makefile
+++ b/dns/idnkit2/Makefile
@ -20,7 +20,6 @@ USE_AUTOTOOLS=	libtool
 USES=		iconv
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libiconv=${LOCALBASE}

 USE_LDCONFIG=	yes

@ -33,4 +32,16 @@ MAN3=	idn_checkname.3 idn_comparenames.3 idn_comparenames2.3 \
 MAN5=	idn2.conf.5 idn2rc.5 idnalias.conf.5 idnlang.conf.5
 MANCOMPRESSED=	no

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if empty(ICONV_LIB)
+CONFIGURE_ARGS=	--with-libiconv=/usr
+.else
+CONFIGURE_ARGS= --with-libiconv=${LOCALBASE}
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB}|' \
+		${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@ -20,7 +20,7 @@ LICENSE=	GPLv1
 USE_GMAKE=	yes
 USES=		iconv ncurses
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -liconv"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}"
 CPPFLAGS+=	-I${LOCALBASE}/include

 ALL_TARGET=	${PORTNAME}
--- a/editors/joe2/Makefile
+++ b/editors/joe2/Makefile
@ -21,7 +21,7 @@ CONFLICTS=	joe-3*
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USES=		iconv
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -liconv"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}"
 CPPFLAGS+=	-I${LOCALBASE}/include

 ALL_TARGET=	${PORTNAME}
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@ -56,7 +56,7 @@ CONFIGURE_ARGS+=	--without-gs

 .if ${PORT_OPTIONS:MICONV}
 USES+=			iconv
-CONFIGURE_ARGS+=	--with-iconv="${LOCALBASE}"
+CONFIGURE_ARGS+=	--with-iconv
 .else
 CONFIGURE_ARGS+=	--without-iconv
 .endif
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@ -37,7 +37,7 @@ OPTIONS_DEFAULT=ICONV X11
 .if ${PORT_OPTIONS:MICONV}
 USES+=		iconv
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 .else
 CONFIGURE_ENV+=	ac_cv_header_iconv_h=no
 .endif
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@ -245,6 +245,9 @@ post-patch:
 		${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
 		${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
 	@${REINPLACE_CMD} -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' ${WRKSRC}/configure
+.if empty(ICONV_LIB)
+	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk ${WRKSRC}/src/VBox/Runtime/Makefile.kmk
+.endif

 pre-build:
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@ -41,7 +41,8 @@ post-patch:
 		s|./locale|${PREFIX}/share/locale|g; \
 		s|sdl-config|${SDL_CONFIG}|g; \
 		s| -O2| ${CFLAGS}|g; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' \
+		s|%%LOCALBASE%%|${LOCALBASE}|g; \
+		s|%%ICONV_LIB%%|${ICONV_LIB}|' \
 			${WRKSRC}/Makefile

 do-install:
--- a/games/neverball/files/patch-Makefile
+++ b/games/neverball/files/patch-Makefile
@ -19,7 +19,7 @@
 +    BASE_LIBS += -L%%LOCALBASE%%/lib
 +
 +    ifneq ($(ENABLE_NLS),0)
-+        INTL_LIBS := -lintl -liconv
+        INTL_LIBS := -lintl %%ICONV_LIB%%
 +    endif
 +endif
 +
--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@ -39,7 +39,7 @@ MAN1=		pokerth.1
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's|/usr([a-z|/]*)|${LOCALBASE}/\1|g' \
-		-e 's|(-lcurl)|\1 -liconv|g' \
+		-e 's|(-lcurl)|\1 ${ICONV_LIB}|g' \
 		-e 's:boost_([a-z]+)-[-|a-z|0-9|_]*:boost_\1:g' \
 		-e 's|LIB_DIRS =.*|LIB_DIRS = ${LOCALBASE}/lib|g' \
 		-e '/.*QMAKE_CXXFLAGS.*/d' \
--- a/games/stepmania-devel/Makefile
+++ b/games/stepmania-devel/Makefile
@ -56,7 +56,7 @@ CONFIGURE_ARGS+=--without-vorbis

 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/^LIBS/s|-lpthread|-liconv|' ${WRKSRC}/src/Makefile.in
+		'/^LIBS/s|-lpthread|${ICONV_LIB}|' ${WRKSRC}/src/Makefile.in

 pre-build:
 	@${ECHO_CMD} -n > ${WRKDIR}/stepmania.sh
--- a/games/tuxmath/Makefile
+++ b/games/tuxmath/Makefile
@ -31,7 +31,7 @@ CONFIGURE_ENV=	T4K_COMMON_CFLAGS="-I${T4K_WRKSRC}/src" \

 CPPFLAGS+=	$$(pkg-config --cflags SDL_Pango) -I${LOCALBASE}/include \
 		-DHAVE_ALPHASORT -DHAVE_SCANDIR -DHAVE_FSYNC -DICONV_CONST=""
-LDFLAGS+=	$$(pkg-config --libs SDL_Pango) -L${LOCALBASE}/lib -liconv -lpng15
+LDFLAGS+=	$$(pkg-config --libs SDL_Pango) -L${LOCALBASE}/lib ${ICONV_LIB} -lpng15

 T4K_NAME=	t4k_common
 T4K_VERSION=	0.1.1
--- a/graphics/graphite2/Makefile
+++ b/graphics/graphite2/Makefile
@ -11,7 +11,7 @@ COMMENT=	Rendering capabilities for complex non-Roman writing systems

 USES=		cmake iconv
 USE_LDCONFIG=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}

 post-patch:
 	@${REINPLACE_CMD} -e 's,/pkgconfig,data/pkgconfig,g' ${WRKSRC}/CMakeLists.txt
--- a/graphics/ida/Makefile
+++ b/graphics/ida/Makefile
@ -26,7 +26,7 @@ USES=		iconv gmake motif perl5
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	JPEG_VER=80 verbose=yes

-LDFLAGS+=	-liconv
+LDFLAGS+=	${ICONV_LIB}

 MAN1=		exiftran.1 ida.1
 PORTDOCS=	README TODO INSTALL
--- a/graphics/ipe/Makefile
+++ b/graphics/ipe/Makefile
@ -26,7 +26,7 @@ USE_TEX=	latex
 USE_GMAKE=	yes
 MAKE_ENV=	DLL_CFLAGS="-fPIC" \
 		ICONV_CFLAGS="-I${LOCALBASE}/include" \
-		ICONV_LIBS="-L${LOCALBASE}/lib -liconv" \
+		ICONV_LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" \
 		INSTALL_DIR="${MKDIR}" \
 		INSTALL_FILES="${INSTALL_DATA}" \
 		INSTALL_SCRIPTS="${INSTALL_SCRIPT}" \
--- a/graphics/libgaiagraphics/Makefile
+++ b/graphics/libgaiagraphics/Makefile
@ -19,7 +19,7 @@ GNU_CONFIGURE=	yes
 USES=		iconv gmake pkgconfig

 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 CONFIGURE_ARGS+=CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes

--- a/graphics/netpbm/files/patch-lib-util-pm_c_util.h
+++ b/graphics/netpbm/files/patch-lib-util-pm_c_util.h
@ -0,0 +1,10 @@
+--- lib/util/pm_c_util.h.orig	2006-08-19 05:12:28.000000000 +0200
+++ lib/util/pm_c_util.h	2013-08-30 13:58:20.918173431 +0200
+@@ -50,6 +50,7 @@
+ #ifndef __cplusplus
+   #ifndef HAVE_BOOL
+     #define HAVE_BOOL 1
+    #undef bool
+     typedef int bool;
+     #endif
+   #ifndef true
--- a/graphics/oyranos/Makefile
+++ b/graphics/oyranos/Makefile
@ -32,7 +32,7 @@ USE_GNOME=	libxml2
 USE_QT4=	gui moc_build qmake_build rcc_build uic_build
 USE_XORG=	xfixes xinerama xrandr xxf86vm
 CMAKE_ARGS+=	-DXDG_CONFIG_DIR=${PREFIX}/etc/xdg
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}

 MAN1=		oyranos-config-fltk.1 oyranos-monitor-daemon.1 oyranos-monitor.1 \
 		oyranos-policy.1 oyranos-profile-graph.1 oyranos-profile-install.1 \
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@ -22,7 +22,7 @@ USE_GNOME=		gtk12
 WANT_GNOME=		yes
 GNU_CONFIGURE=		yes
 # Assign with `+=' for slave ports
-CONFIGURE_ENV+=		LIBS="-L${LOCALBASE}/lib -lintl -liconv"
+CONFIGURE_ENV+=		LIBS="-L${LOCALBASE}/lib -lintl ${ICONV_LIB}"
 CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--without-included-gettext \
 			--enable-nls \
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@ -41,7 +41,7 @@ MAKE_JOBS_UNSAFE=	yes

 CONFIGURE_ARGS=	--enable-multibyte
 CONFIGURE_ENV=	INSTALL_MAN="${INSTALL_MAN}" \
-		LIBS="-L${LOCALBASE}/lib -liconv"
+		LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}"
 CFLAGS+=	-I${LOCALBASE}/include

 TMACBASE=	${WRKDIR}/${TMAC_DISTNAME}
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@ -240,6 +240,13 @@ post-patch:
 	@${REINPLACE_CMD} 's|build-policy install-limited|build-policy install-unlimited|' \
 		${WRKSRC}/jdk/make/javax/crypto/Makefile
 .endif
+.if empty(ICONV_LIB)
+	@${REINPLACE_CMD} 's| -liconv||' \
+		${WRKSRC}/Makefile \
+		${WRKSRC}/jdk/make/sun/splashscreen/Makefile \
+		${WRKSRC}/jdk/make/java/npt/Makefile \
+		${WRKSRC}/jdk/make/java/instrument/Makefile
+.endif

 post-build:
 .if ${PORT_OPTIONS:MTZUPDATE}
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@ -159,6 +159,13 @@ post-patch:
 	@${REINPLACE_CMD} 's|build-policy install-limited|build-policy install-unlimited|' \
 		${WRKSRC}/jdk/make/javax/crypto/Makefile
 .endif
+.if empty(ICONV_LIB)
+	@${REINPLACE_CMD} 's| -liconv||' \
+		${WRKSRC}/Makefile \
+		${WRKSRC}/jdk/make/sun/splashscreen/Makefile \
+		${WRKSRC}/jdk/make/java/npt/Makefile \
+		${WRKSRC}/jdk/make/java/instrument/Makefile
+.endif

 .if ${PORT_OPTIONS:MTZUPDATE}
 pre-install:
--- a/lang/php5/Makefile.ext
+++ b/lang/php5/Makefile.ext
@ -126,7 +126,7 @@ CONFIGURE_ARGS+=--enable-hash \
 .endif

 .if ${PHP_MODNAME} == "iconv"
-CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
+CONFIGURE_ARGS+=--with-iconv

 USES+=	iconv
 .endif
@ -424,8 +424,7 @@ USE_PHP_BUILD=	yes

 .if ${PHP_MODNAME} == "xmlrpc"
 CONFIGURE_ARGS+=--with-xmlrpc \
-		--with-libxml-dir=${LOCALBASE} \
-		--with-iconv-dir=${LOCALBASE}
+		--with-libxml-dir=${LOCALBASE}

 USES+=		iconv
 USE_GNOME=	libxml2
--- a/lang/php52/Makefile.ext
+++ b/lang/php52/Makefile.ext
@ -135,8 +135,7 @@ CONFIGURE_ARGS+=--enable-hash
 .endif

 .if ${PHP_MODNAME} == "iconv"
-CONFIGURE_ARGS+=--with-iconv=${LOCALBASE} \
-		--with-iconv-dir=${LOCALBASE}
+CONFIGURE_ARGS+=--with-iconv

 USES+=		iconv
 .endif
@ -482,8 +481,7 @@ USE_PHP_BUILD=	yes

 .if ${PHP_MODNAME} == "xmlrpc"
 CONFIGURE_ARGS+=--with-xmlrpc \
-		--with-libxml-dir=${LOCALBASE} \
-		--with-iconv-dir=${LOCALBASE}
+		--with-libxml-dir=${LOCALBASE}

 USES+=		iconv
 USE_GNOME=	libxml2
--- a/lang/php53/Makefile.ext
+++ b/lang/php53/Makefile.ext
@ -125,7 +125,7 @@ CONFIGURE_ARGS+=--enable-hash \
 .endif

 .if ${PHP_MODNAME} == "iconv"
-CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
+CONFIGURE_ARGS+=--with-iconv

 USES+=	iconv
 .endif
@ -429,8 +429,7 @@ USE_PHP_BUILD=	yes

 .if ${PHP_MODNAME} == "xmlrpc"
 CONFIGURE_ARGS+=--with-xmlrpc \
-		--with-libxml-dir=${LOCALBASE} \
-		--with-iconv-dir=${LOCALBASE}
+		--with-libxml-dir=${LOCALBASE}

 USES+=		iconv
 USE_GNOME=	libxml2
--- a/lang/php55/Makefile.ext
+++ b/lang/php55/Makefile.ext
@ -126,7 +126,7 @@ CONFIGURE_ARGS+=--enable-hash \
 .endif

 .if ${PHP_MODNAME} == "iconv"
-CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
+CONFIGURE_ARGS+=--with-iconv

 USES+=	iconv
 .endif
@ -424,8 +424,7 @@ USE_PHP_BUILD=	yes

 .if ${PHP_MODNAME} == "xmlrpc"
 CONFIGURE_ARGS+=--with-xmlrpc \
-		--with-libxml-dir=${LOCALBASE} \
-		--with-iconv-dir=${LOCALBASE}
+		--with-libxml-dir=${LOCALBASE}

 USES+=		iconv
 USE_GNOME=	libxml2
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--enable-threads \
 		--with-ssl \
 		--without-nm \
 		--with-canberra
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${ICONV_LIB} ${PTHREAD_LIBS}"
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}

 MAN1=		balsa.1
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@ -43,7 +43,7 @@ BF_CPPFLAGS?=		-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
 .if ${PORT_OPTIONS:MUNICODE}
 CONFIGURE_ARGS+=	--enable-unicode
-BF_LIBS+=		-liconv
+BF_LIBS+=		${ICONV_LIB}
 .endif
 .if ${PORT_OPTIONS:MGSL}
 LIB_DEPENDS+=		libgsl.so:${PORTSDIR}/math/gsl
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@ -67,7 +67,7 @@ USE_OPENLDAP=		yes
 .endif

 post-patch:
-	@${REINPLACE_CMD} -e 's|-lresolv||g; s|-lpisock\"|-liconv &|g' \
+	@${REINPLACE_CMD} -e 's|-lresolv||g; s|-lpisock\"|${ICONV_LIB} &|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g ; s|/usr/share|${LOCALBASE}/share|g' \
 		${WRKSRC}/src/procmime.c
--- a/mail/crm114/Makefile
+++ b/mail/crm114/Makefile
@ -30,7 +30,7 @@ MAKE_ARGS=	CC="${CC}" prefix="${PREFIX}" \
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-LIBS+=		-L${LOCALBASE}/lib -liconv -lintl
+LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB} -lintl

 CFLAGS+=	-DVERSION='\"${PORTVERSION}-${CRM114RELEASENAME}\"'
 CFLAGS+=	-DNO_LOGL
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@ -235,7 +235,7 @@ SEDLIST+=	-e 's,XX_TCP_WRAPPERS_LIBS_XX,,'

 .if ${PORT_OPTIONS:MICONV}
 USES=		iconv
-SEDLIST+=	-e 's,XX_ICONV_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -liconv,' \
+SEDLIST+=	-e 's,XX_ICONV_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib ${ICONV_LIB},' \
 		-e 's,^\# (HAVE_ICONV=),\1,'
 .else
 SEDLIST+=	-e 's,XX_ICONV_LIBS_XX,,'
--- a/mail/libpst/Makefile
+++ b/mail/libpst/Makefile
@ -17,7 +17,7 @@ LIB_DEPENDS=	gsf-1:${PORTSDIR}/devel/libgsf
 GNU_CONFIGURE=	yes
 USES=		iconv pathfix gmake pkgconfig
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 CONFIGURE_ARGS+=	--disable-python --enable-libpst-shared
 USE_LDCONFIG=	yes

--- a/mail/mmr/Makefile
+++ b/mail/mmr/Makefile
@ -29,7 +29,7 @@ CXXFLAGS+=	-DTHREADMAIL \
 		-DMAILPATH=\"/var/mail\" \
 		-DMAILER=\"/usr/sbin/sendmail\ -t\" \
 		-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv -lcurses -lmd
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB} -lcurses -lmd

 post-patch:
 	@${REINPLACE_CMD} -e 's|md5/libmd5.a||g' ${WRKSRC}/Makefile
--- a/mail/normalizemime/Makefile
+++ b/mail/normalizemime/Makefile
@ -22,7 +22,7 @@ USES=		iconv
 NO_WRKSUBDIR=	yes

 CXXFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}

 PLIST_FILES=	bin/${DISTNAME:R}

--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@ -101,7 +101,7 @@ MAKEFILES=	Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \

 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
-		s|-lresolv||g; s|-lpisock\"|-liconv &|g;' \
+		s|-lresolv||g; s|-lpisock\"|${ICONV_LIB} &|g;' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g' \
 		${WRKSRC}/libsylph/procmime.c
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@ -241,7 +241,7 @@ pre-configure:
 		 s|THREAD_CFLAGS=".*"|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \
 		 s|-L/usr/local/lib||g ; \
 		 s|-I/usr/local/include||g ; \
-		 s|-lgiconv|-liconv|g ; \
+		 s|-lgiconv|${ICONV_LIB}|g ; \
 		 s|-funroll-loops||g ; \
 		 s|LIBFFMPEG_CFLAGS|LIBFFMPEG_CPPFLAGS|g ; \
 		 s|echo aout|echo elf|g' ${WRKSRC}/configure
--- a/multimedia/mkclean/Makefile
+++ b/multimedia/mkclean/Makefile
@ -16,7 +16,7 @@ HAS_CONFIGURE=	yes
 USES=		iconv gmake

 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}

 MAKE_ENV+=	"LFLAGS=${LDFLAGS}"
 MAKEFILE=	GNUmakefile
--- a/multimedia/mkvalidator/Makefile
+++ b/multimedia/mkvalidator/Makefile
@ -16,7 +16,7 @@ HAS_CONFIGURE=	yes
 USES=		iconv gmake

 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}

 MAKE_ENV+=	"LFLAGS=${LDFLAGS}"
 MAKEFILE=	GNUmakefile
--- a/multimedia/vdr/Makefile
+++ b/multimedia/vdr/Makefile
@ -78,7 +78,8 @@ ALL_TARGET=	vdr plugins

 post-patch:
 # clang doesn't know -MG:
-	@${REINPLACE_CMD} '/^MAKEDEP.*-MM/s/-MG[[:space:]]*$$/# -MG/' \
+	@${REINPLACE_CMD} -e '/^MAKEDEP.*-MM/s/-MG[[:space:]]*$$/# -MG/' \
+			-e '/^LIBS/s/-liconv/${ICONVLIB}/' \
 		${WRKSRC}/Makefile ${WRKSRC}/libsi/Makefile \
 		${WRKSRC}/PLUGINS/src/*/Makefile
 	@[ ! -f ${WRKSRC}/s2apiwrapper.c ] || \
--- a/multimedia/w_scan/Makefile
+++ b/multimedia/w_scan/Makefile
@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 PATCH_STRIP=	-lp1
 USES+=		gettext
 CPPFLAGS+=	-I"${LOCALBASE}/include"
-LDFLAGS+=	-L"${LOCALBASE}/lib\ -liconv"
+LDFLAGS+=	-L"${LOCALBASE}/lib\ ${ICONV_LIB}"
 PORTDOCS=	COPYING ChangeLog README
 PLIST_FILES=	bin/${PORTNAME}
 MAN1=		w_scan.1
--- a/net-im/imspector/Makefile
+++ b/net-im/imspector/Makefile
@ -43,6 +43,8 @@ post-patch:
 		${WRKSRC}/main.cpp
 	@${REINPLACE_CMD} -e 's,= SSLv23_method(),= (SSL_METHOD *) SSLv23_method(),g' \
 		${WRKSRC}/sslstate.cpp
+	@${REINPLACE_CMD} -e 's,%%ICONV_LIB%%,${ICONV_LIB},' \
+		${WRKSRC}/Makefile

 post-install:
 .for f in ${CONFIG_FILES}
--- a/net-im/imspector/files/patch-Makefile
+++ b/net-im/imspector/files/patch-Makefile
@ -42,7 +42,7 @@
 	$(CXX) msnprotocolplugin.o libimspector.so $(PLUGIN_FLAGS)
 icqprotocolplugin.so: icqprotocolplugin.o libimspector.so
 -	$(CXX) icqprotocolplugin.o libimspector.so $(PLUGIN_FLAGS)
-+	$(CXX) icqprotocolplugin.o libimspector.so $(PLUGIN_FLAGS) -liconv -L${LOCALBASE}/lib
+	$(CXX) icqprotocolplugin.o libimspector.so $(PLUGIN_FLAGS) %%ICONV_LIB%% -L${LOCALBASE}/lib
 yahooprotocolplugin.so: yahooprotocolplugin.o libimspector.so
 	$(CXX) yahooprotocolplugin.o libimspector.so $(PLUGIN_FLAGS)
 ircprotocolplugin.so: ircprotocolplugin.o libimspector.so
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@ -311,7 +311,7 @@ post-patch:
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		-e 's|-lpanel |-lpanel -lncurses|g' \
 		-e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \
-		-e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} $$LIBDL|-lsilc -lsilcclient ${PTHREAD_LIBS} -liconv|' \
+		-e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} $$LIBDL|-lsilc -lsilcclient ${PTHREAD_LIBS} ${ICONV_LIB}|' \
 		-e 's|TCL_VERSION found but 8.3 required|TCL_VERSION found but ${TCLTK_VER} required|g' \
 		-e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${TCLTK_VER:E}|' \
 			${WRKSRC}/configure
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 LICQ_PORT?=	net-im/licq

 # workaround for installed autoconf/automake
-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv -Wl,--export-dynamic
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib ${ICONV_LIB} -Wl,--export-dynamic
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-Wl,--export-dynamic
--- a/net-im/ysm/Makefile
+++ b/net-im/ysm/Makefile
@ -17,7 +17,7 @@ USES=		iconv gmake
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}

 MAN1=		ysm.1
 PLIST_FILES=	bin/ysm
--- a/net/afpfs-ng/Makefile
+++ b/net/afpfs-ng/Makefile
@ -53,7 +53,7 @@ post-patch:	.SILENT
 		${WRKSRC}/Makefile.am

 post-configure: .SILENT
-	${REINPLACE_CMD} 's|LIBS = |LIBS = -liconv |' \
+	${REINPLACE_CMD} 's|LIBS = |LIBS = ${ICONV_LIB} |' \
 		${WRKSRC}/cmdline/Makefile

 .include <bsd.port.post.mk>
--- a/net/ldapdiff/Makefile
+++ b/net/ldapdiff/Makefile
@ -20,8 +20,7 @@ USES=		iconv
 USE_OPENLDAP=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${LOCALBASE} \
-		--with-ldap-dir=${LOCALBASE} \
-		--with-iconv-dir=${LOCALBASE}
+		--with-ldap-dir=${LOCALBASE}
 SAMPLES=	addentry.sh webtomware_without_jpeg.user.ldif \
 		webtomware.init.ldif webtomware.user.ldif
 MAN1=		ldapdiff.1
@ -30,6 +29,12 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

 PORTDOCS=	CHANGES ChangeLog README TODO

+.include <bsd.port.pre.mk>
+
+.if ! empty(ICONV_LIB)
+CONFIGURE_ARGS+=--with-iconv-dir=${LOCALBASE}
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ldapdiff ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1
@ -46,4 +51,4 @@ do-install:
 .endif
 	@${CAT} ${PKGMESSAGE}

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/net/xmlrpc-epi/Makefile
+++ b/net/xmlrpc-epi/Makefile
@ -19,7 +19,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 CONFIGURE_ARGS=	--program-transform="s|^|xre-|"

 PORTDOCS=	AUTHORS ChangeLog NEWS README
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@ -23,7 +23,7 @@ USES=		pathfix gettext pkgconfig
 USE_GNOME=	intlhack
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lgnuregex -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib -lgnuregex ${ICONV_LIB}

 OPTIONS_DEFINE=	GTKSPELL GTK3
 OPTIONS_DEFAULT=GTKSPELL
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@ -20,7 +20,7 @@ USE_PERL5_BUILD=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV +=	LDFLAGS="${LDFLAGS}" LIBS="-liconv"
+CONFIGURE_ENV +=	LDFLAGS="${LDFLAGS}" LIBS="${ICONV_LIB}"
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/X11 \
 			--enable-setenv-code \
 			--enable-SIGCHLD-fallback
--- a/print/pdftk/Makefile
+++ b/print/pdftk/Makefile
@ -52,7 +52,7 @@ post-patch:
 #

 	@${REINPLACE_CMD} -e "s|GCJFLAGS=|GCJFLAGS= -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib/gcc${CSUFF} -w|g" ${WRKSRC}/${MAKEFILE}
-	@${REINPLACE_CMD} -e "s|LDLIBS= -lgcj|LDLIBS= -lgcj ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -liconv -lz -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib/gcc${CSUFF} -w|g" \
+	@${REINPLACE_CMD} -e "s|LDLIBS= -lgcj|LDLIBS= -lgcj ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} ${ICONV_LIB} -lz -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib/gcc${CSUFF} -w|g" \
 			${WRKSRC}/${MAKEFILE}

 do-install:
--- a/print/py-cups/Makefile
+++ b/print/py-cups/Makefile
@ -23,11 +23,16 @@ USE_PYTHON=	-2.7
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/cups.so
 PYDISTUTILS_EGGINFO=	py${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg-info

+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|^\(VERSION=\).*$$|\1${PORTVERSION}|' ${WRKSRC}/Makefile
+.if empty(ICONV_LIB)
+	@${REINPLACE_CMD} -e 's| or sys.platform.startswith("freebsd"):|:|' ${WRKSRC}/setup.py
+.endif

 pre-configure:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/cupsconnection.c
 	@${REINPLACE_CMD} -e 's|#ifdef __SVR4|#ifdef __FreeBSD__|' ${WRKSRC}/cupsppd.c

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/security/scanhill/Makefile
+++ b/security/scanhill/Makefile
@ -26,6 +26,9 @@ CONFIGURE_ARGS+=	--enable-mysql
 USE_MYSQL=		yes
 .endif

+post-patch:
+	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/scanhill ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/scanhill.conf ${PREFIX}/etc/scanhill.conf-dist
--- a/Show More
+++ b/Show More