Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29637/10.4-transitional/unstable/main/finkinfo/utils
Modified Files:
canna.info canna.patch
Log Message:
Patch build on 10.4.
Index: canna.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils/canna.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- canna.patch 27 Apr 2005 03:26:48 -0000 1.1
+++ canna.patch 29 May 2005 15:53:44 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Nru Canna37p3.orig/Canna.conf Canna37p3/Canna.conf
---- Canna37p3.orig/Canna.conf Thu May 20 00:48:47 2004
-+++ Canna37p3/Canna.conf Wed Mar 9 02:04:46 2005
+diff -Naur Canna37p3.orig/Canna.conf Canna37p3/Canna.conf
+--- Canna37p3.orig/Canna.conf 2004-05-19 15:48:47.000000000 +0000
++++ Canna37p3/Canna.conf 2005-05-29 14:59:54.000000000 +0000
@@ -140,19 +140,23 @@
# define ModernElfLinkAvailable NO
#endif
@@ -76,9 +76,53 @@
#endif
UnixSockName = IROHA
-diff -Nru Canna37p3.orig/dic/ideo/words/chimei.t
Canna37p3/dic/ideo/words/chimei.t
---- Canna37p3.orig/dic/ideo/words/chimei.t Sat Sep 27 15:18:39 2003
-+++ Canna37p3/dic/ideo/words/chimei.t Wed Mar 9 02:05:13 2005
+diff -Naur Canna37p3.orig/canna/widedef.h Canna37p3/canna/widedef.h
+--- Canna37p3.orig/canna/widedef.h 2003-12-27 17:15:20.000000000 +0000
++++ Canna37p3/canna/widedef.h 2005-05-29 15:00:31.000000000 +0000
+@@ -32,12 +32,12 @@
+ #endif
+
+ #if (defined(__FreeBSD__) && __FreeBSD_version < 500000) \
+- || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
++ || defined(__NetBSD__) || defined(__OpenBSD__)
+ # include <machine/ansi.h>
+ #endif
+
+ #if (defined(__FreeBSD__) && __FreeBSD_version < 500000) \
+- || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
++ || defined(__NetBSD__) || defined(__OpenBSD__)
+ # ifdef _BSD_WCHAR_T_
+ # undef _BSD_WCHAR_T_
+ # ifdef WCHAR16
+@@ -45,10 +45,6 @@
+ # else
+ # define _BSD_WCHAR_T_ unsigned long
+ # endif
+-# if defined(__APPLE__) && defined(__WCHAR_TYPE__)
+-# undef __WCHAR_TYPE__
+-# define __WCHAR_TYPE__ _BSD_WCHAR_T_
+-# endif
+ # include <stddef.h>
+ # define _WCHAR_T
+ # endif
+@@ -59,6 +55,14 @@
+ # endif
+ # include <stddef.h>
+ # define _WCHAR_T
++#elif defined(__APPLE__)
++# ifdef WCHAR16
++typedef unsigned short wchar_t;
++# else
++typedef unsigned long wchar_t;
++# endif
++# define _BSD_WCHAR_T_DEFINED_ /* <= 10.3 */
++# define _WCHAR_T /* >= 10.4 */
+ #else
+ #if !defined(WCHAR_T) && !defined(_WCHAR_T) && !defined(_WCHAR_T_) \
+ && !defined(__WCHAR_T) && !defined(_GCC_WCHAR_T) &&
!defined(_WCHAR_T_DEFINED)
+diff -Naur Canna37p3.orig/dic/ideo/words/chimei.t
Canna37p3/dic/ideo/words/chimei.t
+--- Canna37p3.orig/dic/ideo/words/chimei.t 2003-09-27 06:18:39.000000000
+0000
++++ Canna37p3/dic/ideo/words/chimei.t 2005-05-29 14:59:54.000000000 +0000
@@ -714,7 +714,7 @@
じょうせき #CN 城跡
じょうとうく #CNS 城東区
@@ -88,9 +132,9 @@
じょうようし #CNS 城陽市
じょほーる #CN ジョホール
じんぐうまえ #CN 神宮前
-diff -Nru Canna37p3.orig/dic/phono/Imakefile Canna37p3/dic/phono/Imakefile
---- Canna37p3.orig/dic/phono/Imakefile Sat Oct 19 17:27:40 2002
-+++ Canna37p3/dic/phono/Imakefile Wed Mar 9 02:04:46 2005
+diff -Naur Canna37p3.orig/dic/phono/Imakefile Canna37p3/dic/phono/Imakefile
+--- Canna37p3.orig/dic/phono/Imakefile 2002-10-19 08:27:40.000000000 +0000
++++ Canna37p3/dic/phono/Imakefile 2005-05-29 14:59:54.000000000 +0000
@@ -25,7 +25,11 @@
KPDIC = $(CMDDIR)/kpdic/kpdic
#endif
@@ -103,15 +147,15 @@
DICDIR = $(cannaLibDir)/dic
SAMPLEDIR = $(cannaLibDir)/sample
-diff -Nru Canna37p3.orig/hosts.canna Canna37p3/hosts.canna
---- Canna37p3.orig/hosts.canna Thu Jan 1 09:00:00 1970
-+++ Canna37p3/hosts.canna Wed Mar 9 02:04:46 2005
+diff -Naur Canna37p3.orig/hosts.canna Canna37p3/hosts.canna
+--- Canna37p3.orig/hosts.canna 1970-01-01 00:00:00.000000000 +0000
++++ Canna37p3/hosts.canna 2005-05-29 14:59:54.000000000 +0000
@@ -0,0 +1,2 @@
+unix
+localhost
-diff -Nru Canna37p3.orig/update-canna-dics-dir Canna37p3/update-canna-dics-dir
---- Canna37p3.orig/update-canna-dics-dir Thu Jan 1 09:00:00 1970
-+++ Canna37p3/update-canna-dics-dir Wed Mar 9 02:04:46 2005
+diff -Naur Canna37p3.orig/update-canna-dics-dir Canna37p3/update-canna-dics-dir
+--- Canna37p3.orig/update-canna-dics-dir 1970-01-01 00:00:00.000000000
+0000
++++ Canna37p3/update-canna-dics-dir 2005-05-29 14:59:54.000000000 +0000
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
Index: canna.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils/canna.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- canna.info 1 May 2005 05:58:33 -0000 1.2
+++ canna.info 29 May 2005 15:53:44 -0000 1.3
@@ -1,6 +1,6 @@
Package: canna
Version: 3.7p3
-Revision: 2
+Revision: 3
Replaces: %N (<= 3.5b2-4)
BuildDepends: system-xfree86-dev | x11-dev, passwd
Depends: %N-shlibs (= %v-%r), %N-utils (= %v-%r), %N-server (= %v-%r)
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
