11 files changed, 77 insertions, 95 deletions

diff --git a/japanese/diclookup-emacs20/Makefile b/japanese/diclookup-emacs20/Makefile
index 5dd675da7b87..2f05491b186c 100644
--- a/japanese/diclookup-emacs20/Makefile
+++ b/japanese/diclookup-emacs20/Makefile
@@ -1,36 +1,41 @@
-# New ports collection makefile for:	diclookup-mule
+# New ports collection makefile for:	diclookup-emacs20
 # Date created:		31 Jan 1998
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	diclookup-mule
-PORTVERSION=	2.3.3
+PORTNAME=	diclookup
+PORTVERSION=	2.3.4b8
 CATEGORIES=	japanese elisp
-MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tools/diclookup-mule/
+MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tools/diclookup-mule/beta/
+PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+DISTNAME=	diclookup-mule-${PORTVERSION}
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	diclookup-mule-${PORTVERSION}-wave-patch.gz
+MAINTAINER=	mita@FreeBSD.org
 
-MAINTAINER=	mita@jp.FreeBSD.org
+RUN_DEPENDS=	${X11BASE}/share/doc/intlfonts-1.2/README:${PORTSDIR}/x11-fonts/intlfonts
 
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/non-cjk/fonts.dir:${PORTSDIR}/x11-fonts/etlfonts
-BUILD_DEPENDS=	mule:${PORTSDIR}/japanese/mule-freewnn
+WRKSRC=		${WRKDIR}/diclookup-mule-${PORTVERSION}
+EMACS_PORT_NAME?=	emacs20
+MAKE_ARGS+=	LISPDIR="${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/diclookup"
+DOC_DIR=	${PREFIX}/share/doc/diclookup-emacs20
 
+pre-install:
+	${MKDIR} ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/diclookup
 post-install:
-	${MKDIR} ${PREFIX}/lib/dserver/doc
+	${MKDIR} ${DOC_DIR}
 	@${SED} s!PREFIX_DIR!${PREFIX}!g ${FILESDIR}/setup-diclookup.sh \
-				> ${PREFIX}/lib/dserver/setup-diclookup.sh
+				> ${DOC_DIR}/setup-diclookup.sh
 	@${SED} s!PREFIX_DIR!${PREFIX}!g ${FILESDIR}/deinstall-diclookup.sh \
-				> ${PREFIX}/lib/dserver/deinstall-diclookup.sh
+				> ${DOC_DIR}/deinstall-diclookup.sh
 	${INSTALL_DATA} ${FILESDIR}/README.diclookup-setup.txt \
-				${PREFIX}/lib/dserver/doc
+				${DOC_DIR}/
 	${INSTALL_DATA} ${WRKSRC}/README \
-				${PREFIX}/lib/dserver/doc/README.diclookup-mule
+				${DOC_DIR}/README.diclookup-mule
 	${INSTALL_DATA} ${WRKSRC}/README.sirup \
-				${PREFIX}/lib/dserver/doc/
+				${DOC_DIR}/
 	${INSTALL_DATA} ${WRKSRC}/lib/README \
-			${PREFIX}/lib/dserver/doc/README.diclookup-mule.lib
+			${DOC_DIR}/README.diclookup-mule.lib
 
 .include <bsd.port.mk>
diff --git a/japanese/diclookup-emacs20/distinfo b/japanese/diclookup-emacs20/distinfo
index 7810bee15b1c..770a29c7584f 100644
--- a/japanese/diclookup-emacs20/distinfo
+++ b/japanese/diclookup-emacs20/distinfo
@@ -1,2 +1 @@
-MD5 (diclookup-mule-2.3.3.tar.gz) = 76f01fc26b7fc5fcf2064584bf672549
-MD5 (diclookup-mule-2.3.3-wave-patch.gz) = bad55b2e3aba2a69338a96c95bb70df5
+MD5 (diclookup-mule-2.3.4b8.tar.gz) = fae81ac18987f36767373ac8d341d998
diff --git a/japanese/diclookup-emacs20/files/README.diclookup-setup.txt b/japanese/diclookup-emacs20/files/README.diclookup-setup.txt
index 4fab25a09caf..70da16e96c58 100644
--- a/japanese/diclookup-emacs20/files/README.diclookup-setup.txt
+++ b/japanese/diclookup-emacs20/files/README.diclookup-setup.txt
@@ -14,29 +14,32 @@ One of mule (ja-*mule-2.3 or mule-2.3) is necessary for this program.
 
     dserver:  Dictionary server.  NDTP has been a protocol for dserver.
 	      It supports EB/EBG/EBXA/EPWING CDROM dictionaries.
