[31279] trunk/dports/textproc/canna
takanori at macports.org
takanori at macports.org
Sun Nov 18 22:42:58 PST 2007
Revision: 31279
http://trac.macosforge.org/projects/macports/changeset/31279
Author: takanori at macports.org
Date: 2007-11-18 22:42:56 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
canna: Linted.
Modified Paths:
--------------
trunk/dports/textproc/canna/Portfile
Added Paths:
-----------
trunk/dports/textproc/canna/files/patch-Canna.conf.diff
trunk/dports/textproc/canna/files/patch-canna_widedef.h.diff
trunk/dports/textproc/canna/files/patch-dic_ideo_words_dics.dir.diff
trunk/dports/textproc/canna/files/patch-doc_man_guide_tex_Imakefile.diff
trunk/dports/textproc/canna/files/patch-lib_canna_lisp.c.diff
trunk/dports/textproc/canna/files/patch-misc_default.ca.diff
trunk/dports/textproc/canna/files/patch-server_util.c.diff
Removed Paths:
-------------
trunk/dports/textproc/canna/files/patch-Canna.conf
trunk/dports/textproc/canna/files/patch-canna_widedef.h
trunk/dports/textproc/canna/files/patch-dic_ideo_words_dics.dir
trunk/dports/textproc/canna/files/patch-doc_man_guide_tex_Imakefile
trunk/dports/textproc/canna/files/patch-lib_canna_lisp.c
trunk/dports/textproc/canna/files/patch-misc_default.ca
trunk/dports/textproc/canna/files/patch-server_util.c
Modified: trunk/dports/textproc/canna/Portfile
===================================================================
--- trunk/dports/textproc/canna/Portfile 2007-11-19 06:42:28 UTC (rev 31278)
+++ trunk/dports/textproc/canna/Portfile 2007-11-19 06:42:56 UTC (rev 31279)
@@ -1,21 +1,33 @@
# $Id$
PortSystem 1.0
+
name canna
version 3.7p3
set dicversion 0.95c
categories textproc japanese
maintainers takanori openmaintainer
description Kana-Kanji conversion system
-long_description ${description}
+long_description \
+ ${description}
platforms darwin
homepage http://canna.sourceforge.jp/
+#master_sites sourceforge_jp:${name}/9565/:canna \
+# http://cannadic.oucrc.org/:cannadic
master_sites http://downloads.sourceforge.jp/canna/9565/:canna \
http://cannadic.oucrc.org/:cannadic
distname "Canna[string map {"." ""} ${version}]"
use_bzip2 yes
distfiles ${distname}${extract.suffix}:canna \
cannadic-${dicversion}.tar.gz:cannadic
+patchfiles patch-Canna.conf.diff \
+ patch-canna_widedef.h.diff \
+ patch-doc_man_guide_tex_Imakefile.diff \
+ patch-lib_canna_lisp.c.diff \
+ patch-server_util.c.diff \
+ \
+ patch-dic_ideo_words_dics.dir.diff \
+ patch-misc_default.ca.diff
checksums ${distname}${extract.suffix} md5 0b8c241f63ab4cd3c0b9be569456dc33 \
sha1 e39eece7c70c669dd46dd74b26121a60a2496fde \
rmd160 33e5eb9e2dc144835db838612897e652acbc60ed \
@@ -28,15 +40,6 @@
system "cd ${workpath} && gzip -dc ${distpath}/cannadic-${dicversion}.tar.gz | tar --no-same-owner -xf -"
}
-patchfiles patch-Canna.conf \
- patch-canna_widedef.h \
- patch-doc_man_guide_tex_Imakefile \
- patch-lib_canna_lisp.c \
- patch-server_util.c \
- \
- patch-dic_ideo_words_dics.dir \
- patch-misc_default.ca
-
post-patch {
reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/Canna.conf
}
@@ -118,3 +121,6 @@
xinstall -m 644 ${worksrcpath}/doc/lisp/canlisp.pdf ${destroot}${prefix}/share/doc/${name}/lisp
}
}
+
+livecheck.check regex
+livecheck.regex Canna (\[0-9.a-z\]+)
Deleted: trunk/dports/textproc/canna/files/patch-Canna.conf
===================================================================
--- trunk/dports/textproc/canna/files/patch-Canna.conf 2007-11-19 06:42:28 UTC (rev 31278)
+++ trunk/dports/textproc/canna/files/patch-Canna.conf 2007-11-19 06:42:56 UTC (rev 31279)
@@ -1,65 +0,0 @@
---- Canna.conf.orig 2004-05-20 00:48:47.000000000 +0900
-+++ Canna.conf 2007-10-12 17:20:00.000000000 +0900
-@@ -109,7 +109,7 @@
- # define DefErrDir $(cannaPrefix)/log
- # define DefLibCannaDir $(cannaExecPrefix)/lib
- #else
--# define DefCannaPrefix /usr/local/canna
-+# define DefCannaPrefix __PREFIX__
- # ifdef ObsoleteInstallDir
- # define DefErrDir /usr/spool/canna
- # define DefLibCannaDir /usr/lib
-@@ -147,12 +147,12 @@
- XCOMM cannaLibDir = /var/lib/canna
- XCOMM cannaLibDir = /var/db/canna
- cannaLibDir = DefCannaLibDir
--XCOMM cannaManDir = $(cannaPrefix)/share/man
--cannaManDir = $(cannaPrefix)/man
-+cannaManDir = $(cannaPrefix)/share/man
-+XCOMM cannaManDir = $(cannaPrefix)/man
- cannaIncDir = $(cannaPrefix)/include/canna
-
- libCannaDir = DefLibCannaDir
--ErrDir = DefErrDir
-+ErrDir = ${cannaPrefix}/var/log/canna
-
- /* \xB5\xEC\xA5С\xBC\xA5\xB8\xA5\xE7\xA5\xF3\xA4Ȥθߴ\xB9API\xA4\xF2̵\xB8\xFA\xA4ˤ\xB9\xA4\xEB\xBE\xEC\xB9\xE7\xA4\xCF0\xA4\xC8\xC4\xEA\xB5\xC1\xA4\xB7\xA4Ƥ\xAF\xA4\xC0\xA4\xB5\xA4\xA4 */
- #define SupportOldWchar 1
-@@ -169,8 +169,8 @@
- #define ModernElfLink NO /* experimental */
-
-
--cannaOwner = bin
--cannaGroup = bin
-+cannaOwner = canna
-+cannaGroup = canna
-
- #ifdef InstallAsUser
- cannaOwnerGroup =
-@@ -205,7 +205,7 @@
- #endif
-
- /* \xC6\xFC\xCBܸ\xEC\xA5ޥ˥奢\xA5\xEB\xA4\xF2\xBBȤ\xEF\xA4ʤ\xA4\xA4ΤǤ\xA2\xA4\xEC\xA4Х\xB3\xA5\xE1\xA5\xF3\xA5ȥ\xA2\xA5\xA6\xA5\xC8 */
--#define JAPANESEMAN
-+/* #define JAPANESEMAN */
-
- /* #define engineSwitch */
-
-@@ -237,7 +237,7 @@
- /* #define UseInstalledLibCanna YES */
- #define UseInstalledLibCanna NO
-
--DicDir = $(cannaLibDir)/dic
-+DicDir = ${cannaPrefix}/var/db/canna/dic
-
- /* \xA4\xB3\xA4\xB3\xA4\xAB\xA4鲼\xA4\xCF\xCAѹ\xB9\xC9\xD4\xCDפǤ\xB9 */
-
-@@ -343,7 +343,7 @@
- AccessFile = $(cannaPrefix)/etc/hosts.canna
- #else
- UnixSockDir = /tmp/.iroha_unix
--AccessFile = /etc/hosts.canna
-+AccessFile = $(cannaPrefix)/etc/hosts.canna
- #endif
- UnixSockName = IROHA
-
Copied: trunk/dports/textproc/canna/files/patch-Canna.conf.diff (from rev 30574, trunk/dports/textproc/canna/files/patch-Canna.conf)
===================================================================
--- trunk/dports/textproc/canna/files/patch-Canna.conf.diff (rev 0)
+++ trunk/dports/textproc/canna/files/patch-Canna.conf.diff 2007-11-19 06:42:56 UTC (rev 31279)
@@ -0,0 +1,65 @@
+--- Canna.conf.orig 2004-05-20 00:48:47.000000000 +0900
++++ Canna.conf 2007-10-12 17:20:00.000000000 +0900
+@@ -109,7 +109,7 @@
+ # define DefErrDir $(cannaPrefix)/log
+ # define DefLibCannaDir $(cannaExecPrefix)/lib
+ #else
+-# define DefCannaPrefix /usr/local/canna
++# define DefCannaPrefix __PREFIX__
+ # ifdef ObsoleteInstallDir
+ # define DefErrDir /usr/spool/canna
+ # define DefLibCannaDir /usr/lib
+@@ -147,12 +147,12 @@
+ XCOMM cannaLibDir = /var/lib/canna
+ XCOMM cannaLibDir = /var/db/canna
+ cannaLibDir = DefCannaLibDir
+-XCOMM cannaManDir = $(cannaPrefix)/share/man
+-cannaManDir = $(cannaPrefix)/man
++cannaManDir = $(cannaPrefix)/share/man
++XCOMM cannaManDir = $(cannaPrefix)/man
+ cannaIncDir = $(cannaPrefix)/include/canna
+
+ libCannaDir = DefLibCannaDir
+-ErrDir = DefErrDir
++ErrDir = ${cannaPrefix}/var/log/canna
+
+ /* \xB5\xEC\xA5С\xBC\xA5\xB8\xA5\xE7\xA5\xF3\xA4Ȥθߴ\xB9API\xA4\xF2̵\xB8\xFA\xA4ˤ\xB9\xA4\xEB\xBE\xEC\xB9\xE7\xA4\xCF0\xA4\xC8\xC4\xEA\xB5\xC1\xA4\xB7\xA4Ƥ\xAF\xA4\xC0\xA4\xB5\xA4\xA4 */
+ #define SupportOldWchar 1
+@@ -169,8 +169,8 @@
+ #define ModernElfLink NO /* experimental */
+
+
+-cannaOwner = bin
+-cannaGroup = bin
++cannaOwner = canna
++cannaGroup = canna
+
+ #ifdef InstallAsUser
+ cannaOwnerGroup =
+@@ -205,7 +205,7 @@
+ #endif
+
+ /* \xC6\xFC\xCBܸ\xEC\xA5ޥ˥奢\xA5\xEB\xA4\xF2\xBBȤ\xEF\xA4ʤ\xA4\xA4ΤǤ\xA2\xA4\xEC\xA4Х\xB3\xA5\xE1\xA5\xF3\xA5ȥ\xA2\xA5\xA6\xA5\xC8 */
+-#define JAPANESEMAN
++/* #define JAPANESEMAN */
+
+ /* #define engineSwitch */
+
+@@ -237,7 +237,7 @@
+ /* #define UseInstalledLibCanna YES */
+ #define UseInstalledLibCanna NO
+
+-DicDir = $(cannaLibDir)/dic
++DicDir = ${cannaPrefix}/var/db/canna/dic
+
+ /* \xA4\xB3\xA4\xB3\xA4\xAB\xA4鲼\xA4\xCF\xCAѹ\xB9\xC9\xD4\xCDפǤ\xB9 */
+
+@@ -343,7 +343,7 @@
+ AccessFile = $(cannaPrefix)/etc/hosts.canna
+ #else
+ UnixSockDir = /tmp/.iroha_unix
+-AccessFile = /etc/hosts.canna
++AccessFile = $(cannaPrefix)/etc/hosts.canna
+ #endif
+ UnixSockName = IROHA
+
Deleted: trunk/dports/textproc/canna/files/patch-canna_widedef.h
===================================================================
--- trunk/dports/textproc/canna/files/patch-canna_widedef.h 2007-11-19 06:42:28 UTC (rev 31278)
+++ trunk/dports/textproc/canna/files/patch-canna_widedef.h 2007-11-19 06:42:56 UTC (rev 31279)
@@ -1,43 +0,0 @@
---- canna/widedef.h.orig 2003-12-28 02:15:20.000000000 +0900
-+++ canna/widedef.h 2007-10-16 03:38:13.000000000 +0900
-@@ -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)
Copied: trunk/dports/textproc/canna/files/patch-canna_widedef.h.diff (from rev 30574, trunk/dports/textproc/canna/files/patch-canna_widedef.h)
===================================================================
--- trunk/dports/textproc/canna/files/patch-canna_widedef.h.diff (rev 0)
+++ trunk/dports/textproc/canna/files/patch-canna_widedef.h.diff 2007-11-19 06:42:56 UTC (rev 31279)
@@ -0,0 +1,43 @@
+--- canna/widedef.h.orig 2003-12-28 02:15:20.000000000 +0900
++++ canna/widedef.h 2007-10-16 03:38:13.000000000 +0900
+@@ -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)
Deleted: trunk/dports/textproc/canna/files/patch-dic_ideo_words_dics.dir
===================================================================
--- trunk/dports/textproc/canna/files/patch-dic_ideo_words_dics.dir 2007-11-19 06:42:28 UTC (rev 31278)
+++ trunk/dports/textproc/canna/files/patch-dic_ideo_words_dics.dir 2007-11-19 06:42:56 UTC (rev 31279)
@@ -1,10 +0,0 @@
---- dic/ideo/words/dics.dir.orig 2003-09-27 15:18:39.000000000 +0900
-+++ dic/ideo/words/dics.dir 2007-10-12 22:06:44.000000000 +0900
-@@ -39,3 +39,7 @@
- kanasmpl.ctd(.mwd) -kanasample---
- necgaiji.ctd(.mwd) -necgaiji---
- software.ctd(.mwd) -software---
-+
-+gcanna.cld(gcanna.mwd) -gcanna---
-+gcanna.cbd(gcanna.mwd) -gcanna---
-+gcannaf.ctd(.swd) -gcannaf---
Copied: trunk/dports/textproc/canna/files/patch-dic_ideo_words_dics.dir.diff (from rev 30574, trunk/dports/textproc/canna/files/patch-dic_ideo_words_dics.dir)
===================================================================
--- trunk/dports/textproc/canna/files/patch-dic_ideo_words_dics.dir.diff (rev 0)
+++ trunk/dports/textproc/canna/files/patch-dic_ideo_words_dics.dir.diff 2007-11-19 06:42:56 UTC (rev 31279)
@@ -0,0 +1,10 @@
+--- dic/ideo/words/dics.dir.orig 2003-09-27 15:18:39.000000000 +0900
++++ dic/ideo/words/dics.dir 2007-10-12 22:06:44.000000000 +0900
+@@ -39,3 +39,7 @@
+ kanasmpl.ctd(.mwd) -kanasample---
+ necgaiji.ctd(.mwd) -necgaiji---
+ software.ctd(.mwd) -software---
++
++gcanna.cld(gcanna.mwd) -gcanna---
++gcanna.cbd(gcanna.mwd) -gcanna---
++gcannaf.ctd(.swd) -gcannaf---
Deleted: trunk/dports/textproc/canna/files/patch-doc_man_guide_tex_Imakefile
===================================================================
--- trunk/dports/textproc/canna/files/patch-doc_man_guide_tex_Imakefile 2007-11-19 06:42:28 UTC (rev 31278)
+++ trunk/dports/textproc/canna/files/patch-doc_man_guide_tex_Imakefile 2007-11-19 06:42:56 UTC (rev 31279)
@@ -1,11 +0,0 @@
---- doc/man/guide/tex/Imakefile.orig 2003-09-09 19:33:00.000000000 +0900
-+++ doc/man/guide/tex/Imakefile 2007-10-12 18:53:05.000000000 +0900
-@@ -3,7 +3,7 @@
-
- CANNAROOT = ../../../..
- INCLUDES = -I$(CANNAROOT)/include
-- JLATEXCMD = latex
-+ JLATEXCMD = platex -kanji=euc
- DVI2PSCMD = dvi2ps
- DVIPDFMX = dvipdfmx
-
Copied: trunk/dports/textproc/canna/files/patch-doc_man_guide_tex_Imakefile.diff (from rev 30574, trunk/dports/textproc/canna/files/patch-doc_man_guide_tex_Imakefile)
===================================================================
--- trunk/dports/textproc/canna/files/patch-doc_man_guide_tex_Imakefile.diff (rev 0)
+++ trunk/dports/textproc/canna/files/patch-doc_man_guide_tex_Imakefile.diff 2007-11-19 06:42:56 UTC (rev 31279)
@@ -0,0 +1,11 @@
+--- doc/man/guide/tex/Imakefile.orig 2003-09-09 19:33:00.000000000 +0900
++++ doc/man/guide/tex/Imakefile 2007-10-12 18:53:05.000000000 +0900
+@@ -3,7 +3,7 @@
+
+ CANNAROOT = ../../../..
+ INCLUDES = -I$(CANNAROOT)/include
+- JLATEXCMD = latex
++ JLATEXCMD = platex -kanji=euc
+ DVI2PSCMD = dvi2ps
+ DVIPDFMX = dvipdfmx
+
Deleted: trunk/dports/textproc/canna/files/patch-lib_canna_lisp.c
===================================================================
--- trunk/dports/textproc/canna/files/patch-lib_canna_lisp.c 2007-11-19 06:42:28 UTC (rev 31278)
+++ trunk/dports/textproc/canna/files/patch-lib_canna_lisp.c 2007-11-19 06:42:56 UTC (rev 31279)
@@ -1,26 +0,0 @@
---- lib/canna/lisp.c.orig 2004-04-27 07:49:21.000000000 +0900
-+++ lib/canna/lisp.c 2007-10-16 03:49:46.000000000 +0900
-@@ -2643,15 +2643,21 @@
- int n;
- {
- list p, t;
-- FILE *instream, *fopen();
-+ list noerror = NIL;
-+ FILE *instream;
-
-- argnchk("load",1);
-+ if (n != 1 && n != 2)
-+ argnerr("load");
-+ if (n == 2)
-+ noerror = pop1();
- p = pop1();
- if ( !stringp(p) ) {
- error("load: illegal file name ",p);
- /* NOTREACHED */
- }
- if ((instream = fopen(xstring(p), "r")) == (FILE *)NULL) {
-+ if (noerror)
-+ return NIL;
- error("load: file not found ",p);
- /* NOTREACHED */
- }
Copied: trunk/dports/textproc/canna/files/patch-lib_canna_lisp.c.diff (from rev 30574, trunk/dports/textproc/canna/files/patch-lib_canna_lisp.c)
===================================================================
--- trunk/dports/textproc/canna/files/patch-lib_canna_lisp.c.diff (rev 0)
+++ trunk/dports/textproc/canna/files/patch-lib_canna_lisp.c.diff 2007-11-19 06:42:56 UTC (rev 31279)
@@ -0,0 +1,26 @@
+--- lib/canna/lisp.c.orig 2004-04-27 07:49:21.000000000 +0900
++++ lib/canna/lisp.c 2007-10-16 03:49:46.000000000 +0900
+@@ -2643,15 +2643,21 @@
+ int n;
+ {
+ list p, t;
+- FILE *instream, *fopen();
++ list noerror = NIL;
++ FILE *instream;
+
+- argnchk("load",1);
++ if (n != 1 && n != 2)
++ argnerr("load");
++ if (n == 2)
++ noerror = pop1();
+ p = pop1();
+ if ( !stringp(p) ) {
+ error("load: illegal file name ",p);
+ /* NOTREACHED */
+ }
+ if ((instream = fopen(xstring(p), "r")) == (FILE *)NULL) {
++ if (noerror)
++ return NIL;
+ error("load: file not found ",p);
+ /* NOTREACHED */
+ }
Deleted: trunk/dports/textproc/canna/files/patch-misc_default.ca
===================================================================
--- trunk/dports/textproc/canna/files/patch-misc_default.ca 2007-11-19 06:42:28 UTC (rev 31278)
+++ trunk/dports/textproc/canna/files/patch-misc_default.ca 2007-11-19 06:42:56 UTC (rev 31279)
@@ -1,13 +0,0 @@
---- misc/default.ca.orig 2003-02-04 05:13:01.000000000 +0900
-+++ misc/default.ca 2007-10-12 22:08:43.000000000 +0900
-@@ -24,7 +24,9 @@
- (setq romkana-table "default.cbp")
-
- (use-dictionary
-- "iroha"
-+ "gcanna"
-+ "gcannaf"
-+;; "iroha"
- "fuzokugo"
- "hojomwd"
- "hojoswd"
Copied: trunk/dports/textproc/canna/files/patch-misc_default.ca.diff (from rev 30574, trunk/dports/textproc/canna/files/patch-misc_default.ca)
===================================================================
--- trunk/dports/textproc/canna/files/patch-misc_default.ca.diff (rev 0)
+++ trunk/dports/textproc/canna/files/patch-misc_default.ca.diff 2007-11-19 06:42:56 UTC (rev 31279)
@@ -0,0 +1,13 @@
+--- misc/default.ca.orig 2003-02-04 05:13:01.000000000 +0900
++++ misc/default.ca 2007-10-12 22:08:43.000000000 +0900
+@@ -24,7 +24,9 @@
+ (setq romkana-table "default.cbp")
+
+ (use-dictionary
+- "iroha"
++ "gcanna"
++ "gcannaf"
++;; "iroha"
+ "fuzokugo"
+ "hojomwd"
+ "hojoswd"
Deleted: trunk/dports/textproc/canna/files/patch-server_util.c
===================================================================
--- trunk/dports/textproc/canna/files/patch-server_util.c 2007-11-19 06:42:28 UTC (rev 31278)
+++ trunk/dports/textproc/canna/files/patch-server_util.c 2007-11-19 06:42:56 UTC (rev 31279)
@@ -1,24 +0,0 @@
---- server/util.c.orig 2003-09-21 21:56:29.000000000 +0900
-+++ server/util.c 2007-10-16 03:52:04.000000000 +0900
-@@ -24,10 +24,10 @@
- static char rcs_id[] = "$Id: util.c,v 1.8 2003/09/21 12:56:29 aida_s Exp $";
- #endif
-
--#include "server.h"
--#if 1 /* unused */
-+#if 0 /* unused */
- #include "widedef.h"
- #endif
-+#include "server.h"
-
- size_t
- ushort2euc(src, srclen, dest, destlen)
-@@ -104,7 +104,7 @@
- return j;
- }
-
--#if 1 /* unused */
-+#if 0 /* unused */
- size_t
- wchar2ushort32(src, srclen, dest, destlen)
- register const wchar_t *src;
Copied: trunk/dports/textproc/canna/files/patch-server_util.c.diff (from rev 30574, trunk/dports/textproc/canna/files/patch-server_util.c)
===================================================================
--- trunk/dports/textproc/canna/files/patch-server_util.c.diff (rev 0)
+++ trunk/dports/textproc/canna/files/patch-server_util.c.diff 2007-11-19 06:42:56 UTC (rev 31279)
@@ -0,0 +1,24 @@
+--- server/util.c.orig 2003-09-21 21:56:29.000000000 +0900
++++ server/util.c 2007-10-16 03:52:04.000000000 +0900
+@@ -24,10 +24,10 @@
+ static char rcs_id[] = "$Id: util.c,v 1.8 2003/09/21 12:56:29 aida_s Exp $";
+ #endif
+
+-#include "server.h"
+-#if 1 /* unused */
++#if 0 /* unused */
+ #include "widedef.h"
+ #endif
++#include "server.h"
+
+ size_t
+ ushort2euc(src, srclen, dest, destlen)
+@@ -104,7 +104,7 @@
+ return j;
+ }
+
+-#if 1 /* unused */
++#if 0 /* unused */
+ size_t
+ wchar2ushort32(src, srclen, dest, destlen)
+ register const wchar_t *src;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071118/5afd6028/attachment.html
More information about the macports-changes
mailing list