Date: Mon, 1 May 2006 23:14:13 +0900 (JST) From: Fumihiko Kimura <jfkimura@yahoo.co.jp> To: FreeBSD-gnats-submit@FreeBSD.org Cc: anray@FreeBSD.org, jmelo@FreeBSD.org Subject: ports/96588: update ports: databases/namazu2 japanese/namazu2 Message-ID: <200605011414.k41EEDMe038514@sh1.radio.gr.jp> Resent-Message-ID: <200605011420.k41EKJPZ042356@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96588
>Category: ports
>Synopsis: update ports: databases/namazu2 japanese/namazu2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon May 01 14:20:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Fumihiko Kimura
>Release: FreeBSD 6.0-RELEASE-p6 i386
>Organization:
>Environment:
>Description:
- add port function
* Support MeCab
- check portlint
>How-To-Repeat:
>Fix:
Checked FreeBSD 4.11-RELEASE and FreeBSD 6.0-RELEASE
Do you take to maintainership, Jean Milanez Melo-san?
[databases]
=== begin cut here ===
diff -urN namazu2.orig/files/patch-pl::conf.pl.in namazu2/files/patch-pl::conf.pl.in
--- namazu2.orig/files/patch-pl::conf.pl.in Wed Mar 15 13:55:53 2006
+++ namazu2/files/patch-pl::conf.pl.in Mon May 1 22:12:26 2006
@@ -1,5 +1,5 @@
--- pl/conf.pl.in.orig Fri Nov 25 15:04:26 2005
-+++ pl/conf.pl.in Mon Mar 13 22:16:41 2006
++++ pl/conf.pl.in Mon May 1 21:51:04 2006
@@ -197,19 +197,19 @@
#
# Network Kanji Filter nkf v1.71 or later
@@ -23,13 +23,22 @@
#
# ChaSen 2.02 or later (with noun words extraction)
-@@ -224,7 +224,8 @@
+@@ -219,13 +219,14 @@
#
- # Default Japanese processer: KAKASI or ChaSen.
+ # 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;
#===================================================================
+ #
diff -urN namazu2.orig/pkg-plist namazu2/pkg-plist
--- namazu2.orig/pkg-plist Wed Mar 15 13:55:53 2006
+++ namazu2/pkg-plist Mon May 1 22:10:17 2006
@@ -54,104 +54,104 @@
%%PORTDOCS%%@dirrm share/namazu/doc/ja
%%PORTDOCS%%share/namazu/doc/namazu.css
%%PORTDOCS%%@dirrm share/namazu/doc
-share/namazu/etc/AUTHORS
-share/namazu/etc/COPYING
-share/namazu/etc/CREDITS
-share/namazu/etc/ChangeLog
-share/namazu/etc/ChangeLog.1
-share/namazu/etc/HACKING
-share/namazu/etc/HACKING-ja
-share/namazu/etc/INSTALL
-share/namazu/etc/INSTALL-ja
-share/namazu/etc/NEWS
-share/namazu/etc/README
-share/namazu/etc/README-es
-share/namazu/etc/README-ja
-share/namazu/etc/THANKS
-share/namazu/etc/TODO
-share/namazu/etc/namazu.png
+%%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
-share/namazu/filter/apachecache.pl
-share/namazu/filter/bzip2.pl
-share/namazu/filter/compress.pl
-share/namazu/filter/deb.pl
-share/namazu/filter/dvi.pl
-share/namazu/filter/excel.pl
-share/namazu/filter/gnumeric.pl
-share/namazu/filter/gzip.pl
-share/namazu/filter/hdml.pl
-share/namazu/filter/hnf.pl
-share/namazu/filter/html.pl
-share/namazu/filter/koffice.pl
-share/namazu/filter/macbinary.pl
-share/namazu/filter/mailnews.pl
-share/namazu/filter/man.pl
-share/namazu/filter/mhonarc.pl
-share/namazu/filter/mp3.pl
-share/namazu/filter/msword.pl
-share/namazu/filter/ooo.pl
-share/namazu/filter/pdf.pl
-share/namazu/filter/pipermail.pl
-share/namazu/filter/postscript.pl
-share/namazu/filter/powerpoint.pl
-share/namazu/filter/rfc.pl
-share/namazu/filter/rpm.pl
-share/namazu/filter/rtf.pl
-share/namazu/filter/taro.pl
-share/namazu/filter/taro56.pl
-share/namazu/filter/taro7_10.pl
-share/namazu/filter/tex.pl
-share/namazu/filter/zip.pl
+%%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
-share/namazu/pl/codeconv.pl
-share/namazu/pl/conf.pl
-share/namazu/pl/document.pl
-share/namazu/pl/filter.pl
-share/namazu/pl/gettext.pl
-share/namazu/pl/gfilter.pl
-share/namazu/pl/htmlsplit.pl
-share/namazu/pl/nmzidx.pl
-share/namazu/pl/seed.pl
-share/namazu/pl/time.pl
-share/namazu/pl/usage.pl
-share/namazu/pl/util.pl
-share/namazu/pl/var.pl
-share/namazu/pl/wakati.pl
+%%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
-share/namazu/template/NMZ.body
-share/namazu/template/NMZ.body.es
-share/namazu/template/NMZ.body.fr
-share/namazu/template/NMZ.body.ja
-share/namazu/template/NMZ.body.pl
-share/namazu/template/NMZ.foot
-share/namazu/template/NMZ.foot.de
-share/namazu/template/NMZ.foot.es
-share/namazu/template/NMZ.foot.fr
-share/namazu/template/NMZ.foot.ja
-share/namazu/template/NMZ.foot.pl
-share/namazu/template/NMZ.head
-share/namazu/template/NMZ.head.de
-share/namazu/template/NMZ.head.es
-share/namazu/template/NMZ.head.fr
-share/namazu/template/NMZ.head.ja
-share/namazu/template/NMZ.head.pl
-share/namazu/template/NMZ.result.normal
-share/namazu/template/NMZ.result.normal.de
-share/namazu/template/NMZ.result.normal.es
-share/namazu/template/NMZ.result.normal.fr
-share/namazu/template/NMZ.result.normal.ja
-share/namazu/template/NMZ.result.normal.pl
-share/namazu/template/NMZ.result.short
-share/namazu/template/NMZ.result.short.de
-share/namazu/template/NMZ.result.short.es
-share/namazu/template/NMZ.result.short.fr
-share/namazu/template/NMZ.result.short.ja
-share/namazu/template/NMZ.result.short.pl
-share/namazu/template/NMZ.tips
-share/namazu/template/NMZ.tips.es
-share/namazu/template/NMZ.tips.fr
-share/namazu/template/NMZ.tips.ja
-share/namazu/template/NMZ.tips.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
=== ended cut here ===
[japanese]
=== begin cut here ===
diff -urN namazu2.orig/Makefile namazu2/Makefile
--- namazu2.orig/Makefile Wed Mar 15 13:55:53 2006
+++ namazu2/Makefile Mon May 1 22:28:27 2006
@@ -17,15 +17,17 @@
COMMENT= Meta-port of Namazu and Japanese support modules
LIB_DEPENDS= nmz.7:${PORTSDIR}/databases/namazu2
-RUN_DEPENDS= ${PM_BASE}/${PERL_ARCH}/NKF.pm:${PORTSDIR}/japanese/p5-nkf \
- ${PM_BASE}/${PERL_ARCH}/Text/${MODULE_NAME}.pm:${PORTSDIR}/japanese/p5-Text-${MODULE_NAME}
+RUN_DEPENDS= ${PM_BASE}/${PERL_ARCH}/NKF.pm:${PORTSDIR}/japanese/p5-nkf
PM_BASE= ${SITE_PERL}
+PLIST= "@comment this plist is intentionally left empty"
-.if defined(WITH_CHASEN)
-MODULE_NAME= ChaSen
+.if defined(WITH_MECAB)
+RUN_DEPENDS+= ${PM_BASE}/${PERL_ARCH}/MeCab.pm:${PORTSDIR}/japanese/p5-MeCab
+.elif defined(WITH_CHASEN)
+RUN_DEPENDS+= ${PM_BASE}/${PERL_ARCH}/Text/ChaSen.pm:${PORTSDIR}/japanese/p5-Text-ChaSen
.else
-MODULE_NAME= Kakasi
+RUN_DEPENDS+= ${PM_BASE}/${PERL_ARCH}/Text/Kakasi.pm:${PORTSDIR}/japanese/p5-Text-Kakasi
.endif
NO_BUILD= yes
diff -urN namazu2.orig/pkg-plist namazu2/pkg-plist
--- namazu2.orig/pkg-plist Mon Oct 22 05:32:46 2001
+++ namazu2/pkg-plist Thu Jan 1 09:00:00 1970
@@ -1 +0,0 @@
-@comment this plist is intentionally left empty
=== ended cut here ===
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605011414.k41EEDMe038514>