Attachment #65115 for bug #96588




--- pl/conf.pl.in.orig	Fri Nov 25 15:04:26 2005
+++ pl/conf.pl.in	Mon May  1 21:51:04 2006
@@ -197,19 +197,19 @@
 #
 # Network Kanji Filter nkf v1.71 or later

 
 #
 # ChaSen 2.02 or later (with noun words extraction)
@@ -219,13 +219,14 @@
 #
 # MeCab
 #
-$MECAB = "@DO_MECAB@";
+$MECAB = "module_mecab";
 
 #
-# Default Japanese processer: KAKASI or ChaSen.
+# Default Japanese processer: KAKASI or ChaSen or Mecab.
 #
-$WAKATI  = $@OPT_WAKATI_DEFAULT@;
-
+$WAKATI  = $KAKASI;
+$WAKATI  = $CHASEN;
+$WAKATI  = $MECAB;
 
 #===================================================================
 #




%%PORTDOCS%%@dirrm share/namazu/doc/ja
%%PORTDOCS%%share/namazu/doc/namazu.css
%%PORTDOCS%%@dirrm share/namazu/doc
%%DATADIR%%etc/AUTHORS
%%DATADIR%%etc/COPYING
%%DATADIR%%etc/CREDITS
%%DATADIR%%etc/ChangeLog
%%DATADIR%%etc/ChangeLog.1
%%DATADIR%%etc/HACKING
%%DATADIR%%etc/HACKING-ja
%%DATADIR%%etc/INSTALL
%%DATADIR%%etc/INSTALL-ja
%%DATADIR%%etc/NEWS
%%DATADIR%%etc/README
%%DATADIR%%etc/README-es
%%DATADIR%%etc/README-ja
%%DATADIR%%etc/THANKS
%%DATADIR%%etc/TODO
%%DATADIR%%etc/namazu.png
@dirrm share/namazu/etc
%%DATADIR%%filter/apachecache.pl
%%DATADIR%%filter/bzip2.pl
%%DATADIR%%filter/compress.pl
%%DATADIR%%filter/deb.pl
%%DATADIR%%filter/dvi.pl
%%DATADIR%%filter/excel.pl
%%DATADIR%%filter/gnumeric.pl
%%DATADIR%%filter/gzip.pl
%%DATADIR%%filter/hdml.pl
%%DATADIR%%filter/hnf.pl
%%DATADIR%%filter/html.pl
%%DATADIR%%filter/koffice.pl
%%DATADIR%%filter/macbinary.pl
%%DATADIR%%filter/mailnews.pl
%%DATADIR%%filter/man.pl
%%DATADIR%%filter/mhonarc.pl
%%DATADIR%%filter/mp3.pl
%%DATADIR%%filter/msword.pl
%%DATADIR%%filter/ooo.pl
%%DATADIR%%filter/pdf.pl
%%DATADIR%%filter/pipermail.pl
%%DATADIR%%filter/postscript.pl
%%DATADIR%%filter/powerpoint.pl
%%DATADIR%%filter/rfc.pl
%%DATADIR%%filter/rpm.pl
%%DATADIR%%filter/rtf.pl
%%DATADIR%%filter/taro.pl
%%DATADIR%%filter/taro56.pl
%%DATADIR%%filter/taro7_10.pl
%%DATADIR%%filter/tex.pl
%%DATADIR%%filter/zip.pl
@dirrm share/namazu/filter
%%DATADIR%%pl/codeconv.pl
%%DATADIR%%pl/conf.pl
%%DATADIR%%pl/document.pl
%%DATADIR%%pl/filter.pl
%%DATADIR%%pl/gettext.pl
%%DATADIR%%pl/gfilter.pl
%%DATADIR%%pl/htmlsplit.pl
%%DATADIR%%pl/nmzidx.pl
%%DATADIR%%pl/seed.pl
%%DATADIR%%pl/time.pl
%%DATADIR%%pl/usage.pl
%%DATADIR%%pl/util.pl
%%DATADIR%%pl/var.pl
%%DATADIR%%pl/wakati.pl
@dirrm share/namazu/pl
%%DATADIR%%template/NMZ.body
%%DATADIR%%template/NMZ.body.es
%%DATADIR%%template/NMZ.body.fr
%%DATADIR%%template/NMZ.body.ja
%%DATADIR%%template/NMZ.body.pl
%%DATADIR%%template/NMZ.foot
%%DATADIR%%template/NMZ.foot.de
%%DATADIR%%template/NMZ.foot.es
%%DATADIR%%template/NMZ.foot.fr
%%DATADIR%%template/NMZ.foot.ja
%%DATADIR%%template/NMZ.foot.pl
%%DATADIR%%template/NMZ.head
%%DATADIR%%template/NMZ.head.de
%%DATADIR%%template/NMZ.head.es
%%DATADIR%%template/NMZ.head.fr
%%DATADIR%%template/NMZ.head.ja
%%DATADIR%%template/NMZ.head.pl
%%DATADIR%%template/NMZ.result.normal
%%DATADIR%%template/NMZ.result.normal.de
%%DATADIR%%template/NMZ.result.normal.es
%%DATADIR%%template/NMZ.result.normal.fr
%%DATADIR%%template/NMZ.result.normal.ja
%%DATADIR%%template/NMZ.result.normal.pl
%%DATADIR%%template/NMZ.result.short
%%DATADIR%%template/NMZ.result.short.de
%%DATADIR%%template/NMZ.result.short.es
%%DATADIR%%template/NMZ.result.short.fr
%%DATADIR%%template/NMZ.result.short.ja
%%DATADIR%%template/NMZ.result.short.pl
%%DATADIR%%template/NMZ.tips
%%DATADIR%%template/NMZ.tips.es
%%DATADIR%%template/NMZ.tips.fr
%%DATADIR%%template/NMZ.tips.ja
%%DATADIR%%template/NMZ.tips.pl
@dirrm share/namazu/template
@dirrm share/namazu
@dirrmtry share/locale/es/LC_MESSAGES

