head 1.13; access; symbols pkgsrc-2022Q4:1.12.0.68 pkgsrc-2022Q4-base:1.12 pkgsrc-2022Q3:1.12.0.66 pkgsrc-2022Q3-base:1.12 pkgsrc-2022Q2:1.12.0.64 pkgsrc-2022Q2-base:1.12 pkgsrc-2022Q1:1.12.0.62 pkgsrc-2022Q1-base:1.12 pkgsrc-2021Q4:1.12.0.60 pkgsrc-2021Q4-base:1.12 pkgsrc-2021Q3:1.12.0.58 pkgsrc-2021Q3-base:1.12 pkgsrc-2021Q2:1.12.0.56 pkgsrc-2021Q2-base:1.12 pkgsrc-2021Q1:1.12.0.54 pkgsrc-2021Q1-base:1.12 pkgsrc-2020Q4:1.12.0.52 pkgsrc-2020Q4-base:1.12 pkgsrc-2020Q3:1.12.0.50 pkgsrc-2020Q3-base:1.12 pkgsrc-2020Q2:1.12.0.46 pkgsrc-2020Q2-base:1.12 pkgsrc-2020Q1:1.12.0.26 pkgsrc-2020Q1-base:1.12 pkgsrc-2019Q4:1.12.0.48 pkgsrc-2019Q4-base:1.12 pkgsrc-2019Q3:1.12.0.44 pkgsrc-2019Q3-base:1.12 pkgsrc-2019Q2:1.12.0.42 pkgsrc-2019Q2-base:1.12 pkgsrc-2019Q1:1.12.0.40 pkgsrc-2019Q1-base:1.12 pkgsrc-2018Q4:1.12.0.38 pkgsrc-2018Q4-base:1.12 pkgsrc-2018Q3:1.12.0.36 pkgsrc-2018Q3-base:1.12 pkgsrc-2018Q2:1.12.0.34 pkgsrc-2018Q2-base:1.12 pkgsrc-2018Q1:1.12.0.32 pkgsrc-2018Q1-base:1.12 pkgsrc-2017Q4:1.12.0.30 pkgsrc-2017Q4-base:1.12 pkgsrc-2017Q3:1.12.0.28 pkgsrc-2017Q3-base:1.12 pkgsrc-2017Q2:1.12.0.24 pkgsrc-2017Q2-base:1.12 pkgsrc-2017Q1:1.12.0.22 pkgsrc-2017Q1-base:1.12 pkgsrc-2016Q4:1.12.0.20 pkgsrc-2016Q4-base:1.12 pkgsrc-2016Q3:1.12.0.18 pkgsrc-2016Q3-base:1.12 pkgsrc-2016Q2:1.12.0.16 pkgsrc-2016Q2-base:1.12 pkgsrc-2016Q1:1.12.0.14 pkgsrc-2016Q1-base:1.12 pkgsrc-2015Q4:1.12.0.12 pkgsrc-2015Q4-base:1.12 pkgsrc-2015Q3:1.12.0.10 pkgsrc-2015Q3-base:1.12 pkgsrc-2015Q2:1.12.0.8 pkgsrc-2015Q2-base:1.12 pkgsrc-2015Q1:1.12.0.6 pkgsrc-2015Q1-base:1.12 pkgsrc-2014Q4:1.12.0.4 pkgsrc-2014Q4-base:1.12 pkgsrc-2014Q3:1.12.0.2 pkgsrc-2014Q3-base:1.12 pkgsrc-2014Q2:1.11.0.24 pkgsrc-2014Q2-base:1.11 pkgsrc-2014Q1:1.11.0.22 pkgsrc-2014Q1-base:1.11 pkgsrc-2013Q4:1.11.0.20 pkgsrc-2013Q4-base:1.11 pkgsrc-2013Q3:1.11.0.18 pkgsrc-2013Q3-base:1.11 pkgsrc-2013Q2:1.11.0.16 pkgsrc-2013Q2-base:1.11 pkgsrc-2013Q1:1.11.0.14 pkgsrc-2013Q1-base:1.11 pkgsrc-2012Q4:1.11.0.12 pkgsrc-2012Q4-base:1.11 pkgsrc-2012Q3:1.11.0.10 pkgsrc-2012Q3-base:1.11 pkgsrc-2012Q2:1.11.0.8 pkgsrc-2012Q2-base:1.11 pkgsrc-2012Q1:1.11.0.6 pkgsrc-2012Q1-base:1.11 pkgsrc-2011Q4:1.11.0.4 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q3:1.11.0.2 pkgsrc-2011Q3-base:1.11 pkgsrc-2011Q2:1.10.0.6 pkgsrc-2011Q2-base:1.10 pkgsrc-2011Q1:1.10.0.4 pkgsrc-2011Q1-base:1.10 pkgsrc-2010Q4:1.10.0.2 pkgsrc-2010Q4-base:1.10 pkgsrc-2010Q3:1.9.0.34 pkgsrc-2010Q3-base:1.9 pkgsrc-2010Q2:1.9.0.32 pkgsrc-2010Q2-base:1.9 pkgsrc-2010Q1:1.9.0.30 pkgsrc-2010Q1-base:1.9 pkgsrc-2009Q4:1.9.0.28 pkgsrc-2009Q4-base:1.9 pkgsrc-2009Q3:1.9.0.26 pkgsrc-2009Q3-base:1.9 pkgsrc-2009Q2:1.9.0.24 pkgsrc-2009Q2-base:1.9 pkgsrc-2009Q1:1.9.0.22 pkgsrc-2009Q1-base:1.9 pkgsrc-2008Q4:1.9.0.20 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.18 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.16 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.14 pkgsrc-2008Q2-base:1.9 cwrapper:1.9.0.12 pkgsrc-2008Q1:1.9.0.10 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.8 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.6 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.4 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.2 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.8.0.22 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.20 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.18 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.16 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.14 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.12 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.10 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.8 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.6 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.4 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.2 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.7.0.2 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.5.0.2 netbsd-1-6-1-base:1.5 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.1; locks; strict; comment @# @; 1.13 date 2023.01.23.15.22.24; author wiz; state dead; branches; next 1.12; commitid EN1yTFg9Lop0aGaE; 1.12 date 2014.09.02.10.07.23; author jperkin; state Exp; branches; next 1.11; commitid w6QAaZ1Vd5uMVKOx; 1.11 date 2011.09.08.16.29.49; author bsiegert; state Exp; branches; next 1.10; 1.10 date 2010.11.10.21.00.50; author adam; state Exp; branches; next 1.9; 1.9 date 2007.03.20.00.44.53; author wiz; state Exp; branches; next 1.8; 1.8 date 2004.04.02.19.08.37; author jschauma; state Exp; branches; next 1.7; 1.7 date 2004.03.02.05.01.38; author snj; state Exp; branches; next 1.6; 1.6 date 2003.07.13.13.32.30; author wiz; state Exp; branches; next 1.5; 1.5 date 2002.11.26.00.51.02; author grant; state Exp; branches; next 1.4; 1.4 date 2002.08.25.18.38.19; author jlam; state Exp; branches; next 1.3; 1.3 date 2002.08.20.11.52.14; author wiz; state Exp; branches; next 1.2; 1.2 date 2001.05.14.12.14.48; author rh; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 2001.01.11.10.56.34; author rh; state Exp; branches; next ; 1.2.2.1 date 2002.08.22.11.10.02; author jlam; state Exp; branches; next ; desc @@ 1.13 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-ab,v 1.12 2014/09/02 10:07:23 jperkin Exp $ Support MAKE_JOBS. --- Makefile.in.orig 2009-06-21 11:17:33.000000000 +0000 +++ Makefile.in @@@@ -25,21 +25,26 @@@@ INSTALL_PROGRAM = @@INSTALL_PROGRAM@@ INSTALL_DATA = @@INSTALL_DATA@@ mkinstalldirs = $(SHELL) @@top_srcdir@@/build-aux/mkinstalldirs +top_builddir = @@top_builddir@@ +LIBTOOL = @@LIBTOOL@@ + #### End of system configuration section. #### SHELL = /bin/sh all : lib/localcharset.h force - cd lib && $(MAKE) all - cd preload && $(MAKE) all - cd srclib && $(MAKE) all - cd src && $(MAKE) all - cd po && $(MAKE) all - cd man && $(MAKE) all - if test -d tests; then cd tests && $(MAKE) all; fi + (cd lib && $(MAKE) all) + (cd preload && $(MAKE) all) + (cd srclib && $(MAKE) all) + (cd src && $(MAKE) all) + (cd po && $(MAKE) all) + (cd man && $(MAKE) all) + (if test -d tests; then cd tests && $(MAKE) all; fi) lib/localcharset.h : - builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib" + builddir="`pwd`"; cd libcharset && $(MAKE) all && \ + ${LIBTOOL} --mode=install cp lib/libcharset.la "$$builddir/lib/" && \ + ${PAX} -rw include/*.h "$$builddir/" # Installs the library and include files only. Typically called with only # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. @ 1.12 log @Ensure 'cd dir && make' rules are executed in a sub-shell, allowing us to remove MAKE_JOBS_SAFE=no. We can't depend on gmake due to circular dependencies. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.11 2011/09/08 16:29:49 bsiegert Exp $ @ 1.11 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$ d3 3 a5 1 --- Makefile.in.orig Sun Jun 21 11:17:09 2009 d7 1 a7 1 @@@@ -25,6 +25,9 @@@@ INSTALL_PROGRAM = @@INSTALL_PROGRAM@@ d17 16 a32 2 @@@@ -39,7 +42,9 @@@@ all : lib/localcharset.h force if test -d tests; then cd tests && $(MAKE) all; fi @ 1.10 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 --- Makefile.in.orig 2009-06-21 11:17:33.000000000 +0000 d5 11 a15 1 @@@@ -39,7 +39,9 @@@@ all : lib/localcharset.h force d21 1 a21 1 + ${PAX} -rw lib/libcharset.la lib/.libs "$$builddir/" && \ @ 1.9 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-ab,v 1.8 2004/04/02 19:08:37 jschauma Exp $ d3 1 a3 1 --- Makefile.in.orig 2006-07-14 13:14:17.000000000 +0000 d5 1 a5 1 @@@@ -38,7 +38,9 @@@@ all : lib/localcharset.h force @ 1.8 log @Apparently cp(1) under Irix does not like to overwrite symbolic links. This causes the package to fail to install, as this section is executed a second time. Use pax instead and all's peachy. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.7 2004/03/02 05:01:38 snj Exp $ d3 1 a3 1 --- Makefile.in.orig Wed Apr 23 13:29:22 2003 d5 1 a5 1 @@@@ -37,7 +37,9 @@@@ all : lib/localcharset.h force @ 1.7 log @Use ${CP} instead of cp. From Georg Schwarz in PR pkg/24634. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2003/07/13 13:32:30 wiz Exp $ d11 2 a12 2 + ${CP} -R lib/libcharset.la lib/.libs "$$builddir/lib" && \ + ${CP} -R include/*.h "$$builddir/include" @ 1.6 log @Update to 1.9.1. * Many more transliterations. * New configuration option --enable-relocatable. @ text @d1 1 a1 1 $NetBSD$ d11 2 a12 2 + cp -R lib/libcharset.la lib/.libs "$$builddir/lib" && \ + cp -R include/*.h "$$builddir/include" @ 1.5 log @don't unnecessarily pass -p to `cp', it causes a fatal error on Darwin while trying to chown a symlink. @ text @d3 4 a6 4 --- Makefile.in.orig Wed May 1 00:23:47 2002 +++ Makefile.in Tue Nov 26 11:46:45 2002 @@@@ -27,7 +27,9 @@@@ SHELL = /bin/sh d8 1 a8 1 all : force d13 3 a15 3 cd lib && $(MAKE) all cd src && $(MAKE) all cd po && $(MAKE) all @ 1.4 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. This provides sufficient buildlink2 infrastructure to start merging other packages from the buildlink2 branch that have already been converted to use the buildlink2 framework. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2.2.1 2002/08/22 11:10:02 jlam Exp $ d3 3 a5 3 --- Makefile.in.orig Tue Aug 20 13:38:33 2002 +++ Makefile.in @@@@ -27,7 +27,9 @@@@ INSTALL_DATA = @@INSTALL_DATA@@ d11 2 a12 2 + cp -pR lib/libcharset.la lib/.libs "$$builddir/lib" && \ + cp -pR include/*.h "$$builddir/include" @ 1.3 log @Update to 1.8. Changes since 1.7: * The iconv program has new options -l, -c, -s. * The iconv program is internationalized. * Added C99 converter. * Added KOI8-T converter. * New configuration option --enable-extra-encodings that enables a bunch of additional encodings; see the README for details. * Updated the ISO-8859-16 converter. * Upgraded BIG5-HKSCS, EUC-TW, ISO-2022-CN, ISO-2022-CN-EXT converters to Unicode 3.2. * Upgraded EUC-KR, CP949, JOHAB converters to include the Euro sign. * Changed the ARMSCII-8 converter. * Extended the EUC-JP encoder so that YEN SIGN characters don't cause failures in Shift_JIS to EUC-JP conversion. * The JAVA converter now handles characters outside the Unicode BMP correctly. * Fixed a bug in the CP1255, CP1258, TCVN decoders: The base characters of combining characters could be dropped at the end of the conversion buffer. * Fixed a bug in the transliteration that could lead to excessive memory allocations in libintl when transliteration was needed. * Portability to BSD/OS and SCO 3.2.5. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update libiconv to 1.6.1. Notable changes include: * Bugfixes * The iconv program's -f and -t options are now optional. * Many more transliterations. * Added CP862 converter. * Changed the GB18030 converter. * Portability to DOS with DJGPP. @ text @d3 1 a3 1 --- Makefile.in.orig Mon Apr 16 13:58:39 2001 d5 1 a5 1 @@@@ -27,7 +27,9 @@@@ d15 1 a15 1 cd man && $(MAKE) all @ 1.2.2.1 log @Merge changes from pkgsrc-current into the buildlink2 branch for the packages that have buildlink2.mk files. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2002/08/20 11:52:14 wiz Exp $ d3 1 a3 1 --- Makefile.in.orig Tue Aug 20 13:38:33 2002 d5 1 a5 1 @@@@ -27,7 +27,9 @@@@ INSTALL_DATA = @@INSTALL_DATA@@ d15 1 a15 1 cd po && $(MAKE) all @ 1.1 log @Make this build without root permissions. Fixes Luke's PR 11893. @ text @d3 1 a3 1 --- Makefile.in.orig Sat Dec 2 04:00:57 2000 d9 3 a11 3 - builddir="`pwd`"; cd libcharset && $(MAKE) -r all && $(MAKE) -r install-lib libdir="$$builddir/lib" includedir="$$builddir/lib" + builddir="`pwd`"; cd libcharset && $(MAKE) -r all && \ + cp -pR lib/libcharset.la lib/.libs "$$builddir/lib" && \ d13 3 a15 3 cd lib && $(MAKE) -r all cd src && $(MAKE) -r all cd man && $(MAKE) -r all @