cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to recode-3.7.12

Browse Source
This commit is contained in:
sthen 2022-11-28 20:52:35 +00:00
parent cb6d2eaa68
commit 5809286a73
10 changed files with 41 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
converters/recode/Makefile
View File

@ -1,37 +1,32 @@
COMMENT= convert files between character sets and usages
DISTNAME= recode-3.6
REVISION = 12
SHARED_LIBS += recode 0.0 # .0.0
V= 3.7.12
DISTNAME= recode-$V
SHARED_LIBS += recode 1.0 # 10.12
CATEGORIES= converters textproc
HOMEPAGE= http://recode.progiciels-bpi.ca
MODULES= lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
HOMEPAGE= https://github.com/rrthomas/recode
# (L)GPLv2
PERMIT_PACKAGE= Yes
WANTLIB= c iconv intl
WANTLIB= c iconv intl
# moved to https://github.com/pinard/Recode/
MASTER_SITES= ${MASTER_SITE_GNU:=recode/}
MASTER_SITES= https://github.com/rrthomas/recode/releases/download/v$V/
MODULES= lang/python
MODPY_RUNDEP= No
LIB_DEPENDS= devel/gettext,-runtime
TEST_DEPENDS= lang/cython${MODPY_FLAVOR}
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --without-included-gettext
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
CYTHON=cython
TEST_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
post-extract:
@cd ${WRKSRC}/lib && cp -p error.c ../src
post-test:
@cd ${WRKBUILD}/tests && ${MAKE_PROGRAM} PYTHON=${MODPY_BIN} bigtest
.include <bsd.port.mk>

4
converters/recode/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (recode-3.6.tar.gz) = 4+ak8/jlxgUqtwFVmQwHTYeqC2FPwb4x0ZR1DR2WL88=
SIZE (recode-3.6.tar.gz) = 1751886
SHA256 (recode-3.7.12.tar.gz) = TbHJB28E26oVlyb1AAhH5eWoOuyOXGT4ygQ4P2zaEtU=
SIZE (recode-3.7.12.tar.gz) = 2399126

19
converters/recode/patches/patch-configure
View File

@ -1,19 +0,0 @@
--- configure.orig Wed Jan 3 17:40:32 2001
+++ configure Sat Apr 25 19:18:55 2009
@@ -3399,7 +3399,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3405 "configure"
#include "confdefs.h"
@@ -3508,6 +3508,7 @@ echo "configure:3508: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
+ LIBS="-lintl -liconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3513 "configure"
#include "confdefs.h"

11
converters/recode/patches/patch-libiconv_aliases_h
View File

