update Debian patch to egg_4.0.6+0.20041122cvs-3.

6 files changed, 8 insertions, 48 deletions

diff --git a/editors/tamago-emacs21/Makefile b/editors/tamago-emacs21/Makefile
index 7a3cdfe0dac9..b1f23000cb33 100644
--- a/editors/tamago-emacs21/Makefile
+++ b/editors/tamago-emacs21/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tamago
-PORTVERSION=	4.0.6.0.20041122.2
+PORTVERSION=	4.0.6.0.20041122.3
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/e/egg
@@ -15,7 +15,7 @@ DISTNAME=	egg_4.0.6+0.20041122cvs.orig
 
 PATCH_SITES=	${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \
 		${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,}
-PATCHFILES=	egg_4.0.6+0.20041122cvs-2.diff.gz
+PATCHFILES=	egg_4.0.6+0.20041122cvs-3.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER?=	ports@FreeBSD.org
diff --git a/editors/tamago-emacs21/distinfo b/editors/tamago-emacs21/distinfo
index c11f60340bc2..594ef7fe771b 100644
--- a/editors/tamago-emacs21/distinfo
+++ b/editors/tamago-emacs21/distinfo
@@ -1,4 +1,4 @@
 MD5 (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 64ec1af61f6e265c05447dd4e2a83aae
 SIZE (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 287308
-MD5 (egg_4.0.6+0.20041122cvs-2.diff.gz) = 5cad905bb39a11d830e9898949dcf496
-SIZE (egg_4.0.6+0.20041122cvs-2.diff.gz) = 16000
+MD5 (egg_4.0.6+0.20041122cvs-3.diff.gz) = 11a3f526211fea5f7ee1a35be42275e7
+SIZE (egg_4.0.6+0.20041122cvs-3.diff.gz) = 16042
diff --git a/editors/tamago-emacs21/files/patch-egg::canna.el b/editors/tamago-emacs21/files/patch-egg::canna.el
index b0466ac8890f..b7685bd54caf 100644
--- a/editors/tamago-emacs21/files/patch-egg::canna.el
+++ b/editors/tamago-emacs21/files/patch-egg::canna.el
@@ -11,23 +11,3 @@ diff -u egg/canna.el.orig egg/canna.el
    "path of canna unix domain connection helper program"
    :group 'canna :type 'file)
  
-@@ -360,13 +360,12 @@
- 		      (setq proc (make-network-process :name proc-name :buffer buf :host host :service port :family family))
- 		    ((error quit)))
- 		; for old emacs (<= 21.3) bellow
--		(setq proc
--		      (cond ((string-match "^unix/" hostname)
--			     (let ((process-connection-type nil))
--			       (start-process proc-name buf egg-canna-icanna-path)))
--			    (condition-case nil
--				(open-network-stream proc-name buf hostname port)
--			      (error nil))))))
-+		(if (string-match "^unix/" hostname)
-+		    (let ((process-connection-type nil))
-+		      (setq proc (start-process proc-name buf egg-canna-icanna-path)))
-+		  (condition-case nil
-+		      (setq proc (open-network-stream proc-name buf hostname port))
-+		    (error quit)))))
- 	    (when (processp proc)
- 	      (process-kill-without-query proc)
- 	      (set-process-coding-system proc 'binary 'binary)
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index 7a3cdfe0dac9..b1f23000cb33 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tamago
-PORTVERSION=	4.0.6.0.20041122.2
+PORTVERSION=	4.0.6.0.20041122.3
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/e/egg
@@ -15,7 +15,7 @@ DISTNAME=	egg_4.0.6+0.20041122cvs.orig
 
 PATCH_SITES=	${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \
 		${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,}
-PATCHFILES=	egg_4.0.6+0.20041122cvs-2.diff.gz
+PATCHFILES=	egg_4.0.6+0.20041122cvs-3.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER?=	ports@FreeBSD.org
diff --git a/editors/tamago/distinfo b/editors/tamago/distinfo
index c11f60340bc2..594ef7fe771b 100644
--- a/editors/tamago/distinfo
+++ b/editors/tamago/distinfo
@@ -1,4 +1,4 @@
 MD5 (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 64ec1af61f6e265c05447dd4e2a83aae
 SIZE (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 287308
-MD5 (egg_4.0.6+0.20041122cvs-2.diff.gz) = 5cad905bb39a11d830e9898949dcf496
-SIZE (egg_4.0.6+0.20041122cvs-2.diff.gz) = 16000
+MD5 (egg_4.0.6+0.20041122cvs-3.diff.gz) = 11a3f526211fea5f7ee1a35be42275e7
+SIZE (egg_4.0.6+0.20041122cvs-3.diff.gz) = 16042
diff --git a/editors/tamago/files/patch-egg::canna.el b/editors/tamago/files/patch-egg::canna.el
index b0466ac8890f..b7685bd54caf 100644
--- a/editors/tamago/files/patch-egg::canna.el
+++ b/editors/tamago/files/patch-egg::canna.el
@@ -11,23 +11,3 @@ diff -u egg/canna.el.orig egg/canna.el
    "path of canna unix domain connection helper program"
    :group 'canna :type 'file)
  
-@@ -360,13 +360,12 @@
- 		      (setq proc (make-network-process :name proc-name :buffer buf :host host :service port :family family))
- 		    ((error quit)))
- 		; for old emacs (<= 21.3) bellow
--		(setq proc
--		      (cond ((string-match "^unix/" hostname)
--			     (let ((process-connection-type nil))
--			       (start-process proc-name buf egg-canna-icanna-path)))
--			    (condition-case nil
--				(open-network-stream proc-name buf hostname port)
--			      (error nil))))))
-+		(if (string-match "^unix/" hostname)
-+		    (let ((process-connection-type nil))
-+		      (setq proc (start-process proc-name buf egg-canna-icanna-path)))
-+		  (condition-case nil
-+		      (setq proc (open-network-stream proc-name buf hostname port))
-+		    (error quit)))))
- 	    (when (processp proc)
- 	      (process-kill-without-query proc)
- 	      (set-process-coding-system proc 'binary 'binary)