Date: Tue, 9 Apr 2002 16:44:58 +0900 (JST) From: NAKAJI Hiroyuki <nakaji@jp.freebsd.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/36922: [Update] japanese/emacs20-emcws by maintainer Message-ID: <200204090744.g397iw456762@boggy.acest.tutrp.tut.ac.jp>
next in thread | raw e-mail | index | archive | help
>Number: 36922
>Category: ports
>Synopsis: [Update] japanese/emacs20-emcws by maintainer
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 09 00:50:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: NAKAJI Hiroyuki
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD boggy.acest.tutrp.tut.ac.jp 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Fri Apr 5 00:23:31 JST 2002 root@boggy.acest.tutrp.tut.ac.jp:/usr/obj/usr/src/sys/NAKAJI i386
>Description:
Emcws patch for emacs-20.7 is updated to emcws-20.7-20020208.gz.
And more important, the latest /usr/bin/makeinfo (texinfo-4.1)
cannot handle man/emacs.texi properly.
>How-To-Repeat:
N/A
>Fix:
Here is a diff from ports-current.
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/emacs20-emcws/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 29 Jan 2002 11:08:48 -0000 1.4
+++ Makefile 9 Apr 2002 07:33:52 -0000
@@ -8,7 +8,7 @@
PORTNAME= emcws
PORTVERSION= 20.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= japanese editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
@@ -16,7 +16,7 @@
PATCH_SITES= ftp://ftp.ki.nu/pub/emcws/ \
ftp://ftp.jpl.org/pub/misc/
-PATCHFILES= emcws-${EMACS_VER}-20011002.gz
+PATCHFILES= emcws-${EMACS_VER}-20020208.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= nakaji@jp.freebsd.org
@@ -134,6 +134,7 @@
@(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs)
@(cd ${WRKSRC}/src/../lisp; \
${WRKSRC}/src/emacs -batch -q -f batch-byte-compile \
+ egg.el wnn-egg.el \
ange-ftp.el help.el international/ccl.el international/mule-cmds.el \
international/mule.el international/titdic-cnv.el)
${RM} -f ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VER}.1
@@ -159,6 +160,8 @@
${INSTALL_DATA} ${WRKSRC}/lisp/$$i \
${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/$$i; \
done
+ @test -d ${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET} || \
+ ${MKDIR} ${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
@${INSTALL_DATA} ${WRKSRC}/lib-src/fns-emcws-${EMACS_VER}.1.el \
${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}/fns-emcws-${EMACS_VER}.1.el
@test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp || \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/japanese/emacs20-emcws/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 1 Dec 2001 09:09:12 -0000 1.2
+++ distinfo 22 Feb 2002 06:47:17 -0000
@@ -1,2 +1,2 @@
MD5 (emacs-20.7.tar.gz) = c732cf5e668d4ac67d9418ecb103ecf5
-MD5 (emcws-20.7-20011002.gz) = 05c64fd467fbd7942b5cb9af32a2e907
+MD5 (emcws-20.7-20020208.gz) = 750b2df254aed3b6775755ffc277f989
Index: files/patch-ag
===================================================================
RCS file: /home/ncvs/ports/japanese/emacs20-emcws/files/patch-ag,v
retrieving revision 1.1
diff -u -r1.1 patch-ag
--- files/patch-ag 27 Jun 2001 14:33:33 -0000 1.1
+++ files/patch-ag 9 Apr 2002 05:02:27 -0000
@@ -5,7 +5,7 @@
# The makeinfo program is part of the Texinfo distribution.
-MAKEINFO = makeinfo
-+MAKEINFO = makeinfo --no-split
++MAKEINFO = makeinfo --no-split --force
INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
../info/dired-x ../info/ediff ../info/forms ../info/gnus \
../info/info ../info/message ../info/mh-e ../info/reftex \
Index: files/patch-an
===================================================================
RCS file: /home/ncvs/ports/japanese/emacs20-emcws/files/patch-an,v
retrieving revision 1.1
diff -u -r1.1 patch-an
--- files/patch-an 27 Jun 2001 14:33:34 -0000 1.1
+++ files/patch-an 9 Apr 2002 07:23:23 -0000
@@ -1,7 +1,7 @@
---- man/emacs.texi.orig Fri Jun 25 02:53:58 1999
-+++ man/emacs.texi Sat Jul 24 01:09:24 1999
+--- man/emacs.texi.orig Tue Jun 13 04:12:20 2000
++++ man/emacs.texi Tue Apr 9 16:23:13 2002
@@ -11,9 +11,9 @@
- updated for Emacs version 20.4
+ updated for Emacs version 20.7.
@c Please REMEMBER to update edition number in *three* places in this file.
-@dircategory Editors
@@ -12,3 +12,12 @@
@end direntry
Published by the Free Software Foundation
+@@ -119,7 +119,7 @@
+ Emacs is the extensible, customizable, self-documenting real-time
+ display editor. This Info file describes how to edit with Emacs and
+ some of how to customize it; it corresponds to GNU Emacs version 20.7.
+-For information on extending Emacs, see @ref{,Emacs Lisp,, elisp, The
++For information on extending Emacs, see @ref{Top, Emacs Lisp,, elisp, The
+ Emacs Lisp Reference Manual}.
+ @end ifinfo
+
Index: files/patch-da
===================================================================
RCS file: /home/ncvs/ports/japanese/emacs20-emcws/files/patch-da,v
retrieving revision 1.2
diff -u -r1.2 patch-da
--- files/patch-da 1 Dec 2001 09:01:53 -0000 1.2
+++ files/patch-da 22 Feb 2002 06:56:36 -0000
@@ -1,37 +1,33 @@
---- configure.in.orig Wed Nov 28 15:25:17 2001
-+++ configure.in Wed Nov 28 15:26:42 2001
-@@ -35,13 +35,21 @@
+--- configure.in.orig Fri Feb 22 15:50:26 2002
++++ configure.in Fri Feb 22 15:55:10 2002
+@@ -35,18 +35,26 @@
dnl A case that the LEIM package does not exist.
dnl
- locallisppath='${datadir}/emacs/${version}-emcws/site-lisp:'\
+ locallisppath='${datadir}/emacs/${version}$(EMACS_POSTFIX)/site-lisp:'\
-'${datadir}/emacs/site-lisp'
+'${datadir}/emacs/site-lisp:'\
+'${datadir}/emacs/${version}/site-lisp:'\
-+'${datadir}/emacs/${version}-emcws/lisp:'\
++'${datadir}/emacs/${version}$(EMACS_POSTFIX)/lisp:'\
+'${datadir}/emacs/${version}/lisp'
else
dnl
dnl A case that the LEIM package exists.
dnl
- locallisppath='${datadir}/emacs/${version}-emcws/site-lisp:'\
--'${datadir}/emacs/site-lisp:${datadir}/emacs/${version}-emcws/leim'
+ locallisppath='${datadir}/emacs/${version}$(EMACS_POSTFIX)/site-lisp:'\
+-'${datadir}/emacs/site-lisp:${datadir}/emacs/${version}$(EMACS_POSTFIX)/leim'
+'${datadir}/emacs/site-lisp:'\
-+'${datadir}/emacs/${version}-emcws/leim:'\
++'${datadir}/emacs/${version}$(EMACS_POSTFIX)/leim:'\
+'${datadir}/emacs/${version}/site-lisp:'\
+'${datadir}/emacs/${version}/leim:'\
-+'${datadir}/emacs/${version}-emcws/lisp:'\
-+'${datadir}/emacs/${version}/lisp'\
- echo
- echo modifying leim/Makefile.in for emcws
- mv ${srcdir}/leim/Makefile.in ${srcdir}/leim/Makefile.in.orig
-@@ -53,8 +61,8 @@
++'${datadir}/emacs/${version}$(EMACS_POSTFIX)/lisp:'\
++'${datadir}/emacs/${version}/lisp'
fi
lisppath='${locallisppath}:${lispdir}'
--etcdir='${datadir}/emacs/${version}-emcws/etc'
--archlibdir='${libexecdir}/emacs/${version}-emcws/${configuration}'
+-etcdir='${datadir}/emacs/${version}$(EMACS_POSTFIX)/etc'
+-archlibdir='${libexecdir}/emacs/${version}$(EMACS_POSTFIX)/${configuration}'
+etcdir='${datadir}/emacs/${version}/etc'
+archlibdir='${libexecdir}/emacs/${version}/${configuration}'
- docdir='${datadir}/emacs/${version}-emcws/etc'
+ docdir='${datadir}/emacs/${version}$(EMACS_POSTFIX)/etc'
AC_ARG_WITH(gcc,
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204090744.g397iw456762>