Convert to pkginstall framework. Bump PKGREVISION.

7 files changed, 37 insertions, 59 deletions

diff --git a/inputmethod/skkfep/INSTALL b/inputmethod/skkfep/INSTALL
deleted file mode 100644
index 341c360eaf9..00000000000
--- a/inputmethod/skkfep/INSTALL
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-#	$NetBSD: INSTALL,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
-
-conf=@PKGBASE@/etc/skk.conf
-
-case "$2" in
-POST-INSTALL)
-	# install skkserv port number
-	if grep '^skkserv[ 	]' /etc/services >/dev/null; then
-		:
-	else
-		echo '
-skkserv		1178/tcp		# SKK server' >>/etc/services
-	fi
-
-	# install skk.conf
-	if [ -f $conf ] && grep -v -e '^#' -e '^$' $conf >/dev/null; then
-		: file exists and it seems to have some configurations
-	else
-		cat <<'END' >$conf
-# skk.conf - configuration file for SKK client programs
-
-# Syntax
-# Lines start with '#' are comments.
-#
-# skkserv_host:	<hostnme>	# Host which skkserv is running on.
-#				# default: localhost
-#
-# skkserv_port:	<port>		# TCP service name or port number of skkserv.
-#				# default: skkserv
-#
-
-# skkserv_host:	localhost
-# skkserv_port:	skkserv
-# skkserv_port:	1178
-END
-	fi
-	;;
-esac
diff --git a/inputmethod/skkfep/MESSAGE b/inputmethod/skkfep/MESSAGE
index 848cc199022..89366d0bc93 100644
--- a/inputmethod/skkfep/MESSAGE
+++ b/inputmethod/skkfep/MESSAGE
@@ -1,9 +1,13 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:20 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2006/02/18 22:08:50 wiz Exp $
 
-    To use skkfep, the dictionary server (skkserv) is almost
-required.  Use "skkserv" pkg, or, if you have another machine
-running skkserv, put the hostname in ${LOCALBASE}/etc/skk.conf
+    To use skkfep, a dictionary server (skkserv) is almost
+required.  Use the "skkserv" pkg, or, if you have another machine
+running skkserv, put the hostname in ${PREFIX}/etc/skk.conf
 file, and skkfep will connect to the host.
 
+Please also add
+	skkserv         1178/tcp                # SKK server
+to /etc/services, if it's not already there.
+
 ===========================================================================
diff --git a/inputmethod/skkfep/Makefile b/inputmethod/skkfep/Makefile
index ececb3c2bea..1772442ef94 100644
--- a/inputmethod/skkfep/Makefile
+++ b/inputmethod/skkfep/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:24 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/18 22:08:50 wiz Exp $
 
 DISTNAME=	skkfep0.86c
 PKGNAME=	skkfep-0.86c
+PKGREVISION=	1
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/skkfep/
 
@@ -15,18 +16,14 @@ WRKSRC=		${WRKDIR}/skkfep
 NO_CONFIGURE=	yes
 MAKE_ENV+=	MAKE_FLAGS=EXECBASE=${LOCALBASE:Q}\ CC=${CC:Q}
 
-DESCR_SRC=	${WRKDIR}/DESCR
-INSTALL_FILE=	${WRKDIR}/INSTALL
-
 INSTALLATION_DIRS=	bin man/man1
 
