From owner-freebsd-ports Fri Aug 2 4:43:34 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 DEBA637B405 for ; Fri, 2 Aug 2002 04:42:31 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D0A943F46 for ; Fri, 2 Aug 2002 04:40:02 -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 g72Be2JU004702 for ; Fri, 2 Aug 2002 04:40:02 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g72Be2Us004701; Fri, 2 Aug 2002 04:40:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D4A8937B400 for ; Fri, 2 Aug 2002 04:37:42 -0700 (PDT) Received: from berkeley.sa2c.net (berkeley.sa2c.net [61.194.193.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DC0643E42 for ; Fri, 2 Aug 2002 04:37:41 -0700 (PDT) (envelope-from sa2c@sa2c.net) Received: by berkeley.sa2c.net (Postfix, from userid 3104) id 5ECF92C1; Fri, 2 Aug 2002 20:37:40 +0900 (JST) Message-Id: <20020802113740.5ECF92C1@berkeley.sa2c.net> Date: Fri, 2 Aug 2002 20:37:40 +0900 (JST) From: NIIMI Satoshi Reply-To: NIIMI Satoshi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/41259: Info directory change for various GNU Emacs flavors 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 >Number: 41259 >Category: ports >Synopsis: Info directory change for various GNU Emacs flavors >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Aug 02 04:40:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: NIIMI Satoshi >Release: FreeBSD 4.6.1-RELEASE-p7 i386 >Organization: >Environment: System: FreeBSD berkeley.sa2c.net 4.6.1-RELEASE-p7 FreeBSD 4.6.1-RELEASE-p7 #4: Fri Aug 2 17:03:52 JST 2002 sa2c@berkeley.sa2c.net:/usr/obj/usr/src/sys/SA2C_NET i386 >Description: I've noticed that XEmacs ports install their info files into version specific directories. I think it's a good idea also for GNU Emacs. Because: * Better coexistence with various versions. Emacs users tend to keep some versions installed by some reasons. * Emacs is a self-documenting text editor. If help-string refers a info file from different version's, users will be confused. * Although /usr/bin/info will not be able to refer Emacs info files, Emacs comes with more powerful info viewer. :-) More considerations may be required: * I included %%EMACS_VERSION%%/info/dir as a normal file like XEmacs ports because %%EMACS_VERSION%%/info/ should be dedicated for Emacs only. But some elisp libraries might want to install their info files into version specific directory. * This PR covers following ports: editors/emacs editors/emacs20 editors/emacs20-dl editors/emacs20-mule-devel editors/emacs21 editors/mule editors/mule-common The reason why I post this as one big PR is that I think it would be better these ports are committed at once than separately. >How-To-Repeat: This is a change request. Not a bug report. >Fix: --- diff begins here --- Index: emacs/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/emacs/Makefile,v retrieving revision 1.46 diff -u -r1.46 Makefile --- emacs/Makefile 1 Jan 2001 10:15:01 -0000 1.46 +++ emacs/Makefile 2 Aug 2002 10:32:07 -0000 @@ -7,6 +7,7 @@ PORTNAME= emacs PORTVERSION= 19.34b +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs @@ -26,6 +27,7 @@ .else CONFIGURE_ARGS= --with-x=no --sharedstatedir=/var/run .endif +CONFIGURE_ARGS+= --infodir='$${datadir}/emacs/$${version}/info' STRIP= MAN1= emacs.1 etags.1 ctags.1 Index: emacs/pkg-plist =================================================================== RCS file: /home/ncvs/ports/editors/emacs/pkg-plist,v retrieving revision 1.23 diff -u -r1.23 pkg-plist --- emacs/pkg-plist 5 Jun 1999 22:22:15 -0000 1.23 +++ emacs/pkg-plist 2 Aug 2002 10:32:07 -0000 @@ -13,105 +13,82 @@ @comment This can fail if other ports are installed, no need to @comment scare user in that case @unexec rmdir %D/share/emacs/%%EMACS_VERSION%%/site-lisp 2>/dev/null || true -@unexec install-info --delete %D/info/emacs %D/info/dir -@unexec install-info --delete %D/info/vip %D/info/dir -@unexec install-info --delete %D/info/viper %D/info/dir -@unexec install-info --delete %D/info/forms %D/info/dir -@unexec install-info --delete %D/info/gnus %D/info/dir -@unexec install-info --delete %D/info/mh-e %D/info/dir -@unexec install-info --delete %D/info/cl %D/info/dir -@unexec install-info --delete %D/info/sc %D/info/dir -@unexec install-info --delete %D/info/dired-x %D/info/dir -@unexec install-info --delete %D/info/ediff %D/info/dir -@unexec install-info --delete %D/info/ccmode %D/info/dir -@unexec install-info --delete %D/info/message %D/info/dir -info/ccmode -info/ccmode-1 -info/ccmode-2 -info/cl -info/cl-1 -info/cl-2 -info/cl-3 -info/cl-4 -info/cl-5 -info/cl-6 -info/dired-x -info/ediff -info/ediff-1 -info/ediff-2 -info/emacs -info/emacs-1 -info/emacs-10 -info/emacs-11 -info/emacs-12 -info/emacs-13 -info/emacs-14 -info/emacs-15 -info/emacs-16 -info/emacs-17 -info/emacs-18 -info/emacs-19 -info/emacs-2 -info/emacs-20 -info/emacs-21 -info/emacs-22 -info/emacs-23 -info/emacs-24 -info/emacs-25 -info/emacs-26 -info/emacs-27 -info/emacs-28 -info/emacs-29 -info/emacs-3 -info/emacs-4 -info/emacs-5 -info/emacs-6 -info/emacs-7 -info/emacs-8 -info/emacs-9 -info/forms -info/gnus -info/gnus-1 -info/gnus-2 -info/gnus-3 -info/gnus-4 -info/gnus-5 -info/gnus-6 -info/gnus-7 -info/gnus-8 -info/gnus-9 -info/gnus-10 -info/gnus-11 -info/message -info/mh-e -info/mh-e-1 -info/mh-e-2 -info/mh-e-3 -info/mh-e-4 -info/sc -info/sc-1 -info/sc-2 -info/sc-3 -info/vip -info/vip-1 -info/vip-2 -info/viper -info/viper-1 -info/viper-2 -info/viper-3 -info/viper-4 -@exec install-info %D/info/emacs %D/info/dir -@exec install-info %D/info/vip %D/info/dir -@exec install-info %D/info/viper %D/info/dir -@exec install-info %D/info/forms %D/info/dir -@exec install-info %D/info/gnus %D/info/dir -@exec install-info %D/info/mh-e %D/info/dir -@exec install-info %D/info/cl %D/info/dir -@exec install-info %D/info/sc %D/info/dir -@exec install-info %D/info/dired-x %D/info/dir -@exec install-info %D/info/ediff %D/info/dir -@exec install-info %D/info/ccmode %D/info/dir -@exec install-info %D/info/message %D/info/dir +share/emacs/%%EMACS_VERSION%%/info/ccmode +share/emacs/%%EMACS_VERSION%%/info/ccmode-1 +share/emacs/%%EMACS_VERSION%%/info/ccmode-2 +share/emacs/%%EMACS_VERSION%%/info/cl +share/emacs/%%EMACS_VERSION%%/info/cl-1 +share/emacs/%%EMACS_VERSION%%/info/cl-2 +share/emacs/%%EMACS_VERSION%%/info/cl-3 +share/emacs/%%EMACS_VERSION%%/info/cl-4 +share/emacs/%%EMACS_VERSION%%/info/cl-5 +share/emacs/%%EMACS_VERSION%%/info/cl-6 +share/emacs/%%EMACS_VERSION%%/info/dir +share/emacs/%%EMACS_VERSION%%/info/dired-x +share/emacs/%%EMACS_VERSION%%/info/ediff +share/emacs/%%EMACS_VERSION%%/info/ediff-1 +share/emacs/%%EMACS_VERSION%%/info/ediff-2 +share/emacs/%%EMACS_VERSION%%/info/emacs +share/emacs/%%EMACS_VERSION%%/info/emacs-1 +share/emacs/%%EMACS_VERSION%%/info/emacs-10 +share/emacs/%%EMACS_VERSION%%/info/emacs-11 +share/emacs/%%EMACS_VERSION%%/info/emacs-12 +share/emacs/%%EMACS_VERSION%%/info/emacs-13 +share/emacs/%%EMACS_VERSION%%/info/emacs-14 +share/emacs/%%EMACS_VERSION%%/info/emacs-15 +share/emacs/%%EMACS_VERSION%%/info/emacs-16 +share/emacs/%%EMACS_VERSION%%/info/emacs-17 +share/emacs/%%EMACS_VERSION%%/info/emacs-18 +share/emacs/%%EMACS_VERSION%%/info/emacs-19 +share/emacs/%%EMACS_VERSION%%/info/emacs-2 +share/emacs/%%EMACS_VERSION%%/info/emacs-20 +share/emacs/%%EMACS_VERSION%%/info/emacs-21 +share/emacs/%%EMACS_VERSION%%/info/emacs-22 +share/emacs/%%EMACS_VERSION%%/info/emacs-23 +share/emacs/%%EMACS_VERSION%%/info/emacs-24 +share/emacs/%%EMACS_VERSION%%/info/emacs-25 +share/emacs/%%EMACS_VERSION%%/info/emacs-26 +share/emacs/%%EMACS_VERSION%%/info/emacs-27 +share/emacs/%%EMACS_VERSION%%/info/emacs-28 +share/emacs/%%EMACS_VERSION%%/info/emacs-29 +share/emacs/%%EMACS_VERSION%%/info/emacs-3 +share/emacs/%%EMACS_VERSION%%/info/emacs-4 +share/emacs/%%EMACS_VERSION%%/info/emacs-5 +share/emacs/%%EMACS_VERSION%%/info/emacs-6 +share/emacs/%%EMACS_VERSION%%/info/emacs-7 +share/emacs/%%EMACS_VERSION%%/info/emacs-8 +share/emacs/%%EMACS_VERSION%%/info/emacs-9 +share/emacs/%%EMACS_VERSION%%/info/forms +share/emacs/%%EMACS_VERSION%%/info/gnus +share/emacs/%%EMACS_VERSION%%/info/gnus-1 +share/emacs/%%EMACS_VERSION%%/info/gnus-2 +share/emacs/%%EMACS_VERSION%%/info/gnus-3 +share/emacs/%%EMACS_VERSION%%/info/gnus-4 +share/emacs/%%EMACS_VERSION%%/info/gnus-5 +share/emacs/%%EMACS_VERSION%%/info/gnus-6 +share/emacs/%%EMACS_VERSION%%/info/gnus-7 +share/emacs/%%EMACS_VERSION%%/info/gnus-8 +share/emacs/%%EMACS_VERSION%%/info/gnus-9 +share/emacs/%%EMACS_VERSION%%/info/gnus-10 +share/emacs/%%EMACS_VERSION%%/info/gnus-11 +share/emacs/%%EMACS_VERSION%%/info/message +share/emacs/%%EMACS_VERSION%%/info/mh-e +share/emacs/%%EMACS_VERSION%%/info/mh-e-1 +share/emacs/%%EMACS_VERSION%%/info/mh-e-2 +share/emacs/%%EMACS_VERSION%%/info/mh-e-3 +share/emacs/%%EMACS_VERSION%%/info/mh-e-4 +share/emacs/%%EMACS_VERSION%%/info/sc +share/emacs/%%EMACS_VERSION%%/info/sc-1 +share/emacs/%%EMACS_VERSION%%/info/sc-2 +share/emacs/%%EMACS_VERSION%%/info/sc-3 +share/emacs/%%EMACS_VERSION%%/info/vip +share/emacs/%%EMACS_VERSION%%/info/vip-1 +share/emacs/%%EMACS_VERSION%%/info/vip-2 +share/emacs/%%EMACS_VERSION%%/info/viper +share/emacs/%%EMACS_VERSION%%/info/viper-1 +share/emacs/%%EMACS_VERSION%%/info/viper-2 +share/emacs/%%EMACS_VERSION%%/info/viper-3 +share/emacs/%%EMACS_VERSION%%/info/viper-4 libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/cvtmail libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/digest-doc libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/emacsserver Index: emacs20/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/emacs20/Makefile,v retrieving revision 1.55 diff -u -r1.55 Makefile --- emacs20/Makefile 6 Jan 2002 06:20:18 -0000 1.55 +++ emacs20/Makefile 2 Aug 2002 10:32:07 -0000 @@ -7,7 +7,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs @@ -29,7 +29,8 @@ CONFIGURE_ARGS= --with-x-toolkit --with-pop USE_XLIB= yes .endif -CONFIGURE_ARGS+= --with-line-space +CONFIGURE_ARGS+= --with-line-space \ + --infodir='$${datadir}/emacs/$${version}/info' MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" MAN1= emacs.1 etags.1 ctags.1 Index: emacs20/pkg-plist =================================================================== RCS file: /home/ncvs/ports/editors/emacs20/pkg-plist,v retrieving revision 1.27 diff -u -r1.27 pkg-plist --- emacs20/pkg-plist 8 Aug 1999 17:58:54 -0000 1.27 +++ emacs20/pkg-plist 2 Aug 2002 10:32:07 -0000 @@ -5,51 +5,22 @@ bin/emacsclient bin/etags bin/rcs-checkin -@unexec install-info --delete %D/info/ccmode %D/info/dir -@unexec install-info --delete %D/info/cl %D/info/dir -@unexec install-info --delete %D/info/dired-x %D/info/dir -@unexec install-info --delete %D/info/ediff %D/info/dir -@unexec install-info --delete %D/info/emacs %D/info/dir -@unexec install-info --delete %D/info/forms %D/info/dir -@unexec install-info --delete %D/info/gnus %D/info/dir -@unexec install-info --delete %D/info/info %D/info/dir -@unexec install-info --delete %D/info/message %D/info/dir -@unexec install-info --delete %D/info/mh-e %D/info/dir -@unexec install-info --delete %D/info/reftex %D/info/dir -@unexec install-info --delete %D/info/sc %D/info/dir -@unexec install-info --delete %D/info/vip %D/info/dir -@unexec install-info --delete %D/info/viper %D/info/dir -@unexec install-info --delete %D/info/widget %D/info/dir -info/ccmode -info/cl -info/dired-x -info/ediff -info/emacs -info/forms -info/gnus -info/info -info/message -info/mh-e -info/reftex -info/sc -info/vip -info/viper -info/widget -@exec install-info %D/info/ccmode %D/info/dir -@exec install-info %D/info/cl %D/info/dir -@exec install-info %D/info/dired-x %D/info/dir -@exec install-info %D/info/ediff %D/info/dir -@exec install-info %D/info/emacs %D/info/dir -@exec install-info %D/info/forms %D/info/dir -@exec install-info %D/info/gnus %D/info/dir -@exec install-info %D/info/info %D/info/dir -@exec install-info %D/info/message %D/info/dir -@exec install-info %D/info/mh-e %D/info/dir -@exec install-info %D/info/reftex %D/info/dir -@exec install-info %D/info/sc %D/info/dir -@exec install-info %D/info/vip %D/info/dir -@exec install-info %D/info/viper %D/info/dir -@exec install-info %D/info/widget %D/info/dir +share/emacs/%%EMACS_VER%%/info/ccmode +share/emacs/%%EMACS_VER%%/info/cl +share/emacs/%%EMACS_VER%%/info/dir +share/emacs/%%EMACS_VER%%/info/dired-x +share/emacs/%%EMACS_VER%%/info/ediff +share/emacs/%%EMACS_VER%%/info/emacs +share/emacs/%%EMACS_VER%%/info/forms +share/emacs/%%EMACS_VER%%/info/gnus +share/emacs/%%EMACS_VER%%/info/info +share/emacs/%%EMACS_VER%%/info/message +share/emacs/%%EMACS_VER%%/info/mh-e +share/emacs/%%EMACS_VER%%/info/reftex +share/emacs/%%EMACS_VER%%/info/sc +share/emacs/%%EMACS_VER%%/info/vip +share/emacs/%%EMACS_VER%%/info/viper +share/emacs/%%EMACS_VER%%/info/widget libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/cvtmail libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/digest-doc libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/emacsserver @@ -1308,6 +1279,7 @@ @dirrm libexec/emacs @dirrm share/emacs/%%EMACS_VER%%/etc/e @dirrm share/emacs/%%EMACS_VER%%/etc +@dirrm share/emacs/%%EMACS_VER%%/info @dirrm share/emacs/%%EMACS_VER%%/leim @dirrm share/emacs/%%EMACS_VER%%/lisp/language @dirrm share/emacs/%%EMACS_VER%%/lisp/gnus Index: emacs20-dl/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/emacs20-dl/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- emacs20-dl/Makefile 7 Dec 2001 12:58:19 -0000 1.24 +++ emacs20-dl/Makefile 2 Aug 2002 10:32:07 -0000 @@ -7,7 +7,7 @@ PORTNAME= emacs-dl PORTVERSION= ${EMACS_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors ipv6 MASTER_SITES= http://www.ainet.or.jp/~inoue/software/emacs-xim/ \ ${MASTER_SITE_GNU} @@ -40,7 +40,8 @@ .else CONFIGURE_ARGS= --with-x=no --with-pop .endif -CONFIGURE_ARGS+= --with-line-space +CONFIGURE_ARGS+= --with-line-space \ + --infodir='$${datadir}/emacs/$${version}/info' # for XIM extension XIM_PATCH= emacs20-xim-20000713 Index: emacs20-mule-devel/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/emacs20-mule-devel/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- emacs20-mule-devel/Makefile 29 Jan 2002 10:34:17 -0000 1.4 +++ emacs20-mule-devel/Makefile 2 Aug 2002 10:32:07 -0000 @@ -7,7 +7,7 @@ PORTNAME= emacs-${MULE} PORTVERSION= ${EMACS_VER}.${MULE_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors ipv6 MASTER_SITES= http://www.ainet.or.jp/~inoue/software/emacs-xim/ \ ${MASTER_SITE_GNU} @@ -41,6 +41,7 @@ .else CONFIGURE_ARGS= --with-x=no --with-pop .endif +CONFIGURE_ARGS+= --infodir='$${datadir}/emacs/$${version}/info' # for Mule patch MULE= mule Index: emacs21/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/emacs21/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- emacs21/Makefile 12 May 2002 14:29:01 -0000 1.13 +++ emacs21/Makefile 2 Aug 2002 10:32:07 -0000 @@ -7,7 +7,7 @@ PORTNAME= emacs PORTVERSION= 21.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -40,6 +40,7 @@ .if defined(WITHOUT_XIM) CONFIGURE_ARGS+= --without-xim .endif +CONFIGURE_ARGS+= --infodir='$${datadir}/emacs/$${version}/info' MAN1= ctags.1 emacs.1 etags.1 gfdl.1 PLIST_SUB= EMACS_VER=${PORTVERSION} EMACS_ARCH=${CONFIGURE_TARGET} Index: emacs21/pkg-plist =================================================================== RCS file: /home/ncvs/ports/editors/emacs21/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- emacs21/pkg-plist 23 Oct 2001 16:35:56 -0000 1.1 +++ emacs21/pkg-plist 2 Aug 2002 10:32:07 -0000 @@ -7,84 +7,33 @@ bin/etags bin/grep-changelog bin/rcs-checkin -@unexec install-info --delete %D/info/ada-mode %D/info/dir -@unexec install-info --delete %D/info/autotype %D/info/dir -@unexec install-info --delete %D/info/ccmode %D/info/dir -@unexec install-info --delete %D/info/cl %D/info/dir -@unexec install-info --delete %D/info/dired-x %D/info/dir -@unexec install-info --delete %D/info/ebrowse %D/info/dir -@unexec install-info --delete %D/info/ediff %D/info/dir -@unexec install-info --delete %D/info/efaq %D/info/dir -@unexec install-info --delete %D/info/emacs %D/info/dir -@unexec install-info --delete %D/info/emacs-mime %D/info/dir -@unexec install-info --delete %D/info/eshell %D/info/dir -@unexec install-info --delete %D/info/eudc %D/info/dir -@unexec install-info --delete %D/info/forms %D/info/dir -@unexec install-info --delete %D/info/gnus %D/info/dir -@unexec install-info --delete %D/info/idlwave %D/info/dir -@unexec install-info --delete %D/info/info %D/info/dir -@unexec install-info --delete %D/info/message %D/info/dir -@unexec install-info --delete %D/info/mh-e %D/info/dir -@unexec install-info --delete %D/info/pcl-cvs %D/info/dir -@unexec install-info --delete %D/info/reftex %D/info/dir -@unexec install-info --delete %D/info/sc %D/info/dir -@unexec install-info --delete %D/info/speedbar %D/info/dir -@unexec install-info --delete %D/info/vip %D/info/dir -@unexec install-info --delete %D/info/viper %D/info/dir -@unexec install-info --delete %D/info/widget %D/info/dir -@unexec install-info --delete %D/info/woman %D/info/dir -info/ada-mode -info/autotype -info/ccmode -info/cl -info/dired-x -info/ebrowse -info/ediff -info/efaq -info/emacs -info/emacs-mime -info/eshell -info/eudc -info/forms -info/gnus -info/idlwave -info/info -info/message -info/mh-e -info/pcl-cvs -info/reftex -info/sc -info/speedbar -info/vip -info/viper -info/widget -info/woman -@exec install-info %D/info/ada-mode %D/info/dir -@exec install-info %D/info/autotype %D/info/dir -@exec install-info %D/info/ccmode %D/info/dir -@exec install-info %D/info/cl %D/info/dir -@exec install-info %D/info/dired-x %D/info/dir -@exec install-info %D/info/ebrowse %D/info/dir -@exec install-info %D/info/ediff %D/info/dir -@exec install-info %D/info/efaq %D/info/dir -@exec install-info %D/info/emacs %D/info/dir -@exec install-info %D/info/emacs-mime %D/info/dir -@exec install-info %D/info/eshell %D/info/dir -@exec install-info %D/info/eudc %D/info/dir -@exec install-info %D/info/forms %D/info/dir -@exec install-info %D/info/gnus %D/info/dir -@exec install-info %D/info/idlwave %D/info/dir -@exec install-info %D/info/info %D/info/dir -@exec install-info %D/info/message %D/info/dir -@exec install-info %D/info/mh-e %D/info/dir -@exec install-info %D/info/pcl-cvs %D/info/dir -@exec install-info %D/info/reftex %D/info/dir -@exec install-info %D/info/sc %D/info/dir -@exec install-info %D/info/speedbar %D/info/dir -@exec install-info %D/info/vip %D/info/dir -@exec install-info %D/info/viper %D/info/dir -@exec install-info %D/info/widget %D/info/dir -@exec install-info %D/info/woman %D/info/dir +share/emacs/%%EMACS_VER%%/info/ada-mode +share/emacs/%%EMACS_VER%%/info/autotype +share/emacs/%%EMACS_VER%%/info/ccmode +share/emacs/%%EMACS_VER%%/info/cl +share/emacs/%%EMACS_VER%%/info/dir +share/emacs/%%EMACS_VER%%/info/dired-x +share/emacs/%%EMACS_VER%%/info/ebrowse +share/emacs/%%EMACS_VER%%/info/ediff +share/emacs/%%EMACS_VER%%/info/efaq +share/emacs/%%EMACS_VER%%/info/emacs +share/emacs/%%EMACS_VER%%/info/emacs-mime +share/emacs/%%EMACS_VER%%/info/eshell +share/emacs/%%EMACS_VER%%/info/eudc +share/emacs/%%EMACS_VER%%/info/forms +share/emacs/%%EMACS_VER%%/info/gnus +share/emacs/%%EMACS_VER%%/info/idlwave +share/emacs/%%EMACS_VER%%/info/info +share/emacs/%%EMACS_VER%%/info/message +share/emacs/%%EMACS_VER%%/info/mh-e +share/emacs/%%EMACS_VER%%/info/pcl-cvs +share/emacs/%%EMACS_VER%%/info/reftex +share/emacs/%%EMACS_VER%%/info/sc +share/emacs/%%EMACS_VER%%/info/speedbar +share/emacs/%%EMACS_VER%%/info/vip +share/emacs/%%EMACS_VER%%/info/viper +share/emacs/%%EMACS_VER%%/info/widget +share/emacs/%%EMACS_VER%%/info/woman libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/cvtmail libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/digest-doc libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/emacsserver @@ -1813,6 +1762,7 @@ @dirrm libexec/emacs @dirrm share/emacs/%%EMACS_VER%%/etc/e @dirrm share/emacs/%%EMACS_VER%%/etc +@dirrm share/emacs/%%EMACS_VER%%/info @dirrm share/emacs/%%EMACS_VER%%/leim @dirrm share/emacs/%%EMACS_VER%%/lisp/calendar @dirrm share/emacs/%%EMACS_VER%%/lisp/emacs-lisp Index: mule/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/mule/Makefile,v retrieving revision 1.53 diff -u -r1.53 Makefile --- mule/Makefile 29 Jan 2002 16:41:48 -0000 1.53 +++ mule/Makefile 2 Aug 2002 10:32:07 -0000 @@ -8,7 +8,7 @@ PORTNAME= mule PORTVERSION= ${MULE_VERSION} PKGNAMESUFFIX= ${INPUT_METHOD} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES+= editors MASTER_SITES= ftp://ftp.m17n.org/pub/mule/ \ ftp://ftp.jaist.ac.jp/pub/GNU/mule/ \ @@ -44,6 +44,7 @@ CONFIGURE_ARGS= --with-executable=${EMACS_EXECUTABLE} \ --with-emacs-prefix=${EMACS_PREFIX} \ --with-terminal-face \ + --infodir='$${datadir}/mule/$${version}/info' \ --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib \ ${WITH_INPUT_METHOD} ${WITH_DIALOGS} STRIP= Index: mule-common/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/mule-common/Makefile,v retrieving revision 1.56 diff -u -r1.56 Makefile --- mule-common/Makefile 3 Dec 2001 14:02:22 -0000 1.56 +++ mule-common/Makefile 2 Aug 2002 10:32:07 -0000 @@ -7,7 +7,7 @@ PORTNAME= mule-common PORTVERSION= ${MULE_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors japanese MASTER_SITES= ftp://ftp.m17n.org/pub/mule/ \ ftp://ftp.jaist.ac.jp/pub/GNU/mule/ \ @@ -76,6 +76,7 @@ CONFIGURE_ARGS= --with-executable=${EMACS_EXECUTABLE} \ --with-emacs-prefix=${EMACS_PREFIX} \ --with-terminal-face \ + --infodir='$${datadir}/mule/$${version}/info' \ --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib STRIP= MAN1= coco.1 ctags.1 etags.1 m2ps.1 emacs.1 mule.1 @@ -84,6 +85,7 @@ COMP_ELC= egg.elc wnn-egg.elc sj3-client.elc sj3-egg.elc canna.elc ELC_DIR= ../lisp +INFODIR= ${PREFIX}/share/mule/${EMACS_VERSION}/info # ORIGINAL, MEW_ORG_PATCH and MEW_PATCH are used for debugging. # @@ -136,18 +138,15 @@ .for file in b2m coco ctags emacsclient etags m2ps strip ${PREFIX}/bin/${file} .endfor - if [ ! -f ${PREFIX}/share/mule/${EMACS_VERSION}/info/dir ]; then \ - ${MKDIR} ${PREFIX}/share/mule/${EMACS_VERSION}/info; \ - fi .for info in emacs vip viper forms gnus mh-e cl sc dired-x ediff ccmode message - install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir + install-info ${INFODIR}/${info} ${INFODIR}/dir .endfor # Our makeinfo can't handle files with Japanese characters. :< - install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp). Version 19 Antenews. (Japanese)" ${PREFIX}/info/antenews-jp ${PREFIX}/info/dir - install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule). Multilingual Enhancement to GNU Emacs." ${PREFIX}/info/mule ${PREFIX}/info/dir - install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp). Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir - install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp). Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir - install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp). Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir + install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp). Version 19 Antenews. (Japanese)" ${INFODIR}/antenews-jp ${INFODIR}/dir + install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule). Multilingual Enhancement to GNU Emacs." ${INFODIR}/mule ${INFODIR}/dir + install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp). Multilingual Enhancement to GNU Emacs. (Japanese)" ${INFODIR}/mule-jp ${INFODIR}/dir + install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp). Japanese/Chinese Inputting Method. (Japanese)" ${INFODIR}/egg-jp ${INFODIR}/dir + install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp). Another Japanese Inputting Method. (Japanese)" ${INFODIR}/canna-jp ${INFODIR}/dir @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE} if [ ! -f ${STARTUP_SCRIPT} ]; then \ Index: mule-common/pkg-plist =================================================================== RCS file: /home/ncvs/ports/editors/mule-common/pkg-plist,v retrieving revision 1.20 diff -u -r1.20 pkg-plist --- mule-common/pkg-plist 11 Aug 2000 03:03:58 -0000 1.20 +++ mule-common/pkg-plist 2 Aug 2002 10:32:07 -0000 @@ -14,145 +14,110 @@ @comment scare user in that case @unexec rmdir %D/share/mule/site-lisp 2>/dev/null || true @unexec rmdir %D/share/mule/%%EMACS_VERSION%%/site-lisp 2>/dev/null || true -@unexec install-info --delete %D/info/emacs %D/info/dir -@unexec install-info --delete %D/info/vip %D/info/dir -@unexec install-info --delete %D/info/viper %D/info/dir -@unexec install-info --delete %D/info/forms %D/info/dir -@unexec install-info --delete %D/info/gnus %D/info/dir -@unexec install-info --delete %D/info/mh-e %D/info/dir -@unexec install-info --delete %D/info/cl %D/info/dir -@unexec install-info --delete %D/info/sc %D/info/dir -@unexec install-info --delete %D/info/dired-x %D/info/dir -@unexec install-info --delete %D/info/ediff %D/info/dir -@unexec install-info --delete %D/info/ccmode %D/info/dir -@unexec install-info --delete %D/info/message %D/info/dir -@comment for mule -@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp). Version 19 Antenews. (Japanese)" %D/info/antenews-jp %D/info/dir -@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Mule: (mule). Multilingual Enhancement to GNU Emacs." %D/info/mule %D/info/dir -@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp). Multilingual Enhancement to GNU Emacs. (Japanese)" %D/info/mule-jp %D/info/dir -@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp). Japanese/Chinese Inputting Method. (Japanese)" %D/info/egg-jp %D/info/dir -@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp). Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir @comment @comment emacs stuff @comment -info/ccmode -info/ccmode-1 -info/ccmode-2 -info/cl -info/cl-1 -info/cl-2 -info/cl-3 -info/cl-4 -info/cl-5 -info/cl-6 -info/dired-x -info/ediff -info/ediff-1 -info/ediff-2 -info/emacs -info/emacs-1 -info/emacs-10 -info/emacs-11 -info/emacs-12 -info/emacs-13 -info/emacs-14 -info/emacs-15 -info/emacs-16 -info/emacs-17 -info/emacs-18 -info/emacs-19 -info/emacs-2 -info/emacs-20 -info/emacs-21 -info/emacs-22 -info/emacs-23 -info/emacs-24 -info/emacs-25 -info/emacs-26 -info/emacs-27 -info/emacs-28 -info/emacs-29 -info/emacs-3 -info/emacs-4 -info/emacs-5 -info/emacs-6 -info/emacs-7 -info/emacs-8 -info/emacs-9 -info/forms -info/gnus -info/gnus-1 -info/gnus-2 -info/gnus-3 -info/gnus-4 -info/gnus-5 -info/gnus-6 -info/gnus-7 -info/gnus-8 -info/gnus-9 -info/gnus-10 -info/gnus-11 -info/message -info/mh-e -info/mh-e-1 -info/mh-e-2 -info/mh-e-3 -info/mh-e-4 -info/sc -info/sc-1 -info/sc-2 -info/sc-3 -info/vip -info/vip-1 -info/vip-2 -info/viper -info/viper-1 -info/viper-2 -info/viper-3 -info/viper-4 +share/mule/%%EMACS_VERSION%%/info/ccmode +share/mule/%%EMACS_VERSION%%/info/ccmode-1 +share/mule/%%EMACS_VERSION%%/info/ccmode-2 +share/mule/%%EMACS_VERSION%%/info/cl +share/mule/%%EMACS_VERSION%%/info/cl-1 +share/mule/%%EMACS_VERSION%%/info/cl-2 +share/mule/%%EMACS_VERSION%%/info/cl-3 +share/mule/%%EMACS_VERSION%%/info/cl-4 +share/mule/%%EMACS_VERSION%%/info/cl-5 +share/mule/%%EMACS_VERSION%%/info/cl-6 +share/mule/%%EMACS_VERSION%%/info/dir +share/mule/%%EMACS_VERSION%%/info/dired-x +share/mule/%%EMACS_VERSION%%/info/ediff +share/mule/%%EMACS_VERSION%%/info/ediff-1 +share/mule/%%EMACS_VERSION%%/info/ediff-2 +share/mule/%%EMACS_VERSION%%/info/emacs +share/mule/%%EMACS_VERSION%%/info/emacs-1 +share/mule/%%EMACS_VERSION%%/info/emacs-10 +share/mule/%%EMACS_VERSION%%/info/emacs-11 +share/mule/%%EMACS_VERSION%%/info/emacs-12 +share/mule/%%EMACS_VERSION%%/info/emacs-13 +share/mule/%%EMACS_VERSION%%/info/emacs-14 +share/mule/%%EMACS_VERSION%%/info/emacs-15 +share/mule/%%EMACS_VERSION%%/info/emacs-16 +share/mule/%%EMACS_VERSION%%/info/emacs-17 +share/mule/%%EMACS_VERSION%%/info/emacs-18 +share/mule/%%EMACS_VERSION%%/info/emacs-19 +share/mule/%%EMACS_VERSION%%/info/emacs-2 +share/mule/%%EMACS_VERSION%%/info/emacs-20 +share/mule/%%EMACS_VERSION%%/info/emacs-21 +share/mule/%%EMACS_VERSION%%/info/emacs-22 +share/mule/%%EMACS_VERSION%%/info/emacs-23 +share/mule/%%EMACS_VERSION%%/info/emacs-24 +share/mule/%%EMACS_VERSION%%/info/emacs-25 +share/mule/%%EMACS_VERSION%%/info/emacs-26 +share/mule/%%EMACS_VERSION%%/info/emacs-27 +share/mule/%%EMACS_VERSION%%/info/emacs-28 +share/mule/%%EMACS_VERSION%%/info/emacs-29 +share/mule/%%EMACS_VERSION%%/info/emacs-3 +share/mule/%%EMACS_VERSION%%/info/emacs-4 +share/mule/%%EMACS_VERSION%%/info/emacs-5 +share/mule/%%EMACS_VERSION%%/info/emacs-6 +share/mule/%%EMACS_VERSION%%/info/emacs-7 +share/mule/%%EMACS_VERSION%%/info/emacs-8 +share/mule/%%EMACS_VERSION%%/info/emacs-9 +share/mule/%%EMACS_VERSION%%/info/forms +share/mule/%%EMACS_VERSION%%/info/gnus +share/mule/%%EMACS_VERSION%%/info/gnus-1 +share/mule/%%EMACS_VERSION%%/info/gnus-2 +share/mule/%%EMACS_VERSION%%/info/gnus-3 +share/mule/%%EMACS_VERSION%%/info/gnus-4 +share/mule/%%EMACS_VERSION%%/info/gnus-5 +share/mule/%%EMACS_VERSION%%/info/gnus-6 +share/mule/%%EMACS_VERSION%%/info/gnus-7 +share/mule/%%EMACS_VERSION%%/info/gnus-8 +share/mule/%%EMACS_VERSION%%/info/gnus-9 +share/mule/%%EMACS_VERSION%%/info/gnus-10 +share/mule/%%EMACS_VERSION%%/info/gnus-11 +share/mule/%%EMACS_VERSION%%/info/message +share/mule/%%EMACS_VERSION%%/info/mh-e +share/mule/%%EMACS_VERSION%%/info/mh-e-1 +share/mule/%%EMACS_VERSION%%/info/mh-e-2 +share/mule/%%EMACS_VERSION%%/info/mh-e-3 +share/mule/%%EMACS_VERSION%%/info/mh-e-4 +share/mule/%%EMACS_VERSION%%/info/sc +share/mule/%%EMACS_VERSION%%/info/sc-1 +share/mule/%%EMACS_VERSION%%/info/sc-2 +share/mule/%%EMACS_VERSION%%/info/sc-3 +share/mule/%%EMACS_VERSION%%/info/vip +share/mule/%%EMACS_VERSION%%/info/vip-1 +share/mule/%%EMACS_VERSION%%/info/vip-2 +share/mule/%%EMACS_VERSION%%/info/viper +share/mule/%%EMACS_VERSION%%/info/viper-1 +share/mule/%%EMACS_VERSION%%/info/viper-2 +share/mule/%%EMACS_VERSION%%/info/viper-3 +share/mule/%%EMACS_VERSION%%/info/viper-4 @comment @comment mule-specific stuff @comment -info/CCL -info/ISO2022 -info/R2L -info/XFONT -info/antenews-jp -info/canna-jp -info/egg -info/egg-jp -info/egg-jp-1 -info/egg-jp-2 -info/kbd-trans -info/languages -info/m2ps -info/mule -info/mule-jp -info/mule-jp-1 -info/mule-jp-2 -info/mule-jp-3 -info/quail -info/terminology -@exec install-info %D/info/emacs %D/info/dir -@exec install-info %D/info/vip %D/info/dir -@exec install-info %D/info/forms %D/info/dir -@exec install-info %D/info/gnus %D/info/dir -@exec install-info %D/info/mh-e %D/info/dir -@exec install-info %D/info/cl %D/info/dir -@exec install-info %D/info/sc %D/info/dir -@exec install-info %D/info/dired-x %D/info/dir -@exec install-info %D/info/ediff %D/info/dir -@exec install-info %D/info/ccmode %D/info/dir -@exec install-info %D/info/message %D/info/dir -@comment for mule -@exec install-info --section="The Emacs editor and associated tools" --entry="* Antenews-jp: (antenews-jp). Version 19 Antenews. (Japanese)" %D/info/antenews-jp %D/info/dir -@exec install-info --section="The Emacs editor and associated tools" --entry="* Mule: (mule). Multilingual Enhancement to GNU Emacs." %D/info/mule %D/info/dir -@exec install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp). Multilingual Enhancement to GNU Emacs. (Japanese)" %D/info/mule-jp %D/info/dir -@exec install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp). Japanese/Chinese Inputting Method. (Japanese)" %D/info/egg-jp %D/info/dir -@exec install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp). Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir +share/mule/%%EMACS_VERSION%%/info/CCL +share/mule/%%EMACS_VERSION%%/info/ISO2022 +share/mule/%%EMACS_VERSION%%/info/R2L +share/mule/%%EMACS_VERSION%%/info/XFONT +share/mule/%%EMACS_VERSION%%/info/antenews-jp +share/mule/%%EMACS_VERSION%%/info/canna-jp +share/mule/%%EMACS_VERSION%%/info/egg +share/mule/%%EMACS_VERSION%%/info/egg-jp +share/mule/%%EMACS_VERSION%%/info/egg-jp-1 +share/mule/%%EMACS_VERSION%%/info/egg-jp-2 +share/mule/%%EMACS_VERSION%%/info/kbd-trans +share/mule/%%EMACS_VERSION%%/info/languages +share/mule/%%EMACS_VERSION%%/info/m2ps +share/mule/%%EMACS_VERSION%%/info/mule +share/mule/%%EMACS_VERSION%%/info/mule-jp +share/mule/%%EMACS_VERSION%%/info/mule-jp-1 +share/mule/%%EMACS_VERSION%%/info/mule-jp-2 +share/mule/%%EMACS_VERSION%%/info/mule-jp-3 +share/mule/%%EMACS_VERSION%%/info/quail +share/mule/%%EMACS_VERSION%%/info/terminology @comment -@exec [ -f %D/share/mule/%%EMACS_VERSION%%/info/dir ] || mkdir -p %D/share/mule/%%EMACS_VERSION%%/info -@unexec rmdir %D/share/mule/%%EMACS_VERSION%%/info 2>/dev/null || true +@dirrm share/mule/%%EMACS_VERSION%%/info libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%/cvtmail libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%/digest-doc libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%/emacsserver --- diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message