pkg/43325: [PATCH] textproc/namazu is not really WAKATI friendly, internal make check fails

[makoto%ki.nu@localhost]

>Number:         43325
>Category:       pkg
>Synopsis:       textproc/namazu is not really WAKATI friendly, internal make 
>check fails
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed May 19 02:50:01 +0000 2010
>Originator:     Makoto Fujiwara
>Release:        NetBSD 5.0_STABLE
>Organization:
KINU Corporation
>Environment:
        
        
System: NetBSD modena 5.0_STABLE NetBSD 5.0_STABLE (XEN3_DOM0) #0: Wed Apr 7 
02:17:52 UTC 2010 
builds%b8.netbsd.org@localhost:/home/builds/ab/netbsd-5/amd64/201004070000Z-obj/home/builds/ab/netbsd-5/src/sys/arch/amd64/compile/XEN3_DOM0
 amd64
Architecture: x86_64
Machine: amd64
>Description:
        textproc/namazu has various situation to package, LANGUAGE and WAKATI
        (word segmentation for Japanese = morphological analyzer)
        and textproc/namazu fails internal 'make check' after build, with
        LANG=ja_JP.eucJP (or any LANG=ja...)
        
        These situation should be selected by options.mk
>How-To-Repeat:
(1) before the patch
--------------------
foreach lang (C ja_JP.eucJP) \
  (make clean && make  package &&  \
  (cd work/namazu-2.0.20/; env PERL_BADLANG=0 LANG=$lang make -i check) \
  ) |& tee  -a ~/prep/namazu-log-before
end

stable@makoto 11:23:16/100519(..textproc/namazu)% grep ' tests ' 
~/prep/namazu-log-before
All 47 tests passed
19 of 50 tests failed

(2) after the patch
--------------------
( in /etc/mk.conf, following three lines are added)
----
PKG_OPTIONS.namazu=     kakasi
PKG_OPTIONS.namazu+=    chasen
PKG_OPTIONS.namazu+=    mecab
----
stable@makoto 11:33:57/100519(..textproc/namazu)% foreach lang (C ja_JP.eucJP)\
  (make clean && make  package && \
  (cd work/namazu-2.0.20/; env PERL_BADLANG=0 LANG=$lang make -i check) ) \
  |& tee  -a ~/prep/namazu-after
end

stable@makoto 11:34:01/100519(..textproc/namazu)% grep ' tests ' 
~/prep/namazu-after             
All 47 tests passed
All 50 tests passed

>Fix:
Index: Makefile
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/textproc/namazu/Makefile,v
retrieving revision 1.5
diff -u -a -u -r1.5 Makefile
--- Makefile    17 Apr 2010 16:25:11 -0000      1.5
+++ Makefile    19 May 2010 02:25:37 -0000
@@ -27,22 +27,11 @@
 CONFIGURE_ARGS+=       --localstatedir=${PREFIX}/${DATADIR} \
                        --libexecdir=${PREFIX}/libexec/cgi-bin \
                        --sysconfdir=${PKG_SYSCONFBASE}
-CONFIGURE_ENV+=                KAKASI="module_kakasi"
-CONFIGURE_ENV+=                ac_cv_path_KAKASI="module_kakasi"
-CONFIGURE_ENV+=                CHASEN="module_chasen"
-CONFIGURE_ENV+=                ac_cv_path_CHASEN="module_chasen"
-CONFIGURE_ENV+=                MECAB="module_mecab"
-CONFIGURE_ENV+=                ac_cv_path_MECAB="module_mecab"
 DATADIR=               libdata
 EXAMPLESDIR=           share/examples/namazu
 EXAMPLES=              mknmzrc namazurc
 INSTALLATION_DIRS+=    ${DATADIR}/namazu ${EXAMPLESDIR}
 
-SUBST_CLASSES+=                wakati
-SUBST_STAGE.wakati=    pre-configure
-SUBST_FILES.wakati=    pl/conf.pl.in
-SUBST_SED.wakati=      -e 's|@OPT_WAKATI_DEFAULT@|none|'
-
 .include "../../mk/bsd.prefs.mk"
 
 PKG_SYSCONFSUBDIR=     namazu
@@ -58,6 +47,8 @@
                ${DESTDIR}${PREFIX}/${EXAMPLESDIR}/${f}
 .endfor
 
+.include       "options.mk"
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: options.mk
===================================================================
RCS file: options.mk
diff -N options.mk
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ options.mk  19 May 2010 02:27:27 -0000
@@ -0,0 +1,33 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.namazu
+PKG_SUPPORTED_OPTIONS= ja_lang kakasi chasen mecab
+#                      ja_lang is not currently supported yet
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+.  if !empty(PKG_OPTIONS:Mkakasi)
+CONFIGURE_ENV+=                KAKASI="module_kakasi"
+CONFIGURE_ENV+=                ac_cv_path_KAKASI="module_kakasi"
+DEPENDS+=              p5-Text-Kakasi>=1.04:../../textproc/p5-Text-Kakasi
+.  endif
+
+.  if !empty(PKG_OPTIONS:Mchasen)
+CONFIGURE_ENV+=                CHASEN="module_chasen"
+CONFIGURE_ENV+=                ac_cv_path_CHASEN="module_chasen"
+DEPENDS+=              p5-Text-ChaSen>=1.0:../../textproc/p5-Text-ChaSen
+.  endif
+
+.  if !empty(PKG_OPTIONS:Mmecab)
+CONFIGURE_ENV+=                MECAB="module_mecab"
+CONFIGURE_ENV+=                ac_cv_path_MECAB="module_mecab"
+DEPENDS+=              mecab:../../textproc/mecab
+.  endif
+
+.  if empty(PKG_OPTIONS:Mkakasi) && empty(PKG_OPTIONS:Mchasen) && 
empty(PKG_OPTIONS:Mmecab)
+SUBST_CLASSES+=                wakati
+SUBST_STAGE.wakati=    pre-configure
+SUBST_FILES.wakati=    pl/conf.pl.in
+SUBST_SED.wakati=      -e 's|@OPT_WAKATI_DEFAULT@|none|'
+.  endif

>Unformatted: