From nobody@FreeBSD.org  Sun Aug 11 23:20:06 2002
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B85CC37B400
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 11 Aug 2002 23:20:06 -0700 (PDT)
Received: from www.freebsd.org (www.FreeBSD.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7B9D443E3B
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 11 Aug 2002 23:20:06 -0700 (PDT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.4/8.12.4) with ESMTP id g7C6K5OT017412
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 11 Aug 2002 23:20:05 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.4/8.12.4/Submit) id g7C6K5xO017411;
	Sun, 11 Aug 2002 23:20:05 -0700 (PDT)
Message-Id: <200208120620.g7C6K5xO017411@www.freebsd.org>
Date: Sun, 11 Aug 2002 23:20:05 -0700 (PDT)
From: Nishimura Takashi <tanishi@syd.odn.ne.jp>
To: freebsd-gnats-submit@FreeBSD.org
Subject: japanese/emacs20-emcws doesn't install without japanese/Canna
X-Send-Pr-Version: www-1.0

>Number:         41571
>Category:       ports
>Synopsis:       japanese/emacs20-emcws doesn't install without japanese/Canna
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 11 23:30:01 PDT 2002
>Closed-Date:    Thu Oct 24 07:03:40 JST 2002
>Last-Modified:  Thu Oct 24 07:03:40 JST 2002
>Originator:     Nishimura Takashi
>Release:        4.6-RC4
>Organization:
Nomura Research Institute, Ltd.
>Environment:
FreeBSD t3-nishimu-bsd 4.6-RC4 FreeBSD 4.6-RC4 #0: Wed Jun  5 03:44:53 GMT 2002
murray@builder.freebsdmall.com:/usr/src/sys/compile/GENERIC  i386

>Description:
japanese/emacs20-emcws install fails with USE_CANNA=NO.

>How-To-Repeat:
# make USE_WNN6=NO USE_FREEWNN=YES USE_CANNA=NO install
===>  Installing for ja-emcws-20.7_2
===>   ja-emcws-20.7_2 depends on shared library: wnn.0 - found
===>   ja-emcws-20.7_2 depends on shared library: X11.6 - found
install: /usr/local/ports/japanese/emacs20-emcws/work/emacs-20.7/lisp/canna.elc:
 No such file or directory
*** Error code 71

Stop in /usr/local/ports/japanese/emacs20-emcws.

>Fix:

>Release-Note:
>Audit-Trail:

From: "Akinori MUSHA" <knu@iDaemons.org>
To: nakaji@jp.freebsd.org
Cc: freebsd-gnats-submit@FreeBSD.org,
	Nishimura Takashi <tanishi@syd.odn.ne.jp>