-	      FreeBSD port is ready for installation: ja-dserver-2.2.2
+	      FreeBSD port is ready for installation: ja-dserver-2.2.2_1
 	      Dserver packages includes `dictionary file compression tool'
 
     ndtpd:    Dserver-compatible Network Dictionary server.  
 	      It also supports EB/EBG/EBXA/EPWING CDROM dictionaries.
+	      FreeBSD port is redy for installation: ja-ndtpd-2.3.8
+	      Also includes `dictionary file compression tool'
+
     Also refer documents to each packages for setup of server.
 
 1. Add startup code to site-start.el
     Typing
-	% /usr/local/lib/dserver/setup-diclookup.sh
+	% /usr/local/share/doc/diclookup-emacs20/setup-diclookup.sh
     displays you `ja-diclookup setup dialog':
      ------------------------ja-diclookup setup --------------------------
      |                                                                   |
      | You have to install appropreate startup code for diclookup-mule.  |
      | This setup script automatically it to:                            |
-     | /usr/local/share/mule/19.34/site-lisp/site-start.el.              |
+     | /usr/local/share/emacs/20.7/site-lisp/site-start.el.              |
      |                                                                   |
      | Are you sure?                                                     |
      |-------------------------------------------------------------------|
      |                       [ Yes ]         No                          |
      |-------------------------------------------------------------------|
 	By answering [ Yes ], startup code is automatically added to
-	/usr/local/share/mule/19.34/site-lisp/site-start.el
+	/usr/local/share/emacs/20.7/site-lisp/site-start.el
 	(Deinstallation is possible by deinstall-diclookup.sh)
 
 2. Usage.
@@ -73,29 +76,30 @@ diclookup-mule は, mule の上で, 電子辞書を引けるようにするための
     しておくことが必須です.
     NDTP サーバとしては, 老舗の dserver や, SRA の笠原さんが開発なさっている 
     ndtpd などが知られています. 
-    dserver は, ja-dserver-2.2.2 というパッケージになっています.
-    ndtp も近日 FreeBSD ports colleciton に取り込まれることでしょう.
+    dserver は, ja-dserver-2.2.2_1 というパッケージになっています.
+    ndtp も というパッケージになっています.
     
     dserver または, ndtp の設定は, それぞれのパッケージに附属の
     文書を参照してください.
     
 I. 起動の準備.
 
-    ~/.emacs もしくは ${PREFIX}/share/mule/19.34/site-lisp/site-start.el などの,
-    初期設定ファイルに, diclookup-mule 起動のためのエントリを追加します.
-    [${PREFIX}/lib/dserver/setup-diclookup.sh] を起動すると, 自動的に
-   設定をsite-start.el に追加してくれます．
+    ~/.emacs もしくは ${PREFIX}/share/emacs/20.7/site-lisp/site-start.el
+    などの初期設定ファイルに, diclookup-mule 起動のためのエントリを追加します.
+    [${PREFIX}/share/doc/diclookup-emacs20/setup-diclookup.sh] を起動すると, 
+    自動的に設定をsite-start.el に追加してくれます．
 
   ※ ${PREFIX}
      ここで ${PREFIX} とは ports をコンパイル時の環境変数 PREFIX を
      示します. packages では, [/usr/local] となります.  上記の場合,
-     [/usr/local/lib/dserver/setup-diclookup.sh] と適時読みかえてください. 
+     [/usr/local/share/doc/diclookup-emacs20/setup-diclookup.sh] と適時
+     読みかえてください. 
 
 II. site-start.el の再編集.
 
    setup-diclookup.sh を起動すれば, 自動的に設定を追加してくれるのですが,
    一点だけ修正するところがあります.
-   ${PREFIX}/share/mule/19.34/site-lisp/site-start.el の次の行です.
+   ${PREFIX}/share/emacs/20.7/site-lisp/site-start.el の次の行です.
 
 --------
 (setq od-dictfile-list '("od-chujiten" "od-kojien" "od-readers" "od-crown")) ; diclookup-mule
@@ -132,7 +136,8 @@ II. site-start.el の再編集.
 III. 削除(uninstall)
 
     削除は，インストールの逆を行えばよいわけですが，自動的に削除を
-  行うためのシェルスクリプト，[${PREFIX}/lib/dserver/deinstall.sh] を
+  行うためのシェルスクリプト，
+  [${PREFIX}/share/doc/diclookup-emacs20/deinstall.sh] を
   用意しておきました．
 
     その後で，pkg_deleteを行えばOKのはずです．
diff --git a/japanese/diclookup-emacs20/files/deinstall-diclookup.sh b/japanese/diclookup-emacs20/files/deinstall-diclookup.sh
index 2735c2b69593..1b5079b4eb96 100644
--- a/japanese/diclookup-emacs20/files/deinstall-diclookup.sh
+++ b/japanese/diclookup-emacs20/files/deinstall-diclookup.sh
@@ -6,8 +6,8 @@ Are you sure?" -1 -1
 RETVAL=$?
 
 if [ "X${RETVAL}" = "X0" ] ; then # answer is `Yes'. hack diclookup-mule.