-post-build:
-	${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/DESCR	>${DESCR_SRC}
-	${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/INSTALL	>${INSTALL_FILE}
+CONF_FILES+=	${PREFIX}/share/examples/skk/skk.conf ${PKG_SYSCONFDIR}/skk.conf
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/skkfep ${PREFIX}/bin/skkfep
 	${INSTALL_MAN} ${WRKSRC}/skkfep.1 ${PREFIX}/man/man1/skkfep.1
-	${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/skk
+	${INSTALL_DATA} ${FILESDIR}/skk.conf ${PREFIX}/share/examples/skk/skk.conf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/skkfep/PLIST b/inputmethod/skkfep/PLIST
index 97d35eb8cb8..a686b5bfaa6 100644
--- a/inputmethod/skkfep/PLIST
+++ b/inputmethod/skkfep/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/18 22:08:50 wiz Exp $
 bin/skkfep
 man/man1/skkfep.1
-@unexec if [ -f %D/etc/skk.conf ]; then echo 'Remove "%D/etc/skk.conf" if you will not use SKK programs any longer.'; fi
+share/examples/skk/skk.conf
+@dirrm share/examples/skk
diff --git a/inputmethod/skkfep/distinfo b/inputmethod/skkfep/distinfo
index df737b3654e..952394d007d 100644
--- a/inputmethod/skkfep/distinfo
+++ b/inputmethod/skkfep/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/12/30 16:05:55 joerg Exp $
+$NetBSD: distinfo,v 1.5 2006/02/18 22:08:50 wiz Exp $
 
 SHA1 (skkfep0.86c.tar.gz) = fe1473c2a9d28901a96fdc5cf51079de47c86c32
 RMD160 (skkfep0.86c.tar.gz) = 11bfc483ee31b74070d288ecb3e269cb66347760
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = b294b095581e2438596b869052e772a1fc2824d9
 SHA1 (patch-ab) = f913b929b6857bf29b2936edde6c87d9d17c4309
 SHA1 (patch-ac) = a55de012abb00d22a9a209c265b72a508c333d47
 SHA1 (patch-ad) = 2756635d4c92bdeb42bcd537b67cacfe8de9d053
-SHA1 (patch-ba) = 4c3d43e8424a1218e4b638dde49e16023ee2d96a
+SHA1 (patch-ba) = c814f8315aa904bc1e395544060378df6608d8c3
 SHA1 (patch-bb) = 9eb7fb317c661ebc293fdf02d2128b31a465c4ab
 SHA1 (patch-bc) = d5f63071cfd9f5cc73abb683c610b04df419c932
 SHA1 (patch-bd) = 8e3321de9841382f932bb9edf1470d1cbe455bce
diff --git a/inputmethod/skkfep/files/skk.conf b/inputmethod/skkfep/files/skk.conf
new file mode 100644
index 00000000000..755956b98c4
--- /dev/null
+++ b/inputmethod/skkfep/files/skk.conf
@@ -0,0 +1,15 @@
+# skk.conf - configuration file for SKK client programs
+
+# Syntax
+# Lines start with '#' are comments.
+#
+# skkserv_host: <hostnme>       # Host which skkserv is running on.
+#                               # default: localhost
+#
+# skkserv_port: <port>          # TCP service name or port number of skkserv.
+#                               # default: skkserv
+#
+
+# skkserv_host: localhost
+# skkserv_port: skkserv
+# skkserv_port: 1178
diff --git a/inputmethod/skkfep/patches/patch-ba b/inputmethod/skkfep/patches/patch-ba
index b859d0e1738..d9d966fc916 100644
--- a/inputmethod/skkfep/patches/patch-ba
+++ b/inputmethod/skkfep/patches/patch-ba
@@ -1,11 +1,11 @@
-$NetBSD: patch-ba,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
+$NetBSD: patch-ba,v 1.2 2006/02/18 22:08:50 wiz Exp $
 
---- protoMakefile.orig	Tue Jul  7 00:31:15 1998
-+++ protoMakefile	Mon Dec 20 23:49:42 1999
+--- protoMakefile.orig	1998-07-06 15:31:15.000000000 +0000
++++ protoMakefile
 @@ -1,4 +1,5 @@
 -CFLAGS=$(SYSINCLUDE) $(SYSDEFINE) $(DEFINE) $(OPTIMIZE)
 +CFLAGS=$(SYSINCLUDE) $(SYSDEFINE) $(DEFINE) $(OPTIMIZE) \
-+	-DSKK_CONF=\"$(EXECBASE)/etc/skk.conf\"
++	-DSKK_CONF=\"$(PKG_SYSCONFDIR)/skk.conf\"
  LIBS  =$(SYSLIBS) $(EXTRALIBS) -ltermcap
  
  OBJS=fep.o connsh.o readwrite.o terms.o stty.o keybind.o romkan.o etc.o\