8 files changed, 79 insertions, 79 deletions

diff --git a/japanese/dbskkd-cdb/Makefile b/japanese/dbskkd-cdb/Makefile
index 2813e2ebe066..3dcd5865f14f 100644
--- a/japanese/dbskkd-cdb/Makefile
+++ b/japanese/dbskkd-cdb/Makefile
@@ -6,52 +6,39 @@
 #
 
 PORTNAME=	dbskkd-cdb
-PORTVERSION=	1.71
-PORTREVISION=	1
+PORTVERSION=	2.00
+#PORTREVISION=	0
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-DISTVERSIONSUFFIX=	dev
+#DISTVERSIONSUFFIX=
 
 MAINTAINER=	matusita@FreeBSD.org
 COMMENT=Yet another dictionary server for SKK
 
-BUILD_DEPENDS=	${NONEXISTENT}:${CDBPORTSDIR}:build
-RUN_DEPENDS=	${INSTALLEDJISYO}:${PORTSDIR}/japanese/skk-jisyo-cdb
+BUILD_DEPENDS=	${LOCALBASE}/lib/libcdb.a:${PORTSDIR}/databases/tinycdb
+RUN_DEPENDS=	${SKKJISYOCDB}:${PORTSDIR}/japanese/skk-jisyo-cdb
 
 PLIST_FILES=	libexec/dbskkd-cdb
 
 SKKDIR?=	share/skk
 SKKJISYO_TYPE?=	L
-SKKJISYOCDB?=	/SKK-JISYO.${SKKJISYO_TYPE}.cdb
-SERVER_DIR?=	${LOCALBASE}/${SKKDIR}
+SKKJISYOCDB?=	${LOCALBASE}/${SKKDIR}/SKK-JISYO.${SKKJISYO_TYPE}.cdb
 
-CDBPORTSDIR=	${PORTSDIR}/databases/cdb
-INSTALLEDJISYO=	${LOCALBASE}/${SKKDIR}/SKK-JISYO.${SKKJISYO_TYPE}.cdb
-MAKE_ENV+=	SERVER_DIR=${SERVER_DIR} SKKJISYOCDB=${SKKJISYOCDB}
+MAKE_ENV+=	LOCALBASE="${LOCALBASE}" CFLAGS="${CFLAGS}"
+MAKE_ENV+=	SKKJISYOCDB="${SKKJISYOCDB}"
 .if !defined(NOPORTDOCS)
 PORTDOCS=	${PORTDOCS_FILE} ${PORTDOCS_SH}
-PORTDOCS_FILE=	CHANGES LICENSE READMEJP run.example run.log.example
+PORTDOCS_FILE=	CHANGES LICENSE READMEJP \
+		example-daemontools.txt example-inetd.txt
 PORTDOCS_SH=	makeskkcdb.sh skktocdbm.sh
 .endif
 
 .include <bsd.port.pre.mk>
 
-CDBDIR!=	cd ${CDBPORTSDIR}; ${MAKE} -V WRKSRC
-
-pre-fetch:
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "Note:"
-	@${ECHO_CMD} "    This daemon does chroot(2) to ${SERVER_DIR}, then"
-	@${ECHO_CMD} "    use ${SKKJISYOCDB} as a dictionary file."
-	@${ECHO_CMD} "    Please set SERVER_DIR/SKKJISYOCDB variables if you don't like much."
-	@${ECHO_CMD} ""
-
 post-patch:
