ports/140910: [Maintainer] textproc/kmflcomp: Fix KMFL on amd64, part 1/4 - prevents kmflcomp from coredumping

[Nikola Lecic]

>Number:         140910
>Category:       ports
>Synopsis:       [Maintainer] textproc/kmflcomp: Fix KMFL on amd64, part 1/4 - prevents kmflcomp from coredumping
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 26 21:10:11 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Nikola Lecic
>Release:        FreeBSD 8.0-RC3 amd64
>Organization:
>Environment:

System: FreeBSD xxx 8.0-RC3 FreeBSD 8.0-RC3 #0: Tue Nov 10 06:35:19 UTC 2009 root at mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64

>Description:

Fixes kmflcomp coredumping on amd64 systems; the patches are provided by Doug Rintoul <doug_rintoul at sil.org>, KMFL developer.

The patch creates two new files, files/patch-include::kmfl.h and
files/patch-include::kmflutfconv.h.

>How-To-Repeat:
	
>Fix:

--- kmflcomp-0.9.8_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/kmflcomp/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	22 Aug 2009 00:36:59 -0000	1.5
+++ Makefile	20 Nov 2009 09:12:08 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	kmflcomp
 PORTVERSION=	0.9.8
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/kmfl/kmfl/${PORTVERSION} \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/
Index: files/patch-include::kmfl.h
===================================================================
RCS file: files/patch-include::kmfl.h
diff -N files/patch-include::kmfl.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-include::kmfl.h	19 Nov 2009 22:17:26 -0000
@@ -0,0 +1,39 @@
+--- include/kmfl.h	2006-11-03 10:32:24.000000000 -0800
++++ include/kmfl.h	2009-11-18 16:57:02.000000000 -0800
+@@ -31,6 +31,7 @@
+ #endif
+ 
+ 
++#include <sys/types.h>
+ #define FILE_VERSION	"1"
+ #define BASE_VERSION	"320"
+ #define LAST_VERSION	"600"
+@@ -79,25 +80,12 @@
+ #ifdef _WIN32
+ 	typedef unsigned int UINT; 	// 32-bit unsigned integer (general purpose)
+ #else
+-#include <stdint.h>
+-#ifdef __uint32_t_defined
+-	typedef uint32_t UINT;
+-#else
+-	typedef unsigned long UINT;	// 32-bit unsigned integer (general purpose)
+-#endif
++	typedef u_int32_t UINT;
+ #endif
+ 
+-#ifdef __int32_t_defined
+-	typedef int32_t INT;
+-#else
+-	typedef long INT;	// 32-bit unsigned integer (general purpose)
+-#endif
++typedef int32_t INT;
+ 
+-#ifdef __uint8_t_defined
+-typedef uint8_t BYTE;
+-#else
+-typedef unsigned char BYTE; 	// 8-bit unsigned integer
+-#endif
++typedef u_int8_t BYTE;
+ typedef UINT ITEM; 	// 32-bit unsigned integer for UTF-32 or control values
+ typedef UINT OFFSET;	// 32-bit unsigned integer used as table offsets
+ 
Index: files/patch-include::kmflutfconv.h
===================================================================
RCS file: files/patch-include::kmflutfconv.h
diff -N files/patch-include::kmflutfconv.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-include::kmflutfconv.h	19 Nov 2009 22:17:09 -0000
@@ -0,0 +1,24 @@
+--- include/kmflutfconv.h	2006-03-10 15:34:49.000000000 -0800
++++ include/kmflutfconv.h	2009-11-18 16:56:36.000000000 -0800
+@@ -26,16 +26,10 @@
+ extern "C" {
+ #endif
+ 
+-
+-#ifdef __uint32_t_defined
+-typedef uint32_t        UTF32;
+-typedef uint16_t        UTF16;
+-typedef uint8_t UTF8;
+-#else
+-typedef unsigned long   UTF32;
+-typedef unsigned short  UTF16;
+-typedef unsigned char   UTF8;
+-#endif
++#include <sys/types.h>
++typedef u_int32_t        UTF32;
++typedef u_int16_t        UTF16;
++typedef u_int8_t UTF8;
+ 
+ size_t IConvertUTF8toUTF16 (
+ 		const UTF8** sourceStart, const UTF8* sourceEnd, 
+
--- kmflcomp-0.9.8_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: