From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 15 03:01:36 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F1DDE16A4CE for ; Tue, 15 Jun 2004 03:01:35 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2FD743D4C for ; Tue, 15 Jun 2004 03:01:35 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i5F30WJg007314 for ; Tue, 15 Jun 2004 03:00:32 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i5F30WbN007246; Tue, 15 Jun 2004 03:00:32 GMT (envelope-from gnats) Resent-Date: Tue, 15 Jun 2004 03:00:32 GMT Resent-Message-Id: <200406150300.i5F30WbN007246@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KIMURA Yasuhiro Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E8DB816A4CE for ; Tue, 15 Jun 2004 02:59:42 +0000 (GMT) Received: from utahime.as.wakwak.ne.jp (utahime.as.wakwak.ne.jp [61.205.238.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A7E843D4C for ; Tue, 15 Jun 2004 02:59:42 +0000 (GMT) (envelope-from yasu@home.utahime.org) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) by utahime.as.wakwak.ne.jp (Postfix) with ESMTP id 51FADA970 for ; Tue, 15 Jun 2004 11:58:48 +0900 (JST) Received: from localhost.home.utahime.org (localhost.home.utahime.org [127.0.0.1])22C5D5531; Tue, 15 Jun 2004 11:58:48 +0900 (JST) Received: from eastasia.home.utahime.org (localhost.home.utahime.org [127.0.0.1]) by localhost.home.utahime.org (AvMailGate-2.0.2-5) id 23734-09FE2069; Tue, 15 Jun 2004 11:58:48 +0900 Received: by eastasia.home.utahime.org (Postfix, from userid 1000) id 01C965530; Tue, 15 Jun 2004 11:58:47 +0900 (JST) Message-Id: <20040615025847.01C965530@eastasia.home.utahime.org> Date: Tue, 15 Jun 2004 11:58:47 +0900 (JST) From: KIMURA Yasuhiro To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/67957: [PATCH] editors/{tamago,tamago-emacs20} Unbreak tamago-emacs20 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2004 03:01:36 -0000 >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@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: