From owner-freebsd-ports Wed Aug 14 18: 0:23 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D34B537B400 for ; Wed, 14 Aug 2002 18:00:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77A0743E65 for ; Wed, 14 Aug 2002 18:00:07 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7F107JU087265 for ; Wed, 14 Aug 2002 18:00:07 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7F107fO087264; Wed, 14 Aug 2002 18:00:07 -0700 (PDT) Date: Wed, 14 Aug 2002 18:00:07 -0700 (PDT) Message-Id: <200208150100.g7F107fO087264@freefall.freebsd.org> To: freebsd-ports@FreeBSD.org Cc: From: NAKAJI Hiroyuki Subject: Re: ports/41571: japanese/emacs20-emcws doesn't install without japanese/Canna Reply-To: NAKAJI Hiroyuki Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org The following reply was made to PR ports/41571; it has been noted by GNATS. From: NAKAJI Hiroyuki To: "Akinori MUSHA" Cc: freebsd-gnats-submit@FreeBSD.org, Nishimura Takashi 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" 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 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message