@ -1,11 +0,0 @@
--- libiconv/aliases.h.orig Mon Apr 17 16:09:17 2017
+++ libiconv/aliases.h Mon Apr 17 16:10:03 2017
@@ -69,7 +69,7 @@ aliases_hash (register const char *str, register unsig
#ifdef __GNUC__
__inline
#endif
-const struct alias *
+static const struct alias *
aliases_lookup (register const char *str, register unsigned int len)
{
static const struct alias wordlist[] =

20
converters/recode/patches/patch-src_Makefile_in
View File

@ -1,20 +0,0 @@
--- src/Makefile.in.orig Mon Jan 22 19:14:16 2001
+++ src/Makefile.in Sat Apr 25 19:18:55 2009
@@ -129,7 +129,7 @@ L_SURFACES =
recode_SOURCES = main.c freeze.c mixed.c
recode_LDADD = librecode.la ../lib/libreco.a
-librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c hash.c iconv.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c recode.c request.c strip-pool.c task.c xmalloc.c $(C_STEPS)
+librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c hash.c iconv.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c recode.c request.c strip-pool.c task.c xmalloc.c error.c $(C_STEPS)
librecode_la_LDFLAGS = -version-info 0:0:0
@@ -159,7 +159,7 @@ librecode_la_LIBADD =
librecode_la_OBJECTS = argmatch$U.lo charname$U.lo combine$U.lo \
fr-charname$U.lo hash$U.lo iconv$U.lo libiconv$U.lo localcharset$U.lo \
merged$U.lo names$U.lo outer$U.lo quotearg$U.lo recode$U.lo \
-request$U.lo strip-pool$U.lo task$U.lo xmalloc$U.lo african$U.lo \
+request$U.lo strip-pool$U.lo task$U.lo xmalloc$U.lo error$U.lo african$U.lo \
afrtran$U.lo applemac$U.lo atarist$U.lo bangbang$U.lo cdcnos$U.lo \
ebcdic$U.lo ibmpc$U.lo iconqnx$U.lo lat1asci$U.lo mule$U.lo \
strip-data$U.lo testdump$U.lo ucs$U.lo utf16$U.lo utf7$U.lo utf8$U.lo \

22
converters/recode/patches/patch-src_libiconv_c
View File

@ -1,22 +0,0 @@
In the "while (cursor > input_buffer || input_char != EOF)" loop,
the "cursor" pointer sometimes refers to "input_buffer" and sometimes
to "output_buffer". It must refer to "input_buffer" at the start of
the loop, but the present code forgets to ensure this.
Examples that trigger the problem:
$ perl -e 'print "\xc3\xa4"x1025' | recode utf8..latin1 | wc -c
$ perl -e 'print "\xc3\xa4"x2000' | recode utf8..latin1 | wc -c
--- src/libiconv.c.orig Sat Jul 1 19:13:25 2000
+++ src/libiconv.c Sat Sep 27 23:47:54 2014
@@ -195,9 +195,9 @@ wrapped_transform (iconv_t conversion, iconv_t convers
memcpy() doesn't do here, because the regions might overlap.
memmove() isn't worth it, because we rarely have to move more
than 12 bytes. */
+ cursor = input_buffer;
if (input > input_buffer && input_left > 0)
{
- cursor = input_buffer;
do
*cursor++ = *input++;
while (--input_left > 0);

11
converters/recode/patches/patch-src_recodext_h
View File

@ -1,11 +0,0 @@
--- src/recodext.h.orig Sat Apr 15 20:09:37 2017
+++ src/recodext.h Sat Apr 15 20:10:14 2017
@@ -218,7 +218,7 @@ struct recode_symbol
enum recode_symbol_type type : 3;
/* Non zero if this one should be ignored. */
- bool ignore : 2;
+ bool ignore : 1;
};
struct recode_surface_list

43
converters/recode/patches/patch-tests_bigauto_py
View File

@ -1,43 +0,0 @@
--- tests/bigauto.py.orig Thu Apr 27 01:16:04 2000
+++ tests/bigauto.py Sat Sep 27 22:57:00 2014
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright © 1997, 1999, 2000 Progiciels Bourbeau-Pinard inc.
-# François Pinard <pinard@iro.umontreal.ca>, 1997.
+# Copyright (c) 1997, 1999, 2000 Progiciels Bourbeau-Pinard inc.
+# Francois Pinard <pinard@iro.umontreal.ca>, 1997.
"""\
Produce statistics from the results of the bigauto check.
@@ -48,7 +48,7 @@ def create_data(name, recode_options, charset_options)
charsets = []
for line in os.popen('recode -l').readlines():
charset = string.split(line)[0]
- if charset[0] in ':/':
+ if charset[0] in ':/' or charset == 'data' or charset == 'tree':
continue
charsets.append(charset)
# Do the work, calling a subshell once per `before' value.
@@ -81,16 +81,20 @@ class Report:
lensep = len(os.linesep)
line = readline()
while line:
- type, request = string.split(line[:-lensep], ':', 1)
+ split = string.split(line[:-lensep], ':', 1)
+ type = split[0]
if type == 'Request':
+ request = split[1]
steps = self.get_steps(request)
self.count_original_request(steps, request)
line = readline()
if line:
if len(string.split(line[:-lensep], ':', 1)) != 2:
print '*', line,
- type, shrunk_to = string.split(line[:-lensep], ':', 1)
+ split = string.split(line[:-lensep], ':', 1)
+ type = split[0]
if type == 'Shrunk to':
+ shrunk_to = split[1]
steps = self.get_steps(shrunk_to)
self.count_shrunk_request(steps, shrunk_to)
line = readline()

13
converters/recode/pkg/DESCR
View File

@ -1,6 +1,7 @@
GNU `recode' converts files between character sets and usages. When
exact transliterations are not possible, it may get rid of the
offending characters or fall back on approximations. This program
recognizes or produces nearly 150 different character sets and is able
to transliterate files between almost any pair. Most RFC 1345
character sets are supported.
The Recode library converts files between character sets and usages.
It recognises or produces over 200 different character sets (or about
300 if combined with an iconv library) and transliterates files between
almost any pair. When exact transliterations are not possible, it gets
rid of offending characters or falls back on approximations.
The recode(1) program is a handy front-end to the library.

22
converters/recode/pkg/PLIST
View File

@ -3,19 +3,39 @@ include/recode.h
include/recodext.h
@info info/recode.info
@comment lib/charset.alias
lib/librecode.a
@static-lib lib/librecode.a
lib/librecode.la
@lib lib/librecode.so.${LIBrecode_VERSION}
@man man/man1/recode.1
share/locale/be/LC_MESSAGES/recode.mo
share/locale/ca/LC_MESSAGES/recode.mo
share/locale/cs/LC_MESSAGES/recode.mo
share/locale/da/LC_MESSAGES/recode.mo
share/locale/de/LC_MESSAGES/recode.mo
share/locale/el/LC_MESSAGES/recode.mo
share/locale/eo/LC_MESSAGES/recode.mo
share/locale/es/LC_MESSAGES/recode.mo
share/locale/fi/LC_MESSAGES/recode.mo
share/locale/fr/LC_MESSAGES/recode.mo
share/locale/ga/LC_MESSAGES/recode.mo
share/locale/gl/LC_MESSAGES/recode.mo
share/locale/he/LC_MESSAGES/recode.mo
share/locale/hr/LC_MESSAGES/recode.mo
share/locale/hu/LC_MESSAGES/recode.mo
share/locale/id/LC_MESSAGES/recode.mo
share/locale/it/LC_MESSAGES/recode.mo
share/locale/nb/LC_MESSAGES/recode.mo
share/locale/nl/LC_MESSAGES/recode.mo
share/locale/pl/LC_MESSAGES/recode.mo
share/locale/pt/LC_MESSAGES/recode.mo
share/locale/pt_BR/LC_MESSAGES/recode.mo
share/locale/ro/LC_MESSAGES/recode.mo
share/locale/ru/LC_MESSAGES/recode.mo
share/locale/sk/LC_MESSAGES/recode.mo
share/locale/sl/LC_MESSAGES/recode.mo
share/locale/sr/LC_MESSAGES/recode.mo
share/locale/sv/LC_MESSAGES/recode.mo
share/locale/tr/LC_MESSAGES/recode.mo
share/locale/uk/LC_MESSAGES/recode.mo
share/locale/vi/LC_MESSAGES/recode.mo
share/locale/zh_CN/LC_MESSAGES/recode.mo