diff options
| author | maya <maya@pkgsrc.org> | 2017-07-22 17:53:16 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2017-07-22 17:53:16 +0000 |
| commit | 1c37fd64245377154b1e62999e6ae7c850ceabe9 (patch) | |
| tree | 22f0041119707d994d6110d0391589d5c7690563 /inputmethod | |
| parent | 99d9ae6c297384ae24b1a89a4e0f99e8e00bae15 (diff) | |
| download | pkgsrc-1c37fd64245377154b1e62999e6ae7c850ceabe9.tar.gz | |
Don't include machine/ansi.h on fbsd and os x which removed it.
do include sys/_types.h on freebsd because gcc does in the identical
fragment of code that it contains.
Diffstat (limited to 'inputmethod')
| -rw-r--r-- | inputmethod/canna/distinfo | 4 | ||||
| -rw-r--r-- | inputmethod/canna/patches/patch-canna_widedef.h | 16 |
2 files changed, 16 insertions, 4 deletions
diff --git a/inputmethod/canna/distinfo b/inputmethod/canna/distinfo index 70ee7f8c894..b409b475ca8 100644 --- a/inputmethod/canna/distinfo +++ b/inputmethod/canna/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2017/07/22 17:44:40 maya Exp $ +$NetBSD: distinfo,v 1.17 2017/07/22 17:53:16 maya Exp $ SHA1 (Canna37p3.tar.bz2) = e39eece7c70c669dd46dd74b26121a60a2496fde RMD160 (Canna37p3.tar.bz2) = 33e5eb9e2dc144835db838612897e652acbc60ed @@ -6,7 +6,7 @@ SHA512 (Canna37p3.tar.bz2) = 82846f2393aa2654dd2c97a93178098b8bd11e5409b584447f1 Size (Canna37p3.tar.bz2) = 1263065 bytes SHA1 (patch-Canna.conf) = 81b46285a2b91c07b8497dc6669eb26552391a6c SHA1 (patch-Imakefile) = a70dee63ce9ce392b29b76df70479fee45e1a2b9 -SHA1 (patch-canna_widedef.h) = c52cbbe5b55fc4fca6a501eef50fbf5bb878e514 +SHA1 (patch-canna_widedef.h) = 711bc129ca58265fb7555b99f9fe7fa72bebd7fc SHA1 (patch-canuum_Imakefile) = 5f4e7970a92d514ec538e4591eaa4f46843654a3 SHA1 (patch-canuum_canna.c) = a543a720fba9e2f770d6397d6b05352cfa58f300 SHA1 (patch-canuum_config.h.in) = 98547954e459bd85e5b03fc86f34fb5d1e3eed4b diff --git a/inputmethod/canna/patches/patch-canna_widedef.h b/inputmethod/canna/patches/patch-canna_widedef.h index e0d6fcf44e9..307a45acbc5 100644 --- a/inputmethod/canna/patches/patch-canna_widedef.h +++ b/inputmethod/canna/patches/patch-canna_widedef.h @@ -1,10 +1,22 @@ -$NetBSD: patch-canna_widedef.h,v 1.1 2015/10/18 03:58:31 tsutsui Exp $ +$NetBSD: patch-canna_widedef.h,v 1.2 2017/07/22 17:53:16 maya Exp $ DragonFly wchar_t support. +apple and freebsd no longer have machine/ansi.h +freebsd probably needs sys/_types.h as it does on gcc which is the +source of this file. --- canna/widedef.h.orig 2003-12-27 17:15:20.000000000 +0000 +++ canna/widedef.h -@@ -36,7 +36,10 @@ +@@ -29,14 +29,17 @@ + + #ifdef __FreeBSD__ + # include <osreldate.h> ++# include <sys/_types.h> + #endif + +-#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) \ +- || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) ++#if defined(__NetBSD__) || defined(__OpenBSD__) # include <machine/ansi.h> #endif |