From bdea4103be02ae7c21892fa9f2d0f962ff5353c8 Mon Sep 17 00:00:00 2001 From: ume Date: Wed, 23 Feb 2005 15:39:12 +0000 Subject: update Debian patch to egg_4.0.6+0.20041122cvs-2. --- editors/tamago-emacs21/Makefile | 9 ++++++--- editors/tamago-emacs21/distinfo | 4 ++-- editors/tamago-emacs21/files/patch-egg::canna.el | 13 +++++++++++-- editors/tamago-emacs21/pkg-message | 8 -------- editors/tamago-emacs21/pkg-plist | 1 + editors/tamago/Makefile | 9 ++++++--- editors/tamago/distinfo | 4 ++-- editors/tamago/files/patch-egg::canna.el | 13 +++++++++++-- editors/tamago/pkg-message | 8 -------- editors/tamago/pkg-plist | 1 + 10 files changed, 40 insertions(+), 30 deletions(-) (limited to 'editors') diff --git a/editors/tamago-emacs21/Makefile b/editors/tamago-emacs21/Makefile index ed35b43227ff..7a3cdfe0dac9 100644 --- a/editors/tamago-emacs21/Makefile +++ b/editors/tamago-emacs21/Makefile @@ -6,8 +6,7 @@ # PORTNAME= tamago -PORTVERSION= 4.0.6.0.20041122.1 -PORTREVISION= 1 +PORTVERSION= 4.0.6.0.20041122.2 CATEGORIES= editors elisp MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/e/egg @@ -16,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-1.diff.gz +PATCHFILES= egg_4.0.6+0.20041122cvs-2.diff.gz PATCH_DIST_STRIP= -p1 MAINTAINER?= ports@FreeBSD.org @@ -42,7 +41,11 @@ pre-configure: @${REINPLACE_CMD} -e 's|emacs/site-lisp|${EMACS_NAME}/${EMACS_VER}/site-lisp|g' \ ${WRKSRC}/configure +post-build: + (cd ${WRKSRC}/helper && ${MAKE} egg-helper) + post-install: + ${INSTALL_PROGRAM} ${WRKSRC}/helper/egg-helper ${PREFIX}/bin/egg-helper @${CAT} ${PKGMESSAGE} .include diff --git a/editors/tamago-emacs21/distinfo b/editors/tamago-emacs21/distinfo index d257f9922f58..c11f60340bc2 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-1.diff.gz) = c0f4798fe1c3e406bfcac467c0054823 -SIZE (egg_4.0.6+0.20041122cvs-1.diff.gz) = 13845 +MD5 (egg_4.0.6+0.20041122cvs-2.diff.gz) = 5cad905bb39a11d830e9898949dcf496 +SIZE (egg_4.0.6+0.20041122cvs-2.diff.gz) = 16000 diff --git a/editors/tamago-emacs21/files/patch-egg::canna.el b/editors/tamago-emacs21/files/patch-egg::canna.el index a3d546ddfb48..b0466ac8890f 100644 --- a/editors/tamago-emacs21/files/patch-egg::canna.el +++ b/editors/tamago-emacs21/files/patch-egg::canna.el @@ -1,7 +1,16 @@ Index: egg/canna.el diff -u egg/canna.el.orig egg/canna.el ---- egg/canna.el.orig Wed Feb 23 21:57:47 2005 -+++ egg/canna.el Wed Feb 23 21:58:47 2005 +--- 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) + @@ -360,13 +360,12 @@ (setq proc (make-network-process :name proc-name :buffer buf :host host :service port :family family)) ((error quit))) diff --git a/editors/tamago-emacs21/pkg-message b/editors/tamago-emacs21/pkg-message index 7403cbfcb926..6d3011f40a62 100644 --- a/editors/tamago-emacs21/pkg-message +++ b/editors/tamago-emacs21/pkg-message @@ -10,11 +10,3 @@ Chinese-GB: (set-language-environment "Chinese-GB") Chinese-CNS: (set-language-environment "Chinese-CNS") add to their `~/.emacs' file. - -Tamago uses unix domain socket to connect to Canna server by default. -If you want to use Canna via unix domain socket, you need to install -japanese/yc.el, too. Or, you may want to use inet domain socket by -following settings: - - (setq canna-hostname "localhost") - (setq canna-server-port "canna") diff --git a/editors/tamago-emacs21/pkg-plist b/editors/tamago-emacs21/pkg-plist index 96adfaff9a11..00053a34f8cf 100644 --- a/editors/tamago-emacs21/pkg-plist +++ b/editors/tamago-emacs21/pkg-plist @@ -1,3 +1,4 @@ +bin/egg-helper %%ELISPDIR%%/egg/egg-cnv.el %%ELISPDIR%%/egg/egg-cnv.elc %%ELISPDIR%%/egg/egg-com.el diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile index ed35b43227ff..7a3cdfe0dac9 100644 --- a/editors/tamago/Makefile +++ b/editors/tamago/Makefile @@ -6,8 +6,7 @@ # PORTNAME= tamago -PORTVERSION= 4.0.6.0.20041122.1 -PORTREVISION= 1 +PORTVERSION= 4.0.6.0.20041122.2 CATEGORIES= editors elisp MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/e/egg @@ -16,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-1.diff.gz +PATCHFILES= egg_4.0.6+0.20041122cvs-2.diff.gz PATCH_DIST_STRIP= -p1 MAINTAINER?= ports@FreeBSD.org @@ -42,7 +41,11 @@ pre-configure: @${REINPLACE_CMD} -e 's|emacs/site-lisp|${EMACS_NAME}/${EMACS_VER}/site-lisp|g' \ ${WRKSRC}/configure +post-build: + (cd ${WRKSRC}/helper && ${MAKE} egg-helper) + post-install: + ${INSTALL_PROGRAM} ${WRKSRC}/helper/egg-helper ${PREFIX}/bin/egg-helper @${CAT} ${PKGMESSAGE} .include diff --git a/editors/tamago/distinfo b/editors/tamago/distinfo index d257f9922f58..c11f60340bc2 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-1.diff.gz) = c0f4798fe1c3e406bfcac467c0054823 -SIZE (egg_4.0.6+0.20041122cvs-1.diff.gz) = 13845 +MD5 (egg_4.0.6+0.20041122cvs-2.diff.gz) = 5cad905bb39a11d830e9898949dcf496 +SIZE (egg_4.0.6+0.20041122cvs-2.diff.gz) = 16000 diff --git a/editors/tamago/files/patch-egg::canna.el b/editors/tamago/files/patch-egg::canna.el index a3d546ddfb48..b0466ac8890f 100644 --- a/editors/tamago/files/patch-egg::canna.el +++ b/editors/tamago/files/patch-egg::canna.el @@ -1,7 +1,16 @@ Index: egg/canna.el diff -u egg/canna.el.orig egg/canna.el ---- egg/canna.el.orig Wed Feb 23 21:57:47 2005 -+++ egg/canna.el Wed Feb 23 21:58:47 2005 +--- 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) + @@ -360,13 +360,12 @@ (setq proc (make-network-process :name proc-name :buffer buf :host host :service port :family family)) ((error quit))) diff --git a/editors/tamago/pkg-message b/editors/tamago/pkg-message index 7403cbfcb926..6d3011f40a62 100644 --- a/editors/tamago/pkg-message +++ b/editors/tamago/pkg-message @@ -10,11 +10,3 @@ Chinese-GB: (set-language-environment "Chinese-GB") Chinese-CNS: (set-language-environment "Chinese-CNS") add to their `~/.emacs' file. - -Tamago uses unix domain socket to connect to Canna server by default. -If you want to use Canna via unix domain socket, you need to install -japanese/yc.el, too. Or, you may want to use inet domain socket by -following settings: - - (setq canna-hostname "localhost") - (setq canna-server-port "canna") diff --git a/editors/tamago/pkg-plist b/editors/tamago/pkg-plist index 96adfaff9a11..00053a34f8cf 100644 --- a/editors/tamago/pkg-plist +++ b/editors/tamago/pkg-plist @@ -1,3 +1,4 @@ +bin/egg-helper %%ELISPDIR%%/egg/egg-cnv.el %%ELISPDIR%%/egg/egg-cnv.elc %%ELISPDIR%%/egg/egg-com.el -- cgit