Return to bug 96588

Lines 1-5 Link Here

(-)namazu2/files/patch-pl::conf.pl.in (-4 / +13 lines)
1	--- pl/conf.pl.in.orig Fri Nov 25 15:04:26 2005	1	--- pl/conf.pl.in.orig Fri Nov 25 15:04:26 2005
2	+++ pl/conf.pl.in Mon Mar 13 22:16:41 2006	2	+++ pl/conf.pl.in Mon May 1 21:51:04 2006
3	@@ -197,19 +197,19 @@	3	@@ -197,19 +197,19 @@
4	#	4	#
5	# Network Kanji Filter nkf v1.71 or later	5	# Network Kanji Filter nkf v1.71 or later
Lines 23-35 Link Here
23		23
24	#	24	#
25	# ChaSen 2.02 or later (with noun words extraction)	25	# ChaSen 2.02 or later (with noun words extraction)
26	@@ -224,7 +224,8 @@	26	@@ -219,13 +219,14 @@
27	#	27	#
28	# Default Japanese processer: KAKASI or ChaSen.	28	# MeCab
		29	#
		30	-$MECAB = "@DO_MECAB@";
		31	+$MECAB = "module_mecab";
		32
		33	#
		34	-# Default Japanese processer: KAKASI or ChaSen.
		35	+# Default Japanese processer: KAKASI or ChaSen or Mecab.
29	#	36	#
30	-$WAKATI = $@OPT_WAKATI_DEFAULT@;	37	-$WAKATI = $@OPT_WAKATI_DEFAULT@;
		38	-
31	+$WAKATI = $KAKASI;	39	+$WAKATI = $KAKASI;
32	+$WAKATI = $CHASEN;	40	+$WAKATI = $CHASEN;
33		41	+$WAKATI = $MECAB;
34		42
35	#===================================================================	43	#===================================================================
		44	#

Lines 54-157 Link Here

