ports/67957: [PATCH] editors/{tamago,tamago-emacs20} Unbreak tamago-emacs20

[KIMURA Yasuhiro]

>Number:         67957
>Category:       ports
>Synopsis:       [PATCH] editors/{tamago,tamago-emacs20} Unbreak tamago-emacs20
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 15 03:00:32 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     KIMURA Yasuhiro
>Release:        FreeBSD 4.10-RELEASE i386
>Organization:
>Environment:
System: FreeBSD eastasia.home.utahime.org 4.10-RELEASE FreeBSD 4.10-RELEASE #0: Fri May 28 04:49:31 JST 2004 root at eastasia.home.utahime.org:/usr/obj/usr1/cvsup/releng_4_10/src/sys/EASTASIA i386


	
>Description:
	

	This patch fixes pkg-plist and should unbreak tamago-emacs20.

>How-To-Repeat:
	
>Fix:

	

--- tamago-unbreak.patch begins here ---
diff -ruN editors/tamago-emacs20.dist/Makefile editors/tamago-emacs20/Makefile
--- editors/tamago-emacs20.dist/Makefile	Mon Jun 14 10:11:15 2004
+++ editors/tamago-emacs20/Makefile	Tue Jun 15 11:21:35 2004
@@ -11,6 +11,4 @@
 MASTERDIR=		${.CURDIR}/../tamago
 EMACS_PORT_NAME=	emacs20
 
-BROKEN=		"Broken pkg-plist"
-
 .include "${MASTERDIR}/Makefile"
diff -ruN editors/tamago.dist/Makefile editors/tamago/Makefile
--- editors/tamago.dist/Makefile	Sat May 22 15:34:31 2004
+++ editors/tamago/Makefile	Tue Jun 15 11:17:25 2004
@@ -32,6 +32,12 @@
 ELISPDIR=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 PLIST_SUB=	ELISPDIR="${EMACS_LIBDIR_WITH_VER}/site-lisp"
 
+.if ${EMACS_PORT_NAME} == emacs21
+PLIST_SUB+=	HAS_JISX0213=""
+.else
+PLIST_SUB+=	HAS_JISX0213="@comment "
+.endif
+
 pre-configure:
 	@${REINPLACE_CMD} -e 's|emacs/site-lisp|${EMACS_NAME}/${EMACS_VER}/site-lisp|g' \
 	    ${WRKSRC}/configure
diff -ruN editors/tamago.dist/pkg-plist editors/tamago/pkg-plist
--- editors/tamago.dist/pkg-plist	Sat May 22 15:34:31 2004
+++ editors/tamago/pkg-plist	Tue Jun 15 11:06:08 2004
@@ -34,8 +34,8 @@
 %%ELISPDIR%%/egg/its.elc
 %%ELISPDIR%%/egg/its/ascii.el
 %%ELISPDIR%%/egg/its/ascii.elc
-%%ELISPDIR%%/egg/its/aynu.el
-%%ELISPDIR%%/egg/its/aynu.elc
+%%HAS_JISX0213%%%%ELISPDIR%%/egg/its/aynu.el
+%%HAS_JISX0213%%%%ELISPDIR%%/egg/its/aynu.elc
 %%ELISPDIR%%/egg/its/bixing.el
 %%ELISPDIR%%/egg/its/bixing.elc
 %%ELISPDIR%%/egg/its/erpin.el
--- tamago-unbreak.patch ends here ---


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