Update to 1.71.

As you know, version 1.71 (actually 1.71dev) is "development version."
However, this version was already available in 20th century, and there
are no "doesn't work" information.  The author of dbskkd-cdb says it's
ok to update this port to version 1.71dev, so here it is.

With a help of ports/databases/cdb, the Makefile is simpler than previous.

No features are changed, except dbskkd-cdb does chroot(2) in this version.
Since chroot(2) requires superuser privilege, dbskkd-cdb should be started
by root.  For inetd user, please double-check your inetd.conf line from

  skkserv stream tcp nowait nobody ${PREFIX}/libexec/dbskkd-cdb dbskkd-cdb

to

  skkserv stream tcp nowait root ${PREFIX}/libexec/dbskkd-cdb dbskkd-cdb"

to kick by root.  Daemontools users please consult the document.

Thanks to: Kenji Rikitake (the dbskkd-cdb author)

8 files changed, 88 insertions, 125 deletions

diff --git a/japanese/dbskkd-cdb/Makefile b/japanese/dbskkd-cdb/Makefile
index 10d452c9a370..e6a7d3f5f4a1 100644
--- a/japanese/dbskkd-cdb/Makefile
+++ b/japanese/dbskkd-cdb/Makefile
@@ -6,41 +6,68 @@
 #
 
 PORTNAME=	dbskkd-cdb
-PORTVERSION=	1.01
-PORTREVISION=	1
+PORTVERSION=	1.71
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.ne.jp/asahi/bdx/info/software/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${CDB_DISTNAME}${EXTRACT_SUFX}
+DISTNAME=	${PORTNAME}-${PORTVERSION}dev
 
 MAINTAINER=	matusita@FreeBSD.org
 COMMENT=Yet another dictionary server for SKK
 
-RUN_DEPENDS=	${LOCALBASE}/${SKKDIR}/SKK-JISYO.${SKKJISYO_TYPE}.cdb:${PORTSDIR}/japanese/skk-jisyo-cdb
-
-CDB_DISTNAME=	cdb-0.55
+BUILD_DEPENDS=	${NONEXISTENT}:${CDBPORTSDIR}:build
+RUN_DEPENDS=	${INSTALLEDJISYO}:${PORTSDIR}/japanese/skk-jisyo-cdb
 
 SKKDIR?=	share/skk
 SKKJISYO_TYPE?=	L
-DOCS=		Release-Notes.English Release-Notes.Japanese LICENSE
+SKKJISYOCDB?=	/SKK-JISYO.${SKKJISYO_TYPE}.cdb
+SERVER_DIR?=	${LOCALBASE}/${SKKDIR}
+
+CDBPORTSDIR=	${PORTSDIR}/databases/cdb
+INSTALLEDJISYO=	${LOCALBASE}/${SKKDIR}/SKK-JISYO.${SKKJISYO_TYPE}.cdb
+MAKE_ENV+=	SERVER_DIR=${SERVER_DIR} SKKJISYOCDB=${SKKJISYOCDB}
+.if !defined(NOPORTDOCS)
+PORTDOCS=	${PORTDOCS_FILE} ${PORTDOCS_SH}
+PORTDOCS_FILE=	CHANGES LICENSE READMEJP run.example run.log.example
+PORTDOCS_SH=	makeskkcdb.sh skktocdbm.sh
+.endif
+
+.include <bsd.port.pre.mk>
 
-MAKE_ENV+=	SKKDIR=${SKKDIR} SKKJISYO=SKK-JISYO.${SKKJISYO_TYPE}
+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 docs in ${DOCS}
-	${SED} -e "s!%%PREFIX%%!${PREFIX}!g" -e "s!%%SKKDIR%%!${SKKDIR}!g" -e "s!%%JISYONAME%%!SKK-JISYO.${SKKJISYO_TYPE}!g" < ${WRKSRC}/${docs} > ${WRKSRC}/.tmp
-	${MV} -f ${WRKSRC}/.tmp ${WRKSRC}/${docs}
+.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}
 .endfor
