pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/converters/libiconv
Module Name: pkgsrc
Committed By: wiz
Date: Mon Jan 23 15:22:24 UTC 2023
Modified Files:
pkgsrc/converters/libiconv: Makefile PLIST builtin.mk distinfo
Removed Files:
pkgsrc/converters/libiconv/patches: patch-aa patch-ab patch-ad patch-ae
patch-af patch-srclib_stdio.in.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/converters/libiconv/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/converters/libiconv/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/converters/libiconv/builtin.mk
cvs rdiff -u -r1.43 -r1.44 pkgsrc/converters/libiconv/distinfo
cvs rdiff -u -r1.11 -r0 pkgsrc/converters/libiconv/patches/patch-aa
cvs rdiff -u -r1.12 -r0 pkgsrc/converters/libiconv/patches/patch-ab
cvs rdiff -u -r1.8 -r0 pkgsrc/converters/libiconv/patches/patch-ad \
pkgsrc/converters/libiconv/patches/patch-af
cvs rdiff -u -r1.7 -r0 pkgsrc/converters/libiconv/patches/patch-ae
cvs rdiff -u -r1.2 -r0 \
pkgsrc/converters/libiconv/patches/patch-srclib_stdio.in.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/converters/libiconv/Makefile
diff -u pkgsrc/converters/libiconv/Makefile:1.68 pkgsrc/converters/libiconv/Makefile:1.69
--- pkgsrc/converters/libiconv/Makefile:1.68 Sat Jan 18 23:30:14 2020
+++ pkgsrc/converters/libiconv/Makefile Mon Jan 23 15:22:24 2023
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.68 2020/01/18 23:30:14 rillig Exp $
+# $NetBSD: Makefile,v 1.69 2023/01/23 15:22:24 wiz Exp $
-DISTNAME= libiconv-1.14
-PKGREVISION= 3
+DISTNAME= libiconv-1.17
CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_GNU:=libiconv/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://www.gnu.org/software/libiconv/
COMMENT= Character set conversion library
-LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2
+LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1
USE_LANGUAGES+= c c++
USE_LIBTOOL= yes
@@ -18,6 +17,8 @@ GNU_CONFIGURE_STRICT= no # has multiple
CONFLICTS= man-pages-[0-9]*
+MAKE_JOBS_SAFE= no
+
# Explicitly disable NLS since libiconv is a dependency for gettext-lib
# and we don't want libiconv to pick up any NLS functions from libc
# if they exist.
@@ -38,36 +39,10 @@ CONFIGURE_ENV.SunOS+= am_cv_proto_iconv=
TEST_TARGET= check
-EGDIR= ${PREFIX}/share/examples/libiconv
-REQD_FILES= ${EGDIR}/charset.alias ${PREFIX}/lib/charset.alias
-
-MAKE_ENV+= PAX=${PAX:Q}
-
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mmipspro*)
CFLAGS+= -c99
.endif
-# no patch for libiconv-1.14 available yet
-#.include "options.mk"
-
-PLIST_VARS+= preload
-
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" || ${OPSYS} == "OSF1"
-PLIST.preload= yes
-.endif
-
-# remove any existing charset.alias; if it already exists, libiconv does
-# not overwrite it, and older versions of libiconv wrote incorrect
-# charset.alias files, which were not removed during deinstall since
-# other packages touched them.
-pre-install:
- ${RM} -f ${DESTDIR}${PREFIX}/lib/charset.alias
-
-# be sure to install a new charset.alias
-post-install:
- cd ${WRKSRC}/libcharset/lib && \
- ${MAKE} libdir=${EGDIR} DESTDIR=${DESTDIR} install-charset-alias
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/converters/libiconv/PLIST
diff -u pkgsrc/converters/libiconv/PLIST:1.9 pkgsrc/converters/libiconv/PLIST:1.10
--- pkgsrc/converters/libiconv/PLIST:1.9 Wed Nov 10 21:00:49 2010
+++ pkgsrc/converters/libiconv/PLIST Mon Jan 23 15:22:24 2023
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.9 2010/11/10 21:00:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2023/01/23 15:22:24 wiz Exp $
bin/iconv
include/iconv.h
include/libcharset.h
include/localcharset.h
lib/libcharset.la
lib/libiconv.la
-${PLIST.preload}lib/preloadable_libiconv.so
man/man1/iconv.1
man/man3/iconv.3
man/man3/iconv_close.3
@@ -18,4 +17,3 @@ share/doc/libiconv/iconv_close.3.html
share/doc/libiconv/iconv_open.3.html
share/doc/libiconv/iconv_open_into.3.html
share/doc/libiconv/iconvctl.3.html
-share/examples/libiconv/charset.alias
Index: pkgsrc/converters/libiconv/builtin.mk
diff -u pkgsrc/converters/libiconv/builtin.mk:1.25 pkgsrc/converters/libiconv/builtin.mk:1.26
--- pkgsrc/converters/libiconv/builtin.mk:1.25 Mon Jan 13 17:35:05 2020
+++ pkgsrc/converters/libiconv/builtin.mk Mon Jan 23 15:22:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.25 2020/01/13 17:35:05 rillig Exp $
+# $NetBSD: builtin.mk,v 1.26 2023/01/23 15:22:24 wiz Exp $
#
# Package-settable variables:
#
@@ -30,7 +30,7 @@ BUILTIN_FIND_GREP.H_CITRUS_ICONV= Copyri
IS_BUILTIN.iconv= no
. if empty(H_ICONV:M__nonexistent__) && \
empty(H_ICONV:M${LOCALBASE}/*) && \
- !empty(BUILTIN_LIB_FOUND.iconv:M[yY][eE][sS])
+ ${BUILTIN_LIB_FOUND.iconv:U:tl} == yes
IS_BUILTIN.iconv= yes
. endif
.endif
@@ -41,7 +41,7 @@ MAKEVARS+= IS_BUILTIN.iconv
### a package name to represent the built-in package.
###
.if !defined(BUILTIN_PKG.iconv) && \
- !empty(IS_BUILTIN.iconv:M[yY][eE][sS]) && \
+ ${IS_BUILTIN.iconv:tl} == yes && \
empty(H_ICONV:M__nonexistent__)
BUILTIN_VERSION.iconv!= \
${AWK} 'BEGIN { hex="0123456789abcdef" } \
@@ -75,10 +75,10 @@ USE_BUILTIN.iconv= no
. else
USE_BUILTIN.iconv= ${IS_BUILTIN.iconv}
. if defined(BUILTIN_PKG.iconv) && \
- !empty(IS_BUILTIN.iconv:M[yY][eE][sS])
+ ${IS_BUILTIN.iconv:tl} == yes
USE_BUILTIN.iconv= yes
. for _dep_ in ${BUILDLINK_API_DEPENDS.iconv}
-. if !empty(USE_BUILTIN.iconv:M[yY][eE][sS])
+. if ${USE_BUILTIN.iconv:tl} == yes
USE_BUILTIN.iconv!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.iconv:Q}; then \
${ECHO} yes; \
@@ -95,7 +95,7 @@ USE_BUILTIN.iconv!= \
# XXX
. if empty(H_GLIBC_ICONV:M__nonexistent__) && \
empty(H_GLIBC_ICONV:M${LOCALBASE}/*) && \
- !empty(BUILTIN_LIB_FOUND.iconv:M[nN][oO])
+ ${BUILTIN_LIB_FOUND.iconv:U:tl} == no
USE_BUILTIN.iconv= yes
H_ICONV= ${H_GLIBC_ICONV}
. endif
@@ -105,7 +105,7 @@ H_ICONV= ${H_GLIBC_ICONV}
# XXX
. if empty(H_CITRUS_ICONV:M__nonexistent__) && \
empty(H_CITRUS_ICONV:M${LOCALBASE}/*) && \
- !empty(BUILTIN_LIB_FOUND.iconv:M[nN][oO])
+ ${BUILTIN_LIB_FOUND.iconv:U:tl} == no
USE_BUILTIN.iconv= yes
H_ICONV= ${H_CITRUS_ICONV}
. endif
@@ -127,7 +127,7 @@ MAKEVARS+= USE_BUILTIN.iconv
# implementation.
#
.if defined(USE_GNU_ICONV)
-. if !empty(IS_BUILTIN.iconv:M[nN][oO])
+. if ${IS_BUILTIN.iconv:tl} == no
USE_BUILTIN.iconv= no
. endif
.endif
@@ -135,7 +135,7 @@ USE_BUILTIN.iconv= no
# Define BUILTIN_LIBNAME.iconv to be the base name of the built-in
# iconv library.
#
-.if !empty(BUILTIN_LIB_FOUND.iconv:M[yY][eE][sS])
+.if ${BUILTIN_LIB_FOUND.iconv:U:tl} == yes
BUILTIN_LIBNAME.iconv= iconv
.else
BUILTIN_LIBNAME.iconv= # empty (part of the C library)
@@ -146,8 +146,8 @@ BUILTIN_LIBNAME.iconv= # empty (part of
#
.if !defined(ICONV_TYPE)
ICONV_TYPE?= gnu
-. if !empty(USE_BUILTIN.iconv:M[yY][eE][sS]) && \
- !empty(IS_BUILTIN.iconv:M[nN][oO])
+. if ${USE_BUILTIN.iconv:tl} == yes && \
+ ${IS_BUILTIN.iconv:tl} == no
ICONV_TYPE= native
. endif
.endif
@@ -157,9 +157,9 @@ ICONV_TYPE= native
### solely to determine whether a built-in implementation exists.
###
CHECK_BUILTIN.iconv?= no
-.if !empty(CHECK_BUILTIN.iconv:M[nN][oO])
+.if ${CHECK_BUILTIN.iconv:tl} == no
-. if !empty(USE_BUILTIN.iconv:M[yY][eE][sS])
+. if ${USE_BUILTIN.iconv:tl} == yes
BUILDLINK_LIBNAME.iconv= ${BUILTIN_LIBNAME.iconv}
. if empty(BUILTIN_LIBNAME.iconv)
BUILDLINK_TRANSFORM+= rm:-liconv
@@ -167,7 +167,7 @@ BUILDLINK_TRANSFORM+= rm:-liconv
. endif
. if defined(GNU_CONFIGURE) && ${GNU_CONFIGURE_ICONV:Uyes:M[yY][eE][sS]}
-. if !empty(USE_BUILTIN.iconv:M[nN][oO])
+. if ${USE_BUILTIN.iconv:tl} == no
CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
. endif
. endif
Index: pkgsrc/converters/libiconv/distinfo
diff -u pkgsrc/converters/libiconv/distinfo:1.43 pkgsrc/converters/libiconv/distinfo:1.44
--- pkgsrc/converters/libiconv/distinfo:1.43 Tue Oct 26 10:06:42 2021
+++ pkgsrc/converters/libiconv/distinfo Mon Jan 23 15:22:24 2023
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.43 2021/10/26 10:06:42 nia Exp $
+$NetBSD: distinfo,v 1.44 2023/01/23 15:22:24 wiz Exp $
-BLAKE2s (libiconv-1.14.tar.gz) = 687cc55731abf89c913a752d364de8e1bff4e4762fb2be0793765438f786dc4b
-SHA512 (libiconv-1.14.tar.gz) = b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387
-Size (libiconv-1.14.tar.gz) = 4984397 bytes
-SHA1 (patch-aa) = 7fe47a14379dbeb487c677957e67fc7b043297ce
-SHA1 (patch-ab) = 1499add23e7941b21dcc982baefe0276bcaafc28
-SHA1 (patch-ad) = e94da1c4423677b74f463d4b132c7714efc65815
-SHA1 (patch-ae) = ab346a515d5ab0efd679e7783edebd95a05db782
-SHA1 (patch-af) = 513a8f995161853870a01afabccdb2a650b794a6
-SHA1 (patch-srclib_stdio.in.h) = 0d72478608096ab621864cb7966dc735a75b93bc
+BLAKE2s (libiconv-1.17.tar.gz) = 4814bedfb28a110fbc6e7ae1b602c3beab371516c097667f0b4142858bbf6d02
+SHA512 (libiconv-1.17.tar.gz) = 18a09de2d026da4f2d8b858517b0f26d853b21179cf4fa9a41070b2d140030ad9525637dc4f34fc7f27abca8acdc84c6751dfb1d426e78bf92af4040603ced86
+Size (libiconv-1.17.tar.gz) = 5413283 bytes
Home |
Main Index |
Thread Index |
Old Index