-.for f in READMEJP copyfromcdb.sh
-	${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}
+.for f in READMEJP makeskkcdb.sh
+	${REINPLACE_CMD} -e "s!%%PREFIX%%!${PREFIX}!g" -e "s!%%SKKDIR%%!${SKKDIR}!g" -e "s!%%JISYONAME%%!SKK-JISYO.${SKKJISYO_TYPE}!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
diff --git a/japanese/dbskkd-cdb/distinfo b/japanese/dbskkd-cdb/distinfo
index 1d5724e14dc9..8c42fadbbf70 100644
--- a/japanese/dbskkd-cdb/distinfo
+++ b/japanese/dbskkd-cdb/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbskkd-cdb-1.71dev.tar.gz) = 16e8dcc259d8468ea6a5e5b84014d8f9
-SHA256 (dbskkd-cdb-1.71dev.tar.gz) = 88cee276621b1cc082186cf7109fddd315c7c3211302de1c09beccc69728c59c
-SIZE (dbskkd-cdb-1.71dev.tar.gz) = 7350
+MD5 (dbskkd-cdb-2.00.tar.gz) = ea6536e7f52b0ed315ff0ecb966f5f94
+SHA256 (dbskkd-cdb-2.00.tar.gz) = 0e434e72153dde3131aeeeafbb40eba0054d0d37cab47b1561e4cf6dda6da8bb
+SIZE (dbskkd-cdb-2.00.tar.gz) = 9296
diff --git a/japanese/dbskkd-cdb/files/patch-Makefile b/japanese/dbskkd-cdb/files/patch-Makefile
new file mode 100644
index 000000000000..4b7aa71353fc
--- /dev/null
+++ b/japanese/dbskkd-cdb/files/patch-Makefile
@@ -0,0 +1,26 @@
+--- Makefile.dist	2009-02-06 11:56:47.000000000 +0900
++++ Makefile	2009-02-11 01:31:03.000000000 +0900
+@@ -1,9 +1,11 @@
+ # dbskkd-cdb Makefile
+ 
+-CC = cc -Wall -O2 -g -I/usr/local/include
++PREFIX = ${LOCALBASE}
++CC = cc ${CFLAGS} -I${PREFIX}/include
+ COMPAT =
+-CDBLIB = /usr/local/lib/libcdb.a
+-INSTALLDIR = /usr/local/libexec
++CDBLIB = ${PREFIX}/lib/libcdb.a
++INSTALLDIR = ${PREFIX}/libexec
++JISYOFILE = ${SKKJISYOCDB}
+ 
+ .c.o:
+ 	$(CC) $(COMPAT) $(PRIVATE) -c $*.c
+@@ -18,7 +20,7 @@
+ 		dbskkd-cdb.o ${CDBLIB}
+ 
+ dbskkd-cdb.o: dbskkd-cdb.c 
+-	$(CC) $(COMPAT) $(PRIVATE) -c dbskkd-cdb.c
++	$(CC) $(COMPAT) $(PRIVATE) -DJISYO_FILE=\"$(JISYOFILE)\" -c dbskkd-cdb.c
+ 
+ error.o: error.c error.h
+ 
diff --git a/japanese/dbskkd-cdb/files/patch-READMEJP b/japanese/dbskkd-cdb/files/patch-READMEJP
index 593e5bc2b55e..0558b82d0042 100644
--- a/japanese/dbskkd-cdb/files/patch-READMEJP
+++ b/japanese/dbskkd-cdb/files/patch-READMEJP
@@ -1,13 +1,26 @@
---- READMEJP.dist	Fri Apr 28 22:06:12 2000
-+++ READMEJP	Fri Oct 29 16:13:21 2004
-@@ -49,8 +49,8 @@
- 
- 4. $BE:IU$N(Bmakeskkcdb.sh$B$r<B9T$9$k!#$3$N%9%/%j%W%H$G$O(B
-    $B<-=q%U%!%$%k$O(Bskktocdbm.sh$B$NI8=`F~NO$KM?$($k$h$&$K$J$C$F$$$k!#(B
--   $B%G%U%)%k%H$O(B /usr/local/share/skk/SKK-JISYO.L$B$r;XDj$7$F$$$k!#(B
--   $B$^$?!"%G%U%)%k%H$G$O%+%l%s%H%G%#%l%/%H%j$K(BSKK-JISYO.L.cdb$B$,:n$i$l$k!#(B
-+   $B%G%U%)%k%H$O(B %%PREFIX%%/%%SKKDIR%%/%%JISYONAME%%$B$r;XDj$7$F$$$k!#(B
-+   $B$^$?!"%G%U%)%k%H$G$O%+%l%s%H%G%#%l%/%H%j$K(B%%JISYONAME%%.cdb$B$,:n$i$l$k!#(B
-    $B$3$N<-=q%U%!%$%k$O%$%s%9%H!<%k$N:](B dbskkd-cdb $B$,(B chroot $B$9$k(B
-    $B%G%#%l%/%H%j$KCV$/!#(B
+--- READMEJP.dist	2009-02-06 11:56:47.000000000 +0900
++++ READMEJP	2009-02-11 01:30:09.000000000 +0900
+@@ -40,11 +40,11 @@
+ 
+ 1. 添付の makeskkcdb.sh を実行する．このスクリプトでは
+    辞書ファイルは skktocdbm.sh の標準入力に与える．
+-   ファイル名の既定値は /usr/local/share/skk/SKK-JISYO.L である．
+-   実行するとカレントディレクトリに SKK-JISYO.L.cdb が作られる．
++   ファイル名の既定値は %%PREFIX%%/%%SKKDIR%%/%%JISYONAME%% である．
++   実行するとカレントディレクトリに %%JISYONAME%%.cdb が作られる．
+    この辞書ファイルはインストールの際 dbskkd-cdb.c 中の
+    JISYO_FILE で指定するディレクトリに置く．
+-   JISYO_FILE の規定値は /usr/local/share/skk/SKK-JISYO.L.cdb である．
++   JISYO_FILE の規定値は %%PREFIX%%/%%SKKDIR%%/%%JISYONAME%%.cdb である．
+    注意: 1.x ではこのマクロは "JISHO_FILE" と定義していたが，
+    辞書ファイルとの名前の整合性を取るためにこのようにした．
+ 
+@@ -53,7 +53,7 @@
+    また TinyCDB 中の libcdb.a をリンクする．
+ 
+ 3. make install で dbskkd-cdb を実行ディレクトリにコピーする．
+-   既定値では /usr/local/libexec へコピーする．
++   既定値では %%PREFIX%%/libexec へコピーする．
+ 
+ ●インストールの際の注意
  
diff --git a/japanese/dbskkd-cdb/files/patch-aa b/japanese/dbskkd-cdb/files/patch-aa
deleted file mode 100644
index 9b1808a294f8..000000000000
--- a/japanese/dbskkd-cdb/files/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.dist	Sat Mar 25 23:31:29 2000
-+++ Makefile	Sat Oct 30 01:54:16 2004
-@@ -2,7 +2,8 @@
- # $Id: Makefile,v 3.2 2000/03/25 14:30:58 kenji Exp $
- 
- # please define SERVERDIR
--SERVERDIR = /service/dbskkd-cdb/root
-+SERVERDIR = ${SERVER_DIR}
-+JISHOFILE = ${SKKJISYOCDB}
- #
- CC = gcc -Wall -O2 -g
- COMPAT =
-@@ -30,7 +31,7 @@
- 	$(CC) $(COMPAT) $(PRIVATE) -o dbskkd-cdb $>
- 
- dbskkd-cdb.o: dbskkd-cdb.c cdb.h uint32.h
--	$(CC) $(COMPAT) $(PRIVATE) -DSERVER_DIR=\"$(SERVERDIR)\" -c dbskkd-cdb.c
-+	$(CC) $(COMPAT) $(PRIVATE) -DJISHO_FILE=\"$(JISHOFILE)\" -DSERVER_DIR=\"$(SERVERDIR)\" -c dbskkd-cdb.c
- 
- error.o: error.c error.h
- 
diff --git a/japanese/dbskkd-cdb/files/patch-copyfromcdb.sh b/japanese/dbskkd-cdb/files/patch-copyfromcdb.sh
deleted file mode 100644
index 92384069ab80..000000000000
--- a/japanese/dbskkd-cdb/files/patch-copyfromcdb.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- copyfromcdb.sh.dist	Sat Mar 25 23:26:43 2000
-+++ copyfromcdb.sh	Sat Oct 30 00:51:56 2004
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # $Id: copyfromcdb.sh,v 1.1 2000/03/25 14:26:10 kenji Exp $
- 
--CDBDIR=~/src/cdb-0.75
-+CDBDIR=%%CDBDIR%%
- CP=/bin/cp
- 
- ${CP} ${CDBDIR}/byte.h .
diff --git a/japanese/dbskkd-cdb/files/patch-makeskkcdb.sh b/japanese/dbskkd-cdb/files/patch-makeskkcdb.sh
new file mode 100644
index 000000000000..a41ab2667530
--- /dev/null
+++ b/japanese/dbskkd-cdb/files/patch-makeskkcdb.sh
@@ -0,0 +1,8 @@
+--- makeskkcdb.sh.dist	2009-02-06 11:56:47.000000000 +0900
++++ makeskkcdb.sh	2009-02-11 01:34:16.000000000 +0900
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+-./skktocdbm.sh < /usr/local/share/skk/SKK-JISYO.L | \
+-	cdb -c -t - SKK-JISYO.L.cdb
++./skktocdbm.sh < %%PREFIX%%/%%SKKDIR%%/%%JISYONAME%% | \
++	cdb -c -t - %%JISYONAME%%.cdb
diff --git a/japanese/dbskkd-cdb/pkg-message b/japanese/dbskkd-cdb/pkg-message
index c99cfeaec555..428fa706921b 100644
--- a/japanese/dbskkd-cdb/pkg-message
+++ b/japanese/dbskkd-cdb/pkg-message
@@ -1,10 +1,8 @@
-Note for inetd users:
 
-Add following line to /etc/inetd.conf
-   skkserv stream tcp nowait root /usr/local/libexec/dbskkd-cdb dbskkd-cdb
+Note:
+Dbskkd-cdb is designed to run with inetd or daemontools.  Example config
+for both superdaemons are available at /usr/local/share/doc/dbskkd-cdb.
 
-If dbskkd-cdb 1.01 was running, please update your /etc/inetd.conf line.
-
-Also note that dbskkd-cdb should run as root (not 'nobody' as of 1.01),
-since it chroot(8)s to the default dictionary directory, ${PREFIX}/share/skk.
+Also note that dbskkd-cdb no longer required to run 'root' (1.71dev does),
+nor chroot(8) to the dictionary directory.