+	${CHMOD} +x ${WRKSRC}/copyfromcdb.sh
 
-post-install:
-	${MKDIR} ${PREFIX}/share/doc/dbskkd-cdb
-.for docs in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${docs} ${PREFIX}/share/doc/dbskkd-cdb
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/dbskkd-cdb ${PREFIX}/libexec
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for docs in ${PORTDOCS_FILE}
+	${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
 .endfor
+.for docs in ${PORTDOCS_SH}
+	${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} ""
 
-pre-build::
-	(cd ${WRKDIR}/${CDB_DISTNAME}; make it)
-	${CP} ${WRKDIR}/${CDB_DISTNAME}/libcdb.a ${WRKSRC}
-	${CP} ${WRKDIR}/${CDB_DISTNAME}/cdbmake ${WRKSRC}
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/dbskkd-cdb/distinfo b/japanese/dbskkd-cdb/distinfo
index 0f04faf2043a..e7cd140ab744 100644
--- a/japanese/dbskkd-cdb/distinfo
+++ b/japanese/dbskkd-cdb/distinfo
@@ -1,4 +1,2 @@
-MD5 (dbskkd-cdb-1.01.tar.gz) = 866bbf49a4c264c0efd6e5e53934bd55
-SIZE (dbskkd-cdb-1.01.tar.gz) = 11089
-MD5 (cdb-0.55.tar.gz) = bc6f32de8df81c699d5d76431ce76e79
-SIZE (cdb-0.55.tar.gz) = 11397
+MD5 (dbskkd-cdb-1.71dev.tar.gz) = 16e8dcc259d8468ea6a5e5b84014d8f9
+SIZE (dbskkd-cdb-1.71dev.tar.gz) = 7350
diff --git a/japanese/dbskkd-cdb/files/patch-READMEJP b/japanese/dbskkd-cdb/files/patch-READMEJP
new file mode 100644
index 000000000000..593e5bc2b55e
--- /dev/null
+++ b/japanese/dbskkd-cdb/files/patch-READMEJP
@@ -0,0 +1,13 @@
+--- 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
+ 
diff --git a/japanese/dbskkd-cdb/files/patch-aa b/japanese/dbskkd-cdb/files/patch-aa
index 83c46120e1cf..9b1808a294f8 100644
--- a/japanese/dbskkd-cdb/files/patch-aa
+++ b/japanese/dbskkd-cdb/files/patch-aa
@@ -1,21 +1,21 @@
---- Makefile.dist	Wed Jun 16 15:26:04 1999
-+++ Makefile	Fri Jun 18 14:17:15 1999
+--- Makefile.dist	Sat Mar 25 23:31:29 2000
++++ Makefile	Sat Oct 30 01:54:16 2004
 @@ -2,7 +2,8 @@
- # $Id: Makefile,v 1.6 1998/12/12 11:24:36 kenji Exp $
+ # $Id: Makefile,v 3.2 2000/03/25 14:30:58 kenji Exp $
  
  # please define SERVERDIR
--SERVERDIR = /usr/local/libexec
-+SERVERDIR = ${PREFIX}/libexec
-+JISHOFILE = ${PREFIX}/${SKKDIR}/${SKKJISYO}.cdb
- # for FreeBSD-2.x and BSD/OS (without shlib)
- CC = gcc -O -g
+-SERVERDIR = /service/dbskkd-cdb/root
++SERVERDIR = ${SERVER_DIR}
++JISHOFILE = ${SKKJISYOCDB}
+ #
+ CC = gcc -Wall -O2 -g
  COMPAT =
-@@ -17,7 +18,7 @@
- 	$(CC) $(LDFLAGS) -o dbskkd-cdb dbskkd-cdb.o $(LDFLAGS)
+@@ -30,7 +31,7 @@
+ 	$(CC) $(COMPAT) $(PRIVATE) -o dbskkd-cdb $>
  
- dbskkd-cdb.o: dbskkd-cdb.c
+ 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
  
- install: dbskkd-cdb 
- 	cp dbskkd-cdb $(SERVERDIR); chmod 755 $(SERVERDIR)/dbskkd-cdb
+ error.o: error.c error.h
+ 
diff --git a/japanese/dbskkd-cdb/files/patch-ac b/japanese/dbskkd-cdb/files/patch-ac
deleted file mode 100644
index 31f5d6373bb2..000000000000
--- a/japanese/dbskkd-cdb/files/patch-ac
+++ /dev/null
@@ -1,43 +0,0 @@
---- Release-Notes.English.dist	Wed Jun 16 15:20:45 1999
-+++ Release-Notes.English	Thu Jun 17 14:08:39 1999
-@@ -91,13 +91,13 @@
-    Make a copy of libcdb.a to the current directory, because you need this
-    to compile dbskkd-cdb.
- 
--3. Run makeskkcdb.sh and make SKK-JISYO.L.cdb.
-+3. Run makeskkcdb.sh and make %%JISYONAME%%.cdb.
-    This script invokes skktocdbm.sh and
--   redirect /usr/local/share/skk/SKK-JISYO.L as the stdin of skktocdbm.sh.
--   The SKK-JISYO.L.cdb is created under the current directory as default.
-+   redirect %%PREFIX%%/%%SKKDIR%%/%%JISYONAME%% as the stdin of skktocdbm.sh.
-+   The %%JISYONAME%%.cdb is created under the current directory as default.
-    Change the default pathnames if you need to do so.
- 
--4. Install the SKK-JISYO.L.cdb.  The author recommend installing it to
-+4. Install the %%JISYONAME%%.cdb.  The author recommend installing it to
-    the same directory where the SKK directory resides.  The consistency
-    of this cdb-style directory can be verified by cdbtest or cdbstats
-    utilities of the cdb package.
-@@ -108,11 +108,11 @@
- ---------------------------------------
- 
- 1. Set the pathname of SERVER_DIR in dbskkd-cdb.c to the directory
--   where the server resides.  The default value is /usr/local/etc/dbskkd.
-+   where the server resides.  The default value is %%PREFIX%%/libexec.
- 
- 2. Set the pathname of JISHO_FILE in dbskkd-cdb.c to the directory
-    where the cdb-style dictionary resides.
--   The defaule value is /usr/local/share/skk/SKK-JISYO.L.cdb.
-+   The defaule value is %%PREFIX%%/%%SKKDIR%%/%%JISYONAME%%.cdb.
- 
- 3. Setting the compile-time flag LOG_PEERINFO lets the dbskkd-cdb log the
-    source address of the client connected to the server.  This flag is
-@@ -135,7 +135,7 @@
- 2. Add the following line (or something similar) to /etc/inetd.conf:
-    (This example is for a FreeBSD 2.2.8-RELEASE system using tcp_wrapper)
- 
--skkserv stream  tcp     nowait  nobody  /usr/local/libexec/tcpd       /usr/local/etc/dbskkd/dbskkd
-+skkserv stream  tcp     nowait  nobody  %%PREFIX%%/libexec/tcpd       %%PREFIX%%/libexec/dbskkd-cdb
- 
-    *NEVER* run dbskkd-cdb with the root privilege.  Use nobody or
-    a dedicated uid for running dbskkd-cdb.
diff --git a/japanese/dbskkd-cdb/files/patch-ad b/japanese/dbskkd-cdb/files/patch-ad
deleted file mode 100644
index 51974470dafc..000000000000
--- a/japanese/dbskkd-cdb/files/patch-ad
+++ /dev/null
@@ -1,39 +0,0 @@
---- Release-Notes.Japanese.dist	Wed Jun 16 15:22:29 1999
-+++ Release-Notes.Japanese	Thu Jun 17 14:07:08 1999
-@@ -75,11 +75,11 @@
- 
- 3. $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
-    $BI,MW$K1~$8$F%G%U%)%k%HCM$OJQ99$9$k$3$H!#(B
- 
--4. $B:n$i$l$?(BSKK-JISYO.L.cdb$B$rE,@Z$J%G%#%l%/%H%j$K%$%s%9%H!<%k$9$k!#(B
-+4. $B:n$i$l$?(B%%JISYONAME%%.cdb$B$rE,@Z$J%G%#%l%/%H%j$K%$%s%9%H!<%k$9$k!#(B
-    $BDL>o$O(BSKK$B<-=q$N%G%#%l%/%H%j$HF1$8$K$7$F$*$/$H$h$$$@$m$&!#(B
-    $B$3$N<-=q$N@09g@-$O(Bcdb$B%Q%C%1!<%8Cf$N(Bcdbtest$B$d(Bcdbstats$B$G%A%'%C%/$G$-$k!#(B
- 
-@@ -88,10 +88,10 @@
- $B!|%$%s%9%H!<%k$N:]$NCm0U(B
- 
- 1. dbskkd-cdb.c$B$N(BSERVER_DIR$B$r<B:]$K%5!<%P$rCV$/%G%#%l%/%H%j$K@_Dj$9$k!#(B
--   $B%G%U%)%k%H$O(B /usr/local/etc/dbskkd $B!#(B
-+   $B%G%U%)%k%H$O(B %%PREFIX%%/libexec $B!#(B
- 
- 2. dbskkd-cdb.c$B$N(BJISHO_FILE$B$r<B:]$K(Bcdb$B7A<0$K$7$?<-=q%U%!%$%k$N%Q%9L>$H$9$k!#(B
--   $B%G%U%)%k%H$O(B /usr/local/share/skk/SKK-JISYO.L.cdb $B!#(B
-+   $B%G%U%)%k%H$O(B %%PREFIX%%/%%SKKDIR%%/%%JISYONAME%%.cdb $B!#(B
- 
- 3. $B%3%s%Q%$%k%U%i%0$N(BLOG_PEERINFO$B$O(Btcp_wrapper$B$J$I$r;H$o$J$$:]$K(B
-    $B$I$N%[%9%H$+$i@\B3$7$F$-$?$+$r5-O?$9$k$?$a$N$b$N$G$"$k!#(B
-@@ -111,7 +111,7 @@
- 
- 2. /etc/inetd.conf$B$K(B
- 
--skkserv stream  tcp     nowait  nobody  /usr/local/libexec/tcpd       /usr/local/etc/dbskkd/dbskkd-cdb
-+skkserv stream  tcp     nowait  nobody  %%PREFIX%%/libexec/tcpd       %%PREFIX%%/libexec/dbskkd-cdb
-    
-    $B$r2C$($k!#(B(FreeBSD 2.2.8-RELEASE$B$G(Btcp_wrapper$B;HMQ$N>l9g(B)
-    root$B8"8B$G$OF0:n$5$;$F$O$J$i$J$$!#(Bnobody$B$GF0$+$9$3$H!#(B
diff --git a/japanese/dbskkd-cdb/files/patch-copyfromcdb.sh b/japanese/dbskkd-cdb/files/patch-copyfromcdb.sh
new file mode 100644
index 000000000000..92384069ab80
--- /dev/null
+++ b/japanese/dbskkd-cdb/files/patch-copyfromcdb.sh
@@ -0,0 +1,11 @@
+--- 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/pkg-plist b/japanese/dbskkd-cdb/pkg-plist
index 0d88b6a97997..a7e933c3e5c0 100644
--- a/japanese/dbskkd-cdb/pkg-plist
+++ b/japanese/dbskkd-cdb/pkg-plist
@@ -1,5 +1 @@
 libexec/dbskkd-cdb
-share/doc/dbskkd-cdb/Release-Notes.English
-share/doc/dbskkd-cdb/Release-Notes.Japanese
-share/doc/dbskkd-cdb/LICENSE
-@dirrm share/doc/dbskkd-cdb