From 78a8eba4ce5205a1252734ee566e5d66bbafa905 Mon Sep 17 00:00:00 2001 From: sumikawa Date: Wed, 9 Apr 2003 18:55:29 +0000 Subject: Upgrade to 21.3. --- japanese/emacs-emcws/Makefile | 9 ++++----- japanese/emacs-emcws/distinfo | 4 ++-- japanese/emacs-emcws/files/patch-lisp_dired.el | 10 +++++----- japanese/emacs21-emcws/Makefile | 9 ++++----- japanese/emacs21-emcws/distinfo | 4 ++-- japanese/emacs21-emcws/files/patch-lisp_dired.el | 10 +++++----- 6 files changed, 22 insertions(+), 24 deletions(-) diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile index aac4e6ae2e19..3c18f96da50d 100644 --- a/japanese/emacs-emcws/Makefile +++ b/japanese/emacs-emcws/Makefile @@ -6,8 +6,7 @@ # PORTNAME= emcws -PORTVERSION= 21.2 -PORTREVISION= 4 +PORTVERSION= ${EMACS_VER} CATEGORIES= japanese editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs @@ -15,7 +14,7 @@ DISTNAME= emacs-${PORTVERSION} PATCH_SITES= ftp://ftp.ki.nu/pub/emcws/ \ ftp://ftp.jpl.org/pub/misc/ -PATCHFILES= emcws-${EMACS_VER}-20030212.gz +PATCHFILES= emcws-${EMACS_VER}-20030323.gz PATCH_DIST_STRIP= -p1 MAINTAINER= nakaji@jp.freebsd.org @@ -29,7 +28,7 @@ WRKSRC= ${WRKDIR}/emacs-${EMACS_VER} USE_AUTOCONF= YES USE_GMAKE= YES -EMACS_VER= 21.2 +EMACS_VER= 21.3 # Change these as you like. WITH_WNN6?= NO @@ -155,7 +154,7 @@ pre-build: find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \; ${RM} -rf ${WRKSRC}/info/* @(cd ${WRKSRC}/src/../lisp; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} compile-files EMACS=${LOCALBASE}/bin/emacs-21.2) + ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} compile-files EMACS=${LOCALBASE}/bin/emacs-${EMACS_VER}) @(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs) @(cd ${WRKSRC}/src/../lisp; \ ${WRKSRC}/src/emacs -batch -q -f batch-byte-compile \ diff --git a/japanese/emacs-emcws/distinfo b/japanese/emacs-emcws/distinfo index 674e20a94b98..60d4ab7c0996 100644 --- a/japanese/emacs-emcws/distinfo +++ b/japanese/emacs-emcws/distinfo @@ -1,2 +1,2 @@ -MD5 (emacs-21.2.tar.gz) = f4b58e5c2d923fc92495e0c2f167c5db -MD5 (emcws-21.2-20030212.gz) = c300af64eacbf457f009e1980eb37c41 +MD5 (emacs-21.3.tar.gz) = a0bab457cbf5b4f8eb99d1d0a3ada420 +MD5 (emcws-21.3-20030323.gz) = 3bb57e825d7150daa2f085e442b4300f diff --git a/japanese/emacs-emcws/files/patch-lisp_dired.el b/japanese/emacs-emcws/files/patch-lisp_dired.el index 90081b072053..e4aa2e1cefe8 100644 --- a/japanese/emacs-emcws/files/patch-lisp_dired.el +++ b/japanese/emacs-emcws/files/patch-lisp_dired.el @@ -1,6 +1,6 @@ ---- lisp/dired.el.orig Sat Sep 22 01:41:58 2001 -+++ lisp/dired.el Wed Dec 5 20:06:04 2001 -@@ -1532,6 +1532,7 @@ +--- lisp/dired.el.orig Fri Feb 7 20:48:13 2003 ++++ lisp/dired.el Thu Mar 27 12:12:15 2003 +@@ -1535,6 +1535,7 @@ "\\|" yyyy s s "?" "\\|" s "?" yyyy "\\)")) @@ -8,10 +8,10 @@ (japanese (concat mm k "?" s dd k "?" s "+" "\\(" HH:MM "\\|" yyyy k "?" "\\)"))) -@@ -1543,7 +1544,7 @@ +@@ -1546,7 +1547,7 @@ ;; This avoids recognizing `jservice 10 1024' as a date in the line: ;; drwxr-xr-x 3 jservice 10 1024 Jul 2 1997 esg-host - (concat ".*[0-9][kMGTPEZY]?" + (concat ".*[0-9][kKMGTPEZY]?" - s "\\(" western "\\|" japanese "\\|" iso "\\)" s)) + s "\\(" western "\\|" freebsd-ja "\\|" japanese "\\|" iso "\\)" s)) "Regular expression to match up to the file name in a directory listing. diff --git a/japanese/emacs21-emcws/Makefile b/japanese/emacs21-emcws/Makefile index aac4e6ae2e19..3c18f96da50d 100644 --- a/japanese/emacs21-emcws/Makefile +++ b/japanese/emacs21-emcws/Makefile @@ -6,8 +6,7 @@ # PORTNAME= emcws -PORTVERSION= 21.2 -PORTREVISION= 4 +PORTVERSION= ${EMACS_VER} CATEGORIES= japanese editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs @@ -15,7 +14,7 @@ DISTNAME= emacs-${PORTVERSION} PATCH_SITES= ftp://ftp.ki.nu/pub/emcws/ \ ftp://ftp.jpl.org/pub/misc/ -PATCHFILES= emcws-${EMACS_VER}-20030212.gz +PATCHFILES= emcws-${EMACS_VER}-20030323.gz PATCH_DIST_STRIP= -p1 MAINTAINER= nakaji@jp.freebsd.org @@ -29,7 +28,7 @@ WRKSRC= ${WRKDIR}/emacs-${EMACS_VER} USE_AUTOCONF= YES USE_GMAKE= YES -EMACS_VER= 21.2 +EMACS_VER= 21.3 # Change these as you like. WITH_WNN6?= NO @@ -155,7 +154,7 @@ pre-build: find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \; ${RM} -rf ${WRKSRC}/info/* @(cd ${WRKSRC}/src/../lisp; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} compile-files EMACS=${LOCALBASE}/bin/emacs-21.2) + ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} compile-files EMACS=${LOCALBASE}/bin/emacs-${EMACS_VER}) @(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs) @(cd ${WRKSRC}/src/../lisp; \ ${WRKSRC}/src/emacs -batch -q -f batch-byte-compile \ diff --git a/japanese/emacs21-emcws/distinfo b/japanese/emacs21-emcws/distinfo index 674e20a94b98..60d4ab7c0996 100644 --- a/japanese/emacs21-emcws/distinfo +++ b/japanese/emacs21-emcws/distinfo @@ -1,2 +1,2 @@ -MD5 (emacs-21.2.tar.gz) = f4b58e5c2d923fc92495e0c2f167c5db -MD5 (emcws-21.2-20030212.gz) = c300af64eacbf457f009e1980eb37c41 +MD5 (emacs-21.3.tar.gz) = a0bab457cbf5b4f8eb99d1d0a3ada420 +MD5 (emcws-21.3-20030323.gz) = 3bb57e825d7150daa2f085e442b4300f diff --git a/japanese/emacs21-emcws/files/patch-lisp_dired.el b/japanese/emacs21-emcws/files/patch-lisp_dired.el index 90081b072053..e4aa2e1cefe8 100644 --- a/japanese/emacs21-emcws/files/patch-lisp_dired.el +++ b/japanese/emacs21-emcws/files/patch-lisp_dired.el @@ -1,6 +1,6 @@ ---- lisp/dired.el.orig Sat Sep 22 01:41:58 2001 -+++ lisp/dired.el Wed Dec 5 20:06:04 2001 -@@ -1532,6 +1532,7 @@ +--- lisp/dired.el.orig Fri Feb 7 20:48:13 2003 ++++ lisp/dired.el Thu Mar 27 12:12:15 2003 +@@ -1535,6 +1535,7 @@ "\\|" yyyy s s "?" "\\|" s "?" yyyy "\\)")) @@ -8,10 +8,10 @@ (japanese (concat mm k "?" s dd k "?" s "+" "\\(" HH:MM "\\|" yyyy k "?" "\\)"))) -@@ -1543,7 +1544,7 @@ +@@ -1546,7 +1547,7 @@ ;; This avoids recognizing `jservice 10 1024' as a date in the line: ;; drwxr-xr-x 3 jservice 10 1024 Jul 2 1997 esg-host - (concat ".*[0-9][kMGTPEZY]?" + (concat ".*[0-9][kKMGTPEZY]?" - s "\\(" western "\\|" japanese "\\|" iso "\\)" s)) + s "\\(" western "\\|" freebsd-ja "\\|" japanese "\\|" iso "\\)" s)) "Regular expression to match up to the file name in a directory listing. -- cgit