CVS commit: pkgsrc/converters/TECkit

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jan 26 16:40:50 UTC 2018

Modified Files:
        pkgsrc/converters/TECkit: Makefile distinfo
Added Files:
        pkgsrc/converters/TECkit/patches: patch-SFconv_UtfCodec.h

Log Message:
TECkit: Avoid bash autogen.sh script, fix SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/converters/TECkit/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/converters/TECkit/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/converters/TECkit/patches/patch-SFconv_UtfCodec.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/TECkit/Makefile
diff -u pkgsrc/converters/TECkit/Makefile:1.9 pkgsrc/converters/TECkit/Makefile:1.10
--- pkgsrc/converters/TECkit/Makefile:1.9       Thu Jan 25 15:51:24 2018
+++ pkgsrc/converters/TECkit/Makefile   Fri Jan 26 16:40:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/01/25 15:51:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2018/01/26 16:40:50 jperkin Exp $
 
 DISTNAME=      TECkit-2.5.7
 CATEGORIES=    converters
@@ -14,12 +14,13 @@ LICENSE=    gnu-lgpl-v2.1 OR cpl-1.0
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_LANGUAGES= c c++
-USE_TOOLS+=    autoconf automake
+USE_TOOLS+=    aclocal autoconf automake gmake
 
 PKGCONFIG_OVERRIDE=    teckit.pc.in
 
 pre-configure:
-       (cd ${WRKSRC}; ./autogen.sh)
+       cd ${WRKSRC} && libtoolize -c && aclocal && \
+           autoheader && autoconf && automake -a
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/converters/TECkit/distinfo
diff -u pkgsrc/converters/TECkit/distinfo:1.6 pkgsrc/converters/TECkit/distinfo:1.7
--- pkgsrc/converters/TECkit/distinfo:1.6       Thu Jan 25 15:51:24 2018
+++ pkgsrc/converters/TECkit/distinfo   Fri Jan 26 16:40:50 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2018/01/25 15:51:24 jperkin Exp $
+$NetBSD: distinfo,v 1.7 2018/01/26 16:40:50 jperkin Exp $
 
 SHA1 (TECkit-2.5.7.tar.gz) = e0555f71ef4bbdc5badca260607c27da610b4ab4
 RMD160 (TECkit-2.5.7.tar.gz) = 0745f336c141ac969e2b54033edc47a85e26d02b
 SHA512 (TECkit-2.5.7.tar.gz) = 00f7991e2a98eda59c07a3ea197df0ddcf9fa9ea167379c2d4467d4fdf708803c3c74a549f457765837387b9ac9ab121eaf37bb42d4da4b5aadb5699b202a806
 Size (TECkit-2.5.7.tar.gz) = 2940182 bytes
+SHA1 (patch-SFconv_UtfCodec.h) = 4ac9db7a5e23afa0f819fab9747b82e39bce0f78

Added files:

Index: pkgsrc/converters/TECkit/patches/patch-SFconv_UtfCodec.h
diff -u /dev/null pkgsrc/converters/TECkit/patches/patch-SFconv_UtfCodec.h:1.1
--- /dev/null   Fri Jan 26 16:40:50 2018
+++ pkgsrc/converters/TECkit/patches/patch-SFconv_UtfCodec.h    Fri Jan 26 16:40:50 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-SFconv_UtfCodec.h,v 1.1 2018/01/26 16:40:50 jperkin Exp $
+
+Avoid uchar_t redefinition on SunOS.
+
+--- SFconv/UtfCodec.h.orig     2017-06-23 19:39:26.000000000 +0000
++++ SFconv/UtfCodec.h
+@@ -34,7 +34,9 @@ using std::int8_t;
+ using std::uint8_t;
+ using std::ptrdiff_t;
+ 
++#ifndef __sun
+ typedef uint32_t  uchar_t;
++#endif
+ 
+ template <int N>
+ struct _utf_codec