Date: Sat, 26 Feb 2005 07:56:41 +0900 (JST) From: KIMURA Yasuhiro <yasu@utahime.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/78100: [PATCH] editors/tamago: Debian patch is update to 4.0.6+0.20041122cvs-4 Message-ID: <20050225225641.89A8B5552@eastasia.home.utahime.org> Resent-Message-ID: <200502252300.j1PN0QLa008023@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 78100
>Category: ports
>Synopsis: [PATCH] editors/tamago: Debian patch is update to 4.0.6+0.20041122cvs-4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 25 23:00:25 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: KIMURA Yasuhiro
>Release: FreeBSD 4.11-RELEASE i386
>Organization:
>Environment:
System: FreeBSD xxxxxxxx 4.11-RELEASE FreeBSD 4.11-RELEASE #0: Wed Jan 26 08:33:31 JST 2005 xxxxxxxx i386
>Description:
- Debian patch is update to 4.0.6+0.20041122cvs-4.
- Change pkg-message.
>How-To-Repeat:
>Fix:
--- patch-tamago begins here ---
Index: Makefile
===================================================================
RCS file: /net/cvsup/cvsroot/ports/editors/tamago/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- Makefile 24 Feb 2005 11:43:47 -0000 1.20
+++ Makefile 25 Feb 2005 22:36:48 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= tamago
-PORTVERSION= 4.0.6.0.20041122.3
+PORTVERSION= 4.0.6.0.20041122.4
CATEGORIES= editors elisp
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/e/egg
@@ -15,7 +15,7 @@
PATCH_SITES= ${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \
${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,}
-PATCHFILES= egg_4.0.6+0.20041122cvs-3.diff.gz
+PATCHFILES= egg_4.0.6+0.20041122cvs-4.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER?= ports@FreeBSD.org
Index: distinfo
===================================================================
RCS file: /net/cvsup/cvsroot/ports/editors/tamago/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo 24 Feb 2005 11:43:47 -0000 1.10
+++ distinfo 25 Feb 2005 21:33:12 -0000
@@ -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-3.diff.gz) = 11a3f526211fea5f7ee1a35be42275e7
-SIZE (egg_4.0.6+0.20041122cvs-3.diff.gz) = 16042
+MD5 (egg_4.0.6+0.20041122cvs-4.diff.gz) = 6b5eb09f164e9dc3546d0a87526839d3
+SIZE (egg_4.0.6+0.20041122cvs-4.diff.gz) = 16558
Index: pkg-message
===================================================================
RCS file: /net/cvsup/cvsroot/ports/editors/tamago/pkg-message,v
retrieving revision 1.3
diff -u -r1.3 pkg-message
--- pkg-message 23 Feb 2005 15:39:12 -0000 1.3
+++ pkg-message 25 Feb 2005 22:42:22 -0000
@@ -1,12 +1,10 @@
Enabling Tamago
=================
- You can now tell your users to enable Tamago with Emacs 20.5 by adding
- If you use with Asian Languages, select suitable languages, such as
+You can now enable Tamago by adding one of following lines to your
+.emacs file depending on the language you use:
Japanese: (set-language-environment "Japanese")
Korean: (set-language-environment "Korean")
Chinese-GB: (set-language-environment "Chinese-GB")
Chinese-CNS: (set-language-environment "Chinese-CNS")
-
-add to their `~/.emacs' file.
Index: files/patch-egg::canna.el
===================================================================
RCS file: files/patch-egg::canna.el
diff -N files/patch-egg::canna.el
--- files/patch-egg::canna.el 24 Feb 2005 11:43:48 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Index: egg/canna.el
-diff -u egg/canna.el.orig egg/canna.el
---- egg/canna.el.orig Thu Feb 24 00:16:28 2005
-+++ egg/canna.el Thu Feb 24 00:27:33 2005
-@@ -53,7 +53,7 @@
- "Group Name on CANNA server"
- :group 'canna :type 'string)
-
--(defcustom egg-canna-icanna-path "icanna"
-+(defcustom egg-canna-icanna-path "egg-helper"
- "path of canna unix domain connection helper program"
- :group 'canna :type 'file)
-
Index: files/patch-helper::egg-helper.c
===================================================================
RCS file: files/patch-helper::egg-helper.c
diff -N files/patch-helper::egg-helper.c
--- files/patch-helper::egg-helper.c 23 Feb 2005 15:46:29 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-Index: helper/egg-helper.c
-diff -u -p helper/egg-helper.c.orig helper/egg-helper.c
---- helper/egg-helper.c.orig Thu Feb 24 00:16:28 2005
-+++ helper/egg-helper.c Thu Feb 24 00:24:12 2005
-@@ -25,7 +25,7 @@
- /*
- * connect unix domain cannaserver
- */
--int connect_canna_server(static char *sock_path)
-+int connect_server(char *sock_path)
- {
- int sockfd;
- struct sockaddr_un sun;
-@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
- {
- int server;
-
-- server = connect_server(); /* connect IM server via unix domain socket */
-+ server = connect_server(CANNA_PATH); /* connect IM server via unix domain socket */
-
- /* transport request & response, until stdin or cannaserver is eof */
- while (1)
--- patch-tamago ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050225225641.89A8B5552>