- Update HOMEPAGE.

- Add support for chasen.
- Add conflict with chasen-*.
- Install namazu.cgi, too.
- Add INSTALL and DEINSTALL script.
- Re-structuring install path.

7 files changed, 180 insertions, 67 deletions

diff --git a/japanese/namazu1/Makefile b/japanese/namazu1/Makefile
index 3ea495459fc..a69c574081c 100644
--- a/japanese/namazu1/Makefile
+++ b/japanese/namazu1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/01/27 02:01:55 taca Exp $
+# $NetBSD: Makefile,v 1.2 2001/01/27 02:21:58 taca Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1999/03/31 11:52:07 flathill Exp $
 
 DISTNAME=	namazu-1.3.0.11
@@ -6,14 +6,53 @@ CATEGORIES=	japanese textproc
 MASTER_SITES=	http://openlab.ring.gr.jp/namazu/release/
 
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
-HOMEPAGE=	http://openlab.ring.gr.jp/namazu/
+HOMEPAGE=	http://www.namazu.org/index.html.en
 
 DEPENDS=	kakasi>=2.3.1:../../japanese/kakasi
 DEPENDS+=	nkf-1.7:../../japanese/nkf
+.if !defined(WITH_CHASEN) || ${WITH_CHASEN} != NO
+DEPENDS+=	p5-Text-ChaSen>=1.0:../../japanese/p5-Text-ChaSen
+.endif
+
+CONFIGURE_ARGS+=	--with-cgi-dir=${LOCALBASE}/libexec/cgi-bin
+.if defined(WITH_CHASEN) && ${WITH_CHASEN} == NO
+CONFIGURE_ARGS+=	-without-chasen
+.else
+CONFIGURE_ARGS+=	-with-chasen
+.endif
+
+DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
+INSTALL_FILE=		${WRKDIR}/INSTALL
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 
+CONFLICTS+=	namazu-*
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
+CONTRIBDIR=	${WRKDIR}/${DISTNAME}/contrib
+
+CONFDIR=	${LOCALBASE}/etc/namazu
+DOCDIR=		${LOCALBASE}/share/namazu/doc
+INDEXDIR=	${LOCALBASE}/libdata/namazu
+
+post-build:
+	@${SED} -e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|g' \
+		< ${CONTRIBDIR}/bnamazu > ${WRKDIR}/bnamazu
+	@for FILE in \
+		${PKGDIR}/DEINSTALL	\
+		${PKGDIR}/INSTALL;	\
+	do \
+		${SED}	-e 's|@CONFDIR@|${CONFDIR}|g' \
+			-e 's|@INDEXDIR@|${INDEXDIR}|g' \
+			-e 's|@DOCDIR@|${DOCDIR}|g' \
+			< $${FILE} > ${WRKDIR}/`basename $${FILE}`; \
+	done
+
+post-install:
+	@cd ${WRKSRC}; ${MAKE} install_cgi
+	@${INSTALL_SCRIPT} ${WRKDIR}/bnamazu ${LOCALBASE}/bin
+	@${TEST} -d ${LOCALBASE}/etc/namazu || ${MKDIR} ${LOCALBASE}/etc/namazu
+	@${SH} ${WRKDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/japanese/namazu1/files/patch-sum b/japanese/namazu1/files/patch-sum
index 3f04266ea76..5990ec49216 100644
--- a/japanese/namazu1/files/patch-sum
+++ b/japanese/namazu1/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1.1.1 2001/01/27 02:01:55 taca Exp $
+$NetBSD: patch-sum,v 1.2 2001/01/27 02:21:59 taca Exp $
 
-MD5 (patch-aa) = 75d8f5a8195c1b365d17a2f379d1538a
+MD5 (patch-aa) = 574dc059b97cc7bd33e6e391e91989f2
diff --git a/japanese/namazu1/patches/patch-aa b/japanese/namazu1/patches/patch-aa
index eef39da1804..ff616061de2 100644
--- a/japanese/namazu1/patches/patch-aa
+++ b/japanese/namazu1/patches/patch-aa
@@ -1,21 +1,52 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/01/27 02:01:55 taca Exp $
+$NetBSD: patch-aa,v 1.2 2001/01/27 02:21:59 taca Exp $
 
---- Makefile.in.orig	Thu May 20 19:09:16 1999
-+++ Makefile.in	Tue Jun  8 19:22:39 1999
-@@ -21,7 +21,7 @@
+--- Makefile.in.orig	Wed Jan 26 22:38:51 2000
++++ Makefile.in
+@@ -21,18 +21,16 @@
  
  BASEDIR		= @prefix@
  CGIDIR		= @CGIDIR@
 -NAMAZUDIR	= $(BASEDIR)/namazu
-+NAMAZUDIR	= $(BASEDIR)/lib/namazu
- BINDIR_SYS	= $(BASEDIR)/bin  # install 'namazu' 'mknmz' command.
- BINDIR		= $(NAMAZUDIR)/bin
- INDEXDIR	= $(NAMAZUDIR)/index
-@@ -317,6 +317,7 @@
+-BINDIR_SYS	= $(BASEDIR)/bin  # install 'namazu' 'mknmz' command.
+-BINDIR		= $(NAMAZUDIR)/bin
+-INDEXDIR	= $(NAMAZUDIR)/index
+-DOCDIR		= $(NAMAZUDIR)/doc
+-LIBDIR		= $(NAMAZUDIR)/lib
+-CONTRIBDIR	= $(NAMAZUDIR)/contrib
++BINDIR		= $(BASEDIR)/bin
++CONFDIR		= $(BASEDIR)/etc/namazu
++INDEXDIR	= $(BASEDIR)/libdata/namazu/index
++DOCDIR		= $(BASEDIR)/share/namazu/doc
++LIBDIR		= $(BASEDIR)/share/namazu/template
+ 
+ ##################################################################
+ ## Pathname of namazu.conf
+ 
+-OPT_NAMAZU_CONF		= $(LIBDIR)/namazu.conf
++OPT_NAMAZU_CONF		= $(CONFDIR)/namazu.conf
+ 
+ ##################################################################
+ ## Programs' pathname
+@@ -307,19 +305,13 @@
+ 	if [ ! -d $(LIBDIR) ]; then \
+ 	    mkdir -p $(LIBDIR); \
+ 	fi
+-	if [ ! -d $(CONTRIBDIR) ]; then \
+-	    mkdir -p $(CONTRIBDIR); \
+-	fi
+-	if [ ! -d $(BINDIR_SYS) ]; then \
+-	    mkdir -p $(BINDIR_SYS); \
+-	fi
+ 	cp mknmz wdnmz rvnmz clnmz namazu vfnmz mailutime gcnmz gtnmz $(BINDIR)
  	cp ../COPYING ../ToDo ../ChangeLog $(DOCDIR)
  	cp ../README.ja ../doc/ja/* "$(DOCDIR)/ja"
  	cp ../README.en ../doc/en/* "$(DOCDIR)/en"
+-	cp ../lib/* $(LIBDIR)
+-	cp ../contrib/* $(CONTRIBDIR)
+-	cp namazu mknmz $(BINDIR_SYS)
 +	rm -f ../lib/*.bak
- 	cp ../lib/* $(LIBDIR)
- 	cp ../contrib/* $(CONTRIBDIR)
- 	cp namazu mknmz $(BINDIR_SYS)
++	cp ../lib/NMZ.* $(LIBDIR)
++	cp ../lib/namazu.conf-dist $(DOCDIR)
+ 
+ clean:
+ 	$(RM) $(TARGET) *.o config.cache config.log config.status
diff --git a/japanese/namazu1/pkg/DEINSTALL b/japanese/namazu1/pkg/DEINSTALL
new file mode 100644
index 00000000000..5e57c0182da
--- /dev/null
+++ b/japanese/namazu1/pkg/DEINSTALL
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2001/01/27 02:22:00 taca Exp $
+#
+
+case "$2" in
+	DEINSTALL) cat <<EOF
+
+=============================================================
+Note that namazu configuration (@CONFDIR@/*), index
+files (@INDEXDIR@/*) are not removed in the
+de-installation process.  You should remove those by hand,
+if you no longer need them.
+=============================================================
+
+EOF
+	;;
+esac
diff --git a/japanese/namazu1/pkg/DESCR b/japanese/namazu1/pkg/DESCR
index 7ebcc9266ad..a6fceb9c648 100644
--- a/japanese/namazu1/pkg/DESCR
+++ b/japanese/namazu1/pkg/DESCR
@@ -1,7 +1,9 @@
-Namazu is a search engine software intended for easy use. Not only it
-works as a CGI program for the small or medium scale WWW search
-engine, but also works as a personal use such as search system for local
-HDDs. Currently, search clients for Mule, Tcl/Tk, JAVA and Win32 are
-available.
+Namazu is a full-text search system intended for easy use. Not only it works
+as a CGI program for a small or medium scale Web search engine, but also works
+as a personal use search system for your pile of email. 
 
 (The Japanese word `Namazu' means `catfish' in English.)
+
+Note: Namazu's newer version already exists.  Since index file format has
+changed, this pacakge is provided for users who want to continute to use
+existing index files.
diff --git a/japanese/namazu1/pkg/INSTALL b/japanese/namazu1/pkg/INSTALL
new file mode 100644
index 00000000000..acc1ced4f65
--- /dev/null
+++ b/japanese/namazu1/pkg/INSTALL
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2001/01/27 02:22:00 taca Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+case ${STAGE} in
+PRE-INSTALL)
+	;;
+POST-INSTALL)
+	cat <<EOF
+
+=============================================================
+If you customize namazu configuration, copy
+@DOCDIR@/namazu.conf-dist to
+@CONFDIR@ and edit them.
+=============================================================
+
+EOF
+	;;
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/japanese/namazu1/pkg/PLIST b/japanese/namazu1/pkg/PLIST
index 76fecb356fc..de5a4842711 100644
--- a/japanese/namazu1/pkg/PLIST
+++ b/japanese/namazu1/pkg/PLIST
@@ -1,48 +1,44 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/01/27 02:01:55 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/01/27 02:22:00 taca Exp $
+bin/bnamazu
+bin/clnmz
+bin/gcnmz
+bin/gtnmz
+bin/mailutime
 bin/mknmz
 bin/namazu
-lib/namazu/bin/clnmz
-lib/namazu/bin/gcnmz
-lib/namazu/bin/gtnmz
-lib/namazu/bin/mailutime
-lib/namazu/bin/mknmz
-lib/namazu/bin/namazu
-lib/namazu/bin/rvnmz
-lib/namazu/bin/vfnmz
-lib/namazu/bin/wdnmz
-lib/namazu/contrib/MHonArc-Japanize-patch-1.6.gz
-lib/namazu/contrib/NamazuJAVA.030.tar.gz
-lib/namazu/contrib/bnamazu
-lib/namazu/contrib/namazu.el-1999.05.10.gz
-lib/namazu/contrib/pnamazu-98.12.16.tgz
-lib/namazu/contrib/tknamazu-1.11.tar.gz
-lib/namazu/doc/COPYING
-lib/namazu/doc/ChangeLog
-lib/namazu/doc/ToDo
-lib/namazu/doc/en/README.en
-lib/namazu/doc/en/intro.html
-lib/namazu/doc/en/manual.html
-lib/namazu/doc/ja/FAQ.html
-lib/namazu/doc/ja/README.ja
-lib/namazu/doc/ja/history.html
-lib/namazu/doc/ja/intro.html
-lib/namazu/doc/ja/lynxcgi.html
-lib/namazu/doc/ja/manual.html
-lib/namazu/doc/ja/nmz_files.txt
-lib/namazu/doc/ja/security.html
-lib/namazu/lib/NMZ.body.en
-lib/namazu/lib/NMZ.body.ja
-lib/namazu/lib/NMZ.foot.en
-lib/namazu/lib/NMZ.foot.ja
-lib/namazu/lib/NMZ.head.en
-lib/namazu/lib/NMZ.head.ja
-lib/namazu/lib/namazu.conf-dist
-@exec mkdir %D/lib/namazu/index
-@unexec rmdir %D/lib/namazu/index
-@dirrm lib/namazu/doc/ja
-@dirrm lib/namazu/doc/en
-@dirrm lib/namazu/doc
-@dirrm lib/namazu/lib
-@dirrm lib/namazu/contrib
-@dirrm lib/namazu/bin
-@dirrm lib/namazu
+bin/rvnmz
+bin/vfnmz
+bin/wdnmz
+@exec /bin/mkdir %D/etc/namazu 2>/dev/null || /usr/bin/true
+@dirrm etc/namazu
+@exec /bin/mkdir %D/libdata/namazu 2>/dev/null || /usr/bin/true
+@exec /bin/mkdir %D/libdata/namazu/index 2>/dev/null || /usr/bin/true
+@dirrm libdata/namazu/index
+@dirrm libdata/namazu
+libexec/cgi-bin/namazu.cgi
+share/namazu/doc/COPYING
+share/namazu/doc/ChangeLog
+share/namazu/doc/ToDo
+share/namazu/doc/en/README.en
+share/namazu/doc/en/intro.html
+share/namazu/doc/en/manual.html
+share/namazu/doc/ja/FAQ.html
+share/namazu/doc/ja/README.ja
+share/namazu/doc/ja/history.html
+share/namazu/doc/ja/intro.html
+share/namazu/doc/ja/lynxcgi.html
+share/namazu/doc/ja/manual.html
+share/namazu/doc/ja/nmz_files.txt
+share/namazu/doc/ja/security.html
+share/namazu/doc/namazu.conf-dist
+share/namazu/template/NMZ.body.en
+share/namazu/template/NMZ.body.ja
+share/namazu/template/NMZ.foot.en
+share/namazu/template/NMZ.foot.ja
+share/namazu/template/NMZ.head.en
+share/namazu/template/NMZ.head.ja
+@dirrm share/namazu/template
+@dirrm share/namazu/doc/ja
+@dirrm share/namazu/doc/en
+@dirrm share/namazu/doc
+@dirrm share/namazu