namazu update

[Takahiro Kambe <taca@sky.yamashina.kyoto.jp>]

In message <200012201206.VAA29755@azarin.localnet>
	on Wed, 20 Dec 2000 21:06:45 +0900,
	SUNAGAWA Keiki <kei_sun@ba2.so-net.ne.jp> wrote:
> Takahiro> 殆んどそのままなんですが、ディレクトリ構成等へ意見
> Takahiro> ある方いらっしゃいますか?
> 
> ではひとつだけお願いです。設定ファイル
> 
> etc/namazu/mknmzrc-sample
> etc/namazu/namazurc-sample
> 
> ですが、s/sample/example/にしていただけませんか。
いくつかの変更を行いました。

- WITH_CHASEN が NO でない限り、dependする。
- ${LOCALBASE}/var を使っていた部分を ${LOCALBASE}/libdata 以下にした。
- 設定ファイルは${LOCALBASE}/etc/namazu以下だが、デフォルトではインス
  トールせず、INSTALL/DEINSTALLで必要なら${LOCALBASE}/share/namazuの
  sampleからコピー/不要なら削除をメッセージとして表示する。

さて、これをnamazu2としてcommitするよりは、

o 現namazuを再度namazu1-13とでもしてimportしておいて、
o 現namazuをnamazu2に更新

として、namazu13とnamazu(実際はnamazu2)の両方を提供するという形が良さ
そうに思えますが、どんなもんでしょうか。

- namazu13なんて残す必要はない。
- 現namazuはそのままで、namazu2としてimportした方が良い。

