From 64723c13acc23913ec23b03542699920acde27b4 Mon Sep 17 00:00:00 2001
From: Makoto Matsushita <matusita@FreeBSD.org>
Date: Fri, 17 Dec 2004 15:53:22 +0000
Subject: [PATCH] Update for the better package, including: 	- info
 messages moved to ${PKGMESSAGE} for pkg_add(1). 	- remove old messages.
 	- employ PLIST_FILES. 	- respect CFLAGS if user wants. 	- add
 WWW: line. 	- add messages for old users that why this daemon runs as
 root.

Submitted by:	sf (except WWW: line)
---
 japanese/dbskkd-cdb/Makefile  | 17 +++++++----------
 japanese/dbskkd-cdb/pkg-descr |  7 +------
 japanese/dbskkd-cdb/pkg-plist |  1 -
 3 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 japanese/dbskkd-cdb/pkg-plist

diff --git a/japanese/dbskkd-cdb/Makefile b/japanese/dbskkd-cdb/Makefile
index e6a7d3f5f4a1..ac779f037d6f 100644
--- a/japanese/dbskkd-cdb/Makefile
+++ b/japanese/dbskkd-cdb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dbskkd-cdb
 PORTVERSION=	1.71
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.ne.jp/asahi/bdx/info/software/
 DISTNAME=	${PORTNAME}-${PORTVERSION}dev
@@ -17,6 +18,9 @@ COMMENT=Yet another dictionary server for SKK
 BUILD_DEPENDS=	${NONEXISTENT}:${CDBPORTSDIR}:build
 RUN_DEPENDS=	${INSTALLEDJISYO}:${PORTSDIR}/japanese/skk-jisyo-cdb
 
+USE_REINPLACE=	yes
+PLIST_FILES=	libexec/dbskkd-cdb
+
 SKKDIR?=	share/skk
 SKKJISYO_TYPE?=	L
 SKKJISYOCDB?=	/SKK-JISYO.${SKKJISYO_TYPE}.cdb
@@ -45,10 +49,10 @@ pre-fetch:
 
 post-patch:
 .for f in READMEJP copyfromcdb.sh
-	${SED} -e "s!%%PREFIX%%!${PREFIX}!g" -e "s!%%SKKDIR%%!${SKKDIR}!g" -e "s!%%JISYONAME%%!SKK-JISYO.${SKKJISYO_TYPE}!g" -e "s!%%CDBDIR%%!${CDBDIR}!g" < ${WRKSRC}/${f} > ${WRKSRC}/.tmp
-	${MV} -f ${WRKSRC}/.tmp ${WRKSRC}/${f}
+	${REINPLACE_CMD} -e "s!%%PREFIX%%!${PREFIX}!g" -e "s!%%SKKDIR%%!${SKKDIR}!g" -e "s!%%JISYONAME%%!SKK-JISYO.${SKKJISYO_TYPE}!g" -e "s!%%CDBDIR%%!${CDBDIR}!g" ${WRKSRC}/${f}
 .endfor
 	${CHMOD} +x ${WRKSRC}/copyfromcdb.sh
+	${REINPLACE_CMD} -e 's|-O2|${CFLAGS}|' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dbskkd-cdb ${PREFIX}/libexec
@@ -61,13 +65,6 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${docs} ${DOCSDIR}
 .endfor
 .endif
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "Note for inetd users:"
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "Add following line to /etc/inetd.conf"
-	@${ECHO_CMD} "   skkserv stream tcp nowait root ${PREFIX}/libexec/dbskkd-cdb dbskkd-cdb"
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "If dbskkd-cdb 1.01 was running, please update your /etc/inetd.conf line."
-	@${ECHO_CMD} ""
+	@${SED} 's|/usr/local|${PREFIX}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/japanese/dbskkd-cdb/pkg-descr b/japanese/dbskkd-cdb/pkg-descr
index e149ffb11c63..42eeaa4a20d5 100644
--- a/japanese/dbskkd-cdb/pkg-descr
+++ b/japanese/dbskkd-cdb/pkg-descr
@@ -8,9 +8,4 @@ called from "super-server" programs such as inetd or tcpserver, and the
 I/O operation is solely with the stdio interface, so the code is compact
 and the access to the server can be easily restricted.
 
-You should invoke dbskkd-cdb via inetd. Add
-
-skkserv stream tcp nowait nobody ${PREFIX}/libexec/dbskkd-cdb dbskkd-cdb
-
-to your /etc/inetd.conf (usually, ${PREFIX} will be replaced to `/usr/local'),
-and send SIGHUP to your inetd.
+WWW: http://www.ne.jp/asahi/bdx/info/software/jp-dbskkd.html
diff --git a/japanese/dbskkd-cdb/pkg-plist b/japanese/dbskkd-cdb/pkg-plist
deleted file mode 100644
index a7e933c3e5c0..000000000000
--- a/japanese/dbskkd-cdb/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-libexec/dbskkd-cdb