summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/mpg123/Makefile2
-rw-r--r--audio/vorbis-tools/Makefile2
-rw-r--r--converters/p5-Text-Iconv/Makefile2
-rw-r--r--converters/py-iconv/Makefile2
-rw-r--r--converters/ruby-iconv/Makefile2
-rw-r--r--converters/siconv/Makefile2
-rw-r--r--databases/freetds-devel/Makefile2
-rw-r--r--databases/freetds/Makefile2
-rw-r--r--databases/grass-i18n/Makefile2
-rw-r--r--databases/grass/Makefile2
-rw-r--r--databases/sqlrelay/Makefile2
-rw-r--r--devel/bison-devel/Makefile2
-rw-r--r--devel/bison/Makefile2
-rw-r--r--devel/bison175/Makefile2
-rw-r--r--devel/bison1875/Makefile2
-rw-r--r--devel/bison2/Makefile2
-rw-r--r--devel/bison20/Makefile2
-rw-r--r--devel/gettext/Makefile2
-rw-r--r--devel/glib20/Makefile2
-rw-r--r--devel/gnome-vfs1/Makefile2
-rw-r--r--devel/gnomevfs/Makefile2
-rw-r--r--devel/styx/Makefile2
-rw-r--r--editors/AbiWord/Makefile5
-rw-r--r--editors/AbiWord2/Makefile5
-rw-r--r--editors/abiword-devel/Makefile5
-rw-r--r--editors/abiword/Makefile5
-rw-r--r--editors/calligra/Makefile2
-rw-r--r--editors/dedit/Makefile2
-rw-r--r--editors/koffice-kde3/Makefile2
-rw-r--r--editors/koffice-kde4/Makefile2
-rw-r--r--editors/koffice/Makefile2
-rw-r--r--editors/nvi-devel/Makefile2
-rw-r--r--ftp/wget+ipv6/Makefile2
-rw-r--r--graphics/djvulibre/Makefile2
-rw-r--r--graphics/gphoto2/Makefile2
-rw-r--r--graphics/graphviz/Makefile2
-rw-r--r--graphics/mplayer/Makefile2
-rw-r--r--graphics/ogle-gui/Makefile2
-rw-r--r--irc/xchat-gnome/Makefile2
-rw-r--r--irc/xchat/Makefile2
-rw-r--r--irc/xchat1/Makefile2
-rw-r--r--irc/xchat2/Makefile2
-rw-r--r--japanese/libjconv/Makefile4
-rw-r--r--japanese/mutt-devel/Makefile2
-rw-r--r--korean/gaim/Makefile2
-rw-r--r--korean/hanterm-xf86/Makefile6
-rw-r--r--mail/elm+ME/Makefile2
-rw-r--r--mail/heirloom-mailx/Makefile2
-rw-r--r--mail/mutt-devel/Makefile2
-rw-r--r--mail/nail/Makefile2
-rw-r--r--mail/stuphead/Makefile2
-rw-r--r--math/gnumeric/Makefile3
-rw-r--r--math/gnumeric2/Makefile3
-rw-r--r--misc/gnome-mime-data/Makefile2
-rw-r--r--misc/gnomemimedata/Makefile2
-rw-r--r--misc/pinfo/Makefile2
-rw-r--r--multimedia/mplayer/Makefile2
-rw-r--r--multimedia/mplayerxp/Makefile2
-rw-r--r--multimedia/ogle-gui/Makefile2
-rw-r--r--net-p2p/dctc-gui/Makefile2
-rw-r--r--net-p2p/gtkhx/Makefile4
-rw-r--r--net/dctc-gui/Makefile2
-rw-r--r--net/gtk+licq/Makefile2
-rw-r--r--net/gtkhx/Makefile4
-rw-r--r--net/wol/Makefile2
-rw-r--r--news/tin/Makefile2
-rw-r--r--palm/pilot-link-devel/Makefile2
-rw-r--r--palm/pilot-link/Makefile2
-rw-r--r--science/vis5d+/Makefile2
-rw-r--r--security/gnupg/Makefile2
-rw-r--r--security/gnupg1/Makefile2
-rw-r--r--textproc/intltool/Makefile2
-rw-r--r--textproc/libxml2/Makefile2
-rw-r--r--textproc/minidom/Makefile2
-rw-r--r--textproc/p5-XML-Sablotron/Makefile2
-rw-r--r--textproc/ruby-sablot/Makefile2
-rw-r--r--textproc/sablotron/Makefile2
-rw-r--r--www/galeon/Makefile2
-rw-r--r--www/galeon2/Makefile2
-rw-r--r--www/p5-AxKit/Makefile2
-rw-r--r--x11-toolkits/gal/Makefile2
-rw-r--r--x11-toolkits/gal2/Makefile2
-rw-r--r--x11-toolkits/wxgtk-devel/Makefile2
-rw-r--r--x11-wm/icewm/Makefile2
-rw-r--r--x11-wm/xfce/Makefile2
-rw-r--r--x11-wm/xfce4/Makefile2
-rw-r--r--x11/gdkxft/Makefile2
87 files changed, 98 insertions, 100 deletions
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index b2c424ad8b40..5d9781bf2ad0 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -32,7 +32,7 @@ MAKE_ARGS+= WITH_ICONV=yes
.if defined(DEFAULT_RECODE)
MAKE_ARGS+= DEFAULT_RECODE=${DEFAULT_RECODE}
.endif
-LIB_DEPENDS+= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
.endif
.if defined(WITH_NAS)
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 040b291a6d48..a7be3991e76c 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= naddy@FreeBSD.org
LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \
curl.2:${PORTSDIR}/ftp/curl \
- iconv.2:${PORTSDIR}/converters/iconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
vorbis.1:${PORTSDIR}/audio/libvorbis
GNU_CONFIGURE= yes
diff --git a/converters/p5-Text-Iconv/Makefile b/converters/p5-Text-Iconv/Makefile
index 993bb86ea647..6a05fc2fc15a 100644
--- a/converters/p5-Text-Iconv/Makefile
+++ b/converters/p5-Text-Iconv/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@protey.ru
-LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
PERL_CONFIGURE= yes
CONFIGURE_ARGS+= INC="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib -liconv"
diff --git a/converters/py-iconv/Makefile b/converters/py-iconv/Makefile
index ae186f3ce0a2..845759b80613 100644
--- a/converters/py-iconv/Makefile
+++ b/converters/py-iconv/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= python
MAINTAINER= perky@fallin.lv
BUILD_DEPENDS= ${PYDISTUTILS}
-LIB_DEPENDS= iconv:${PORTSDIR}/converters/iconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_PYTHON= yes
SETUP_CMD= cd ${WRKSRC} && ${PYTHON_CMD} setup.py
diff --git a/converters/ruby-iconv/Makefile b/converters/ruby-iconv/Makefile
index b7efa7974855..5608f6798e95 100644
--- a/converters/ruby-iconv/Makefile
+++ b/converters/ruby-iconv/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
-LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
diff --git a/converters/siconv/Makefile b/converters/siconv/Makefile
index 1afb3194e98c..a5bb61130396 100644
--- a/converters/siconv/Makefile
+++ b/converters/siconv/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.technocage.com/~caskey/siconv/download/
MAINTAINER= ijliao@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
do-build:
${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib -o ${WRKSRC}/siconv ${WRKSRC}/siconv.c -lgiconv
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index d783c712a58c..b2cae4aab08f 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index d783c712a58c..b2cae4aab08f 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/databases/grass-i18n/Makefile b/databases/grass-i18n/Makefile
index 63a3d905aad8..e97e0945da5a 100644
--- a/databases/grass-i18n/Makefile
+++ b/databases/grass-i18n/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.9:${PORTSDIR}/graphics/jpeg \
gd.2:${PORTSDIR}/graphics/gd \
fftw.2:${PORTSDIR}/math/fftw \
- giconv.2:${PORTSDIR}/converters/libiconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
freetype.9:${PORTSDIR}/print/freetype2 \
gdbm.2:${PORTSDIR}/databases/gdbm \
pq.2:${PORTSDIR}/databases/postgresql7 \
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index 63a3d905aad8..e97e0945da5a 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.9:${PORTSDIR}/graphics/jpeg \
gd.2:${PORTSDIR}/graphics/gd \
fftw.2:${PORTSDIR}/math/fftw \
- giconv.2:${PORTSDIR}/converters/libiconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
freetype.9:${PORTSDIR}/print/freetype2 \
gdbm.2:${PORTSDIR}/databases/gdbm \
pq.2:${PORTSDIR}/databases/postgresql7 \
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 59e0204679ed..8f5f79c9ba33 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= knu@FreeBSD.org
LIB_DEPENDS= rudiments.0:${PORTSDIR}/devel/rudiments \
xml2.5:${PORTSDIR}/textproc/libxml2 \
- giconv.2:${PORTSDIR}/converters/libiconv
+ iconv.3:${PORTSDIR}/converters/libiconv
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/bison-devel/Makefile b/devel/bison-devel/Makefile
index d6acd8bb2c40..9115ff9d4880 100644
--- a/devel/bison-devel/Makefile
+++ b/devel/bison-devel/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= bison
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-included-gettext
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index d6acd8bb2c40..9115ff9d4880 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= bison
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-included-gettext
diff --git a/devel/bison175/Makefile b/devel/bison175/Makefile
index d6acd8bb2c40..9115ff9d4880 100644
--- a/devel/bison175/Makefile
+++ b/devel/bison175/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= bison
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-included-gettext
diff --git a/devel/bison1875/Makefile b/devel/bison1875/Makefile
index d6acd8bb2c40..9115ff9d4880 100644
--- a/devel/bison1875/Makefile
+++ b/devel/bison1875/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= bison
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-included-gettext
diff --git a/devel/bison2/Makefile b/devel/bison2/Makefile
index d6acd8bb2c40..9115ff9d4880 100644
--- a/devel/bison2/Makefile
+++ b/devel/bison2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= bison
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-included-gettext
diff --git a/devel/bison20/Makefile b/devel/bison20/Makefile
index d6acd8bb2c40..9115ff9d4880 100644
--- a/devel/bison20/Makefile
+++ b/devel/bison20/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= bison
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-included-gettext
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 56e1cbec1c33..a5eeb8e66853 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= gettext
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
NO_LATEST_LINK= yes
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 6f0d8cb8bdef..6f5d0b3bfe57 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -19,7 +19,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv \
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
intl.1:${PORTSDIR}/devel/gettext-old
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index 1894732622ff..2cfcee55e1b6 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext \
${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf \
- giconv.2:${PORTSDIR}/converters/libiconv
+ iconv.3:${PORTSDIR}/converters/libiconv
.if !exists(/usr/bin/bzip2)
LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
.endif
diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile
index 1894732622ff..2cfcee55e1b6 100644
--- a/devel/gnomevfs/Makefile
+++ b/devel/gnomevfs/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext \
${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf \
- giconv.2:${PORTSDIR}/converters/libiconv
+ iconv.3:${PORTSDIR}/converters/libiconv
.if !exists(/usr/bin/bzip2)
LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
.endif
diff --git a/devel/styx/Makefile b/devel/styx/Makefile
index 52b8fdf66f29..5ba0a446c755 100644
--- a/devel/styx/Makefile
+++ b/devel/styx/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${PREFIX}/include ${PTHREAD_FLAGS}" \
diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile
index d9352ba864cc..e25f897d904f 100644
--- a/editors/AbiWord/Makefile
+++ b/editors/AbiWord/Makefile
@@ -20,10 +20,9 @@ DISTNAME= abiword-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
# unzip is needed during the installation process
-BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \
- giconv:${PORTSDIR}/converters/libiconv
+BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
- giconv.2:${PORTSDIR}/converters/libiconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
psiconv.8:${PORTSDIR}/converters/psiconv
DIST_SUBDIR= AbiWord
diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile
index d9352ba864cc..e25f897d904f 100644
--- a/editors/AbiWord2/Makefile
+++ b/editors/AbiWord2/Makefile
@@ -20,10 +20,9 @@ DISTNAME= abiword-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
# unzip is needed during the installation process
-BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \
- giconv:${PORTSDIR}/converters/libiconv
+BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
- giconv.2:${PORTSDIR}/converters/libiconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
psiconv.8:${PORTSDIR}/converters/psiconv
DIST_SUBDIR= AbiWord
diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index d9352ba864cc..e25f897d904f 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -20,10 +20,9 @@ DISTNAME= abiword-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
# unzip is needed during the installation process
-BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \
- giconv:${PORTSDIR}/converters/libiconv
+BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
- giconv.2:${PORTSDIR}/converters/libiconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
psiconv.8:${PORTSDIR}/converters/psiconv
DIST_SUBDIR= AbiWord
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index d9352ba864cc..e25f897d904f 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -20,10 +20,9 @@ DISTNAME= abiword-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
# unzip is needed during the installation process
-BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \
- giconv:${PORTSDIR}/converters/libiconv
+BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
- giconv.2:${PORTSDIR}/converters/libiconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
psiconv.8:${PORTSDIR}/converters/psiconv
DIST_SUBDIR= AbiWord
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 03fa731054c6..6f52cf261a7a 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_KDELIBS_VER=2
USE_PYTHON= yes
diff --git a/editors/dedit/Makefile b/editors/dedit/Makefile
index b440b85f2a61..f8bb3ea214ef 100644
--- a/editors/dedit/Makefile
+++ b/editors/dedit/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index 03fa731054c6..6f52cf261a7a 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_KDELIBS_VER=2
USE_PYTHON= yes
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index 03fa731054c6..6f52cf261a7a 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_KDELIBS_VER=2
USE_PYTHON= yes
diff --git a/editors/koffice/Makefile b/editors/koffice/Makefile
index 03fa731054c6..6f52cf261a7a 100644
--- a/editors/koffice/Makefile
+++ b/editors/koffice/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= kde@FreeBSD.org
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_KDELIBS_VER=2
USE_PYTHON= yes
diff --git a/editors/nvi-devel/Makefile b/editors/nvi-devel/Makefile
index cf6c449b2fad..7f8315f48993 100644
--- a/editors/nvi-devel/Makefile
+++ b/editors/nvi-devel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.kotnet.org/~skimo/nvi/devel/
MAINTAINER= dd@FreeBSD.org
-BUILD_DEPENDS= iconv:${PORTSDIR}/converters/iconv
+BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
USE_BZIP2= yes
diff --git a/ftp/wget+ipv6/Makefile b/ftp/wget+ipv6/Makefile
index 53ef87b1cdda..2e3683a61f27 100644
--- a/ftp/wget+ipv6/Makefile
+++ b/ftp/wget+ipv6/Makefile
@@ -24,7 +24,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= sf@FreeBSD.org
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old
-BUILD_DEPENDS= giconv:${PORTSDIR}/converters/libiconv
+BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
.if !defined(WITHOUT_SSL)
USE_OPENSSL= yes
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index 3968b22a3842..469fd198d58d 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= djvu
MAINTAINER= mi@aldan.algebra.com
LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
- giconv.2:${PORTSDIR}/converters/libiconv
+ iconv.3:${PORTSDIR}/converters/libiconv
.ifndef WITHOUT_X11
USE_QT_VER= 2
#LIB_DEPENDS+= qt2:${PORTSDIR}/x11-toolkits/qt23
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 8a8cb1e74eee..ec347e50c836 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.gphoto.net/dist/
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv \
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
intl.1:${PORTSDIR}/devel/gettext-old \
usb-0.1.5:${PORTSDIR}/devel/libusb \
aa.1:${PORTSDIR}/graphics/aalib \
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 1f9c48aed6c8..cbbb05d8b446 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -42,7 +42,7 @@ PORTDOCS= dotguide.pdf dottyguide.pdf gd.html leftyguide.pdf \
.include <bsd.port.pre.mk>
.if exists(${LOCALBASE}/include/iconv.h) || defined(WITH_ICONV)
-LIB_DEPENDS+= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
CONFIGURE_ENV+= LIBS="-liconv"
.endif
diff --git a/graphics/mplayer/Makefile b/graphics/mplayer/Makefile
index fa5cee020e5f..1432d4ea0c34 100644
--- a/graphics/mplayer/Makefile
+++ b/graphics/mplayer/Makefile
@@ -21,7 +21,7 @@ DISTNAME= MPlayer-0.60
MAINTAINER= riggs@rrr.de
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
- giconv.2:${PORTSDIR}/converters/libiconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
SDL-1.1.3:${PORTSDIR}/devel/sdl12
RUN_DEPENDS= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/graphics/mplayer-fonts
diff --git a/graphics/ogle-gui/Makefile b/graphics/ogle-gui/Makefile
index 5db265eb6860..94b3ccfe27fb 100644
--- a/graphics/ogle-gui/Makefile
+++ b/graphics/ogle-gui/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= lioux@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/ogle/libdvdcontrol.so.5:${PORTSDIR}/graphics/ogle
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
- giconv.2:${PORTSDIR}/converters/libiconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
glade.4:${PORTSDIR}/devel/libglade \
xml2.5:${PORTSDIR}/textproc/libxml2
RUN_DEPENDS= ogle:${PORTSDIR}/graphics/ogle
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 853ab23557ae..5b62627cdaf5 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://xchat.org/files/source/1.8/ \
MAINTAINER?= jim@FreeBSD.org
BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
# This port has a slave port japanese/xchat. Do not carelessly overwrite
# the variables or the targets defined in it. When you need to, please
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 853ab23557ae..5b62627cdaf5 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://xchat.org/files/source/1.8/ \
MAINTAINER?= jim@FreeBSD.org
BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
# This port has a slave port japanese/xchat. Do not carelessly overwrite
# the variables or the targets defined in it. When you need to, please
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index 853ab23557ae..5b62627cdaf5 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://xchat.org/files/source/1.8/ \
MAINTAINER?= jim@FreeBSD.org
BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
# This port has a slave port japanese/xchat. Do not carelessly overwrite
# the variables or the targets defined in it. When you need to, please
diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile
index 853ab23557ae..5b62627cdaf5 100644
--- a/irc/xchat2/Makefile
+++ b/irc/xchat2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://xchat.org/files/source/1.8/ \
MAINTAINER?= jim@FreeBSD.org
BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
# This port has a slave port japanese/xchat. Do not carelessly overwrite
# the variables or the targets defined in it. When you need to, please
diff --git a/japanese/libjconv/Makefile b/japanese/libjconv/Makefile
index d20cb5d15f70..5429c4142dd0 100644
--- a/japanese/libjconv/Makefile
+++ b/japanese/libjconv/Makefile
@@ -17,8 +17,8 @@ MASTER_SITE_SUBDIR= Jirai/SOURCES
MAINTAINER= knu@FreeBSD.org
-LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv
-RUN_DEPENDS= ${LOCALBASE}/libexec/iconv/iso-2022-jp.so:${PORTSDIR}/converters/iconv-extra
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
+#RUN_DEPENDS= ${LOCALBASE}/libexec/iconv/iso-2022-jp.so:${PORTSDIR}/converters/iconv-extra
MAKE_ARGS= NOPROFILE=true
INSTALLS_SHLIB= yes
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 8778b57ebf4d..1657d1aa5671 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -20,7 +20,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= shuna@pop16.odn.ne.jp
LIB_DEPENDS= slang.2:${PORTSDIR}/japanese/libslang \
- giconv.2:${PORTSDIR}/converters/libiconv
+ iconv.3:${PORTSDIR}/converters/libiconv
.if !defined(WITH_GETTEXT)
LIB_DEPENDS+= intl.1:${PORTSDIR}/devel/gettext-old
.endif
diff --git a/korean/gaim/Makefile b/korean/gaim/Makefile
index 0378ccc727c6..214c05a2187c 100644
--- a/korean/gaim/Makefile
+++ b/korean/gaim/Makefile
@@ -12,7 +12,7 @@ MASTERDIR= ${.CURDIR}/../../net/gaim
MAINTAINER= cjh@FreeBSD.org
-LIB_DEPENDS+= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
# this patch from www.intosea.com
EXTRA_PATCHES= ${.CURDIR}/files/gaim-0.50-ko.patch
diff --git a/korean/hanterm-xf86/Makefile b/korean/hanterm-xf86/Makefile
index f3c5ce1d0a8e..f5a0e7c35e0f 100644
--- a/korean/hanterm-xf86/Makefile
+++ b/korean/hanterm-xf86/Makefile
@@ -21,9 +21,9 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= cjh@FreeBSD.org
-LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv
-RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf \
- ${LOCALBASE}/share/iconv/johab.cct:${PORTSDIR}/converters/iconv-extra
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
+RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
+# ${LOCALBASE}/share/iconv/johab.cct:${PORTSDIR}/converters/iconv-extra
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 27efde5d82bb..a664b204fe1e 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -31,7 +31,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= cyrille.lefevre@laposte.net
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
# not needed since config.sh is generated by scripts/pre-configure.
# BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile
index 6d67706a9602..535140e660d6 100644
--- a/mail/heirloom-mailx/Makefile
+++ b/mail/heirloom-mailx/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://omnibus.ruf.uni-freiburg.de/~gritter/archive/nail/
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-rcfile="${PREFIX}/etc/nail.rc"
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index a59f16f58103..320e7a2ed80c 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -130,7 +130,7 @@ SGML_USED= no
.endif
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
- giconv.2:${PORTSDIR}/converters/libiconv
+ iconv.3:${PORTSDIR}/converters/libiconv
.if defined(NOPORTDOCS)
SGML_USED= no
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index 6d67706a9602..535140e660d6 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://omnibus.ruf.uni-freiburg.de/~gritter/archive/nail/
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-rcfile="${PREFIX}/etc/nail.rc"
diff --git a/mail/stuphead/Makefile b/mail/stuphead/Makefile
index 7ef870c0bc56..3ef64e12113e 100644
--- a/mail/stuphead/Makefile
+++ b/mail/stuphead/Makefile
@@ -15,7 +15,7 @@ PATCHFILES= ${PORTNAME}-${PORTVERSION}-1.patch
MAINTAINER= ozz@FreeBSD.org.ru
-LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index d161bd9395bc..fef12b65d62f 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= gnome@FreeBSD.org
LIB_DEPENDS= gnomeole2.0:${PORTSDIR}/devel/libole2 \
gbrun.0:${PORTSDIR}/lang/gnomebasic \
- giconv.2:${PORTSDIR}/converters/libiconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
psiconv.8:${PORTSDIR}/converters/psiconv
RUN_DEPENDS= guppi-gnumeric:${PORTSDIR}/math/guppi
@@ -28,6 +28,7 @@ USE_GNOME= yes
USE_PYTHON= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
+CONFIGURE_ARGS= --with-evolution
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib -lintl -lgiconv ${PTHREAD_LIBS}"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index d161bd9395bc..fef12b65d62f 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= gnome@FreeBSD.org
LIB_DEPENDS= gnomeole2.0:${PORTSDIR}/devel/libole2 \
gbrun.0:${PORTSDIR}/lang/gnomebasic \
- giconv.2:${PORTSDIR}/converters/libiconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
psiconv.8:${PORTSDIR}/converters/psiconv
RUN_DEPENDS= guppi-gnumeric:${PORTSDIR}/math/guppi
@@ -28,6 +28,7 @@ USE_GNOME= yes
USE_PYTHON= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
+CONFIGURE_ARGS= --with-evolution
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib -lintl -lgiconv ${PTHREAD_LIBS}"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index e5e46b0f8dc8..c2cb17f04451 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -14,7 +14,7 @@ DISTNAME= gnome-mime-data-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= giconv:${PORTSDIR}/converters/libiconv
+BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/misc/gnomemimedata/Makefile b/misc/gnomemimedata/Makefile
index e5e46b0f8dc8..c2cb17f04451 100644
--- a/misc/gnomemimedata/Makefile
+++ b/misc/gnomemimedata/Makefile
@@ -14,7 +14,7 @@ DISTNAME= gnome-mime-data-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= giconv:${PORTSDIR}/converters/libiconv
+BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index 8aa54456b828..429c149a5a2c 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://zeus.polsl.gliwice.pl/~pborys/stable-version/
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv \
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
intl.1:${PORTSDIR}/devel/gettext-old
GNU_CONFIGURE= yes
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index fa5cee020e5f..1432d4ea0c34 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -21,7 +21,7 @@ DISTNAME= MPlayer-0.60
MAINTAINER= riggs@rrr.de
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
- giconv.2:${PORTSDIR}/converters/libiconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
SDL-1.1.3:${PORTSDIR}/devel/sdl12
RUN_DEPENDS= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/graphics/mplayer-fonts
diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile
index fa5cee020e5f..1432d4ea0c34 100644
--- a/multimedia/mplayerxp/Makefile
+++ b/multimedia/mplayerxp/Makefile
@@ -21,7 +21,7 @@ DISTNAME= MPlayer-0.60
MAINTAINER= riggs@rrr.de
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
- giconv.2:${PORTSDIR}/converters/libiconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
SDL-1.1.3:${PORTSDIR}/devel/sdl12
RUN_DEPENDS= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/graphics/mplayer-fonts
diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index 5db265eb6860..94b3ccfe27fb 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= lioux@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/ogle/libdvdcontrol.so.5:${PORTSDIR}/graphics/ogle
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
- giconv.2:${PORTSDIR}/converters/libiconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
glade.4:${PORTSDIR}/devel/libglade \
xml2.5:${PORTSDIR}/textproc/libxml2
RUN_DEPENDS= ogle:${PORTSDIR}/graphics/ogle
diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile
index 34383c2a420f..d39fc5a03c4b 100644
--- a/net-p2p/dctc-gui/Makefile
+++ b/net-p2p/dctc-gui/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= lioux@FreeBSD.org
BUILD_DEPENDS= dctc:${PORTSDIR}/net/dctc
LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit \
- iconv.2:${PORTSDIR}/converters/iconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
intl.1:${PORTSDIR}/devel/gettext-old
USE_GNOMELIBS= yes
diff --git a/net-p2p/gtkhx/Makefile b/net-p2p/gtkhx/Makefile
index b134e502131c..9312484bad91 100644
--- a/net-p2p/gtkhx/Makefile
+++ b/net-p2p/gtkhx/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= gtkhx
MAINTAINER= jre@vineyard.net
-LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf:install \
+LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
intl.1:${PORTSDIR}/devel/gettext-old \
- iconv.2:${PORTSDIR}/converters/iconv:install
+ iconv.3:${PORTSDIR}/converters/libiconv
USE_XLIB= yes
USE_GLIB= yes
diff --git a/net/dctc-gui/Makefile b/net/dctc-gui/Makefile
index 34383c2a420f..d39fc5a03c4b 100644
--- a/net/dctc-gui/Makefile
+++ b/net/dctc-gui/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= lioux@FreeBSD.org
BUILD_DEPENDS= dctc:${PORTSDIR}/net/dctc
LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit \
- iconv.2:${PORTSDIR}/converters/iconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
intl.1:${PORTSDIR}/devel/gettext-old
USE_GNOMELIBS= yes
diff --git a/net/gtk+licq/Makefile b/net/gtk+licq/Makefile
index 2a416494e226..39b277ff871d 100644
--- a/net/gtk+licq/Makefile
+++ b/net/gtk+licq/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= roman@xpert.com
BUILD_DEPENDS= ${LOCALBASE}/include/licq/licq_icqd.h:${PORTSDIR}/net/licq
LIB_DEPENDS= pspell.4:${PORTSDIR}/textproc/pspell \
- giconv.2:${PORTSDIR}/converters/libiconv
+ iconv.3:${PORTSDIR}/converters/libiconv
RUN_DEPENDS= licq:${PORTSDIR}/net/licq
# It breaks the build for some reason
diff --git a/net/gtkhx/Makefile b/net/gtkhx/Makefile
index b134e502131c..9312484bad91 100644
--- a/net/gtkhx/Makefile
+++ b/net/gtkhx/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= gtkhx
MAINTAINER= jre@vineyard.net
-LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf:install \
+LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
intl.1:${PORTSDIR}/devel/gettext-old \
- iconv.2:${PORTSDIR}/converters/iconv:install
+ iconv.3:${PORTSDIR}/converters/libiconv
USE_XLIB= yes
USE_GLIB= yes
diff --git a/net/wol/Makefile b/net/wol/Makefile
index f50945b2bdfa..aee4d29a1566 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ahh
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= intl:${PORTSDIR}/devel/gettext-old \
- giconv:${PORTSDIR}/converters/libiconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
gnugetopt:${PORTSDIR}/devel/libgnugetopt
GNU_CONFIGURE= yes
diff --git a/news/tin/Makefile b/news/tin/Makefile
index d48cd9d2ddcc..2fe515523d90 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?= ache@FreeBSD.org
LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib \
intl.1:${PORTSDIR}/devel/gettext-old \
- giconv.2:${PORTSDIR}/converters/libiconv
+ iconv.3:${PORTSDIR}/converters/libiconv
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile
index 473b1aaacab5..07d9d20c3cca 100644
--- a/palm/pilot-link-devel/Makefile
+++ b/palm/pilot-link-devel/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= dima@FreeBSD.org
LIB_DEPENDS= tk83:${PORTSDIR}/x11-toolkits/tk83 \
- giconv:${PORTSDIR}/converters/libiconv
+ iconv.3:${PORTSDIR}/converters/libiconv
USE_BZIP2= yes
USE_LIBTOOL= yes
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index 473b1aaacab5..07d9d20c3cca 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= dima@FreeBSD.org
LIB_DEPENDS= tk83:${PORTSDIR}/x11-toolkits/tk83 \
- giconv:${PORTSDIR}/converters/libiconv
+ iconv.3:${PORTSDIR}/converters/libiconv
USE_BZIP2= yes
USE_LIBTOOL= yes
diff --git a/science/vis5d+/Makefile b/science/vis5d+/Makefile
index 834ac23ed5ff..f7a9b6507e74 100644
--- a/science/vis5d+/Makefile
+++ b/science/vis5d+/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/libmix.a:${PORTSDIR}/graphics/qslim \
convert:${PORTSDIR}/graphics/ImageMagick
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv \
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
netcdf.1:${PORTSDIR}/math/netcdf
RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 933904fa388c..e891eaefd9f3 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -26,7 +26,7 @@ MLINKS= gpg.1 gpgm.1
.include <bsd.port.pre.mk>
.if exists(${PREFIX}/lib/libiconv.so)
-LIB_DEPENDS+= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
.endif
.if exists(${PREFIX}/lib/libgdbm.so)
LIB_DEPENDS+= gdbm.2:${PORTSDIR}/databases/gdbm
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 933904fa388c..e891eaefd9f3 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -26,7 +26,7 @@ MLINKS= gpg.1 gpgm.1
.include <bsd.port.pre.mk>
.if exists(${PREFIX}/lib/libiconv.so)
-LIB_DEPENDS+= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
.endif
.if exists(${PREFIX}/lib/libgdbm.so)
LIB_DEPENDS+= gdbm.2:${PORTSDIR}/databases/gdbm
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index d95730e603c4..c9e020c24c8b 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 0132a1bd3e13..ee1d856c6dbe 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
USE_BZIP2= yes
diff --git a/textproc/minidom/Makefile b/textproc/minidom/Makefile
index 69e1c04d7cca..10fe69f950d7 100644
--- a/textproc/minidom/Makefile
+++ b/textproc/minidom/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.cs.unibo.it/helm/mml-widget/sources/
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 \
- giconv:${PORTSDIR}/converters/libiconv
+ iconv.3:${PORTSDIR}/converters/libiconv
USE_GLIB= yes
USE_LIBTOOL= yes
diff --git a/textproc/p5-XML-Sablotron/Makefile b/textproc/p5-XML-Sablotron/Makefile
index 9f24fb18284d..a6b72b9c7745 100644
--- a/textproc/p5-XML-Sablotron/Makefile
+++ b/textproc/p5-XML-Sablotron/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
LIB_DEPENDS= sablot.67:${PORTSDIR}/textproc/sablotron \
- iconv.2:${PORTSDIR}/converters/iconv
+ iconv.3:${PORTSDIR}/converters/libiconv
PERL_CONFIGURE= yes
CONFIGURE_ARGS= LIBS='-L${LOCALBASE}/lib -lexpat -lsablot -liconv' \
diff --git a/textproc/ruby-sablot/Makefile b/textproc/ruby-sablot/Makefile
index d8f47d54b275..ee7b18893c46 100644
--- a/textproc/ruby-sablot/Makefile
+++ b/textproc/ruby-sablot/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
LIB_DEPENDS= sablot.67:${PORTSDIR}/textproc/sablotron \
- iconv.2:${PORTSDIR}/converters/iconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
expat.2:${PORTSDIR}/textproc/expat2
USE_RUBY= yes
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 89678c3650eb..16b3908a4f21 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://download-2.gingerall.cz/download/sablot/
MAINTAINER= skv@FreeBSD.org
-LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv \
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
expat.2:${PORTSDIR}/textproc/expat2
INSTALLS_SHLIB= yes
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 7a11b5af16b6..e3e4d40d2d0d 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} \
msgfmt-new:${PORTSDIR}/devel/gettext
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
#BROKEN= "b0rken with Mozilla-0.9.9"
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 7a11b5af16b6..e3e4d40d2d0d 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} \
msgfmt-new:${PORTSDIR}/devel/gettext
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
#BROKEN= "b0rken with Mozilla-0.9.9"
diff --git a/www/p5-AxKit/Makefile b/www/p5-AxKit/Makefile
index 1c81a4fa05ae..33801e7d6c1c 100644
--- a/www/p5-AxKit/Makefile
+++ b/www/p5-AxKit/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= dom@happygiraffe.net
-LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
BUILD_DEPENDS= \
${SITE_PERL}/${PERL_ARCH}/Apache/libapreq.pm:${PORTSDIR}/www/p5-libapreq \
${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index c3625f8249a6..1d11c5ab5b21 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -15,7 +15,7 @@ MAINTAINER?= gnome@FreeBSD.org
LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode \
glade.4:${PORTSDIR}/devel/libglade \
- giconv.2:${PORTSDIR}/converters/libiconv
+ iconv.3:${PORTSDIR}/converters/libiconv
USE_X_PREFIX= yes
USE_PERL5= yes
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index c3625f8249a6..1d11c5ab5b21 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -15,7 +15,7 @@ MAINTAINER?= gnome@FreeBSD.org
LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode \
glade.4:${PORTSDIR}/devel/libglade \
- giconv.2:${PORTSDIR}/converters/libiconv
+ iconv.3:${PORTSDIR}/converters/libiconv
USE_X_PREFIX= yes
USE_PERL5= yes
diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile
index 3bacc7c93bb6..be89d4d00fb4 100644
--- a/x11-toolkits/wxgtk-devel/Makefile
+++ b/x11-toolkits/wxgtk-devel/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= sobomax@FreeBSD.org
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
- giconv.2:${PORTSDIR}/converters/libiconv
+ iconv.3:${PORTSDIR}/converters/libiconv
NO_LATEST_LINK= "Unstable, development version."
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index a8b116a49931..0e3efafa4348 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= nakai@FreeBSD.org
BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
- giconv.2:${PORTSDIR}/converters/libiconv
+ iconv.3:${PORTSDIR}/converters/libiconv
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
WANT_GNOME= yes
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index f6138b4cb3e2..1f7c52b7c986 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \
- giconv.2:${PORTSDIR}/converters/libiconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
USE_X_PREFIX= yes
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index f6138b4cb3e2..1f7c52b7c986 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \
- giconv.2:${PORTSDIR}/converters/libiconv \
+ iconv.3:${PORTSDIR}/converters/libiconv \
gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
USE_X_PREFIX= yes
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 56f3e8e76ae2..cc3a5d44255a 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= anders@hack.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_X_PREFIX= yes
USE_GTK= yes