Apply linespace patch (taoka).

Apply dired.el patch (yoichi).

Submitted by:	taoka, yoichi

3 files changed, 40 insertions, 3 deletions

diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile
index 323fcbad832f..b40c5c0b845a 100644
--- a/editors/emacs20-dl/Makefile
+++ b/editors/emacs20-dl/Makefile
@@ -16,9 +16,11 @@ DISTNAME=	emacs-${EMACS_VER}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${XIM_PATCH}${EXTRACT_SUFX}
 
-PATCH_SITES=	ftp://ftp.m17n.org/pub/mule/dynamic-loading/ \
-		http://www.etl.go.jp/~tomo/comp/emacsen/
-PATCHFILES=	emacs-20.4-dl3.diff.gz
+PATCH_SITES=		ftp://ftp.m17n.org/pub/mule/dynamic-loading/ \
+			http://www.etl.go.jp/~tomo/comp/emacsen/ \
+			${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR=	. shige/emacs
+PATCHFILES=		emacs-20.4-dl3.diff.gz emacs-20.7-linespace-patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	shige@FreeBSD.org
@@ -38,6 +40,7 @@ USE_XLIB=	yes
 .else
 CONFIGURE_ARGS=	--with-x=no --with-pop
 .endif
+CONFIGURE_ARGS+=	--with-line-space
 
 # for XIM extension
 XIM_PATCH=	emacs20-xim-20000713
@@ -62,6 +65,8 @@ CONFIGURE_ARGS+=	--with-xpg4
 .endif
 .endif
 
+RECOMPILE_ELS=	dired.el startup.el
+
 pre-patch:
 	@(cd ${WRKSRC} ; \
 	  ${PATCH} ${PATCH_ARGS} -p1 < ../${XIM_PATCH}/${XIM_PATCH}.diff ;\
@@ -71,6 +76,18 @@ pre-build:
 	@${RM} -rf ${WRKSRC}/info/*
 	@${LN} -sf DOC ${WRKSRC}/etc/${DOC_FILE}
 
+post-build:
+# to rebuild emacs because startup.elc should be updated
+	@(cd ${WRKSRC}/lisp; \
+		${WRKSRC}/src/emacs -batch -q -no-init-file \
+			-f batch-byte-compile ${RECOMPILE_ELS} ; \
+	)
+	@${RM} -f ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VER}*
+	@(cd ${BUILD_WRKSRC}; \
+		${SETENV} ${MAKE_ENV} \
+		${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET} ;\
+	)
+
 do-install:
 	@${INSTALL} -c -s -m 555 -o root -g wheel ${WRKSRC}/src/emacs ${PREFIX}/bin/emacs-dl-${EMACS_VER}
 	@${INSTALL_DATA} ${WRKSRC}/etc/DOC ${PREFIX}/share/emacs/${EMACS_VER}/etc/${DOC_FILE}
diff --git a/editors/emacs20-dl/distinfo b/editors/emacs20-dl/distinfo
index 023e07d42d41..499fd4d1e6f4 100644
--- a/editors/emacs20-dl/distinfo
+++ b/editors/emacs20-dl/distinfo
@@ -1,3 +1,4 @@
 MD5 (emacs-20.7.tar.gz) = c732cf5e668d4ac67d9418ecb103ecf5
 MD5 (emacs20-xim-20000713.tar.gz) = 3fec03adb19038afe25345b12962ec0f
 MD5 (emacs-20.4-dl3.diff.gz) = c7d5891607236066cd1a7f187d6100bc
+MD5 (emacs-20.7-linespace-patch.gz) = 01b6e4480f5801dcfb202ca96f8ad886
diff --git a/editors/emacs20-dl/files/patch-lisp::dired.el b/editors/emacs20-dl/files/patch-lisp::dired.el
new file mode 100644
index 000000000000..79cda88d0d19
--- /dev/null
+++ b/editors/emacs20-dl/files/patch-lisp::dired.el
@@ -0,0 +1,19 @@
+--- lisp/dired.el.orig	Tue Nov 30 00:04:12 1999
++++ lisp/dired.el	Wed Dec  5 03:15:14 2001
+@@ -1375,6 +1375,7 @@
+          ;; weiand: changed: year potentially unaligned
+ ;;old			  s "\\(" HH:MM "\\|" s yyyy "\\|" yyyy s "\\)"))
+ 			  s "\\(" HH:MM "\\|" s "?" yyyy "\\|" yyyy s "\\)"))
++	 (freebsd-ja (concat s mm "/" dd s "\\(" HH:MM "\\|" s yyyy "\\)"))
+ 	 (japanese (concat mm k s dd k s "\\(" s HH:MM "\\|" yyyy k "\\)")))
+ 	 ;; The "[0-9]" below requires the previous column to end in a digit.
+ 	 ;; This avoids recognizing `1 may 1997' as a date in the line:
+@@ -1382,7 +1383,7 @@
+ 	 ;; The ".*" below finds the last match if there are multiple matches.
+ 	 ;; 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]" s "\\(" western "\\|" japanese "\\)" s))
++    (concat ".*[0-9]" s "\\(" western "\\|" japanese "\\|" freebsd-ja "\\)" 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.")