ipadic package maintenance. No functionality has changed.

o Remove USE_LIBTOOL and LTCONFIG_OVERRIDE from Makefile since ipadic
  don't use libtool at all.
o Reflect change from chasen-base/Makefile.common to chasen/Makefile.common.
o Utilize bsd.pkg.install.mk for handling configuration file and its example.

5 files changed, 41 insertions, 8 deletions

diff --git a/japanese/ipadic/Makefile b/japanese/ipadic/Makefile
index 0df8caf5f4a..67443dc54d6 100644
--- a/japanese/ipadic/Makefile
+++ b/japanese/ipadic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/04/17 13:36:46 taca Exp $
+# $NetBSD: Makefile,v 1.12 2002/02/09 07:36:58 taca Exp $
 #
 
 DISTNAME=		ipadic-2.4.4
@@ -12,12 +12,13 @@ COMMENT=		Japanese Morphological Dictionary for ChaSen
 DEPENDS=		chasen-base>=2.2.5:../../japanese/chasen-base
 
 GNU_CONFIGURE=		# defined
-USE_LIBTOOL=		# defined
-
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+CONF_FILES=		${CHASEN_DICDIR}/chasenrc.example \
+			${CHASEN_CONFDIR}/chasenrc
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/chasenrc \
 		${LOCALBASE}/share/chasen/dic/ipadic/chasenrc.example
 
+.include "../chasen/Makefile.common"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/japanese/ipadic/PLIST b/japanese/ipadic/PLIST
index f4efcd1cfe5..d4d08886b14 100644
--- a/japanese/ipadic/PLIST
+++ b/japanese/ipadic/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:12 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/09 07:36:58 taca Exp $
 @unexec install-info --delete --info-dir=%D/info %D/info/ipadic-ja.info
 info/ipadic-ja.info
 info/ipadic-ja.info-1
@@ -9,9 +9,7 @@ share/chasen/dic/ipadic/cforms.cha
 share/chasen/dic/ipadic/chadic.ary
 share/chasen/dic/ipadic/chadic.int
 share/chasen/dic/ipadic/chadic.pat
-@unexec if cmp -s %D/etc/chasenrc %D/share/chasen/dic/ipadic/chasenrc.example; then rm -f %D/etc/chasenrc; else true; fi
 share/chasen/dic/ipadic/chasenrc.example
-@exec if [ ! -f %D/etc/chasenrc ]; then cp %F %D/etc/chasenrc; fi
 share/chasen/dic/ipadic/connect.cha
 share/chasen/dic/ipadic/ctypes.cha
 share/chasen/dic/ipadic/grammar.cha
diff --git a/japanese/ipadic/distinfo b/japanese/ipadic/distinfo
index be09349aa04..d85bcdaaa8f 100644
--- a/japanese/ipadic/distinfo
+++ b/japanese/ipadic/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/04/24 00:00:28 taca Exp $
+$NetBSD: distinfo,v 1.4 2002/02/09 07:36:58 taca Exp $
 
 SHA1 (ipadic-2.4.4.tar.gz) = 056b6c9991b762b2fd4776e89728a55cf6e2e154
 Size (ipadic-2.4.4.tar.gz) = 2873402 bytes
 SHA1 (patch-aa) = 472b22da1b79d7bc3d212767277e928d786ccd56
 SHA1 (patch-ab) = ed29e17cd2bfe2f0fe3732f8ca757a798dfb5b3d
+SHA1 (patch-ad) = ebce7f05ae7711b9dbda9dbdaa8e8e5caa5e4f20
+SHA1 (patch-ae) = cccab60a47d8be8ee156b1867bd21553068b9b11
diff --git a/japanese/ipadic/patches/patch-ad b/japanese/ipadic/patches/patch-ad
new file mode 100644
index 00000000000..4ed126bdbdd
--- /dev/null
+++ b/japanese/ipadic/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2002/02/09 07:36:58 taca Exp $
+
+--- Makefile.am.orig	Thu Mar 22 05:41:31 2001
++++ Makefile.am
+@@ -28,11 +28,6 @@
+ 	$(MKDICDIR)/mkary -l -o chadic.ary chadic.int
+ 
+ install-data-local:
+-	if test -f @CHASEN_CHASENRC_PATH@  ; then \
+-		echo "Please modify @CHASEN_CHASENRC_PATH@"; \
+-	else \
+-		cp chasenrc @CHASEN_CHASENRC_PATH@ ;\
+-	fi
+ 
+ sjis-dist: distdir
+ 	cp -R ipadic-@VERSION@ ipadic-sjis-@VERSION@
diff --git a/japanese/ipadic/patches/patch-ae b/japanese/ipadic/patches/patch-ae
new file mode 100644
index 00000000000..81f23b5f979
--- /dev/null
+++ b/japanese/ipadic/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2002/02/09 07:36:59 taca Exp $
+
+--- Makefile.in.orig	Sat Feb  9 16:00:40 2002
++++ Makefile.in
+@@ -375,11 +375,6 @@
+ 	$(MKDICDIR)/mkary -l -o chadic.ary chadic.int
+ 
+ install-data-local:
+-	if test -f @CHASEN_CHASENRC_PATH@  ; then \
+-		echo "Please modify @CHASEN_CHASENRC_PATH@"; \
+-	else \
+-		cp chasenrc @CHASEN_CHASENRC_PATH@ ;\
+-	fi
+ 
+ sjis-dist: distdir
+ 	cp -R ipadic-@VERSION@ ipadic-sjis-@VERSION@