--
神戸 隆博(かんべ たかひろ) at home

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	Makefile
#	files
#	files/md5
#	files/patch-sum
#	patches
#	patches/patch-aa
#	patches/patch-ab
#	pkg
#	pkg/COMMENT
#	pkg/DESCR
#	pkg/PLIST
#	pkg/INSTALL
#	pkg/DEINSTALL
#
echo x - Makefile
sed 's/^X//' >Makefile << 'END-of-Makefile'
X# $NetBSD$
X# FreeBSD Id: ports/japanese/namazu2/Makefile,v 1.16 2000/10/26 20:56:25 knu Exp
X
XDISTNAME=	namazu-2.0.5
XCATEGORIES=	japanese textproc
XMASTER_SITES=	http://www.namazu.org/stable/
X
XMAINTAINER=	packages@netbsd.org
XHOMEPAGE=	http://www.namazu.org/
X
XDEPENDS+=	p5-File-MMagic>=1.09:../../misc/p5-File-MMagic \
X		p5-Text-Kakasi>=1.04:../../japanese/p5-Text-Kakasi \
X		p5-nkf>=1.7:../../japanese/p5-nkf
X.if !defined(WITH_CHASEN) || ${WITH_CHASEN} != NO
XDEPENDS+=	p5-Text-ChaSen>=1.0:../../japanese/p5-Text-ChaSen
X.endif
X
XCONFIGURE_ARGS+=	--localstatedir=${LOCALBASE}/libdata
X#CONFIGURE_ARGS+=	--with-included-gettext
X
XDEINSTALL_FILE=		${WRKDIR}/DEINSTALL
XINSTALL_FILE=		${WRKDIR}/INSTALL
X
XUSE_LIBINTL=		# defined
XUSE_PERL5=		# defined
XGNU_CONFIGURE=		# defined
XUSE_LIBTOOL=		# defined
X
XLTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
X
XCONFLICTS+=	namazu-1.*
X
Xpost-build:
X	@for FILE in \
X		${PKGDIR}/DEINSTALL	\
X		${PKGDIR}/INSTALL;	\
X	do \
X		${SED}	-e 's#@CONFDIR@#${LOCALBASE}/etc/namazu#g' \
X			-e 's#@DATADIR@#${LOCALBASE}/libdata/namazu#g' \
X			-e 's#@EXAMPLEDIR@#${LOCALBASE}/share/namazu#g' \
X			< $${FILE} > ${WRKDIR}/`basename $${FILE}`; \
X	done
X
Xpost-install:
X	@${TEST} -d ${LOCALBASE}/etc/namazu || ${MKDIR} ${LOCALBASE}/etc/namazu
X	@${SH} ${WRKDIR}/INSTALL ${PKGNAME} POST-INSTALL
X
X.include "../../mk/bsd.pkg.mk"
END-of-Makefile
echo c - files
mkdir -p files > /dev/null 2>&1
echo x - files/md5
sed 's/^X//' >files/md5 << 'END-of-files/md5'
X$NetBSD$
X
XMD5 (namazu-2.0.5.tar.gz) = 32b3b80718f038c410045875893b47ae
END-of-files/md5
echo x - files/patch-sum
sed 's/^X//' >files/patch-sum << 'END-of-files/patch-sum'
X$NetBSD$
X
XMD5 (patch-aa) = 86548ef1fb24c8ca90f5a2fa6d923b32
XMD5 (patch-ab) = 328414e7b00bcd572295d26902edac30
END-of-files/patch-sum
echo c - patches
mkdir -p patches > /dev/null 2>&1
echo x - patches/patch-aa
sed 's/^X//' >patches/patch-aa << 'END-of-patches/patch-aa'
X$NetBSD$
X
X--- conf/Makefile.am.orig	Fri Feb 25 23:04:36 2000
X+++ conf/Makefile.am
X@@ -1,9 +1,12 @@
X AUTOMAKE_OPTIONS = 1.4 no-dependencies
X 
X-confdir = $(sysconfdir)/$(PACKAGE)
X-conf_DATA  = namazurc-sample mknmzrc-sample
X+confdir = $(pkgdatadir)
X+conf_DATA  = namazurc.example mknmzrc.example
X EXTRA_DIST = namazurc-sample
X-CLEANFILES = mknmzrc-sample
X+CLEANFILES = namazurc.example mknmzrc.example
X 
X-mknmzrc-sample: ../pl/conf.pl
X+namazurc.example: namazurc-sample
X+	@cp -p $? $@
X+
X+mknmzrc.example: ../pl/conf.pl
X 	perl -pe 's/^/\x23 / unless /^(\x23|package|$$)/' ../pl/conf.pl > $@
END-of-patches/patch-aa
echo x - patches/patch-ab
sed 's/^X//' >patches/patch-ab << 'END-of-patches/patch-ab'
X$NetBSD$
X
X--- conf/Makefile.in.orig	Mon Oct 23 14:58:41 2000
X+++ conf/Makefile.in
X@@ -111,10 +111,10 @@
X 
X AUTOMAKE_OPTIONS = 1.4 no-dependencies
X 
X-confdir = $(sysconfdir)/$(PACKAGE)
X-conf_DATA = namazurc-sample mknmzrc-sample
X+confdir = $(pkgdatadir)
X+conf_DATA = namazurc.example mknmzrc.example
X EXTRA_DIST = namazurc-sample
X-CLEANFILES = mknmzrc-sample
X+CLEANFILES = namazurc.example mknmzrc.example
X mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
X CONFIG_HEADER = ../config.h
X CONFIG_CLEAN_FILES = 
X@@ -238,7 +238,10 @@
X maintainer-clean-generic clean mostlyclean distclean maintainer-clean
X 
X 
X-mknmzrc-sample: ../pl/conf.pl
X+namazurc.example: namazurc-sample
X+	@cp -p $? $@
X+
X+mknmzrc.example: ../pl/conf.pl
X 	perl -pe 's/^/\x23 / unless /^(\x23|package|$$)/' ../pl/conf.pl > $@
X 
X # Tell versions [3.59,3.63) of GNU make to not export all variables.
END-of-patches/patch-ab
echo c - pkg
mkdir -p pkg > /dev/null 2>&1
echo x - pkg/COMMENT
sed 's/^X//' >pkg/COMMENT << 'END-of-pkg/COMMENT'
XFull-text search system intended for easy use
END-of-pkg/COMMENT
echo x - pkg/DESCR
sed 's/^X//' >pkg/DESCR << 'END-of-pkg/DESCR'
XNamazu is a full-text search system intended for easy use. Not only it works
Xas a CGI program for a small or medium scale Web search engine, but also works
Xas a personal use search system for your pile of emails. 
X
X(The Japanese word `Namazu' means `catfish' in English) 
X
XWWW: http://www.namazu.org/
END-of-pkg/DESCR
echo x - pkg/PLIST
sed 's/^X//' >pkg/PLIST << 'END-of-pkg/PLIST'
X@comment $NetBSD$
Xbin/bnamazu
Xbin/gcnmz
Xbin/kwnmz
Xbin/mailutime
Xbin/mknmz
Xbin/namazu
Xbin/nmz-config
Xbin/nmzgrep
Xbin/rfnmz
Xbin/vfnmz
X@exec if [ ! -d %D/etc/namazu ]; then mkdir %D/etc/namazu; fi
Xinclude/namazu/codeconv.h
Xinclude/namazu/field.h
Xinclude/namazu/hlist.h
Xinclude/namazu/i18n.h
Xinclude/namazu/idxname.h
Xinclude/namazu/l10n-ja.h
Xinclude/namazu/libnamazu.h
Xinclude/namazu/parser.h
Xinclude/namazu/query.h
Xinclude/namazu/re.h
Xinclude/namazu/regex.h
Xinclude/namazu/search.h
Xinclude/namazu/util.h
Xinclude/namazu/var.h
Xinclude/namazu/wakati.h
X@dirrm include/namazu
Xlib/libnmz.a
Xlib/libnmz.la
Xlib/libnmz.so
Xlib/libnmz.so.4
Xlib/libnmz.so.4.2
X@exec if [ ! -d %D/libdata/namazu ]; then mkdir %D/libdata/namazu; fi
X@exec if [ ! -d %D/libdata/namazu/index ]; then mkdir %D/libdata/namazu/index; fi
Xlibexec/namazu.cgi
Xshare/locale/es/LC_MESSAGES/namazu.mo
Xshare/locale/fr/LC_MESSAGES/namazu.mo
Xshare/locale/ja/LC_MESSAGES/namazu.mo
Xshare/locale/ja_JP.SJIS/LC_MESSAGES/namazu.mo
Xshare/namazu/doc/en/manual.html
Xshare/namazu/doc/en/nmz.html
Xshare/namazu/doc/en/tips.html
Xshare/namazu/doc/en/tutorial.html
X@dirrm share/namazu/doc/en
Xshare/namazu/doc/ja/manual.html
Xshare/namazu/doc/ja/nmz.html
Xshare/namazu/doc/ja/tips.html
Xshare/namazu/doc/ja/tutorial.html
X@dirrm share/namazu/doc/ja
Xshare/namazu/doc/namazu.css
X@dirrm share/namazu/doc
Xshare/namazu/etc/CREDITS
Xshare/namazu/etc/ChangeLog.1
Xshare/namazu/etc/INSTALL-ja
Xshare/namazu/etc/README-es
Xshare/namazu/etc/README-ja
Xshare/namazu/etc/namazu.png
Xshare/namazu/etc/namazu.spec
Xshare/namazu/etc/namazu.spec.in
X@dirrm share/namazu/etc
Xshare/namazu/filter/bzip2.pl
Xshare/namazu/filter/compress.pl
Xshare/namazu/filter/excel.pl
Xshare/namazu/filter/gfilter.pl
Xshare/namazu/filter/gzip.pl
Xshare/namazu/filter/hnf.pl
Xshare/namazu/filter/html.pl
Xshare/namazu/filter/mailnews.pl
Xshare/namazu/filter/man.pl
Xshare/namazu/filter/mhonarc.pl
Xshare/namazu/filter/msword.pl
Xshare/namazu/filter/pdf.pl
Xshare/namazu/filter/powerpoint.pl
Xshare/namazu/filter/rfc.pl
Xshare/namazu/filter/taro.pl
Xshare/namazu/filter/tex.pl
X@dirrm share/namazu/filter
Xshare/namazu/mknmzrc.example
Xshare/namazu/namazurc.example
Xshare/namazu/pl/codeconv.pl
Xshare/namazu/pl/conf.pl
Xshare/namazu/pl/gettext.pl
Xshare/namazu/pl/htmlsplit.pl
Xshare/namazu/pl/nmzidx.pl
Xshare/namazu/pl/seed.pl
Xshare/namazu/pl/usage.pl
Xshare/namazu/pl/util.pl
Xshare/namazu/pl/var.pl
Xshare/namazu/pl/wakati.pl
X@dirrm share/namazu/pl
Xshare/namazu/template/NMZ.body
Xshare/namazu/template/NMZ.body.es
Xshare/namazu/template/NMZ.body.fr
Xshare/namazu/template/NMZ.body.ja
Xshare/namazu/template/NMZ.foot
Xshare/namazu/template/NMZ.foot.es
Xshare/namazu/template/NMZ.foot.fr
Xshare/namazu/template/NMZ.foot.ja
Xshare/namazu/template/NMZ.head
Xshare/namazu/template/NMZ.head.es
Xshare/namazu/template/NMZ.head.fr
Xshare/namazu/template/NMZ.head.ja
Xshare/namazu/template/NMZ.result.normal
Xshare/namazu/template/NMZ.result.normal.es
Xshare/namazu/template/NMZ.result.normal.fr
Xshare/namazu/template/NMZ.result.normal.ja
Xshare/namazu/template/NMZ.result.short
Xshare/namazu/template/NMZ.result.short.es
Xshare/namazu/template/NMZ.result.short.fr
Xshare/namazu/template/NMZ.result.short.ja
Xshare/namazu/template/NMZ.tips
Xshare/namazu/template/NMZ.tips.es
Xshare/namazu/template/NMZ.tips.fr
Xshare/namazu/template/NMZ.tips.ja
X@dirrm share/namazu/template
X@dirrm share/namazu
END-of-pkg/PLIST
echo x - pkg/INSTALL
sed 's/^X//' >pkg/INSTALL << 'END-of-pkg/INSTALL'
X#!/bin/sh
X#
X# $NetBSD$
X
XPKGNAME=$1
XSTAGE=$2
X
Xcase ${STAGE} in
XPRE-INSTALL)
X	;;
XPOST-INSTALL)
X	cat <<EOF
X
X=============================================================
XIf you customize namazu configuration, copy
X@EXAMPLEDIR@/share/namazu/namazurc.default and
X@EXAMPLEDIR@/mknmzrc.default to @CONFDIR@,
Xand edit them.
X=============================================================
X
XEOF
X	;;
X*)
X	echo "Unexpected argument: ${STAGE}"
X	exit 1
X	;;
Xesac
Xexit 0
END-of-pkg/INSTALL
echo x - pkg/DEINSTALL
sed 's/^X//' >pkg/DEINSTALL << 'END-of-pkg/DEINSTALL'
X#!/bin/sh
X#
X# $NetBSD$
X#
X
Xcase "$2" in
X	DEINSTALL) cat <<EOF
X
X=============================================================
XNote that namazu configuration (@CONFDIR@/*), index
Xfiles (@DATADIR@/*) are not removed in the
Xdeinstallation process.  You should remove those by hand,
Xif you no longer need them.
X=============================================================
X
XEOF
X	;;
Xesac
END-of-pkg/DEINSTALL
exit