summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2002-03-19 12:52:55 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2002-03-19 12:52:55 +0000
commit47828d0fce172b8afae396ba1cbcf459e396ef95 (patch)
treefc522cacf5b7a223abfda5c9bd7fe272ed4a0589 /devel
parentUpgrade to 3.0 beta 5 (diff)
Fix another few places where giconv used instead of iconv.
PR: 36059, 36063, 36082 Submitted by: Joe Marcus Clarke <marcus@marcuscom.com>
Diffstat (limited to 'devel')
-rw-r--r--devel/gettext/Makefile5
-rw-r--r--devel/gtranslator/Makefile2
-rw-r--r--devel/styx/Makefile2
3 files changed, 2 insertions, 7 deletions
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index ed39a7621c26..2ee6d2f46344 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -30,11 +30,6 @@ MAN3= bind_textdomain_codeset.3 bindtextdomain.3 dcgettext.3 \
dcngettext.3 dgettext.3 dngettext.3 gettext.3 ngettext.3 \
textdomain.3
-# X X X - I know, but it doesn't work with BSD iconv yet. :(((
-post-patch:
- @${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \
- 's|-liconv|-lgiconv|g ; s|iconv\.h|giconv\.h|g'
-
pre-configure:
${RM} ${WRKSRC}/doc/gettext.info*
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 59b26ba64bed..e42efff44a86 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -22,7 +22,7 @@ USE_GNOME= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --disable-debug
-CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lgiconv -lgnuregex" \
+CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv -lgnuregex" \
MSGFMT=${LOCALBASE}/bin/msgfmt-new \
XGETTEXT=${LOCALBASE}/bin/xgettext-new
diff --git a/devel/styx/Makefile b/devel/styx/Makefile
index 10d30bc1d385..f04b6ccb79a6 100644
--- a/devel/styx/Makefile
+++ b/devel/styx/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${PREFIX}/include ${PTHREAD_FLAGS}" \
- LIBS="-L${PREFIX}/lib -lgiconv ${PTHREAD_LIBS}"
+ LIBS="-L${PREFIX}/lib -liconv ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --includedir=${PREFIX}/include/styx \
--datadir=${PREFIX}/share/doc/styx