5 files changed, 6 insertions, 78 deletions

diff --git a/japanese/wnn7egg/Makefile b/japanese/wnn7egg/Makefile
index 9200883857cb..dc7561f41af0 100644
--- a/japanese/wnn7egg/Makefile
+++ b/japanese/wnn7egg/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	wnn7egg
-PORTVERSION=	1.00
-PORTREVISION=	1
+PORTVERSION=	1.01
+#PORTREVISION=	1
 CATEGORIES=	japanese elisp
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	taoka
-DISTNAME=	ja-wnn7-elisp-1.00_1
+MASTER_SITES=	ftp://ftp.omronsoft.co.jp/pub/Wnn7/client/lisp/
+DISTNAME=	wnn7-elisp-1.01-1
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	taoka@FreeBSD.org
@@ -22,7 +21,7 @@ SITEPKGDIR=	${PREFIX}/lib/xemacs/site-packages
 XELISPDIR=	${SITEPKGDIR}/lisp/wnn7egg
 DOCDIR=		${PREFIX}/share/doc/wnn7egg
 MANIFEST=	MANIFEST.wnn7egg
-WRKSRC=		${WRKDIR}/usr/share/wnn7/elisp
+WRKSRC=		${WRKDIR}/wnn7/elisp
 
 NO_BUILD=	yes
 
diff --git a/japanese/wnn7egg/distinfo b/japanese/wnn7egg/distinfo
index 5803a4d2f847..577b1648d51a 100644
--- a/japanese/wnn7egg/distinfo
+++ b/japanese/wnn7egg/distinfo
@@ -1 +1 @@
-MD5 (ja-wnn7-elisp-1.00_1.tgz) = b97014ba0abbcd78b5f2385ac4544d7b
+MD5 (wnn7-elisp-1.01-1.tgz) = f1859459fa84ab540a6e348e8a50c2bc
diff --git a/japanese/wnn7egg/files/patch-aa b/japanese/wnn7egg/files/patch-aa
deleted file mode 100644
index 380ada6efb50..000000000000
--- a/japanese/wnn7egg/files/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
---- ../elisp.org/xemacs21/wnn7egg.el	Sat Jul  7 00:00:00 2001
-+++ xemacs21/wnn7egg.el	Sat Jul 14 01:56:09 2001
-@@ -2464,7 +2464,7 @@
- ;; #### Should hide bindings like this, too?  However, `convert-region'
- ;;      probably isn't going to be a LEIM feature, it's really pretty
- ;;      Japanese and Korean specific.
--(define-key global-map "\C-x " 'henkan-region)
-+(define-key global-map "\C-x " 'wnn7-henkan-region)
- 
- ;; 92.3.16 by K.Handa
- ;; global-map => mule-keymap
-@@ -2961,14 +2961,14 @@
-       "Display fence mode help"
-       (interactive "_")
-       (let ((w (selected-window)))
--	(describe-function 'egg-mode)
-+	(describe-function 'wnn7-egg-mode)
- 	(ding)
- 	(select-window w)))
-   (defun fence-mode-help-command ()
-     "Display fence mode help"
-     (interactive)
-     (let ((w (selected-window)))
--      (describe-function 'egg-mode)
-+      (describe-function 'wnn7-egg-mode)
-       (ding)
-       (select-window w))))
- 
diff --git a/japanese/wnn7egg/files/patch-ab b/japanese/wnn7egg/files/patch-ab
deleted file mode 100644
index 696bfc392c94..000000000000
--- a/japanese/wnn7egg/files/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
---- ../elisp.org/emacs20/wnn7egg.el	Sat Jul  7 00:00:00 2001
-+++ emacs20/wnn7egg.el	Mon Jul 16 01:57:38 2001
-@@ -2464,7 +2464,7 @@
- ;; #### Should hide bindings like this, too?  However, `convert-region'
- ;;      probably isn't going to be a LEIM feature, it's really pretty
- ;;      Japanese and Korean specific.
--(define-key global-map "\C-x " 'henkan-region)
-+(define-key global-map "\C-x " 'wnn7-henkan-region)
- 
- ;; 92.3.16 by K.Handa
- ;; global-map => mule-keymap
-@@ -2961,14 +2961,14 @@
-       "Display fence mode help"
-       (interactive "_")
-       (let ((w (selected-window)))
--	(describe-function 'egg-mode)
-+	(describe-function 'wnn7-egg-mode)
- 	(ding)
- 	(select-window w)))
-   (defun fence-mode-help-command ()
-     "Display fence mode help"
-     (interactive)
-     (let ((w (selected-window)))
--      (describe-function 'egg-mode)
-+      (describe-function 'wnn7-egg-mode)
-       (ding)
-       (select-window w))))
- 
diff --git a/japanese/wnn7egg/files/patch-ac b/japanese/wnn7egg/files/patch-ac
deleted file mode 100644
index 509b0d6a3c1e..000000000000
--- a/japanese/wnn7egg/files/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-From Q_and_A.color-mate in color-mate (ports/editors/color-mate)
-
---- xemacs21/wnn7egg-cnv.el	2001/07/12 15:44:38	1.1
-+++ xemacs21/wnn7egg-cnv.el	2001/07/12 16:05:42
-@@ -996,7 +996,9 @@
- 				    (wnn7-bunsetu-position bunsetu-begin)
- 				    (+ (wnn7-bunsetu-position (1- bunsetu-end))
- 				       (length (wnn7-server-bunsetu-kanji 
--						(1- bunsetu-end))))))
-+						(if (>= 0 bunsetu-end)
-+						    0
-+						  (1- bunsetu-end)))))))
- 	  (progn
- 	    (if (overlayp egg:*dai-bunsetu-overlay*)
- 		nil