(-)namazu2/pkg-plist (-95 / +95 lines)
54	%%PORTDOCS%%@dirrm share/namazu/doc/ja	54	%%PORTDOCS%%@dirrm share/namazu/doc/ja
55	%%PORTDOCS%%share/namazu/doc/namazu.css	55	%%PORTDOCS%%share/namazu/doc/namazu.css
56	%%PORTDOCS%%@dirrm share/namazu/doc	56	%%PORTDOCS%%@dirrm share/namazu/doc
57	share/namazu/etc/AUTHORS	57	%%DATADIR%%etc/AUTHORS
58	share/namazu/etc/COPYING	58	%%DATADIR%%etc/COPYING
59	share/namazu/etc/CREDITS	59	%%DATADIR%%etc/CREDITS
60	share/namazu/etc/ChangeLog	60	%%DATADIR%%etc/ChangeLog
61	share/namazu/etc/ChangeLog.1	61	%%DATADIR%%etc/ChangeLog.1
62	share/namazu/etc/HACKING	62	%%DATADIR%%etc/HACKING
63	share/namazu/etc/HACKING-ja	63	%%DATADIR%%etc/HACKING-ja
64	share/namazu/etc/INSTALL	64	%%DATADIR%%etc/INSTALL
65	share/namazu/etc/INSTALL-ja	65	%%DATADIR%%etc/INSTALL-ja
66	share/namazu/etc/NEWS	66	%%DATADIR%%etc/NEWS
67	share/namazu/etc/README	67	%%DATADIR%%etc/README
68	share/namazu/etc/README-es	68	%%DATADIR%%etc/README-es
69	share/namazu/etc/README-ja	69	%%DATADIR%%etc/README-ja
70	share/namazu/etc/THANKS	70	%%DATADIR%%etc/THANKS
71	share/namazu/etc/TODO	71	%%DATADIR%%etc/TODO
72	share/namazu/etc/namazu.png	72	%%DATADIR%%etc/namazu.png
73	@dirrm share/namazu/etc	73	@dirrm share/namazu/etc
74	share/namazu/filter/apachecache.pl	74	%%DATADIR%%filter/apachecache.pl
75	share/namazu/filter/bzip2.pl	75	%%DATADIR%%filter/bzip2.pl
76	share/namazu/filter/compress.pl	76	%%DATADIR%%filter/compress.pl
77	share/namazu/filter/deb.pl	77	%%DATADIR%%filter/deb.pl
78	share/namazu/filter/dvi.pl	78	%%DATADIR%%filter/dvi.pl
79	share/namazu/filter/excel.pl	79	%%DATADIR%%filter/excel.pl
80	share/namazu/filter/gnumeric.pl	80	%%DATADIR%%filter/gnumeric.pl
81	share/namazu/filter/gzip.pl	81	%%DATADIR%%filter/gzip.pl
82	share/namazu/filter/hdml.pl	82	%%DATADIR%%filter/hdml.pl
83	share/namazu/filter/hnf.pl	83	%%DATADIR%%filter/hnf.pl
84	share/namazu/filter/html.pl	84	%%DATADIR%%filter/html.pl
85	share/namazu/filter/koffice.pl	85	%%DATADIR%%filter/koffice.pl
86	share/namazu/filter/macbinary.pl	86	%%DATADIR%%filter/macbinary.pl
87	share/namazu/filter/mailnews.pl	87	%%DATADIR%%filter/mailnews.pl
88	share/namazu/filter/man.pl	88	%%DATADIR%%filter/man.pl
89	share/namazu/filter/mhonarc.pl	89	%%DATADIR%%filter/mhonarc.pl
90	share/namazu/filter/mp3.pl	90	%%DATADIR%%filter/mp3.pl
91	share/namazu/filter/msword.pl	91	%%DATADIR%%filter/msword.pl
92	share/namazu/filter/ooo.pl	92	%%DATADIR%%filter/ooo.pl
93	share/namazu/filter/pdf.pl	93	%%DATADIR%%filter/pdf.pl
94	share/namazu/filter/pipermail.pl	94	%%DATADIR%%filter/pipermail.pl
95	share/namazu/filter/postscript.pl	95	%%DATADIR%%filter/postscript.pl
96	share/namazu/filter/powerpoint.pl	96	%%DATADIR%%filter/powerpoint.pl
97	share/namazu/filter/rfc.pl	97	%%DATADIR%%filter/rfc.pl
98	share/namazu/filter/rpm.pl	98	%%DATADIR%%filter/rpm.pl
99	share/namazu/filter/rtf.pl	99	%%DATADIR%%filter/rtf.pl
100	share/namazu/filter/taro.pl	100	%%DATADIR%%filter/taro.pl
101	share/namazu/filter/taro56.pl	101	%%DATADIR%%filter/taro56.pl
102	share/namazu/filter/taro7_10.pl	102	%%DATADIR%%filter/taro7_10.pl
103	share/namazu/filter/tex.pl	103	%%DATADIR%%filter/tex.pl
104	share/namazu/filter/zip.pl	104	%%DATADIR%%filter/zip.pl
105	@dirrm share/namazu/filter	105	@dirrm share/namazu/filter
106	share/namazu/pl/codeconv.pl	106	%%DATADIR%%pl/codeconv.pl
107	share/namazu/pl/conf.pl	107	%%DATADIR%%pl/conf.pl
108	share/namazu/pl/document.pl	108	%%DATADIR%%pl/document.pl
109	share/namazu/pl/filter.pl	109	%%DATADIR%%pl/filter.pl
110	share/namazu/pl/gettext.pl	110	%%DATADIR%%pl/gettext.pl
111	share/namazu/pl/gfilter.pl	111	%%DATADIR%%pl/gfilter.pl
112	share/namazu/pl/htmlsplit.pl	112	%%DATADIR%%pl/htmlsplit.pl
113	share/namazu/pl/nmzidx.pl	113	%%DATADIR%%pl/nmzidx.pl
114	share/namazu/pl/seed.pl	114	%%DATADIR%%pl/seed.pl
115	share/namazu/pl/time.pl	115	%%DATADIR%%pl/time.pl
116	share/namazu/pl/usage.pl	116	%%DATADIR%%pl/usage.pl
117	share/namazu/pl/util.pl	117	%%DATADIR%%pl/util.pl
118	share/namazu/pl/var.pl	118	%%DATADIR%%pl/var.pl
119	share/namazu/pl/wakati.pl	119	%%DATADIR%%pl/wakati.pl
120	@dirrm share/namazu/pl	120	@dirrm share/namazu/pl
121	share/namazu/template/NMZ.body	121	%%DATADIR%%template/NMZ.body
122	share/namazu/template/NMZ.body.es	122	%%DATADIR%%template/NMZ.body.es
123	share/namazu/template/NMZ.body.fr	123	%%DATADIR%%template/NMZ.body.fr
124	share/namazu/template/NMZ.body.ja	124	%%DATADIR%%template/NMZ.body.ja
125	share/namazu/template/NMZ.body.pl	125	%%DATADIR%%template/NMZ.body.pl
126	share/namazu/template/NMZ.foot	126	%%DATADIR%%template/NMZ.foot
127	share/namazu/template/NMZ.foot.de	127	%%DATADIR%%template/NMZ.foot.de
128	share/namazu/template/NMZ.foot.es	128	%%DATADIR%%template/NMZ.foot.es
129	share/namazu/template/NMZ.foot.fr	129	%%DATADIR%%template/NMZ.foot.fr
130	share/namazu/template/NMZ.foot.ja	130	%%DATADIR%%template/NMZ.foot.ja
131	share/namazu/template/NMZ.foot.pl	131	%%DATADIR%%template/NMZ.foot.pl
132	share/namazu/template/NMZ.head	132	%%DATADIR%%template/NMZ.head
133	share/namazu/template/NMZ.head.de	133	%%DATADIR%%template/NMZ.head.de
134	share/namazu/template/NMZ.head.es	134	%%DATADIR%%template/NMZ.head.es
135	share/namazu/template/NMZ.head.fr	135	%%DATADIR%%template/NMZ.head.fr
136	share/namazu/template/NMZ.head.ja	136	%%DATADIR%%template/NMZ.head.ja
137	share/namazu/template/NMZ.head.pl	137	%%DATADIR%%template/NMZ.head.pl
138	share/namazu/template/NMZ.result.normal	138	%%DATADIR%%template/NMZ.result.normal
139	share/namazu/template/NMZ.result.normal.de	139	%%DATADIR%%template/NMZ.result.normal.de
140	share/namazu/template/NMZ.result.normal.es	140	%%DATADIR%%template/NMZ.result.normal.es
141	share/namazu/template/NMZ.result.normal.fr	141	%%DATADIR%%template/NMZ.result.normal.fr
142	share/namazu/template/NMZ.result.normal.ja	142	%%DATADIR%%template/NMZ.result.normal.ja
143	share/namazu/template/NMZ.result.normal.pl	143	%%DATADIR%%template/NMZ.result.normal.pl
144	share/namazu/template/NMZ.result.short	144	%%DATADIR%%template/NMZ.result.short
145	share/namazu/template/NMZ.result.short.de	145	%%DATADIR%%template/NMZ.result.short.de
146	share/namazu/template/NMZ.result.short.es	146	%%DATADIR%%template/NMZ.result.short.es
147	share/namazu/template/NMZ.result.short.fr	147	%%DATADIR%%template/NMZ.result.short.fr
148	share/namazu/template/NMZ.result.short.ja	148	%%DATADIR%%template/NMZ.result.short.ja
149	share/namazu/template/NMZ.result.short.pl	149	%%DATADIR%%template/NMZ.result.short.pl
150	share/namazu/template/NMZ.tips	150	%%DATADIR%%template/NMZ.tips
151	share/namazu/template/NMZ.tips.es	151	%%DATADIR%%template/NMZ.tips.es
152	share/namazu/template/NMZ.tips.fr	152	%%DATADIR%%template/NMZ.tips.fr
153	share/namazu/template/NMZ.tips.ja	153	%%DATADIR%%template/NMZ.tips.ja
154	share/namazu/template/NMZ.tips.pl	154	%%DATADIR%%template/NMZ.tips.pl
155	@dirrm share/namazu/template	155	@dirrm share/namazu/template
156	@dirrm share/namazu	156	@dirrm share/namazu
157	@dirrmtry share/locale/es/LC_MESSAGES	157	@dirrmtry share/locale/es/LC_MESSAGES