diff options
author | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2003-05-18 12:25:50 +0000 |
---|---|---|
committer | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2003-05-18 12:25:50 +0000 |
commit | 769065ec2e03c64d93db4d2b3de5a47d9b99b5d2 (patch) | |
tree | 31bc226279f6c6032cbf06c2a95400ef32187982 /japanese | |
parent | BROKEN on 5.1: bad C++ (diff) |
Update emcws patch.
PR: ports/52025
Submitted by: NAKAJI Hiroyuki <nakaji@jp.freebsd.org>
Notes
Notes:
svn path=/head/; revision=81236
Diffstat (limited to 'japanese')
-rw-r--r-- | japanese/emacs-emcws/Makefile | 4 | ||||
-rw-r--r-- | japanese/emacs-emcws/distinfo | 2 | ||||
-rw-r--r-- | japanese/emacs-emcws/files/patch-src:wnnfns.c | 22 | ||||
-rw-r--r-- | japanese/emacs-emcws/scripts/configure | 8 | ||||
-rw-r--r-- | japanese/emacs21-emcws/Makefile | 4 | ||||
-rw-r--r-- | japanese/emacs21-emcws/distinfo | 2 | ||||
-rw-r--r-- | japanese/emacs21-emcws/files/patch-src:wnnfns.c | 22 | ||||
-rw-r--r-- | japanese/emacs21-emcws/scripts/configure | 8 |
8 files changed, 6 insertions, 66 deletions
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile index 1c5c58b0f436..f57cc97a1b1f 100644 --- a/japanese/emacs-emcws/Makefile +++ b/japanese/emacs-emcws/Makefile @@ -7,7 +7,7 @@ PORTNAME= emcws PORTVERSION= ${EMACS_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs @@ -15,7 +15,7 @@ DISTNAME= emacs-${PORTVERSION} PATCH_SITES= ftp://ftp.ki.nu/pub/emcws/ \ ftp://ftp.jpl.org/pub/misc/ -PATCHFILES= emcws-${EMACS_VER}-20030323.gz +PATCHFILES= emcws-${EMACS_VER}-20030507.gz PATCH_DIST_STRIP= -p1 MAINTAINER= nakaji@jp.freebsd.org diff --git a/japanese/emacs-emcws/distinfo b/japanese/emacs-emcws/distinfo index 60d4ab7c0996..08b93733158f 100644 --- a/japanese/emacs-emcws/distinfo +++ b/japanese/emacs-emcws/distinfo @@ -1,2 +1,2 @@ MD5 (emacs-21.3.tar.gz) = a0bab457cbf5b4f8eb99d1d0a3ada420 -MD5 (emcws-21.3-20030323.gz) = 3bb57e825d7150daa2f085e442b4300f +MD5 (emcws-21.3-20030507.gz) = 88d7b318fb0833628b99d9d7198ed4ff diff --git a/japanese/emacs-emcws/files/patch-src:wnnfns.c b/japanese/emacs-emcws/files/patch-src:wnnfns.c deleted file mode 100644 index 988c9bcf9578..000000000000 --- a/japanese/emacs-emcws/files/patch-src:wnnfns.c +++ /dev/null @@ -1,22 +0,0 @@ ---- src/wnnfns.c- Wed Apr 30 15:45:08 2003 -+++ src/wnnfns.c Wed Apr 30 15:45:20 2003 -@@ -1816,6 +1816,9 @@ - return Qt; - } - -+/* $B$3$N(Btype cast$B$OHs>o$K4m81!#(Bjl.c$B$,;H$C$F$$$k$N$G%^%M$7$F$$$k$@$1!#(B -+ $B99$K(B js_*()$B7O$r8F$S=P$7$F$k!D(B */ -+#include "mt_jlib.h" /* for WNN_ENV_INT */ - DEFUN ("wnn-nihongo-kosei", Fwnn_nihongo_kosei, Swnn_nihongo_kosei, 1, 1, 0, - "For Wnn7.") - (mode) -@@ -1824,9 +1827,6 @@ - int snum; - if ((snum = check_wnn_server_type()) == -1) return Qnil; - if(!wnnfns_buf[snum]) return Qnil; -- /* $B$3$N(Btype cast$B$OHs>o$K4m81!#(Bjl.c$B$,;H$C$F$$$k$N$G%^%M$7$F$$$k$@$1!#(B -- $B99$K(B js_*()$B7O$r8F$S=P$7$F$k!D(B */ --#include "mt_jlib.h" /* for WNN_ENV_INT */ - if(js_set_henkan_hinsi_group( (WNN_ENV_INT*)wnnfns_buf[snum]->env, - HINSI_NO_GOYOU, - HINSI_NO_GOYOU_START, diff --git a/japanese/emacs-emcws/scripts/configure b/japanese/emacs-emcws/scripts/configure index f588d1f09b77..decb83c576f6 100644 --- a/japanese/emacs-emcws/scripts/configure +++ b/japanese/emacs-emcws/scripts/configure @@ -4,11 +4,3 @@ for f in site-init.el; do ${SED} -e "s,%%DOC_FILE%%,${DOC_FILE},g" \ < ${FILESDIR}/${f}.tmpl > ${WRKSRC}/lisp/${f} done - -cd ${WRKSRC} - -if [ -f /usr/lib/aout/crt0.o -a ! -f /usr/lib/crt0.o ]; then - ${SED} -e "s|/usr/lib/crt0\.o|/usr/lib/aout/crt0.o|g" \ - src/s/freebsd.h > src/s/freebsd.h.new || exit - ${MV} -f src/s/freebsd.h.new src/s/freebsd.h -fi diff --git a/japanese/emacs21-emcws/Makefile b/japanese/emacs21-emcws/Makefile index 1c5c58b0f436..f57cc97a1b1f 100644 --- a/japanese/emacs21-emcws/Makefile +++ b/japanese/emacs21-emcws/Makefile @@ -7,7 +7,7 @@ PORTNAME= emcws PORTVERSION= ${EMACS_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs @@ -15,7 +15,7 @@ DISTNAME= emacs-${PORTVERSION} PATCH_SITES= ftp://ftp.ki.nu/pub/emcws/ \ ftp://ftp.jpl.org/pub/misc/ -PATCHFILES= emcws-${EMACS_VER}-20030323.gz +PATCHFILES= emcws-${EMACS_VER}-20030507.gz PATCH_DIST_STRIP= -p1 MAINTAINER= nakaji@jp.freebsd.org diff --git a/japanese/emacs21-emcws/distinfo b/japanese/emacs21-emcws/distinfo index 60d4ab7c0996..08b93733158f 100644 --- a/japanese/emacs21-emcws/distinfo +++ b/japanese/emacs21-emcws/distinfo @@ -1,2 +1,2 @@ MD5 (emacs-21.3.tar.gz) = a0bab457cbf5b4f8eb99d1d0a3ada420 -MD5 (emcws-21.3-20030323.gz) = 3bb57e825d7150daa2f085e442b4300f +MD5 (emcws-21.3-20030507.gz) = 88d7b318fb0833628b99d9d7198ed4ff diff --git a/japanese/emacs21-emcws/files/patch-src:wnnfns.c b/japanese/emacs21-emcws/files/patch-src:wnnfns.c deleted file mode 100644 index 988c9bcf9578..000000000000 --- a/japanese/emacs21-emcws/files/patch-src:wnnfns.c +++ /dev/null @@ -1,22 +0,0 @@ ---- src/wnnfns.c- Wed Apr 30 15:45:08 2003 -+++ src/wnnfns.c Wed Apr 30 15:45:20 2003 -@@ -1816,6 +1816,9 @@ - return Qt; - } - -+/* $B$3$N(Btype cast$B$OHs>o$K4m81!#(Bjl.c$B$,;H$C$F$$$k$N$G%^%M$7$F$$$k$@$1!#(B -+ $B99$K(B js_*()$B7O$r8F$S=P$7$F$k!D(B */ -+#include "mt_jlib.h" /* for WNN_ENV_INT */ - DEFUN ("wnn-nihongo-kosei", Fwnn_nihongo_kosei, Swnn_nihongo_kosei, 1, 1, 0, - "For Wnn7.") - (mode) -@@ -1824,9 +1827,6 @@ - int snum; - if ((snum = check_wnn_server_type()) == -1) return Qnil; - if(!wnnfns_buf[snum]) return Qnil; -- /* $B$3$N(Btype cast$B$OHs>o$K4m81!#(Bjl.c$B$,;H$C$F$$$k$N$G%^%M$7$F$$$k$@$1!#(B -- $B99$K(B js_*()$B7O$r8F$S=P$7$F$k!D(B */ --#include "mt_jlib.h" /* for WNN_ENV_INT */ - if(js_set_henkan_hinsi_group( (WNN_ENV_INT*)wnnfns_buf[snum]->env, - HINSI_NO_GOYOU, - HINSI_NO_GOYOU_START, diff --git a/japanese/emacs21-emcws/scripts/configure b/japanese/emacs21-emcws/scripts/configure index f588d1f09b77..decb83c576f6 100644 --- a/japanese/emacs21-emcws/scripts/configure +++ b/japanese/emacs21-emcws/scripts/configure @@ -4,11 +4,3 @@ for f in site-init.el; do ${SED} -e "s,%%DOC_FILE%%,${DOC_FILE},g" \ < ${FILESDIR}/${f}.tmpl > ${WRKSRC}/lisp/${f} done - -cd ${WRKSRC} - -if [ -f /usr/lib/aout/crt0.o -a ! -f /usr/lib/crt0.o ]; then - ${SED} -e "s|/usr/lib/crt0\.o|/usr/lib/aout/crt0.o|g" \ - src/s/freebsd.h > src/s/freebsd.h.new || exit - ${MV} -f src/s/freebsd.h.new src/s/freebsd.h -fi |