head 1.9; access; symbols pkgsrc-2022Q4:1.8.0.92 pkgsrc-2022Q4-base:1.8 pkgsrc-2022Q3:1.8.0.90 pkgsrc-2022Q3-base:1.8 pkgsrc-2022Q2:1.8.0.88 pkgsrc-2022Q2-base:1.8 pkgsrc-2022Q1:1.8.0.86 pkgsrc-2022Q1-base:1.8 pkgsrc-2021Q4:1.8.0.84 pkgsrc-2021Q4-base:1.8 pkgsrc-2021Q3:1.8.0.82 pkgsrc-2021Q3-base:1.8 pkgsrc-2021Q2:1.8.0.80 pkgsrc-2021Q2-base:1.8 pkgsrc-2021Q1:1.8.0.78 pkgsrc-2021Q1-base:1.8 pkgsrc-2020Q4:1.8.0.76 pkgsrc-2020Q4-base:1.8 pkgsrc-2020Q3:1.8.0.74 pkgsrc-2020Q3-base:1.8 pkgsrc-2020Q2:1.8.0.70 pkgsrc-2020Q2-base:1.8 pkgsrc-2020Q1:1.8.0.50 pkgsrc-2020Q1-base:1.8 pkgsrc-2019Q4:1.8.0.72 pkgsrc-2019Q4-base:1.8 pkgsrc-2019Q3:1.8.0.68 pkgsrc-2019Q3-base:1.8 pkgsrc-2019Q2:1.8.0.66 pkgsrc-2019Q2-base:1.8 pkgsrc-2019Q1:1.8.0.64 pkgsrc-2019Q1-base:1.8 pkgsrc-2018Q4:1.8.0.62 pkgsrc-2018Q4-base:1.8 pkgsrc-2018Q3:1.8.0.60 pkgsrc-2018Q3-base:1.8 pkgsrc-2018Q2:1.8.0.58 pkgsrc-2018Q2-base:1.8 pkgsrc-2018Q1:1.8.0.56 pkgsrc-2018Q1-base:1.8 pkgsrc-2017Q4:1.8.0.54 pkgsrc-2017Q4-base:1.8 pkgsrc-2017Q3:1.8.0.52 pkgsrc-2017Q3-base:1.8 pkgsrc-2017Q2:1.8.0.48 pkgsrc-2017Q2-base:1.8 pkgsrc-2017Q1:1.8.0.46 pkgsrc-2017Q1-base:1.8 pkgsrc-2016Q4:1.8.0.44 pkgsrc-2016Q4-base:1.8 pkgsrc-2016Q3:1.8.0.42 pkgsrc-2016Q3-base:1.8 pkgsrc-2016Q2:1.8.0.40 pkgsrc-2016Q2-base:1.8 pkgsrc-2016Q1:1.8.0.38 pkgsrc-2016Q1-base:1.8 pkgsrc-2015Q4:1.8.0.36 pkgsrc-2015Q4-base:1.8 pkgsrc-2015Q3:1.8.0.34 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.32 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.30 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.28 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.26 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.24 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.22 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.20 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.18 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.16 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.14 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.12 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.10 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.8 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.6 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.4 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.2 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.6.0.6 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.4 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.2 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.5.0.8 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.6 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.4 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.2 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.3.0.20 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.18 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.16 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.14 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.12 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.10 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.8 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.6 pkgsrc-2008Q1:1.3.0.4 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.2 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.2.0.6 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.4 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.2 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.1.0.22 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.20 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.18 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.16 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.14 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.12 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.10 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.8 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.6 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.4 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.2 pkgsrc-2004Q2-base:1.1; locks; strict; comment @# @; 1.9 date 2023.01.23.15.22.24; author wiz; state dead; branches; next 1.8; commitid EN1yTFg9Lop0aGaE; 1.8 date 2011.09.08.16.29.49; author bsiegert; state Exp; branches; next 1.7; 1.7 date 2011.09.06.18.51.14; author bsiegert; state Exp; branches; next 1.6; 1.6 date 2010.11.10.21.00.50; author adam; state Exp; branches; next 1.5; 1.5 date 2010.01.06.21.01.09; author tron; state Exp; branches; next 1.4; 1.4 date 2010.01.06.18.53.05; author tron; state Exp; branches; next 1.3; 1.3 date 2007.11.29.17.05.35; author wiz; state Exp; branches; next 1.2; 1.2 date 2007.03.20.00.44.53; author wiz; state Exp; branches; next 1.1; 1.1 date 2004.04.28.15.19.04; author tv; state Exp; branches; next ; desc @@ 1.9 log @libiconv: update to 1.17. New in 1.17: * The libiconv library is now licensed under the LGPL version 2.1, instead of the LGPL version 2.0. The iconv program continues to be licensed under GPL version 3. * Added converters for many single-byte EBCDIC encodings: IBM-{037,273,277,278,280,282,284,285,297,423,424,425,500,838,870,871,875}, IBM-{880,905,924,1025,1026,1047,1097,1112,1122,1123,1130,1132,1137,1140}, IBM-{1141,1142,1143,1144,1145,1146,1147,1148,1149,1153,1154,1155,1156,1157}, IBM-{1158,1160,1164,1165,1166,4971,12712,16804}. They are available through the configure option '--enable-extra-encodings'. New in 1.16: * The preloadable library has been removed. New in 1.15: * The UTF-8 converter now rejects surrogates and out-of-range code points. * Added ISO-2022-JP-MS converter. * Updated the CP1255 converter to map one more character. * The functions now support strings longer than 2 GB. @ text @$NetBSD: patch-af,v 1.8 2011/09/08 16:29:49 bsiegert Exp $ --- lib/Makefile.in.orig 2009-06-21 11:17:33.000000000 +0000 +++ lib/Makefile.in @@@@ -96,14 +96,14 @@@@ libiconv.res.lo : $(srcdir)/../windows/l # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. install-lib : all force if [ ! -d $(libdir) ] ; then $(mkinstalldirs) $(libdir) ; fi - $(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(libdir)/libiconv.la + $(LIBTOOL_INSTALL) $(INSTALL) libiconv.la $(libdir)/libiconv.la # On AIX, libiconv.a must include the object files of /lib/libiconv.a, # otherwise the setlocale() call fails when invoked from executables linked # with -rpath $(libdir), even if linked without -liconv. install : all force if [ ! -d $(DESTDIR)$(libdir) ] ; then $(mkinstalldirs) $(DESTDIR)$(libdir) ; fi - $(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(DESTDIR)$(libdir)/libiconv.la + $(LIBTOOL_INSTALL) $(INSTALL) libiconv.la $(DESTDIR)$(libdir)/libiconv.la case "@@host_os@@" in \ aix*) (cd $(DESTDIR)$(libdir) && \ objects=`ar t libiconv.a`" "`ar t /lib/libiconv.a` && \ @ 1.8 log @Revert recent commit, add a (hopefully) correct patch instead. Bump rev. In the Makefile.in, libcharset is copied with pax into lib/ along with its object files. This overwrites relocatable.lo from libiconv, which is then relinked against the wrong object. Use "libtool --mode=install cp" instead to only copy the library. Should hopefully fix PR pkg/45341. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.6 2010/11/10 21:00:50 adam Exp $ @ 1.7 log @Link libiconv.la against libcharset.la to fix the build on MirBSD. Bump PKGREVISION. Patch was first sent to tech-pkg, no one objected. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- lib/Makefile.in.orig Sun Aug 7 17:47:39 2011 d5 1 a5 10 @@@@ -68,7 +68,7 @@@@ OBJECTS_RES_no = all : libiconv.la libiconv.la : $(OBJECTS) - $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o libiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) -no-undefined $(OBJECTS) + $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o libiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) -no-undefined $(OBJECTS) libcharset.la 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 \ @@@@ -96,7 +96,7 @@@@ libiconv.res.lo : $(srcdir)/../windows/l a13 1 @@@@ -103,7 +103,7 @@@@ install-lib : all force @ 1.6 log @Changes 1.13.1: * The library and the iconv program now understand platform dependent aliases, for better compatibility with the platform's own iconv_open function. Examples: "646" on Solaris, "iso88591" on HP-UX, "IBM-1252" on AIX. * For stateful encodings, when the input ends with a shift sequence followed by invalid input, the iconv function now increments the input pointer past the shift sequence before returning (size_t)(-1) with errno = EILSEQ. This is also like GNU libc's iconv() behaves. * The library exports a new function iconv_open_into() that stores the conversion descriptor in pre-allocated memory, rather than allocating fresh memory for it. * Added CP1131 converter. @ text @d3 1 a3 1 --- lib/Makefile.in.orig 2009-06-21 11:17:33.000000000 +0000 d5 10 a14 1 @@@@ -96,14 +96,14 @@@@ libiconv.res.lo : $(srcdir)/../windows/l d23 1 @ 1.5 log @Use "libtool" rules similar to those in version 1.13.1 of "libiconv" to build "preloadable_libiconv.so". This should fix the build under Linux, OSF1 and Solaris with any supported compiler. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.4 2010/01/06 18:53:05 tron Exp $ d3 3 a5 48 --- lib/Makefile.in.orig 2007-05-27 23:15:31.000000000 +0100 +++ lib/Makefile.in 2010-01-06 20:53:18.000000000 +0000 @@@@ -69,35 +69,15 @@@@ libiconv.la : $(OBJECTS) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o libiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) -no-undefined $(OBJECTS) -preloadable_libiconv.so : preloadable_libiconv_@@OS@@.so - $(RM) preloadable_libiconv.so - $(LN_S) preloadable_libiconv_@@OS@@.so preloadable_libiconv.so - -preloadable_libiconv_linux.so : $(SOURCES) - if test -n "@@GCC@@"; then \ - $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \ - else \ - $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \ - fi - -preloadable_libiconv_solaris.so : $(SOURCES) - if test -n "@@GCC@@"; then \ - $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_solaris.so; \ - else \ - $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -G -o preloadable_libiconv_solaris.so; \ - fi - -preloadable_libiconv_osf.so : $(SOURCES) - if test -n "@@GCC@@"; then \ - $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_osf.so; \ - else \ - mkdir objects; \ - for f in $(SOURCES); do \ - $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -DPIC -DLIBICONV_PLUG -c $$f -o objects/`basename $$f | sed -e 's,\.c$$,.o,'`; \ - done; \ - /bin/ld -shared -expect_unresolved \* -o preloadable_libiconv_osf.so objects/*.o; \ - rm -rf objects; \ - fi +preloadable_libiconv.so : $(SOURCES) + $(RM) -rf objects + mkdir objects && \ + for f in $(SOURCES); do \ + $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -DLIBICONV_PLUG -c $$f -o objects/`basename $$f | sed -e 's,\.c$$,.o,'` || exit 1; \ + done && \ + $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o objects/libiconv.la -rpath $(libdir) -no-undefined objects/*.lo && \ + cp objects/.libs/libiconv.so preloadable_libiconv.so + $(RM) -rf objects 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 $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEFS) -c $(srcdir)/iconv.c @@@@ -118,14 +98,14 @@@@ @ 1.4 log @Fix the part of the makefile that builds "preloadable_libiconv.so" under Solaris if GCC is used. As this bit is both operating system and compiler specific we can simple bypass "libtool" which is what must have happened with the old "libtool". The build in the non-GCC case or under Linux respectively OSF1 might still be broken. But I don't have a setup to test that. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.3 2007/11/29 17:05:35 wiz Exp $ d3 5 a7 3 --- lib/Makefile.in.orig Mon May 28 00:15:31 2007 +++ lib/Makefile.in Wed Jan 6 19:44:49 2010 @@@@ -82,7 +82,7 @@@@ d9 13 a21 2 preloadable_libiconv_solaris.so : $(SOURCES) if test -n "@@GCC@@"; then \ d23 28 a50 5 + $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_solaris.so; \ else \ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -G -o preloadable_libiconv_solaris.so; \ fi @@@@ -118,7 +118,7 @@@@ a58 1 @@@@ -125,7 +125,7 @@@@ @ 1.3 log @Update to 1.12: New in libiconv-1.12-cp932.patch: * Changed CP932 converter to use exact mapping table. * Added WINDOWS-31J, csWINDOWS31J, SJIS-OPEN, SJIS-WIN as aliases for CP932. * Added EUCJP-MS converter. * Added EUC-JP-MS, EUCJP-OPEN, EUCJP-WIN as aliases for EUCJP-MS. New in 1.12: * The iconv program is now licensed under the GPL version 3, instead of the GPL version 2. The libiconv library continues to be licensed under LGPL. * Added RK1048 converter. * On AIX, an existing system libiconv no longer causes setlocale() to fail. * Upgraded EUC-KR, JOHAB to include the Korean postal code sign. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.2 2007/03/20 00:44:53 wiz Exp $ d3 12 a14 3 --- lib/Makefile.in.orig 2007-05-27 22:15:31.000000000 +0000 +++ lib/Makefile.in @@@@ -118,14 +118,14 @@@@ libiconv.res : $(srcdir)/../windows/libi d23 1 @ 1.2 log @Update to 1.11: New in 1.11: * The iconv program has new options --unicode-subst, --byte-subst, --widechar-subst that allow to specify substitutions for characters that cannot be converted. * The iconv program now understands long options: long option equivalent to --from-code -f --to-code -t --list -l --silent -s * The CP936 converter is now different from the GBK converter: it has changed to include the Euro sign and private area characters. CP936 is no longer an alias of GBK. * Updated GB18030 converter to include all private area characters. * Updated CP950 converter to include the Euro sign and private area characters. * Updated CP949 converter to include private area characters. * Updated the BIG5-HKSCS converter. The old BIG5-HKSCS converter is renamed to BIG5-HKSCS:1999 and updated to Unicode 4. New converters BIG5-HKSCS:2001 and BIG5-HKSCS:2004 are added. BIG5-HKSCS is now an alias for BIG5-HKSCS:2004. * Added a few irreversible mappings to the CP932 converter. * Tidy up the list of symbols exported from libiconv (assumes gcc >= 4.0). @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.1 2004/04/28 15:19:04 tv Exp $ d3 1 a3 1 --- lib/Makefile.in.orig 2006-07-14 13:18:42.000000000 +0000 d5 1 a5 1 @@@@ -110,13 +110,13 @@@@ iconv-exports.lo : $(srcdir)/../woe32dll d12 3 a15 2 if [ ! -d $(DESTDIR)$(prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(prefix) ; fi if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(exec_prefix) ; fi d19 3 a21 3 if test -n "@@PLUGLIB@@"; then $(INSTALL_DATA) @@PLUGLIB@@ $(DESTDIR)$(libdir)/@@PLUGLIB@@.new && mv $(DESTDIR)$(libdir)/@@PLUGLIB@@.new $(DESTDIR)$(libdir)/@@PLUGLIB@@ ; fi installdirs : force @ 1.1 log @nb2: use $(INSTALL), not $(INSTALL_DATA), for a library in an autoconfiscated package. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- lib/Makefile.in.orig Sun May 18 10:19:16 2003 d5 1 a5 1 @@@@ -101,13 +101,13 @@@@ relocatable.lo : $(srcdir)/relocatable.c @