Update to 2.5.3

Minor bugfixes. Addition of pkg-config file.

6 files changed, 17 insertions, 42 deletions

diff --git a/converters/TECkit/Makefile b/converters/TECkit/Makefile
index 56fe39ce4a4..417a81bf54b 100644
--- a/converters/TECkit/Makefile
+++ b/converters/TECkit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/10/03 00:20:09 asau Exp $
+# $NetBSD: Makefile,v 1.6 2015/06/14 10:01:41 markd Exp $
 
-DISTNAME=	TECkit_2_5_1
-PKGNAME=	${DISTNAME:S/_/-/:S/_/./g}
-PKGREVISION=	1
+DISTNAME=	TECkit_2.5.3
+PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	converters
 MASTER_SITES=	http://scripts.sil.org/svn-view/teckit/TAGS/
 
@@ -14,6 +13,12 @@ LICENSE=	gnu-lgpl-v2.1 OR cpl-1.0
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
+USE_TOOLS+=	autoconf automake
+
+PKGCONFIG_OVERRIDE=	teckit.pc.in
+
+pre-configure:
+		(cd ${WRKSRC}; ./autogen.sh)
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/TECkit/PLIST b/converters/TECkit/PLIST
index a0cb1789d18..32295420681 100644
--- a/converters/TECkit/PLIST
+++ b/converters/TECkit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:39:09 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/06/14 10:01:41 markd Exp $
 bin/sfconv
 bin/teckit_compile
 bin/txtconv
@@ -7,3 +7,4 @@ include/teckit/TECkit_Compiler.h
 include/teckit/TECkit_Engine.h
 lib/libTECkit.la
 lib/libTECkit_Compiler.la
+lib/pkgconfig/teckit.pc
diff --git a/converters/TECkit/buildlink3.mk b/converters/TECkit/buildlink3.mk
index 3fe984738cb..b5f065d266a 100644
--- a/converters/TECkit/buildlink3.mk
+++ b/converters/TECkit/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2015/06/14 10:01:41 markd Exp $
 
 BUILDLINK_TREE+=	TECkit
 
 .if !defined(TECKIT_BUILDLINK3_MK)
 TECKIT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.TECkit+=	TECkit>=2.5.1
+BUILDLINK_API_DEPENDS.TECkit+=	TECkit>=2.5.3
 BUILDLINK_PKGSRCDIR.TECkit?=	../../converters/TECkit
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/converters/TECkit/distinfo b/converters/TECkit/distinfo
index 25ebbe0b7c5..a89b5d45a05 100644
--- a/converters/TECkit/distinfo
+++ b/converters/TECkit/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/09/25 11:16:57 sbd Exp $
+$NetBSD: distinfo,v 1.4 2015/06/14 10:01:41 markd Exp $
 
-SHA1 (TECkit_2_5_1.tar.gz) = 4c43541d11e82c88a56b69d9d077aa3b60e6bb5c
-RMD160 (TECkit_2_5_1.tar.gz) = 4f19b293878329b7eec76b77b322ea2155e34f2f
-Size (TECkit_2_5_1.tar.gz) = 2630207 bytes
-SHA1 (patch-source_Compiler.cpp) = abddeab807c8a724941de065f07a125c7f59569b
-SHA1 (patch-source_Public-headers_TECkit__Common.h) = 203253b23ca68bb148fd71bbca1c497da5101ef3
+SHA1 (TECkit_2.5.3.tar.gz) = a10a78dd0512ad7812f689622a619a5102933797
+RMD160 (TECkit_2.5.3.tar.gz) = 18aadecc5ecd31d64080a446d4944018ac7b9e00
+Size (TECkit_2.5.3.tar.gz) = 2417611 bytes
diff --git a/converters/TECkit/patches/patch-source_Compiler.cpp b/converters/TECkit/patches/patch-source_Compiler.cpp
deleted file mode 100644
index dd482938849..00000000000
--- a/converters/TECkit/patches/patch-source_Compiler.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-source_Compiler.cpp,v 1.1 2011/02/05 20:21:00 markd Exp $
-
-Fix buils with gcc4.3
-
---- source/Compiler.cpp.orig	2011-02-04 04:15:39.108292974 +0000
-+++ source/Compiler.cpp
-@@ -33,6 +33,7 @@ Description:
- #include <iomanip>
- #include <algorithm>
- #include <cstring>
-+#include <cstdio>
- 
- #include "zlib.h"
- 
diff --git a/converters/TECkit/patches/patch-source_Public-headers_TECkit__Common.h b/converters/TECkit/patches/patch-source_Public-headers_TECkit__Common.h
deleted file mode 100644
index 8280971546b..00000000000
--- a/converters/TECkit/patches/patch-source_Public-headers_TECkit__Common.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-source_Public-headers_TECkit__Common.h,v 1.1 2012/09/25 11:18:27 sbd Exp $
-
---- source/Public-headers/TECkit_Common.h.orig	2012-09-25 11:11:23.054232507 +0000
-+++ source/Public-headers/TECkit_Common.h
-@@ -33,7 +33,10 @@ History:
- typedef unsigned char			UInt8;
- typedef unsigned short			UInt16;
- typedef unsigned int			UInt32;	/* NB: assumes int is 4 bytes */
-+/* zconf.h defines 'Byte' */
-+#ifndef ZCONF_H	
- typedef UInt8					Byte;
-+#endif
- typedef Byte*					BytePtr;
- typedef UInt16					UniChar;
-