-cp PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el.bak
-grep -v diclookup-mule PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el.bak > PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el
+cp PREFIX_DIR/share/emacs/20.7/site-lisp/site-start.el PREFIX_DIR/share/emacs/20.7/site-lisp/site-start.el.bak
+grep -v diclookup-mule PREFIX_DIR/share/emacs/20.7/site-lisp/site-start.el.bak > PREFIX_DIR/share/emacs/20.7/site-lisp/site-start.el
 
 /usr/bin/dialog --title "Message" --clear \
 	--msgbox "Thank you for using diclookup-mule.  A bientot." -1 -1
diff --git a/japanese/diclookup-emacs20/files/patch-aa b/japanese/diclookup-emacs20/files/patch-aa
deleted file mode 100644
index 8fe67e3198b0..000000000000
--- a/japanese/diclookup-emacs20/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- diclookup-mule.el.orig	Sun Aug  2 15:52:36 1998
-+++ diclookup-mule.el	Sun Aug  2 15:52:47 1998
-@@ -2562,7 +2562,7 @@
- 	    (set-process-coding-system
- 	     process od-no-conversion od-no-conversion)
- 	    (message "transferring sound data...")
--	    (setq rate (* rate 100))
-+	    (setq rate (* rate 1000))
- 	    (process-send-string
- 	     process
- 	     (concat "RIFF"
diff --git a/japanese/diclookup-emacs20/files/patch-ab b/japanese/diclookup-emacs20/files/patch-ab
deleted file mode 100644
index 1a2b8872de03..000000000000
--- a/japanese/diclookup-emacs20/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.org	Sat Feb 20 20:14:36 1999
-+++ Makefile	Sat Feb 20 20:14:44 1999
-@@ -1,6 +1,6 @@
- EMACS = mule
- 
--LISPDIR = /usr/local/lib/mule/site-lisp
-+LISPDIR = /usr/local/share/mule/19.34/site-lisp
- 
- RM = rm -f
- 
diff --git a/japanese/diclookup-emacs20/files/patch-ac b/japanese/diclookup-emacs20/files/patch-ac
deleted file mode 100644
index 670545580f5e..000000000000
--- a/japanese/diclookup-emacs20/files/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/Makefile.org	Sat Feb 20 20:15:09 1999
-+++ lib/Makefile	Sat Feb 20 20:15:15 1999
-@@ -1,6 +1,6 @@
- EMACS = mule
- 
--LISPDIR = /usr/local/lib/mule/site-lisp
-+LISPDIR = /usr/local/share/mule/19.34/site-lisp
- 
- RM = rm -f
- 
diff --git a/japanese/diclookup-emacs20/files/setup-diclookup.sh b/japanese/diclookup-emacs20/files/setup-diclookup.sh
index ecde9f684544..247fd0eec5de 100644
--- a/japanese/diclookup-emacs20/files/setup-diclookup.sh
+++ b/japanese/diclookup-emacs20/files/setup-diclookup.sh
@@ -1,16 +1,19 @@
 #!/bin/sh
+EMACS=emacs
+EMACS_VER=20.7
+
 /usr/bin/dialog --title "ja-diclookup setup" --clear \
 	--yesno "\n\
 You have to install appropreate startup code for diclookup-mule. \n\
 This setup script automatically it to: \n\
-PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el. \n\n\
+/usr/local/share/${EMACS}/${EMACS_VER}/site-lisp/site-start.el. \n\n\
 Are you sure?" -1 -1
 RETVAL=$?
 # RETVAL=0 for yes, 1 for no, 255 for ESC.
 
 if [ "X${RETVAL}" = "X0" ] ; then # answer is `Yes'. hack diclookup-mule.
 
-# Hack PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el
+# Hack /usr/local/share/${EMACS}/${EMACS_VER}/site-lisp/site-start.el
 rm -f /tmp/hack-site-start.el
 echo "(defun hack-site-start ()" >> /tmp/hack-site-start.el
 echo "  (interactive)" >> /tmp/hack-site-start.el
@@ -46,16 +49,17 @@ echo "      (insert \"	'(\\\"Online Dictionary\\\" . online-dictionary) 'calenda
 echo "      (insert \"; diclookup-mule\n\")" >> /tmp/hack-site-start.el
 echo "      (write-file fname))))" >> /tmp/hack-site-start.el
 
-mule -batch -q -l /tmp/hack-site-start.el -f hack-site-start \
-		PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el ;
+${EMACS}-${EMACS_VER} -batch -q -l /tmp/hack-site-start.el -f hack-site-start \
+		/usr/local/share/${EMACS}/${EMACS_VER}/site-lisp/site-start.el ;
 rm -f /tmp/hack-site-start.el
 
 /usr/bin/dialog --title "ja-diclookup setup" --clear \
 	--msgbox "\n\
-original file is saved in PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el.bak" -1 -1
+original file is saved in /usr/local/share/${EMACS}/${EMACS_VER}/site-lisp/site-start.el.bak" -1 -1
 
 else
 /usr/bin/dialog --title "ja-diclookup setup" --clear \
 	--msgbox "\n\
-For setup, documents under PREFIX_DIR/lib/dserver will be helpful." -1 -1
+For setup, documents under /usr/local/share/doc/diclookup-emacs20 
+will be helpful." -1 -1
 fi
diff --git a/japanese/diclookup-emacs20/pkg-comment b/japanese/diclookup-emacs20/pkg-comment
index 83867e080821..a16bb6ae82b2 100644
--- a/japanese/diclookup-emacs20/pkg-comment
+++ b/japanese/diclookup-emacs20/pkg-comment
@@ -1 +1 @@
-CDROM dictionary client for mule
+CDROM dictionary client for emacs. (needs ndtpd or dserver package)
diff --git a/japanese/diclookup-emacs20/pkg-message b/japanese/diclookup-emacs20/pkg-message
index 58091fa62f91..0b43e125cbf3 100644
--- a/japanese/diclookup-emacs20/pkg-message
+++ b/japanese/diclookup-emacs20/pkg-message
@@ -1,8 +1,8 @@
 To use these Emacs Lisp, startup code is needed.
-Consider to use ${PREFIX}/lib/dserver/setup-diclookup.sh
+Consider to use ${PREFIX}/share/doc/diclookup-emacs20/setup-diclookup.sh
 (Also note deinstallation is deinstall-diclookup.sh)
 
 Also (or to begin with), Network Dictionary Transfer Protocol 
 server is mandatory.  You can use either:
-dserver:	ports/japanese/dserver, ja-dserver-2.2.2
-ndtpd:		Will be soon come to ports collection.
+dserver:	ports/japanese/dserver, ja-dserver-2.2.2_1 and later
+ndtpd:		ports/japanese/ndtpd,	ja-ndtpd-2.3.3 and later
diff --git a/japanese/diclookup-emacs20/pkg-plist b/japanese/diclookup-emacs20/pkg-plist
index 2daf1cd946df..c4a3d135e4e3 100644
--- a/japanese/diclookup-emacs20/pkg-plist
+++ b/japanese/diclookup-emacs20/pkg-plist
@@ -1,21 +1,21 @@
-lib/dserver/doc/README.diclookup-setup.txt
-lib/dserver/doc/README.diclookup-mule
-lib/dserver/doc/README.sirup
-lib/dserver/doc/README.diclookup-mule.lib
-lib/dserver/setup-diclookup.sh
-lib/dserver/deinstall-diclookup.sh
-share/mule/19.34/site-lisp/od-eiwa.elc
-share/mule/19.34/site-lisp/od-oxford.elc
-share/mule/19.34/site-lisp/od-italian.elc
-share/mule/19.34/site-lisp/od-crown.elc
-share/mule/19.34/site-lisp/od-kojien.elc
-share/mule/19.34/site-lisp/od-chujiten64-epw.elc
-share/mule/19.34/site-lisp/od-chujiten64.elc
-share/mule/19.34/site-lisp/od-chujiten.elc
-share/mule/19.34/site-lisp/od-readers.elc
-share/mule/19.34/site-lisp/diclookup-mule.elc
-share/mule/19.34/site-lisp/sirup-doc.elc
-share/mule/19.34/site-lisp/sirup.elc
-share/mule/19.34/site-lisp/ndtp.elc
-@dirrm lib/dserver/doc
-@dirrm lib/dserver
+share/doc/diclookup-emacs20/README.diclookup-setup.txt
+share/doc/diclookup-emacs20/README.diclookup-mule
+share/doc/diclookup-emacs20/README.sirup
+share/doc/diclookup-emacs20/README.diclookup-mule.lib
+share/doc/diclookup-emacs20/setup-diclookup.sh
+share/doc/diclookup-emacs20/deinstall-diclookup.sh
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/diclookup/od-eiwa.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/diclookup/od-oxford.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/diclookup/od-italian.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/diclookup/od-crown.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/diclookup/od-kojien.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/diclookup/od-chujiten64-epw.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/diclookup/od-chujiten64.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/diclookup/od-chujiten.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/diclookup/od-readers.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/diclookup/diclookup-mule.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/diclookup/sirup-doc.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/diclookup/sirup.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/diclookup/ndtp.elc
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/diclookup
+@dirrm share/doc/diclookup-emacs20