Subject: Re: ports/41571: japanese/emacs20-emcws doesn't install without japanese/Canna
Date: Mon, 12 Aug 2002 19:59:39 +0900

 At Sun, 11 Aug 2002 23:20:05 -0700 (PDT),
 Nishimura Takashi wrote:
 > >Description:
 > japanese/emacs20-emcws install fails with USE_CANNA=NO.
 > 
 > >How-To-Repeat:
 > # make USE_WNN6=NO USE_FREEWNN=YES USE_CANNA=NO install
 > ===>  Installing for ja-emcws-20.7_2
 > ===>   ja-emcws-20.7_2 depends on shared library: wnn.0 - found
 > ===>   ja-emcws-20.7_2 depends on shared library: X11.6 - found
 > install: /usr/local/ports/japanese/emacs20-emcws/work/emacs-20.7/lisp/canna.elc:
 >  No such file or directory
 > *** Error code 71
 > 
 > Stop in /usr/local/ports/japanese/emacs20-emcws.
 
 MAINTAINER, any idea/fix on this?
 
 -- 
                      /
                     /__  __            Akinori.org / MUSHA.org
                    / )  )  ) )  /     FreeBSD.org / Ruby-lang.org
 Akinori MUSHA aka / (_ /  ( (__(  @ iDaemons.org / and.or.jp
 
 "When I leave I don't know what I'm hoping to find
               When I leave I don't know what I'm leaving behind.."

From: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
To: "Akinori MUSHA" <knu@iDaemons.org>
Cc: freebsd-gnats-submit@FreeBSD.org,
	Nishimura Takashi <tanishi@syd.odn.ne.jp>
Subject: Re: ports/41571: japanese/emacs20-emcws doesn't install without japanese/Canna
Date: Tue, 13 Aug 2002 18:11:00 +0900

 >>>>> In <86it2g2vhg.wl@archon.local.idaemons.org> 
 >>>>>	"Akinori MUSHA" <knu@iDaemons.org> wrote:
 
 knu> MAINTAINER, any idea/fix on this?
 
 How about this?
 
 Index: Makefile
 ===================================================================
 RCS file: /net/pcat/home/ncvs/ports/japanese/emacs20-emcws/Makefile,v
 retrieving revision 1.6
 diff -u -r1.6 Makefile
 --- Makefile	10 Apr 2002 16:29:21 -0000	1.6
 +++ Makefile	13 Aug 2002 09:07:11 -0000
 @@ -77,11 +77,9 @@
  EMCWS_ELCS=	busyu.el \
  		can-n-egg.el \
  		canna.el \
 -		canna.elc \
  		egg-jsymbol.el \
  		egg-keymap.el \
  		egg.el \
 -		egg.elc \
  		eggrc-sj3 \
  		eggrc-v41 \
  		eggrc-wnn \
 @@ -97,8 +95,25 @@
  		sj3-client.el \
  		sj3-egg.el \
  		wnn-client.el \
 -		wnn-egg.el \
 +		wnn-egg.el
 +
 +.if defined(USE_WNN6) || defined(USE_FREEWNN)
 +.if (${USE_WNN6} == "yes" || ${USE_WNN6} == "YES") || (${USE_FREEWNN} == "yes" || ${USE_FREEWNN} == "YES")
 +EMCWS_ELCS+=	egg.elc \
  		wnn-egg.elc
 +.endif
 +.endif
 +.if defined(USE_CANNA)
 +.if (${USE_CANNA} == "yes" || ${USE_CANNA} == "YES")
 +EMCWS_ELCS+=	canna.elc
 +.endif
 +.endif
 +.if defined(USE_SJ3)
 +.if (${USE_SJ3} == "yes" || ${USE_SJ3} == "YES")
 +EMCWS_ELCS+=	sj3-client.elc \
 +		sj3-egg.elc
 +.endif
 +.endif
  
  MULE_PATCHED_ELS=	ange-ftp.el ange-ftp.elc \
  			help.el help.elc \
 -- 
 NAKAJI Hiroyuki

From: "Akinori MUSHA" <knu@iDaemons.org>
To: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
Cc: freebsd-gnats-submit@FreeBSD.org,
	Nishimura Takashi <tanishi@syd.odn.ne.jp>
Subject: Re: ports/41571: japanese/emacs20-emcws doesn't install without japanese/Canna
Date: Thu, 15 Aug 2002 06:45:27 +0900

 At Tue, 13 Aug 2002 18:11:00 +0900,
 NAKAJI Hiroyuki wrote:
 > 
 > >>>>> In <86it2g2vhg.wl@archon.local.idaemons.org> 
 > >>>>>	"Akinori MUSHA" <knu@iDaemons.org> wrote:
 > 
 > knu> MAINTAINER, any idea/fix on this?
 > 
 > How about this?
 
 I think pkg-plist should also be tweaked in sync with this change.
 
 pkg-plist:
 -share/emacs/%%EMACS_VER%%-emcws/lisp/canna.elc
 +%%USE_CANNA%%share/emacs/%%EMACS_VER%%-emcws/lisp/canna.elc
 
 Makefile:
 +.if (${USE_CANNA} == "yes" || ${USE_CANNA} == "YES")
 +EMCWS_ELCS+=	canna.elc
 +PLIST_SUB+=	USE_CANNA=""
 +.else
 +PLIST_SUB+=	USE_CANNA="@comment "
 +.endif
 
 etc. .
 
 By the way, I prefer WITH_CANNA to USE_CANNA for consistency sake.
 WITH_ (or WITHOUT_) is the most common prefix for ports' build
 options whereas USE_ is (virtually) reserved for bsd.*.mk.
 
 -- 
                      /
                     /__  __            Akinori.org / MUSHA.org
                    / )  )  ) )  /     FreeBSD.org / Ruby-lang.org
 Akinori MUSHA aka / (_ /  ( (__(  @ iDaemons.org / and.or.jp
 
 "When I leave I don't know what I'm hoping to find
               When I leave I don't know what I'm leaving behind.."

From: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
To: "Akinori MUSHA" <knu@iDaemons.org>
Cc: freebsd-gnats-submit@FreeBSD.org,
	Nishimura Takashi <tanishi@syd.odn.ne.jp>
Subject: Re: ports/41571: japanese/emacs20-emcws doesn't install without japanese/Canna
Date: Thu, 15 Aug 2002 09:57:18 +0900

 >>>>> In <86r8h1f72g.wl@archon.local.idaemons.org> 
 >>>>>	"Akinori MUSHA" <knu@iDaemons.org> wrote:
 
 knu> I think pkg-plist should also be tweaked in sync with this
 knu> change.
 
 I think so too. And I noticed that
 editors/emacs20/files/patch-src_emacs.c is also necessary. Please copy
 it in japanese/emacs20-emcws/files.
 
 knu> By the way, I prefer WITH_CANNA to USE_CANNA for consistency sake.
 knu> WITH_ (or WITHOUT_) is the most common prefix for ports' build
 knu> options whereas USE_ is (virtually) reserved for bsd.*.mk.
 
 I did not know the difference between USE_ and WITH_, thanks.
 
 Here is a new diff from CVS head. I only tested WITH_WNN6=yes and
 WITH_CANNA=yes. Users please test other combination.
 
 Index: Makefile
 ===================================================================
 RCS file: /net/pcat/home/ncvs/ports/japanese/emacs20-emcws/Makefile,v
 retrieving revision 1.6
 diff -u -u -r1.6 Makefile
 --- Makefile	10 Apr 2002 16:29:21 -0000	1.6
 +++ Makefile	15 Aug 2002 00:40:25 -0000
 @@ -32,10 +32,10 @@
  EMACS_VER=	20.7
  
  # Change these as you like.
 -USE_WNN6?=	YES
 -USE_FREEWNN?=	NO
 -USE_CANNA?=	YES
 -USE_SJ3?=	NO
 +WITH_WNN6?=	YES
 +WITH_FREEWNN?=	NO
 +WITH_CANNA?=	YES
 +WITH_SJ3?=	NO
  
  CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
  .if !defined(NO_X11)
 @@ -44,30 +44,30 @@
  .else
  CONFIGURE_ARGS=	--with-x=no --with-pop
  .endif
 -.if defined(USE_WNN6)
 -.if (${USE_WNN6} == "yes" || ${USE_WNN6} == "YES")
 +.if defined(WITH_WNN6)
 +.if (${WITH_WNN6} == "yes" || ${WITH_WNN6} == "YES")
  CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn6/wnn \
  		--with-wnn-libraries=${LOCALBASE}/lib/libwnn6.so
  LIB_DEPENDS+=	wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
  .endif
  .endif
 -.if defined(USE_FREEWNN)
 -.if (${USE_FREEWNN} == "yes" || ${USE_FREEWNN} == "YES")
 +.if defined(WITH_FREEWNN)
 +.if (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
  CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn \
  		--with-wnn-libraries=${LOCALBASE}/lib/libwnn.so
  LIB_DEPENDS+=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
  .endif
  .endif
 -.if defined(USE_CANNA)
 -.if (${USE_CANNA} == "yes" || ${USE_CANNA} == "YES")
 +.if defined(WITH_CANNA)
 +.if (${WITH_CANNA} == "yes" || ${WITH_CANNA} == "YES")
  CONFIGURE_ARGS+=	--with-canna \
  			--with-canna-includes=${LOCALBASE}/include \
  			--with-canna-libraries=${LOCALBASE}/lib
  LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/Canna
  .endif
  .endif
 -.if defined(USE_SJ3)
 -.if (${USE_SJ3} == "yes" || ${USE_SJ3} == "YES")
 +.if defined(WITH_SJ3)
 +.if (${WITH_SJ3} == "yes" || ${WITH_SJ3} == "YES")
  CONFIGURE_ARGS+=	--with-sj3
  BUILD_DEPENDS+=		sj3serv:${PORTSDIR}/japanese/sj3
  .endif
 @@ -77,11 +77,9 @@
  EMCWS_ELCS=	busyu.el \
  		can-n-egg.el \
  		canna.el \
 -		canna.elc \
  		egg-jsymbol.el \
  		egg-keymap.el \
  		egg.el \
 -		egg.elc \
  		eggrc-sj3 \
  		eggrc-v41 \
  		eggrc-wnn \
 @@ -97,8 +95,34 @@
  		sj3-client.el \
  		sj3-egg.el \
  		wnn-client.el \
 -		wnn-egg.el \
 +		wnn-egg.el
 +
 +.if defined(WITH_WNN6) || defined(WITH_FREEWNN)
 +.if (${WITH_WNN6} == "yes" || ${WITH_WNN6} == "YES") || (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
 +EMCWS_ELCS+=	egg.elc \
  		wnn-egg.elc
 +PLIST_SUB+=	WITH_WNN=""
 +.else
 +PLIST_SUB+=	WITH_WNN="@comment "
 +.endif
 +.endif
 +.if defined(WITH_CANNA)
 +.if (${WITH_CANNA} == "yes" || ${WITH_CANNA} == "YES")
 +EMCWS_ELCS+=	canna.elc
 +PLIST_SUB+=	WITH_CANNA=""
 +.else
 +PLIST_SUB+=	WITH_CANNA="@comment "
 +.endif
 +.endif
 +.if defined(WITH_SJ3)
 +.if (${WITH_SJ3} == "yes" || ${WITH_SJ3} == "YES")
 +EMCWS_ELCS+=	sj3-client.elc \
 +		sj3-egg.elc
 +PLIST_SUB+=	WITH_SJ3=""
 +.else
 +PLIST_SUB+=	WITH_SJ3="@comment "
 +.endif
 +.endif
  
  MULE_PATCHED_ELS=	ange-ftp.el ange-ftp.elc \
  			help.el help.elc \
 Index: pkg-plist
 ===================================================================
 RCS file: /net/pcat/home/ncvs/ports/japanese/emacs20-emcws/pkg-plist,v
 retrieving revision 1.2
 diff -u -u -r1.2 pkg-plist
 --- pkg-plist	1 Dec 2001 09:09:12 -0000	1.2
 +++ pkg-plist	15 Aug 2002 00:43:26 -0000
 @@ -7,11 +7,11 @@
  share/emacs/%%EMACS_VER%%-emcws/lisp/busyu.el
  share/emacs/%%EMACS_VER%%-emcws/lisp/can-n-egg.el
  share/emacs/%%EMACS_VER%%-emcws/lisp/canna.el
 -share/emacs/%%EMACS_VER%%-emcws/lisp/canna.elc
 +%%WITH_CANNA%%share/emacs/%%EMACS_VER%%-emcws/lisp/canna.elc
  share/emacs/%%EMACS_VER%%-emcws/lisp/egg-jsymbol.el
  share/emacs/%%EMACS_VER%%-emcws/lisp/egg-keymap.el
  share/emacs/%%EMACS_VER%%-emcws/lisp/egg.el
 -share/emacs/%%EMACS_VER%%-emcws/lisp/egg.elc
 +%%WITH_WNN%%share/emacs/%%EMACS_VER%%-emcws/lisp/egg.elc
  share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-sj3
  share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-v41
  share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-wnn
 @@ -38,10 +38,12 @@
  share/emacs/%%EMACS_VER%%-emcws/lisp/loadup.el
  share/emacs/%%EMACS_VER%%-emcws/lisp/mule-inst.el
  share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-client.el
 +%%WITH_SJ3%%share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-client.elc
  share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-egg.el
 +%%WITH_SJ3%%share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-egg.elc
  share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-client.el
  share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-egg.el
 -share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-egg.elc
 +%%WITH_WNN%%share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-egg.elc
  share/emacs/%%EMACS_VER%%-emcws/site-lisp/subdirs.el
  share/emacs/%%EMACS_VER%%-emcws/lisp/subdirs.el
  @dirrm share/emacs/%%EMACS_VER%%-emcws/lisp/its

From: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
To: "Akinori MUSHA" <knu@iDaemons.org>
Cc: freebsd-gnats-submit@FreeBSD.org,
	Nishimura Takashi <tanishi@syd.odn.ne.jp>
Subject: Re: ports/41571: japanese/emacs20-emcws doesn't install without japanese/Canna
Date: Sun, 25 Aug 2002 01:10:54 +0900

 If this change is good, it may be ok for japanese/emacs21-emcws.
 
 Can anybody check them?
 -- 
 NAKAJI Hiroyuki
State-Changed-From-To: open->closed 
State-Changed-By: knu 
State-Changed-When: Thu Oct 24 07:03:20 JST 2002 
State-Changed-Why:  
Fixed some time ago, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=41571 
>Unformatted:
