ports/63387: [japanese/emacs21-emcws] enable menubar fontset support

[NAKAJI Hiroyuki]

>Number:         63387
>Category:       ports
>Synopsis:       [japanese/emacs21-emcws] enable menubar fontset support
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 26 05:10:12 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     NAKAJI Hiroyuki
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD xa12.heimat.gr.jp 5.2-CURRENT FreeBSD 5.2-CURRENT #2: Sun Jan 4 12:30:30 JST 2004 root at xa12.heimat.gr.jp:/usr/obj/usr/src/sys/NAKAJI i386


>Description:
	There are two patch files for emacs-21.x to enable menubar
fontset support. And they are available to use in editors/emacs21 but
not in japanese/emacs21-emcws.
	
>How-To-Repeat:

>Fix:
	I only checked 'make install && make deinstall' was successful.

Index: Makefile
===================================================================
RCS file: /net/pcat/home/ncvs/ports/japanese/emacs21-emcws/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile	10 Feb 2004 22:43:17 -0000	1.25
+++ Makefile	26 Feb 2004 11:01:13 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	emcws
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
@@ -17,6 +17,11 @@
 		ftp://ftp.jpl.org/pub/misc/
 PATCHFILES=	emcws-${EMACS_VER}-20031213.gz
 PATCH_DIST_STRIP=	-p1
+.if defined(WITH_MENUBAR_FONTSET)
+PATCH_SITES+=		http://www.nijino.com/ari/emacs/
+PATCHFILES+=		emacs-21.1-fontset.patch emacs-21.2-menu-encode.patch
+PATCH_DIST_STRIP=	-p1
+.endif
 
 MAINTAINER=	nakaji at jp.freebsd.org
 COMMENT=	Emacs + Canna + Wnn + Sj3
@@ -152,8 +157,13 @@
 EMACS_BASE=${LOCALBASE}
 .endif
 
-pre-fetch:
+pre-everything::
 	@${CAT} ${FILESDIR}/emcws-message
+.if !defined(WITH_MENUBAR_FONTSET)
+	@${ECHO_MSG} "====>"
+	@${ECHO_MSG} "====> To enable menubar fontset support, define WITH_MENUBAR_FONTSET"
+	@${ECHO_MSG} "====>"
+.endif
 
 pre-build:
 	${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
@@ -205,5 +215,12 @@
 	   ${ECHO_CMD} "    (normal-top-level-add-subdirs-to-load-path))") \
 	  > ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/subdirs.el ; \
 	fi
+
+post-install:
+.if defined(WITH_MENUBAR_FONTSET)
+	@${ECHO_MSG} "====>"
+	@${ECHO_MSG} "====> To use Japanese menu, you need menu-tree.el which is available from http://www.is.titech.ac.jp/~yagi/emacs/menu-tree.el"
+	@${ECHO_MSG} "====>"
+.endif
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /net/pcat/home/ncvs/ports/japanese/emacs21-emcws/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo	20 Dec 2003 01:46:11 -0000	1.9
+++ distinfo	25 Feb 2004 22:25:56 -0000
@@ -1,2 +1,8 @@
 MD5 (emacs-21.3.tar.gz) = a0bab457cbf5b4f8eb99d1d0a3ada420
+SIZE (emacs-21.3.tar.gz) = 20399831
 MD5 (emcws-21.3-20031213.gz) = 673dfb5cb640f21620aaadd5aa27a28a
+SIZE (emcws-21.3-20031213.gz) = 190300
+MD5 (emacs-21.1-fontset.patch) = 4d2cdde317b96207f95a7be8cd4f20fc
+SIZE (emacs-21.1-fontset.patch) = 8647
+MD5 (emacs-21.2-menu-encode.patch) = f888cbac4a98c78ad1cf621957b9b247
+SIZE (emacs-21.2-menu-encode.patch) = 3517


>Release-Note:
>Audit-Trail:
>Unformatted: