Date: Sun, 17 Mar 2002 18:57:59 +0200 From: Maxim Sobolev <sobomax@FreeBSD.org> To: "Andrey A. Chernov" <ache@nagual.pp.ru>, Ade Lovett <ade@FreeBSD.org>, Pete Fritchman <petef@databits.net>, Konstantin Chuguev <Konstantin.Chuguev@dante.org.uk>, freebsd-ports@FreeBSD.org, i18n@FreeBSD.org, gnome@FreeBSD.org, knu@FreeBSD.org Subject: iconv conversion: the patch [Was: iconv port: plea for take-over] Message-ID: <3C94CB17.4D9CA989@FreeBSD.org> References: <3C721ADF.7968582D@FreeBSD.org> <B89877E9.76C8%ade@FreeBSD.org> <20020220090003.GA28578@nagual.pp.ru> <3C736738.DF450753@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------0966DDECB85D618CA7865FE7
Content-Type: text/plain; charset=koi8-r
Content-Transfer-Encoding: 7bit
Ok, attached is the patch, which does what was agreed here some time
ago, namely:
1. Removes all `g' prefixes from the
binaries/headers/libraries/manpages installed by the libiconv (aka GNU
iconv) port;
2. Adds similar `b' prefixes to all
binaries/headers/libraries/manpages installed by the iconv (aka BSD
iconv) port;
3. Converts all ports that previously used BSD iconv to GNU iconv;
4. Removes all `g' prefixes from {BUILD,LIB,RUN}_DEPENDS of all ports
that depend of libiconv;
5. Tweaks GNU iconv library to be binary compatible with BSD iconv
(untested!). This part is little tricky, because many ports checks
whether iconv is a standalone library and is test is positive then use
libiconv_open()/libiconv()/libiconv_close() instead of corresponding
iconv_open()/iconv()/iconv_close() functions. Moreover, configure
checks written in such a way that they check presence of those
functions without including <iconv.h> first, so that `#define libfoo
foo' in <iconv.h> doesn't work. Therefore, I ended up adding both
`#define libfoo foo' into <iconv.h> and wrapper libfoo() functions
into the library itself. Quick testing with GNOME confirmed that such
scheme works quite well - configure script detects libfoo() functions
in libiconv, while compiled application has references to foo()
functions instead due to `#define libfoo foo' in iconv.h. This should
allow us to seamlessly convert back to BSD iconv once it is fixed
and/or added into BSD libc.
6. Creates compatibility `g'-symlinks, so that existing `g'-hacks
should continue working until we have ripped them all from the tree.
If there are no serious objections I would like commit this patch
tomorrow (9:00 GMT) and ask individual maintainers to remove all
`g'-hacks from their ports after that.
Thanks!
-Maxim
--------------0966DDECB85D618CA7865FE7
Content-Type: text/plain; charset=koi8-r;
name="iconv.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="iconv.diff"
? audio/mpg123/files/patch-audio.c,v
? devel/gnomevfs/pkg-plist,v
? editors/AbiWord/35254
? editors/AbiWord/pkg-plist,v
? editors/AbiWord/pr-patch
? math/gnumeric/pkg-plist,v
? textproc/libxml2/32746
? textproc/libxml2/pkg-plist,v
? textproc/libxml2/pr-patch
? www/galeon/pkg-plist,v
? x11-toolkits/gal/pkg-plist,v
? x11-toolkits/wxgtk-devel/wxgtk-devel-port.diff
Index: databases/grass/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/grass/Makefile,v
retrieving revision 1.10
diff -d -u -r1.10 Makefile
--- databases/grass/Makefile 12 Mar 2002 22:58:39 -0000 1.10
+++ databases/grass/Makefile 17 Mar 2002 16:31:39 -0000
@@ -21,7 +21,7 @@
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 \
Index: graphics/gphoto2/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/gphoto2/Makefile,v
retrieving revision 1.19
diff -d -u -r1.19 Makefile
--- graphics/gphoto2/Makefile 15 Mar 2002 19:44:04 -0000 1.19
+++ graphics/gphoto2/Makefile 17 Mar 2002 16:31:39 -0000
@@ -12,7 +12,7 @@
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 \
Index: x11-wm/icewm/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-wm/icewm/Makefile,v
retrieving revision 1.69
diff -d -u -r1.69 Makefile
--- x11-wm/icewm/Makefile 15 Mar 2002 19:44:26 -0000 1.69
+++ x11-wm/icewm/Makefile 17 Mar 2002 16:31:39 -0000
@@ -17,7 +17,7 @@
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
Index: x11-wm/xfce/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-wm/xfce/Makefile,v
retrieving revision 1.52
diff -d -u -r1.52 Makefile
--- x11-wm/xfce/Makefile 18 Feb 2002 10:37:10 -0000 1.52
+++ x11-wm/xfce/Makefile 17 Mar 2002 16:31:39 -0000
@@ -15,7 +15,7 @@
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
Index: audio/mpg123/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/mpg123/Makefile,v
retrieving revision 1.38
diff -d -u -r1.38 Makefile
--- audio/mpg123/Makefile 18 Feb 2002 09:34:12 -0000 1.38
+++ audio/mpg123/Makefile 17 Mar 2002 16:31:39 -0000
@@ -32,7 +32,7 @@
.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)
Index: audio/vorbis-tools/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/vorbis-tools/Makefile,v
retrieving revision 1.13
diff -d -u -r1.13 Makefile
--- audio/vorbis-tools/Makefile 14 Feb 2002 16:59:44 -0000 1.13
+++ audio/vorbis-tools/Makefile 17 Mar 2002 16:31:39 -0000
@@ -19,7 +19,7 @@
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
Index: converters/iconv/Makefile
===================================================================
RCS file: /home/ncvs/ports/converters/iconv/Makefile,v
retrieving revision 1.8
diff -d -u -r1.8 Makefile
--- converters/iconv/Makefile 30 Nov 2000 09:23:33 -0000 1.8
+++ converters/iconv/Makefile 17 Mar 2002 16:31:39 -0000
@@ -7,7 +7,7 @@
PORTNAME= iconv
PORTVERSION= 2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= converters
MASTER_SITES= http://www.dante.net/staff/konstantin/FreeBSD/iconv/
@@ -17,8 +17,8 @@
INSTALLS_SHLIB= yes
MANCOMPRESSED= yes
-MAN1= iconv.1
-MAN3= iconv.3 iconv_open.3 iconv_close.3
+MAN1= biconv.1
+MAN3= biconv.3 biconv_open.3 biconv_close.3
.if defined(NOPROFILE)
PLIST_SUB= PROFILE:="@comment "
Index: converters/iconv/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/converters/iconv/pkg-plist,v
retrieving revision 1.6
diff -d -u -r1.6 pkg-plist
--- converters/iconv/pkg-plist 30 Nov 2000 09:23:33 -0000 1.6
+++ converters/iconv/pkg-plist 17 Mar 2002 16:31:39 -0000
@@ -1,10 +1,10 @@
-bin/iconv
+bin/biconv
bin/iconv_mktbl
-include/iconv.h
-lib/libiconv.a
-lib/libiconv.so
-lib/libiconv.so.2
-%%PROFILE:%%lib/libiconv_p.a
+include/biconv.h
+lib/libbiconv.a
+lib/libbiconv.so
+lib/libbiconv.so.2
+%%PROFILE:%%lib/libbiconv_p.a
libexec/iconv/euc-jp.so
libexec/iconv/euc-kr.so
libexec/iconv/euc-tw.so
Index: converters/iconv/files/patch-ai
===================================================================
RCS file: /home/ncvs/ports/converters/iconv/files/patch-ai,v
retrieving revision 1.1
diff -d -u -r1.1 patch-ai
--- converters/iconv/files/patch-ai 8 Dec 2000 11:33:04 -0000 1.1
+++ converters/iconv/files/patch-ai 17 Mar 2002 16:31:39 -0000
@@ -1,6 +1,20 @@
---- lib/Makefile.orig Mon Nov 27 23:33:49 2000
-+++ lib/Makefile Thu Dec 7 15:23:52 2000
-@@ -10,8 +10,8 @@
+
+$FreeBSD$
+
+--- lib/Makefile.orig Tue Nov 28 01:33:49 2000
++++ lib/Makefile Sun Mar 17 13:12:04 2002
+@@ -1,27 +1,27 @@
+-LIB = iconv
++LIB = biconv
+ SHLIB_MAJOR = 2
+ SHLIB_MINOR = 0
+
+ SRCS = aliases.c ccs.c ces.c ces_euc.c ces_iso2022.c ces_table.c \
+- converter.c iconv.c utils.c
++ converter.c iconv.c utils.c biconv.h
+
+ BUILTIN_CCS != cd ${.CURDIR}/../ccs && make lib >/dev/null && ${AR} t libccs.a
+ BUILTIN_CES != cd ${.CURDIR}/../ces && make lib >/dev/null && ${AR} t libces.a
BUILTIN_CES_STATIC != cd ${.CURDIR}/../ces && make libces_static.a \
>/dev/null && ${AR} t libces_static.a
@@ -11,3 +25,37 @@
LIBDIR = ${PREFIX}/lib
+ INCDIR = ${PREFIX}/include
+-INCS = iconv.h
++INCS = biconv.h
+
+ CFLAGS += -DICONV_MODULE_PATH=\"${MODULEDIR}\" \
+ -DICONV_TABLE_PATH=\"${TABLEDIR}\"
+
+-MAN3 = iconv.3 iconv_open.3 iconv_close.3
++MAN3 = biconv.3 biconv_open.3 biconv_close.3
+
+ ALIASES = ${.CURDIR}/../ccs/charset.aliases \
+ ${.CURDIR}/../ces/charset.aliases
+@@ -32,13 +32,19 @@
+ cat ${.ALLSRC} | ${.CURDIR}/../iconv_builtin ${BUILTIN_CCS} \
+ ${BUILTIN_CES} PIC ${BUILTIN_CES_STATIC} > ${.TARGET}
+
+-iconv.3: iconv.3.in
++biconv.3: iconv.3.in
+ sed -e "s|@@TABLE_DIR@@|${TABLEDIR}|" \
+ -e "s|@@MODULE_DIR@@|${MODULEDIR}|" ${.ALLSRC} > ${.TARGET}
+
+-iconv_open.3: iconv_open.3.in
++biconv_open.3: iconv_open.3.in
+ sed -e "s|@@TABLE_DIR@@|${TABLEDIR}|" \
+ -e "s|@@MODULE_DIR@@|${MODULEDIR}|" ${.ALLSRC} > ${.TARGET}
++
++biconv_close.3: iconv_close.3
++ cp ${.ALLSRC} ${.TARGET}
++
++biconv.h: iconv.h
++ cp ${.ALLSRC} ${.TARGET}
+
+ CLEANFILES= ${.CURDIR}/../ccs/libccs.a ${.CURDIR}/../ces/libces*.a \
+ aliases.h iconv.3 iconv_open.3
Index: converters/iconv/files/patch-ces::Makefile
===================================================================
RCS file: converters/iconv/files/patch-ces::Makefile
diff -N converters/iconv/files/patch-ces::Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ converters/iconv/files/patch-ces::Makefile 17 Mar 2002 16:31:39 -0000
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- ces/Makefile 2002/03/17 11:07:44 1.1
++++ ces/Makefile 2002/03/17 11:07:56
+@@ -10,7 +10,7 @@
+ LIB= ces
+ SRCS= ces_builtin.c ${CHARSETS_C}
+
+-LDADD = -L${.CURDIR}/../lib -liconv
++LDADD = -L${.CURDIR}/../lib -lbiconv
+
+ INTERNALLIB =
+
Index: converters/iconv/files/patch-util::Makefile
===================================================================
RCS file: converters/iconv/files/patch-util::Makefile
diff -N converters/iconv/files/patch-util::Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ converters/iconv/files/patch-util::Makefile 17 Mar 2002 16:31:39 -0000
@@ -0,0 +1,24 @@
+
+$FreeBSD$
+
+--- util/Makefile.orig Sun Sep 3 22:33:15 2000
++++ util/Makefile Sun Mar 17 13:08:59 2002
+@@ -1,11 +1,14 @@
+-PROG= iconv
++PROG= biconv
+ SRCS= iconv.c iconv_stream.c
+
+-LDADD= -L../lib -liconv
+-DPADD+= ../lib/libiconv.a
++LDADD= -L../lib -lbiconv
++DPADD+= ../lib/libbiconv.a
+
+ BINDIR= ${PREFIX}/bin
+
+-MAN1= iconv.1
++MAN1= biconv.1
++
++biconv.1: iconv.1
++ cp ${.ALLSRC} ${.TARGET}
+
+ .include <bsd.prog.mk>
Index: converters/iconv-extra/Makefile
===================================================================
RCS file: /home/ncvs/ports/converters/iconv-extra/Makefile,v
retrieving revision 1.3
diff -d -u -r1.3 Makefile
--- converters/iconv-extra/Makefile 29 Nov 2000 11:46:37 -0000 1.3
+++ converters/iconv-extra/Makefile 17 Mar 2002 16:31:39 -0000
@@ -12,7 +12,7 @@
MAINTAINER= Konstantin.Chuguev@dante.org.uk
-LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS= biconv.2:${PORTSDIR}/converters/iconv
USE_PERL5= yes
Index: converters/iconv-extra/files/patch-ces::Makefile
===================================================================
RCS file: converters/iconv-extra/files/patch-ces::Makefile
diff -N converters/iconv-extra/files/patch-ces::Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ converters/iconv-extra/files/patch-ces::Makefile 17 Mar 2002 16:31:39 -0000
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- ces/Makefile 2002/03/17 11:14:41 1.1
++++ ces/Makefile 2002/03/17 11:15:02
+@@ -5,7 +5,7 @@
+
+ .if !defined(ICONVDIR_LIBC)
+ CFLAGS += -I/usr/local/include
+-LDADD += -L/usr/local/lib -liconv
++LDADD += -L/usr/local/lib -lbiconv
+ .endif
+
+ INTERNALLIB =
Index: converters/iconv-extra/files/patch-ces::iso-2022-cn.c
===================================================================
RCS file: converters/iconv-extra/files/patch-ces::iso-2022-cn.c
diff -N converters/iconv-extra/files/patch-ces::iso-2022-cn.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ converters/iconv-extra/files/patch-ces::iso-2022-cn.c 17 Mar 2002 16:31:39 -0000
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- ces/iso-2022-cn.c 2002/03/17 11:15:25 1.1
++++ ces/iso-2022-cn.c 2002/03/17 11:15:46
+@@ -31,7 +31,7 @@
+ */
+
+ #define ICONV_INTERNAL
+-#include <iconv.h>
++#include <biconv.h>
+
+ static const iconv_ces_iso2022_ccs ccsattr[] = {
+ {"us-ascii", "", 0, ICONV_SHIFT_SI},
Index: converters/iconv-extra/files/patch-ces::iso-2022-jp-2.c
===================================================================
RCS file: converters/iconv-extra/files/patch-ces::iso-2022-jp-2.c
diff -N converters/iconv-extra/files/patch-ces::iso-2022-jp-2.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ converters/iconv-extra/files/patch-ces::iso-2022-jp-2.c 17 Mar 2002 16:31:39 -0000
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- ces/iso-2022-jp-2.c 2002/03/17 11:15:25 1.1
++++ ces/iso-2022-jp-2.c 2002/03/17 11:15:46
+@@ -31,7 +31,7 @@
+ */
+
+ #define ICONV_INTERNAL
+-#include <iconv.h>
++#include <biconv.h>
+
+ static const iconv_ces_iso2022_ccs ccsattr[] = {
+ {"us-ascii", "\x1b(B", 3, ICONV_SHIFT_SI},
Index: converters/iconv-extra/files/patch-ces::iso-2022-jp.c
===================================================================
RCS file: converters/iconv-extra/files/patch-ces::iso-2022-jp.c
diff -N converters/iconv-extra/files/patch-ces::iso-2022-jp.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ converters/iconv-extra/files/patch-ces::iso-2022-jp.c 17 Mar 2002 16:31:39 -0000
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- ces/iso-2022-jp.c 2002/03/17 11:15:25 1.1
++++ ces/iso-2022-jp.c 2002/03/17 11:15:46
+@@ -31,7 +31,7 @@
+ */
+
+ #define ICONV_INTERNAL
+-#include <iconv.h>
++#include <biconv.h>
+
+ static const iconv_ces_iso2022_ccs ccsattr[] = {
+ {"us-ascii", "\x1b(B", 3, ICONV_SHIFT_SI},
Index: converters/iconv-extra/files/patch-ces::iso-2022-kr.c
===================================================================
RCS file: converters/iconv-extra/files/patch-ces::iso-2022-kr.c
diff -N converters/iconv-extra/files/patch-ces::iso-2022-kr.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ converters/iconv-extra/files/patch-ces::iso-2022-kr.c 17 Mar 2002 16:31:39 -0000
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- ces/iso-2022-kr.c 2002/03/17 11:15:25 1.1
++++ ces/iso-2022-kr.c 2002/03/17 11:15:46
+@@ -31,7 +31,7 @@
+ */
+
+ #define ICONV_INTERNAL
+-#include <iconv.h>
++#include <biconv.h>
+
+ static const iconv_ces_iso2022_ccs ccsattr[] = {
+ {"us-ascii", "", 0, ICONV_SHIFT_SI},
Index: converters/iconv-extra/files/patch-ces::unicode-1-1-utf-7.c
===================================================================
RCS file: converters/iconv-extra/files/patch-ces::unicode-1-1-utf-7.c
diff -N converters/iconv-extra/files/patch-ces::unicode-1-1-utf-7.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ converters/iconv-extra/files/patch-ces::unicode-1-1-utf-7.c 17 Mar 2002 16:31:39 -0000
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- ces/unicode-1-1-utf-7.c 2002/03/17 11:20:12 1.1
++++ ces/unicode-1-1-utf-7.c 2002/03/17 11:20:21
+@@ -33,7 +33,7 @@
+ #include <stdlib.h>
+
+ #define ICONV_INTERNAL
+-#include <iconv.h>
++#include <biconv.h>
+
+ static inline int
+ lackofbytes(int bytes, size_t *bytesleft)
Index: converters/iconv-rfc1345/Makefile
===================================================================
RCS file: /home/ncvs/ports/converters/iconv-rfc1345/Makefile,v
retrieving revision 1.3
diff -d -u -r1.3 Makefile
--- converters/iconv-rfc1345/Makefile 29 Nov 2000 11:46:38 -0000 1.3
+++ converters/iconv-rfc1345/Makefile 17 Mar 2002 16:31:39 -0000
@@ -12,7 +12,7 @@
MAINTAINER= Konstantin.Chuguev@dante.org.uk
-LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS= biconv.2:${PORTSDIR}/converters/iconv
USE_PERL5= yes
Index: converters/libiconv/Makefile
===================================================================
RCS file: /home/ncvs/ports/converters/libiconv/Makefile,v
retrieving revision 1.10
diff -d -u -r1.10 Makefile
--- converters/libiconv/Makefile 27 Aug 2001 09:39:53 -0000 1.10
+++ converters/libiconv/Makefile 17 Mar 2002 16:31:39 -0000
@@ -7,7 +7,7 @@
PORTNAME= libiconv
PORTVERSION= 1.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= converters devel
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.ilog.fr/pub/Users/haible/gnu/
@@ -19,7 +19,13 @@
CONFIGURE_ARGS= --enable-static
INSTALLS_SHLIB= yes
-MAN1= giconv.1
-MAN3= giconv.3 giconv_open.3 giconv_close.3
+MAN1= iconv.1
+MAN3= iconv.3 iconv_open.3 iconv_close.3
+
+post-install:
+ @${LN} -sf ${PREFIX}/bin/iconv ${PREFIX}/bin/giconv
+ @${LN} -sf ${PREFIX}/include/iconv.h ${PREFIX}/include/giconv.h
+ @${LN} -sf ${PREFIX}/lib/libiconv.a ${PREFIX}/lib/libgiconv.a
+ @${LN} -sf ${PREFIX}/lib/libiconv.so ${PREFIX}/lib/libgiconv.so
.include <bsd.port.mk>
Index: converters/libiconv/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/converters/libiconv/pkg-plist,v
retrieving revision 1.6
diff -d -u -r1.6 pkg-plist
--- converters/libiconv/pkg-plist 27 Aug 2001 09:39:53 -0000 1.6
+++ converters/libiconv/pkg-plist 17 Mar 2002 16:31:39 -0000
@@ -1,12 +1,16 @@
bin/giconv
+bin/iconv
include/giconv.h
+include/iconv.h
include/libcharset.h
lib/libcharset.a
lib/libcharset.so
lib/libcharset.so.1
lib/libgiconv.a
lib/libgiconv.so
-lib/libgiconv.so.2
+lib/libiconv.a
+lib/libiconv.so
+lib/libiconv.so.3
libdata/charset.alias
share/doc/libiconv/iconv.1.html
share/doc/libiconv/iconv.3.html
Index: converters/libiconv/files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/converters/libiconv/files/patch-aa,v
retrieving revision 1.4
diff -d -u -r1.4 patch-aa
--- converters/libiconv/files/patch-aa 27 Aug 2001 09:39:53 -0000 1.4
+++ converters/libiconv/files/patch-aa 17 Mar 2002 16:31:39 -0000
@@ -1,9 +1,9 @@
-$FreeBSD: ports/converters/libiconv/files/patch-aa,v 1.4 2001/08/27 09:39:53 sobomax Exp $
+$FreeBSD$
--- Makefile.in.orig Tue Feb 20 21:43:19 2001
-+++ Makefile.in Mon Aug 27 12:25:03 2001
-@@ -31,14 +31,14 @@
++++ Makefile.in Sun Mar 17 11:01:20 2002
+@@ -31,7 +31,7 @@
cd lib && $(MAKE) all
cd src && $(MAKE) all
cd man && $(MAKE) all
@@ -12,29 +12,3 @@
# Installs the library and include files only. Typically called with only
# $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
- install-lib : all force
- cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)'
- if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi
-- $(INSTALL_DATA) include/iconv.h $(includedir)/iconv.h
-+ $(INSTALL_DATA) include/iconv.h $(includedir)/giconv.h
-
- install : force
- cd libcharset && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
-@@ -47,7 +47,7 @@
- if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi
- if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then mkdir $(DESTDIR)$(exec_prefix) ; fi
- if [ ! -d $(DESTDIR)$(includedir) ] ; then mkdir $(DESTDIR)$(includedir) ; fi
-- $(INSTALL_DATA) include/iconv.h $(DESTDIR)$(includedir)/iconv.h
-+ $(INSTALL_DATA) include/iconv.h $(DESTDIR)$(includedir)/giconv.h
- cd man && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' mandir='$(mandir)'
-
- installdirs : force
-@@ -63,7 +63,7 @@
- cd libcharset && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
- cd lib && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
- cd src && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
-- $(RM) $(DESTDIR)$(includedir)/iconv.h
-+ $(RM) $(DESTDIR)$(includedir)/giconv.h
- cd man && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' mandir='$(mandir)'
-
- check : all force
Index: converters/libiconv/files/patch-ab
===================================================================
RCS file: converters/libiconv/files/patch-ab
diff -N converters/libiconv/files/patch-ab
--- converters/libiconv/files/patch-ab 26 Aug 2001 00:53:02 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
---- src/Makefile.in Mon Jun 25 17:58:00 2001
-+++ src/Makefile.in Thu Aug 23 10:16:07 2001
-@@ -41,8 +41,8 @@
-
--iconv : $(srcdir)/iconv.c ../lib/libiconv.la
-- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) -I../lib $(CFLAGS) $(CPPFLAGS) $(srcdir)/iconv.c ../lib/libiconv.la -o $@
-+iconv : $(srcdir)/iconv.c ../lib/libgiconv.la
-+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) -I../lib $(CFLAGS) $(CPPFLAGS) $(srcdir)/iconv.c ../lib/libgiconv.la -o $@
-
- # The following rule is necessary to avoid a toplevel "make -n check" failure.
--../lib/libiconv.la :
-- cd ../lib && $(MAKE) libiconv.la
-+../lib/libgiconv.la :
-+ cd ../lib && $(MAKE) libgiconv.la
-
-@@ -51,3 +51,3 @@
- if [ ! -d $(DESTDIR)$(bindir) ] ; then mkdir $(DESTDIR)$(bindir) ; fi
-- $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
-+ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/giconv
-
-@@ -59,3 +59,3 @@
- uninstall : force
-- $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(bindir)/iconv
-+ $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(bindir)/giconv
-
Index: converters/libiconv/files/patch-ac
===================================================================
RCS file: /home/ncvs/ports/converters/libiconv/files/patch-ac,v
retrieving revision 1.5
diff -d -u -r1.5 patch-ac
--- converters/libiconv/files/patch-ac 16 Sep 2001 19:30:33 -0000 1.5
+++ converters/libiconv/files/patch-ac 17 Mar 2002 16:31:39 -0000
@@ -12,26 +12,3 @@
htmldir = $(docdir)
# Programs used by "make":
-@@ -32,9 +32,8 @@
- if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi
- if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi
- if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then mkdir $(DESTDIR)$(mandir)/man1 ; fi
-- cd $(srcdir) && for f in *.1 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; done
-+ cd $(srcdir) && for f in *.1 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/g$$f ; done
- if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi
-- cd $(srcdir) && for f in *.3 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; done
-+ cd $(srcdir) && for f in *.3 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/g$$f ; done
-- if [ ! -d $(DESTDIR)$(prefix)/doc ] ; then mkdir $(DESTDIR)$(prefix)/doc ; fi
- if [ ! -d $(DESTDIR)$(docdir) ] ; then mkdir $(DESTDIR)$(docdir) ; fi
- if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi
-@@ -50,8 +50,8 @@
- if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi
-
- uninstall : force
-- cd $(srcdir) && for f in *.1 ; do echo $(RM) $(DESTDIR)$(mandir)/man1/$$f ; $(RM) $(DESTDIR)$(mandir)/man1/$$f ; done
-- cd $(srcdir) && for f in *.3 ; do echo $(RM) $(DESTDIR)$(mandir)/man3/$$f ; $(RM) $(DESTDIR)$(mandir)/man3/$$f ; done
-+ cd $(srcdir) && for f in *.1 ; do echo $(RM) $(DESTDIR)$(mandir)/man1/$$f ; $(RM) $(DESTDIR)$(mandir)/man1/g$$f ; done
-+ cd $(srcdir) && for f in *.3 ; do echo $(RM) $(DESTDIR)$(mandir)/man3/$$f ; $(RM) $(DESTDIR)$(mandir)/man3/g$$f ; done
- cd $(srcdir) && for f in *.html ; do echo $(RM) $(DESTDIR)$(htmldir)/$$f ; $(RM) $(DESTDIR)$(htmldir)/$$f ; done
-
- check :
Index: converters/libiconv/files/patch-ad
===================================================================
RCS file: /home/ncvs/ports/converters/libiconv/files/patch-ad,v
retrieving revision 1.4
diff -d -u -r1.4 patch-ad
--- converters/libiconv/files/patch-ad 27 Aug 2001 09:39:53 -0000 1.4
+++ converters/libiconv/files/patch-ad 17 Mar 2002 16:31:39 -0000
@@ -1,100 +1,14 @@
-$FreeBSD: ports/converters/libiconv/files/patch-ad,v 1.4 2001/08/27 09:39:53 sobomax Exp $
+$FreeBSD$
--- lib/Makefile.in.orig Thu Jun 28 01:37:49 2001
-+++ lib/Makefile.in Mon Aug 27 12:31:31 2001
-@@ -1,4 +1,4 @@
--# Makefile for libiconv/lib
-+# Makefile for libgiconv/lib
-
- #### Start of system configuration section. ####
-
++++ lib/Makefile.in Sun Mar 17 11:34:57 2002
@@ -39,7 +39,7 @@
# Before making a release, change this according to the libtool documentation,
# section "Library interface versions".
-LIBICONV_VERSION_INFO = 2:4:0
-+LIBICONV_VERSION_INFO = 2
++LIBICONV_VERSION_INFO = 3
# Needed by $(LIBTOOL).
top_builddir = ..
-@@ -50,31 +50,31 @@
-
- LIBCHARSET_OBJECTS = ../libcharset/lib/localcharset.lo
-
--all : @PLUGLIB@ libiconv.la
-+all : @PLUGLIB@ libgiconv.la
-
--libiconv.la : $(OBJECTS)
-- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) -no-undefined $(OBJECTS) $(LIBCHARSET_OBJECTS)
-+libgiconv.la : $(OBJECTS)
-+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libgiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) -no-undefined $(OBJECTS) $(LIBCHARSET_OBJECTS)
-
--libiconv_plug.so : libiconv_plug_@OS@.so
-- $(RM) libiconv_plug.so
-- $(LN_S) libiconv_plug_@OS@.so libiconv_plug.so
-+libgiconv_plug.so : libgiconv_plug_@OS@.so
-+ $(RM) libgiconv_plug.so
-+ $(LN_S) libgiconv_plug_@OS@.so libgiconv_plug.so
-
--libiconv_plug_linux.so : $(SOURCES)
-- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -shared -o libiconv_plug_linux.so
-+libgiconv_plug_linux.so : $(SOURCES)
-+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -shared -o libgiconv_plug_linux.so
-
--libiconv_plug_solaris.so : $(SOURCES)
-+libgiconv_plug_solaris.so : $(SOURCES)
- if test -n "@GCC@"; then \
-- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -G -o libiconv_plug_solaris.so; \
-+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -G -o libgiconv_plug_solaris.so; \
- else \
-- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -G -o libiconv_plug_solaris.so; \
-+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -G -o libgiconv_plug_solaris.so; \
- fi
-
--libiconv_plug_osf.so : $(SOURCES)
-+libgiconv_plug_osf.so : $(SOURCES)
- if test -n "@GCC@"; then \
-- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -shared -o libiconv_plug_osf.so; \
-+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -shared -o libgiconv_plug_osf.so; \
- else \
- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -c -o iconv_plug.o; \
-- /bin/ld -shared -expect_unresolved \* -o libiconv_plug_osf.so iconv_plug.o; \
-+ /bin/ld -shared -expect_unresolved \* -o libgiconv_plug_osf.so iconv_plug.o; \
- fi
-
- iconv.lo : $(srcdir)/iconv.c $(srcdir)/converters.h $(srcdir)/encodings.def $(srcdir)/encodings_aix.def $(srcdir)/encodings_osf1.def $(srcdir)/encodings_dos.def $(srcdir)/encodings_local.def $(srcdir)/aliases.h $(srcdir)/aliases_aix.h $(srcdir)/aliases_osf1.h $(srcdir)/aliases_dos.h $(srcdir)/flags.h
-@@ -84,13 +84,13 @@
- # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
- install-lib : all force
- if [ ! -d $(libdir) ] ; then mkdir $(libdir) ; fi
-- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(libdir)/libiconv.la
-+ $(LIBTOOL_INSTALL) $(INSTALL_DATA) libgiconv.la $(libdir)/libgiconv.la
-
- install : all force
- if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi
- if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then mkdir $(DESTDIR)$(exec_prefix) ; fi
- if [ ! -d $(DESTDIR)$(libdir) ] ; then mkdir $(DESTDIR)$(libdir) ; fi
-- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(DESTDIR)$(libdir)/libiconv.la
-+ $(LIBTOOL_INSTALL) $(INSTALL_DATA) libgiconv.la $(DESTDIR)$(libdir)/libgiconv.la
- if test -n "@PLUGLIB@"; then $(INSTALL_DATA) @PLUGLIB@ $(DESTDIR)$(libdir)/@PLUGLIB@.new && mv $(DESTDIR)$(libdir)/@PLUGLIB@.new $(DESTDIR)$(libdir)/@PLUGLIB@ ; fi
-
- installdirs : force
-@@ -99,7 +99,7 @@
- if [ ! -d $(DESTDIR)$(libdir) ] ; then mkdir $(DESTDIR)$(libdir) ; fi
-
- uninstall : force
-- $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libiconv.la
-+ $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libgiconv.la
- if test -n "@PLUGLIB@"; then $(RM) $(DESTDIR)$(libdir)/@PLUGLIB@ ; fi
-
- check : all
-@@ -107,7 +107,7 @@
- mostlyclean : clean
-
- clean : force
-- $(RM) *.o *.lo *.a *.la libiconv_plug* core so_locations
-+ $(RM) *.o *.lo *.a *.la libgiconv_plug* core so_locations
- $(RM) -r .libs _libs
-
- distclean : clean
Index: converters/libiconv/files/patch-ae
===================================================================
RCS file: /home/ncvs/ports/converters/libiconv/files/patch-ae,v
retrieving revision 1.4
diff -d -u -r1.4 patch-ae
--- converters/libiconv/files/patch-ae 27 Aug 2001 09:39:53 -0000 1.4
+++ converters/libiconv/files/patch-ae 17 Mar 2002 16:31:39 -0000
@@ -20,15 +20,6 @@
# Needed by $(LIBTOOL).
top_builddir = ..
-@@ -53,7 +54,7 @@
- $(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS)
-
- localcharset.lo : $(srcdir)/localcharset.c
-- $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H -DLIBDIR=\"$(libdir)\" -c $(srcdir)/localcharset.c
-+ $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H -DLIBDIR=\"$(sysconfdir)\" -c $(srcdir)/localcharset.c
-
- charset.alias: $(srcdir)/config.charset
- $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
@@ -72,11 +73,12 @@
install-lib : all force
$(MKINSTALLDIRS) $(libdir)
Index: converters/libiconv/files/patch-include::iconv.h.in
===================================================================
RCS file: converters/libiconv/files/patch-include::iconv.h.in
diff -N converters/libiconv/files/patch-include::iconv.h.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ converters/libiconv/files/patch-include::iconv.h.in 17 Mar 2002 16:31:39 -0000
@@ -0,0 +1,48 @@
+
+$FreeBSD$
+
+--- include/iconv.h.in.orig Mon Jun 25 15:06:22 2001
++++ include/iconv.h.in Sun Mar 17 15:41:14 2002
+@@ -21,6 +21,10 @@
+ #ifndef _LIBICONV_H
+ #define _LIBICONV_H
+
++#ifdef __FreeBSD__
++#define LIBICONV_PLUG
++#endif
++
+ #define _LIBICONV_VERSION 0x0107 /* version number: (major<<8) + minor */
+ extern int _libiconv_version; /* Likewise */
+
+@@ -68,6 +72,8 @@
+ encoding `tocode'. */
+ #ifndef LIBICONV_PLUG
+ #define iconv_open libiconv_open
++#else
++#define libiconv_open iconv_open
+ #endif
+ extern iconv_t iconv_open (const char* tocode, const char* fromcode);
+
+@@ -78,17 +84,21 @@
+ Decrements `*outbytesleft' and increments `*outbuf' by the same amount. */
+ #ifndef LIBICONV_PLUG
+ #define iconv libiconv
++#else
++#define libiconv iconv
+ #endif
+ extern size_t iconv (iconv_t cd, @ICONV_CONST@ char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft);
+
+ /* Frees resources allocated for conversion descriptor `cd'. */
+ #ifndef LIBICONV_PLUG
+ #define iconv_close libiconv_close
++#else
++#define libiconv_close iconv_close
+ #endif
+ extern int iconv_close (iconv_t cd);
+
+
+-#ifndef LIBICONV_PLUG
++#if !defined(LIBICONV_PLUG) || defined(__FreeBSD__)
+
+ /* Nonstandard extensions. */
+
Index: converters/libiconv/files/patch-lib::iconv.c
===================================================================
RCS file: converters/libiconv/files/patch-lib::iconv.c
diff -N converters/libiconv/files/patch-lib::iconv.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ converters/libiconv/files/patch-lib::iconv.c 17 Mar 2002 16:31:39 -0000
@@ -0,0 +1,58 @@
+
+$FreeBSD$
+
+--- lib/iconv.c.orig Sat May 26 03:25:09 2001
++++ lib/iconv.c Sun Mar 17 15:47:32 2002
+@@ -176,6 +176,13 @@
+ }
+ #endif
+
++#undef libiconv_open
++
++iconv_t libiconv_open (const char* tocode, const char* fromcode)
++{
++ return (iconv_open(tocode, fromcode));
++}
++
+ iconv_t iconv_open (const char* tocode, const char* fromcode)
+ {
+ struct conv_struct * cd;
+@@ -358,6 +365,15 @@
+ return (iconv_t)(-1);
+ }
+
++#undef libiconv
++
++size_t libiconv (iconv_t icd,
++ ICONV_CONST char* * inbuf, size_t *inbytesleft,
++ char* * outbuf, size_t *outbytesleft)
++{
++ return (iconv(icd, inbuf, inbytesleft, outbuf, outbytesleft));
++}
++
+ size_t iconv (iconv_t icd,
+ ICONV_CONST char* * inbuf, size_t *inbytesleft,
+ char* * outbuf, size_t *outbytesleft)
+@@ -371,6 +387,13 @@
+ outbuf,outbytesleft);
+ }
+
++#undef libiconv_close
++
++int libiconv_close (iconv_t icd)
++{
++ return (iconv_close(icd));
++}
++
+ int iconv_close (iconv_t icd)
+ {
+ conv_t cd = (conv_t) icd;
+@@ -378,7 +401,7 @@
+ return 0;
+ }
+
+-#ifndef LIBICONV_PLUG
++#if !defined(LIBICONV_PLUG) || defined(__FreeBSD__)
+
+ int iconvctl (iconv_t icd, int request, void* argument)
+ {
Index: converters/p5-Text-Iconv/Makefile
===================================================================
RCS file: /home/ncvs/ports/converters/p5-Text-Iconv/Makefile,v
retrieving revision 1.5
diff -d -u -r1.5 Makefile
--- converters/p5-Text-Iconv/Makefile 16 Aug 2001 09:28:04 -0000 1.5
+++ converters/p5-Text-Iconv/Makefile 17 Mar 2002 16:31:39 -0000
@@ -14,7 +14,7 @@
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"
Index: converters/py-iconv/Makefile
===================================================================
RCS file: /home/ncvs/ports/converters/py-iconv/Makefile,v
retrieving revision 1.3
diff -d -u -r1.3 Makefile
--- converters/py-iconv/Makefile 28 Jan 2002 16:11:52 -0000 1.3
+++ converters/py-iconv/Makefile 17 Mar 2002 16:31:39 -0000
@@ -16,7 +16,7 @@
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
Index: converters/ruby-iconv/Makefile
===================================================================
RCS file: /home/ncvs/ports/converters/ruby-iconv/Makefile,v
retrieving revision 1.15
diff -d -u -r1.15 Makefile
--- converters/ruby-iconv/Makefile 16 Nov 2001 05:00:34 -0000 1.15
+++ converters/ruby-iconv/Makefile 17 Mar 2002 16:31:39 -0000
@@ -14,7 +14,7 @@
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
Index: converters/siconv/Makefile
===================================================================
RCS file: /home/ncvs/ports/converters/siconv/Makefile,v
retrieving revision 1.1
diff -d -u -r1.1 Makefile
--- converters/siconv/Makefile 26 Mar 2001 17:10:50 -0000 1.1
+++ converters/siconv/Makefile 17 Mar 2002 16:31:39 -0000
@@ -13,7 +13,7 @@
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
Index: databases/freetds/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/freetds/Makefile,v
retrieving revision 1.16
diff -d -u -r1.16 Makefile
--- databases/freetds/Makefile 24 Dec 2001 04:40:35 -0000 1.16
+++ databases/freetds/Makefile 17 Mar 2002 16:31:39 -0000
@@ -13,7 +13,7 @@
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_GMAKE= yes
GNU_CONFIGURE= yes
Index: databases/sqlrelay/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/sqlrelay/Makefile,v
retrieving revision 1.5
diff -d -u -r1.5 Makefile
--- databases/sqlrelay/Makefile 24 Feb 2002 18:33:09 -0000 1.5
+++ databases/sqlrelay/Makefile 17 Mar 2002 16:31:39 -0000
@@ -14,7 +14,7 @@
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
Index: devel/bison/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/bison/Makefile,v
retrieving revision 1.26
diff -d -u -r1.26 Makefile
--- devel/bison/Makefile 16 Mar 2002 12:19:55 -0000 1.26
+++ devel/bison/Makefile 17 Mar 2002 16:31:39 -0000
@@ -14,7 +14,7 @@
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
Index: devel/gettext/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gettext/Makefile,v
retrieving revision 1.23
diff -d -u -r1.23 Makefile
--- devel/gettext/Makefile 15 Mar 2002 19:43:48 -0000 1.23
+++ devel/gettext/Makefile 17 Mar 2002 16:31:39 -0000
@@ -13,7 +13,7 @@
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
NO_LATEST_LINK= yes
Index: devel/glib20/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/glib20/Makefile,v
retrieving revision 1.52
diff -d -u -r1.52 Makefile
--- devel/glib20/Makefile 15 Mar 2002 19:43:50 -0000 1.52
+++ devel/glib20/Makefile 17 Mar 2002 16:31:39 -0000
@@ -19,7 +19,7 @@
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
Index: devel/gnomevfs/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gnomevfs/Makefile,v
retrieving revision 1.30
diff -d -u -r1.30 Makefile
--- devel/gnomevfs/Makefile 17 Mar 2002 16:09:29 -0000 1.30
+++ devel/gnomevfs/Makefile 17 Mar 2002 16:31:39 -0000
@@ -18,7 +18,7 @@
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
Index: devel/styx/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/styx/Makefile,v
retrieving revision 1.4
diff -d -u -r1.4 Makefile
--- devel/styx/Makefile 12 Mar 2002 15:56:43 -0000 1.4
+++ devel/styx/Makefile 17 Mar 2002 16:31:39 -0000
@@ -14,7 +14,7 @@
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}" \
Index: editors/AbiWord/Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/AbiWord/Makefile,v
retrieving revision 1.38
diff -d -u -r1.38 Makefile
--- editors/AbiWord/Makefile 25 Feb 2002 09:33:30 -0000 1.38
+++ editors/AbiWord/Makefile 17 Mar 2002 16:31:39 -0000
@@ -20,10 +20,9 @@
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
Index: editors/dedit/Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/dedit/Makefile,v
retrieving revision 1.14
diff -d -u -r1.14 Makefile
--- editors/dedit/Makefile 22 Jan 2002 21:58:48 -0000 1.14
+++ editors/dedit/Makefile 17 Mar 2002 16:31:39 -0000
@@ -13,7 +13,7 @@
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Index: editors/koffice/Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/koffice/Makefile,v
retrieving revision 1.36
diff -d -u -r1.36 Makefile
--- editors/koffice/Makefile 11 Jan 2002 06:17:02 -0000 1.36
+++ editors/koffice/Makefile 17 Mar 2002 16:31:39 -0000
@@ -17,7 +17,7 @@
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
Index: editors/nvi-devel/Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/nvi-devel/Makefile,v
retrieving revision 1.5
diff -d -u -r1.5 Makefile
--- editors/nvi-devel/Makefile 11 Feb 2002 00:45:45 -0000 1.5
+++ editors/nvi-devel/Makefile 17 Mar 2002 16:31:39 -0000
@@ -12,7 +12,7 @@
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
Index: ftp/wget+ipv6/Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/wget+ipv6/Makefile,v
retrieving revision 1.2
diff -d -u -r1.2 Makefile
--- ftp/wget+ipv6/Makefile 15 Mar 2002 19:44:01 -0000 1.2
+++ ftp/wget+ipv6/Makefile 17 Mar 2002 16:31:39 -0000
@@ -24,7 +24,7 @@
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
Index: graphics/graphviz/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/graphviz/Makefile,v
retrieving revision 1.33
diff -d -u -r1.33 Makefile
--- graphics/graphviz/Makefile 12 Mar 2002 22:54:12 -0000 1.33
+++ graphics/graphviz/Makefile 17 Mar 2002 16:31:39 -0000
@@ -42,7 +42,7 @@
.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
Index: graphics/mplayer/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/mplayer/Makefile,v
retrieving revision 1.14
diff -d -u -r1.14 Makefile
--- graphics/mplayer/Makefile 6 Mar 2002 04:14:08 -0000 1.14
+++ graphics/mplayer/Makefile 17 Mar 2002 16:31:45 -0000
@@ -21,7 +21,7 @@
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
Index: graphics/ogle-gui/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/ogle-gui/Makefile,v
retrieving revision 1.7
diff -d -u -r1.7 Makefile
--- graphics/ogle-gui/Makefile 15 Mar 2002 19:44:05 -0000 1.7
+++ graphics/ogle-gui/Makefile 17 Mar 2002 16:31:45 -0000
@@ -17,7 +17,7 @@
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
Index: irc/xchat/Makefile
===================================================================
RCS file: /home/ncvs/ports/irc/xchat/Makefile,v
retrieving revision 1.91
diff -d -u -r1.91 Makefile
--- irc/xchat/Makefile 15 Mar 2002 19:44:06 -0000 1.91
+++ irc/xchat/Makefile 17 Mar 2002 16:31:45 -0000
@@ -14,7 +14,7 @@
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
Index: japanese/libjconv/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/libjconv/Makefile,v
retrieving revision 1.3
diff -d -u -r1.3 Makefile
--- japanese/libjconv/Makefile 5 Mar 2001 11:27:57 -0000 1.3
+++ japanese/libjconv/Makefile 17 Mar 2002 16:31:45 -0000
@@ -17,8 +17,8 @@
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
Index: japanese/mutt-devel/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/mutt-devel/Makefile,v
retrieving revision 1.31
diff -d -u -r1.31 Makefile
--- japanese/mutt-devel/Makefile 15 Mar 2002 19:44:07 -0000 1.31
+++ japanese/mutt-devel/Makefile 17 Mar 2002 16:31:45 -0000
@@ -20,7 +20,7 @@
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
Index: korean/gaim/Makefile
===================================================================
RCS file: /home/ncvs/ports/korean/gaim/Makefile,v
retrieving revision 1.1
diff -d -u -r1.1 Makefile
--- korean/gaim/Makefile 31 Jan 2002 06:54:41 -0000 1.1
+++ korean/gaim/Makefile 17 Mar 2002 16:31:45 -0000
@@ -12,7 +12,7 @@
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
Index: korean/hanterm-xf86/Makefile
===================================================================
RCS file: /home/ncvs/ports/korean/hanterm-xf86/Makefile,v
retrieving revision 1.24
diff -d -u -r1.24 Makefile
--- korean/hanterm-xf86/Makefile 17 Dec 2001 12:21:48 -0000 1.24
+++ korean/hanterm-xf86/Makefile 17 Mar 2002 16:31:45 -0000
@@ -21,9 +21,9 @@
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
Index: mail/elm+ME/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/elm+ME/Makefile,v
retrieving revision 1.74
diff -d -u -r1.74 Makefile
--- mail/elm+ME/Makefile 17 Jan 2002 23:13:36 -0000 1.74
+++ mail/elm+ME/Makefile 17 Mar 2002 16:31:45 -0000
@@ -31,7 +31,7 @@
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
Index: mail/mutt-devel/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/mutt-devel/Makefile,v
retrieving revision 1.161
diff -d -u -r1.161 Makefile
--- mail/mutt-devel/Makefile 15 Mar 2002 19:44:09 -0000 1.161
+++ mail/mutt-devel/Makefile 17 Mar 2002 16:31:45 -0000
@@ -130,7 +130,7 @@
.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
Index: mail/nail/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/nail/Makefile,v
retrieving revision 1.10
diff -d -u -r1.10 Makefile
--- mail/nail/Makefile 11 Mar 2002 02:22:46 -0000 1.10
+++ mail/nail/Makefile 17 Mar 2002 16:31:45 -0000
@@ -13,7 +13,7 @@
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"
Index: mail/stuphead/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/stuphead/Makefile,v
retrieving revision 1.4
diff -d -u -r1.4 Makefile
--- mail/stuphead/Makefile 11 Jun 2001 15:38:05 -0000 1.4
+++ mail/stuphead/Makefile 17 Mar 2002 16:31:45 -0000
@@ -15,7 +15,7 @@
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
Index: math/gnumeric/Makefile
===================================================================
RCS file: /home/ncvs/ports/math/gnumeric/Makefile,v
retrieving revision 1.81
diff -d -u -r1.81 Makefile
--- math/gnumeric/Makefile 14 Mar 2002 14:28:22 -0000 1.81
+++ math/gnumeric/Makefile 17 Mar 2002 16:31:45 -0000
@@ -16,7 +16,7 @@
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
Index: misc/gnomemimedata/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/gnomemimedata/Makefile,v
retrieving revision 1.1
diff -d -u -r1.1 Makefile
--- misc/gnomemimedata/Makefile 22 Jan 2002 10:31:26 -0000 1.1
+++ misc/gnomemimedata/Makefile 17 Mar 2002 16:31:45 -0000
@@ -14,7 +14,7 @@
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= giconv:${PORTSDIR}/converters/libiconv
+BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
Index: misc/pinfo/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/pinfo/Makefile,v
retrieving revision 1.14
diff -d -u -r1.14 Makefile
--- misc/pinfo/Makefile 15 Mar 2002 19:44:11 -0000 1.14
+++ misc/pinfo/Makefile 17 Mar 2002 16:31:45 -0000
@@ -12,7 +12,7 @@
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
Index: net/dctc-gui/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/dctc-gui/Makefile,v
retrieving revision 1.12
diff -d -u -r1.12 Makefile
--- net/dctc-gui/Makefile 15 Mar 2002 19:44:12 -0000 1.12
+++ net/dctc-gui/Makefile 17 Mar 2002 16:31:45 -0000
@@ -16,7 +16,7 @@
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
Index: net/gtk+licq/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/gtk+licq/Makefile,v
retrieving revision 1.6
diff -d -u -r1.6 Makefile
--- net/gtk+licq/Makefile 28 Aug 2001 11:22:45 -0000 1.6
+++ net/gtk+licq/Makefile 17 Mar 2002 16:31:45 -0000
@@ -14,7 +14,7 @@
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
Index: net/gtkhx/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/gtkhx/Makefile,v
retrieving revision 1.2
diff -d -u -r1.2 Makefile
--- net/gtkhx/Makefile 15 Mar 2002 19:44:13 -0000 1.2
+++ net/gtkhx/Makefile 17 Mar 2002 16:31:45 -0000
@@ -13,9 +13,9 @@
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
Index: net/wol/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/wol/Makefile,v
retrieving revision 1.2
diff -d -u -r1.2 Makefile
--- net/wol/Makefile 15 Mar 2002 19:44:15 -0000 1.2
+++ net/wol/Makefile 17 Mar 2002 16:31:45 -0000
@@ -15,7 +15,7 @@
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
Index: news/tin/Makefile
===================================================================
RCS file: /home/ncvs/ports/news/tin/Makefile,v
retrieving revision 1.94
diff -d -u -r1.94 Makefile
--- news/tin/Makefile 15 Mar 2002 19:44:15 -0000 1.94
+++ news/tin/Makefile 17 Mar 2002 16:31:45 -0000
@@ -16,7 +16,7 @@
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
Index: palm/pilot-link/Makefile
===================================================================
RCS file: /home/ncvs/ports/palm/pilot-link/Makefile,v
retrieving revision 1.47
diff -d -u -r1.47 Makefile
--- palm/pilot-link/Makefile 8 Jan 2002 21:18:32 -0000 1.47
+++ palm/pilot-link/Makefile 17 Mar 2002 16:31:45 -0000
@@ -15,7 +15,7 @@
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
Index: science/vis5d+/Makefile
===================================================================
RCS file: /home/ncvs/ports/science/vis5d+/Makefile,v
retrieving revision 1.1
diff -d -u -r1.1 Makefile
--- science/vis5d+/Makefile 9 Jan 2002 14:51:37 -0000 1.1
+++ science/vis5d+/Makefile 17 Mar 2002 16:31:45 -0000
@@ -16,7 +16,7 @@
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
Index: security/gnupg/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/gnupg/Makefile,v
retrieving revision 1.37
diff -d -u -r1.37 Makefile
--- security/gnupg/Makefile 15 Mar 2002 19:44:18 -0000 1.37
+++ security/gnupg/Makefile 17 Mar 2002 16:31:45 -0000
@@ -26,7 +26,7 @@
.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
Index: textproc/intltool/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/intltool/Makefile,v
retrieving revision 1.11
diff -d -u -r1.11 Makefile
--- textproc/intltool/Makefile 4 Mar 2002 09:34:49 -0000 1.11
+++ textproc/intltool/Makefile 17 Mar 2002 16:31:45 -0000
@@ -14,7 +14,7 @@
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
USE_BZIP2= yes
USE_GMAKE= yes
Index: textproc/libxml2/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/libxml2/Makefile,v
retrieving revision 1.62
diff -d -u -r1.62 Makefile
--- textproc/libxml2/Makefile 11 Mar 2002 19:03:53 -0000 1.62
+++ textproc/libxml2/Makefile 17 Mar 2002 16:31:45 -0000
@@ -15,7 +15,7 @@
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
Index: textproc/minidom/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/minidom/Makefile,v
retrieving revision 1.2
diff -d -u -r1.2 Makefile
--- textproc/minidom/Makefile 18 Aug 2001 09:27:49 -0000 1.2
+++ textproc/minidom/Makefile 17 Mar 2002 16:31:45 -0000
@@ -14,7 +14,7 @@
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
Index: textproc/p5-XML-Sablotron/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/p5-XML-Sablotron/Makefile,v
retrieving revision 1.11
diff -d -u -r1.11 Makefile
--- textproc/p5-XML-Sablotron/Makefile 23 Jan 2002 20:20:24 -0000 1.11
+++ textproc/p5-XML-Sablotron/Makefile 17 Mar 2002 16:31:45 -0000
@@ -16,7 +16,7 @@
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' \
Index: textproc/ruby-sablot/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/ruby-sablot/Makefile,v
retrieving revision 1.11
diff -d -u -r1.11 Makefile
--- textproc/ruby-sablot/Makefile 24 Jan 2002 03:26:05 -0000 1.11
+++ textproc/ruby-sablot/Makefile 17 Mar 2002 16:31:45 -0000
@@ -16,7 +16,7 @@
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
Index: textproc/sablotron/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/sablotron/Makefile,v
retrieving revision 1.14
diff -d -u -r1.14 Makefile
--- textproc/sablotron/Makefile 25 Jan 2002 13:57:27 -0000 1.14
+++ textproc/sablotron/Makefile 17 Mar 2002 16:31:45 -0000
@@ -12,7 +12,7 @@
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
Index: www/galeon/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/galeon/Makefile,v
retrieving revision 1.63
diff -d -u -r1.63 Makefile
--- www/galeon/Makefile 15 Mar 2002 19:44:22 -0000 1.63
+++ www/galeon/Makefile 17 Mar 2002 16:31:45 -0000
@@ -17,7 +17,7 @@
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"
Index: www/p5-AxKit/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/p5-AxKit/Makefile,v
retrieving revision 1.4
diff -d -u -r1.4 Makefile
--- www/p5-AxKit/Makefile 11 Jan 2002 04:34:17 -0000 1.4
+++ www/p5-AxKit/Makefile 17 Mar 2002 16:31:45 -0000
@@ -13,7 +13,7 @@
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 \
Index: x11-toolkits/gal/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/gal/Makefile,v
retrieving revision 1.27
diff -d -u -r1.27 Makefile
--- x11-toolkits/gal/Makefile 13 Jan 2002 19:21:34 -0000 1.27
+++ x11-toolkits/gal/Makefile 17 Mar 2002 16:31:46 -0000
@@ -15,7 +15,7 @@
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
Index: x11-toolkits/wxgtk-devel/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/wxgtk-devel/Makefile,v
retrieving revision 1.29
diff -d -u -r1.29 Makefile
--- x11-toolkits/wxgtk-devel/Makefile 31 Jan 2002 13:00:35 -0000 1.29
+++ x11-toolkits/wxgtk-devel/Makefile 17 Mar 2002 16:31:46 -0000
@@ -17,7 +17,7 @@
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."
Index: x11/gdkxft/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/gdkxft/Makefile,v
retrieving revision 1.7
diff -d -u -r1.7 Makefile
--- x11/gdkxft/Makefile 6 Feb 2002 04:26:38 -0000 1.7
+++ x11/gdkxft/Makefile 17 Mar 2002 16:31:46 -0000
@@ -13,7 +13,7 @@
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
--------------0966DDECB85D618CA7865FE7--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3C94CB17.4D9CA989>