Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21404/10.4/stable/main/finkinfo/utils
Modified Files:
canna.info canna.patch
Log Message:
Canna for 10.7 and later.
Index: canna.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils/canna.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- canna.patch 3 Apr 2011 13:49:55 -0000 1.2
+++ canna.patch 15 Aug 2013 08:33:33 -0000 1.3
@@ -1,12 +1,21 @@
diff -Naur Canna37p3.orig/Canna.conf Canna37p3/Canna.conf
---- Canna37p3.orig/Canna.conf 2004-05-19 11:48:47.000000000 -0400
-+++ Canna37p3/Canna.conf 2011-04-03 08:18:18.000000000 -0400
-@@ -140,19 +140,23 @@
+--- Canna37p3.orig/Canna.conf 2004-05-19 15:48:47.000000000 +0000
++++ Canna37p3/Canna.conf 2013-08-15 07:49:06.000000000 +0000
+@@ -99,7 +99,7 @@
+ */
+
+ /* root¤Ë¤Ê¤é¤º¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë»þ¤Ï¤³¤ì¤òÄêµÁ¤·¤Æ²¼¤µ¤¤ */
+-/* #define InstallAsUser */
++#define InstallAsUser
+ /* ½¾Íè¤È¸ß´¹¤Î¥Ç¥£¥ì¥¯¥È¥ê¹½Â¤¤Ë¤¹¤ë¾ì¹ç¤Ï¤³¤ì¤òÄêµÁ¤·¤Æ¤¯¤À¤µ¤¤ */
+ /* #define ObsoleteInstallDir */
+
+@@ -140,25 +140,29 @@
# define ModernElfLinkAvailable NO
#endif
-cannaPrefix = DefCannaPrefix
-+#define MyCCOptions -no-cpp-precomp -Wall -Wpointer-arith -Wno-implicit-int
-Wno-return-type
++#define MyCCOptions -no-cpp-precomp -Wall -Wpointer-arith -Wno-implicit-int
-Wno-return-type -Wno-invalid-source-encoding
+#undef LibraryCCOptions
+#define LibraryCCOptions MyCCOptions -fno-common
+CCOPTIONS = MyCCOptions
@@ -29,6 +38,13 @@
/* µì¥Ð¡¼¥¸¥ç¥ó¤È¤Î¸ß´¹API¤ò̵¸ú¤Ë¤¹¤ë¾ì¹ç¤Ï0¤ÈÄêµÁ¤·¤Æ¤¯¤À¤µ¤¤ */
#define SupportOldWchar 1
+
+ /* IPv6¤òÍѤ¤¤ë¾ì¹ç¤Ï1¤ÈÄêµÁ¤·¤Æ¤¯¤À¤µ¤¤ */
+-#define UseInet6 0 /* requires newer IPv6 implementation */
++#define UseInet6 1 /* requires newer IPv6 implementation */
+
+ /* 3.2·Ï¤«¤é3.6·Ï¤Þ¤Ç¤Î·Á¼°¤Î¼½ñ¤òºî¤ë¾ì¹ç¤Ï¤³¤ì¤òÄêµÁ¤·¤Æ¤¯¤À¤µ¤¤ */
+ /* #define DIC_3_6_COMPAT */
@@ -169,8 +173,8 @@
#define ModernElfLink NO /* experimental */
@@ -40,17 +56,17 @@
#ifdef InstallAsUser
cannaOwnerGroup =
-@@ -199,13 +203,13 @@
+@@ -197,15 +201,14 @@
+ #ifdef InstallAsUser
+ CHOWN = :
CHGRP = :
- CHMOD = :
+-CHMOD = :
#else
--CHOWN = chown
--CHGRP = chgrp
+ CHOWN = chown
+ CHGRP = chgrp
-CHMOD = chmod
-+CHOWN = /usr/sbin/chown
-+CHGRP = /usr/bin/chgrp
-+CHMOD = /bin/chmod
#endif
++CHMOD = /bin/chmod
/* ÆüËܸì¥Þ¥Ë¥å¥¢¥ë¤ò»È¤ï¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¥³¥á¥ó¥È¥¢¥¦¥È */
-#define JAPANESEMAN
@@ -58,7 +74,7 @@
/* #define engineSwitch */
-@@ -237,7 +241,7 @@
+@@ -237,7 +240,7 @@
/* #define UseInstalledLibCanna YES */
#define UseInstalledLibCanna NO
@@ -67,27 +83,39 @@
/* ¤³¤³¤«¤é²¼¤ÏÊѹ¹ÉÔÍפǤ¹ */
-@@ -343,7 +347,7 @@
- AccessFile = $(cannaPrefix)/etc/hosts.canna
- #else
+@@ -338,13 +341,8 @@
+ useObsoleteFilename = -DUSE_OBSOLETE_STYLE_FILENAME
+ #endif
+
+-#ifdef InstallAsUser
+-UnixSockDir = $(cannaPrefix)/tmp/.iroha_unix
+-AccessFile = $(cannaPrefix)/etc/hosts.canna
+-#else
UnixSockDir = /tmp/.iroha_unix
-AccessFile = /etc/hosts.canna
+-#endif
+AccessFile = $(cannaPrefix)/etc/canna/hosts.canna
- #endif
UnixSockName = IROHA
-@@ -622,7 +626,7 @@
- step::
@@\
- @case '${MFLAGS}' in *[i]*) set +e;; esac; @@\
- DirFailPrefix@for i in dirs; do if [ -d $(DESTDIR)$$i ]; then \ @@\
-- set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i;$(CHOWN) owner
$(DESTDIR)$$i;$(CHGRP) group $(DESTDIR)$$i); fi; \ @@\
-+ set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i); fi; \
@@\
- done
- #endif /* MakeDirectoriesLong */
+ /*
+diff -Naur Canna37p3.orig/Imakefile Canna37p3/Imakefile
+--- Canna37p3.orig/Imakefile 2004-05-19 15:39:22.000000000 +0000
++++ Canna37p3/Imakefile 2013-06-27 11:41:05.000000000 +0000
+@@ -106,8 +106,10 @@
+ fi
+ XCOMM Invoke configure only when accanna.h does not exist for faster build
+-accanna.h pubconf.h:
++pubconf.h:
+ $(CONFIGURE_CMD)
++accanna.h: pubconf.h
++ test -r accanna.h || $(CONFIGURE_CMD)
+ XCOMM If you want to invoke configure explicitly, do "make config"
+ config::
+ $(CONFIGURE_CMD)
diff -Naur Canna37p3.orig/canna/widedef.h Canna37p3/canna/widedef.h
---- Canna37p3.orig/canna/widedef.h Sat Dec 27 17:15:20 2003
-+++ Canna37p3/canna/widedef.h Sun May 29 15:00:31 2005
+--- 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
@@ -129,44 +157,9 @@
#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/grammar/Imakefile
Canna37p3/dic/ideo/grammar/Imakefile
---- Canna37p3.orig/dic/ideo/grammar/Imakefile 2003-09-27 02:18:38.000000000
-0400
-+++ Canna37p3/dic/ideo/grammar/Imakefile 2011-04-03 08:24:11.000000000
-0400
-@@ -77,9 +77,5 @@
-
- MakeDirectories(install,$(CANNADICDIR))
-
--InstallMultipleFlags($(ALLDIC),$(CANNADICDIR),-m 0664 $(cannaOwnerGroup))
-+InstallMultipleFlags($(ALLDIC),$(CANNADICDIR),-m 0664)
-
--install::
-- $(CHGRP) $(cannaGroup) $(DESTDIR)$(CANNADICDIR)
-- $(CHOWN) $(cannaOwner) $(DESTDIR)$(CANNADICDIR)
-- $(CHMOD) ug+w $(DESTDIR)$(CANNADICDIR)
-diff -Naur Canna37p3.orig/dic/ideo/words/Imakefile
Canna37p3/dic/ideo/words/Imakefile
---- Canna37p3.orig/dic/ideo/words/Imakefile 2003-09-27 02:18:39.000000000
-0400
-+++ Canna37p3/dic/ideo/words/Imakefile 2011-04-03 08:35:53.000000000 -0400
-@@ -63,7 +63,7 @@
-
- MakeDirectories(install,$(CANNADICDIR))
-
--InstallMultipleFlags($(TARGETS),$(CANNADICDIR),-m 0664 $(cannaOwnerGroup))
-+InstallMultipleFlags($(TARGETS),$(CANNADICDIR),-m 0664)
-
- #ifdef USE_OBSOLETE_STYLE_FILENAME
- InstallNamedNonExec(obsolete.dir,dics.dir,$(CANNADICDIR))
-@@ -98,7 +98,7 @@
- #else
- TEXTDICS = necgaiji.t kanasmpl.t software.t chimei.t \
- hojomwd.t hojoswd.t suffix.t number.t katakana.t keishiki.t
--InstallMultipleFlags($(TEXTDICS),$(CANNADICDIR),-m 0664 $(cannaOwnerGroup))
-+InstallMultipleFlags($(TEXTDICS),$(CANNADICDIR),-m 0664)
- #endif
-
- depend::
diff -Naur Canna37p3.orig/dic/ideo/words/chimei.t
Canna37p3/dic/ideo/words/chimei.t
---- Canna37p3.orig/dic/ideo/words/chimei.t Sat Sep 27 06:18:39 2003
-+++ Canna37p3/dic/ideo/words/chimei.t Sun May 29 14:59:54 2005
+--- 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 ¾ëÅì¶è
@@ -177,8 +170,8 @@
¤¸¤ç¤Û¡¼¤ë #CN ¥¸¥ç¥Û¡¼¥ë
¤¸¤ó¤°¤¦¤Þ¤¨ #CN ¿ÀµÜÁ°
diff -Naur Canna37p3.orig/dic/phono/Imakefile Canna37p3/dic/phono/Imakefile
---- Canna37p3.orig/dic/phono/Imakefile Sat Oct 19 08:27:40 2002
-+++ Canna37p3/dic/phono/Imakefile Sun May 29 14:59:54 2005
+--- 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
@@ -192,14 +185,14 @@
DICDIR = $(cannaLibDir)/dic
SAMPLEDIR = $(cannaLibDir)/sample
diff -Naur Canna37p3.orig/hosts.canna Canna37p3/hosts.canna
---- Canna37p3.orig/hosts.canna Thu Jan 1 00:00:00 1970
-+++ Canna37p3/hosts.canna Sun May 29 14:59:54 2005
+--- 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 -Naur Canna37p3.orig/lib/canna/lisp.c Canna37p3/lib/canna/lisp.c
---- Canna37p3.orig/lib/canna/lisp.c Mon Apr 26 22:49:21 2004
-+++ Canna37p3/lib/canna/lisp.c Thu Mar 23 17:24:20 2006
+--- Canna37p3.orig/lib/canna/lisp.c 2004-04-26 22:49:21.000000000 +0000
++++ Canna37p3/lib/canna/lisp.c 2006-03-23 17:24:20.000000000 +0000
@@ -2643,15 +2643,21 @@
int n;
{
@@ -225,8 +218,8 @@
/* NOTREACHED */
}
diff -Naur Canna37p3.orig/server/util.c Canna37p3/server/util.c
---- Canna37p3.orig/server/util.c Sun Sep 21 12:56:29 2003
-+++ Canna37p3/server/util.c Sat Jun 4 15:28:41 2005
+--- Canna37p3.orig/server/util.c 2003-09-21 12:56:29.000000000 +0000
++++ Canna37p3/server/util.c 2005-06-04 15:28:41.000000000 +0000
@@ -24,10 +24,10 @@
static char rcs_id[] = "$Id$";
#endif
@@ -250,8 +243,8 @@
wchar2ushort32(src, srclen, dest, destlen)
register const wchar_t *src;
diff -Naur Canna37p3.orig/update-canna-dics-dir Canna37p3/update-canna-dics-dir
---- Canna37p3.orig/update-canna-dics-dir Thu Jan 1 00:00:00 1970
-+++ Canna37p3/update-canna-dics-dir Sun May 29 14:59:54 2005
+--- 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/stable/main/finkinfo/utils/canna.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- canna.info 10 Jan 2013 18:37:27 -0000 1.5
+++ canna.info 15 Aug 2013 08:33:33 -0000 1.6
@@ -1,14 +1,14 @@
Package: canna
Version: 3.7p3
-Revision: 8
+Revision: 9
Replaces: %N (<= 3.5b2-4)
BuildDepends: system-xfree86-dev | x11-dev, passwd-canna (>= 20130103), xmkmf
(>= 1.0.2-3), fink (>= 0.24.12)
Depends: %N-shlibs (= %v-%r), %N-utils (= %v-%r), %N-server (= %v-%r)
Source: http://downloads.sourceforge.jp/canna/9565/Canna37p3.tar.bz2
Source-MD5: 0b8c241f63ab4cd3c0b9be569456dc33
PatchFile: %n.patch
-PatchFile-MD5: aa1465d74fca5558fa4b00a08e4af451
-PatchScript: sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
+PatchFile-MD5: e8f4db49314f3dd45fba7c7aae7fc9eb
+PatchScript: LANG=C sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
CompileScript: <<
#!/bin/sh -ev
export PATH=%p/lib/xmkmf/bin:$PATH
@@ -33,6 +33,7 @@
install -d -m 755 %i/var/lib/canna/dics.d
mv %i/var/lib/canna/dic/canna/dics.dir %i/var/lib/canna/dics.d/00default
touch %i/var/lib/canna/dic/canna/dics.dir
+ chmod 444 %i/var/lib/canna/dic/canna/*.c?d
<<
SplitOff: <<
Package: %N-shlibs
@@ -72,14 +73,7 @@
%p/etc/canna/rc.canna stop >/dev/null 2>&1 || true
install -d -m 1777 /tmp/.iroha_unix 2>&1 || true
- chown canna:canna %p/var/lib/canna/dic
- chown canna:canna %p/var/lib/canna/dic/canna/fuzokugo.cbd
- chmod ug+w %p/var/lib/canna/dic/canna/fuzokugo.cbd
-
- chown canna:canna %p/var/lib/canna/dic/canna/iroha.cbd
- chown canna:canna %p/var/lib/canna/dic/canna/iroha.cld
- chown canna:canna %p/var/lib/canna/dic/canna/bushu.cld
-
+ chown canna:canna %p/var/lib/canna/dic/canna/dics.dir
mkdir -p %p/var/lib/canna/dic/user %p/var/lib/canna/dic/group
chown canna:canna %p/var/lib/canna/dic/user %p/var/lib/canna/dic/group
chmod 770 %p/var/lib/canna/dic/user %p/var/lib/canna/dic/group
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
