summaryrefslogtreecommitdiff
path: root/editors/emacs21
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2001-12-06 12:29:41 +0000
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2001-12-06 12:29:41 +0000
commitb0eea5e5bd47134455311cd65f6e69677e9e0517 (patch)
tree14c9396091de5f9b82da8627a42900df4f8b711c /editors/emacs21
parent- Update MASTER_SITES and WWW; (diff)
Set ALL_TARGET=bootstrap to byte-compile patched elisp files.
Add WITHOUT_XIM and WITHOUT_MENUBAR_FONTSET switch. Make dired output in Japanese locale the same as FreeBSD ls. Submitted by: kuriyama, yoichi Reviewed by: knu
Notes
Notes: svn path=/head/; revision=51135
Diffstat (limited to 'editors/emacs21')
-rw-r--r--editors/emacs21/Makefile16
-rw-r--r--editors/emacs21/files/patch-lisp_dired.el19
2 files changed, 30 insertions, 5 deletions
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 9c904a745dfb..bdff403dadc0 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -7,15 +7,11 @@
PORTNAME= emacs
PORTVERSION= 21.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
-PATCH_SITES= http://www.nijino.com/ari/patches/
-PATCHFILES= emacs-21.1-fontset-20011109.patch.gz
-PATCH_DIST_STRIP= -p1
-
MAINTAINER= nobutaka@FreeBSD.org
.if !defined(WITHOUT_X11)
@@ -28,13 +24,23 @@ USE_XLIB= yes
USE_XPM= yes
.endif
+.if !defined(WITHOUT_MENUBAR_FONTSET)
+PATCH_SITES= http://www.nijino.com/ari/patches/
+PATCHFILES= emacs-21.1-fontset-20011109.patch.gz
+PATCH_DIST_STRIP= -p1
+.endif
+
USE_AUTOCONF= yes
USE_GMAKE= yes
+ALL_TARGET= bootstrap
CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd
.if defined(WITHOUT_X11)
CONFIGURE_ARGS= --with-x=no
.endif
+.if defined(WITHOUT_XIM)
+CONFIGURE_ARGS+= --without-xim
+.endif
MAN1= ctags.1 emacs.1 etags.1 gfdl.1
PLIST_SUB= EMACS_VER=${PORTVERSION} EMACS_ARCH=${CONFIGURE_TARGET}
diff --git a/editors/emacs21/files/patch-lisp_dired.el b/editors/emacs21/files/patch-lisp_dired.el
new file mode 100644
index 000000000000..90081b072053
--- /dev/null
+++ b/editors/emacs21/files/patch-lisp_dired.el
@@ -0,0 +1,19 @@
+--- 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 @@
+ "\\|" yyyy s s "?"
+ "\\|" s "?" yyyy
+ "\\)"))
++ (freebsd-ja (concat s mm "/" dd s "\\(" HH:MM "\\|" s yyyy "\\)"))
+ (japanese
+ (concat mm k "?" s dd k "?" s "+"
+ "\\(" HH:MM "\\|" yyyy k "?" "\\)")))
+@@ -1543,7 +1544,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]?"
+- 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.
+ The default value is designed to recognize dates and times
+ regardless of the language.")