diff options
| author | Shigeyuki Fukushima <shige@FreeBSD.org> | 2000-07-19 08:03:55 +0000 |
|---|---|---|
| committer | Shigeyuki Fukushima <shige@FreeBSD.org> | 2000-07-19 08:03:55 +0000 |
| commit | e976223fb5c77e1e5edfbb9d7a8f42a748b931f2 (patch) | |
| tree | dfa0fbf14d379fbc6b55aaaa923ba053743132d9 /japanese/emacs-manual | |
| parent | Add user configuration variables: EMACS_NO_BUILD_DEPENDS, EMACS_NO_RUN_DEPENDS. (diff) | |
Synchronize with emacs-20.7 update.
And apply EMACS_PORT_NAME style.
Notes
Notes:
svn path=/head/; revision=30831
Diffstat (limited to 'japanese/emacs-manual')
| -rw-r--r-- | japanese/emacs-manual/Makefile | 16 | ||||
| -rw-r--r-- | japanese/emacs-manual/distinfo | 2 | ||||
| -rw-r--r-- | japanese/emacs-manual/files/extra-patch-texinfmt.el.patch | 41 |
3 files changed, 51 insertions, 8 deletions
diff --git a/japanese/emacs-manual/Makefile b/japanese/emacs-manual/Makefile index 6e0f9fd5cb0d..66ab8518caa8 100644 --- a/japanese/emacs-manual/Makefile +++ b/japanese/emacs-manual/Makefile @@ -16,12 +16,13 @@ DISTFILES= ${DISTNAME}.tgz ${EMACS_ARC} MAINTAINER= okazaki@be.to -BUILD_DEPENDS= ${EMACS}:${PORTSDIR}/editors/emacs20 +EMACS_PORT_NAME= emacs20 +EMACS_NO_RUN_DEPENDS= YES ERRATA_FILE= EXTRACT_ONLY= ${DISTNAME}.tgz -EMACS_DISTNAME= emacs-20.6 +EMACS_DISTNAME= emacs-${EMACS_VER} EMACS_ARC= ${EMACS_DISTNAME}.tar.gz EMACS_SRCDIR= ${WRKDIR}/${EMACS_DISTNAME} EXTRACT_FILES= ${EMACS_DISTNAME}/man/ack.texi \ @@ -36,11 +37,6 @@ EXTRACT_ONLY+= ${ERRATA_FILE}.tgz EXTRA_PATCHES+= ${WRKDIR}/${ERRATA_FILE} .endif -# We use emacs20 to format texinfo files. -EMACS= emacs-20.6 - -MAKE_ENV= EMACS="${EMACS}" - post-extract: ${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile ${CP} ${FILESDIR}/PORT_TEXIFMT.MK ${WRKSRC} @@ -49,6 +45,12 @@ post-extract: ${CP} ${EXTRACT_FILES} ${WRKSRC}) ${MKDIR} ${WRKDIR}/info +# workaround target (please delete after emacs-20.7-man-jp is released). +pre-patch: + @(cd ${WRKSRC} && \ + ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-texinfmt.el.patch ; \ + ) + post-patch: cd ${WRKSRC} && \ ${PERL} -pi -e 's/(@[^@]*ref{.*,.*,.*, *elisp),/$$1-ja,/;' *.texi diff --git a/japanese/emacs-manual/distinfo b/japanese/emacs-manual/distinfo index d97cbb2e838b..2a02325a67cb 100644 --- a/japanese/emacs-manual/distinfo +++ b/japanese/emacs-manual/distinfo @@ -1,2 +1,2 @@ MD5 (emacs-20.6-man-jp.tgz) = 4cd74247ebb493f385e41901ef33081f -MD5 (emacs-20.6.tar.gz) = cfcaa33b5fc7d64210d3428f13570f8d +MD5 (emacs-20.7.tar.gz) = c732cf5e668d4ac67d9418ecb103ecf5 diff --git a/japanese/emacs-manual/files/extra-patch-texinfmt.el.patch b/japanese/emacs-manual/files/extra-patch-texinfmt.el.patch new file mode 100644 index 000000000000..ccf025269b6b --- /dev/null +++ b/japanese/emacs-manual/files/extra-patch-texinfmt.el.patch @@ -0,0 +1,41 @@ +--- patch-texinfmt.el.orig Fri Mar 3 21:26:16 2000 ++++ patch-texinfmt.el Thu Jul 13 18:17:38 2000 +@@ -1,5 +1,5 @@ +---- texinfmt.el-ORIG Sun May 30 04:21:06 1999 +-+++ texinfmt.el Thu Jan 13 10:52:58 2000 ++--- texinfmt.el.orig Thu Jul 13 18:12:19 2000 +++++ texinfmt.el Thu Jul 13 18:17:28 2000 + @@ -1111,6 +1111,78 @@ + + ;;; @node, @menu, @detailmenu +@@ -112,17 +112,18 @@ + (texinfo-discard-command) + (setq texinfo-last-node name) + (let ((tem (if texinfo-fold-nodename-case (downcase name) name))) +-@@ -1212,7 +1308,8 @@ ++@@ -1212,7 +1308,9 @@ + (insert (or fname (car args)) ": ") + (if (nth 3 args) + (insert "(" (nth 3 args) ")")) +-- (insert (car args)))))) ++- (and (car args) (insert (car args))))))) + + (insert (or (car args) "")) + + (or (save-excursion (looking-at "[.,]")) (insert ".")))))) +++ + + (put 'pxref 'texinfo-format 'texinfo-format-pxref) + (defun texinfo-format-pxref () +-@@ -1220,6 +1317,7 @@ ++@@ -1220,6 +1318,7 @@ + (or (save-excursion + (forward-char -2) + (looking-at "::")) +@@ -130,7 +131,7 @@ + (insert "."))) + + ;; @inforef{NODE, FNAME, FILE} +-@@ -1230,7 +1328,8 @@ ++@@ -1230,7 +1329,8 @@ + (let ((args (texinfo-format-parse-args))) + (texinfo-discard-command) + (if (nth 1 args) |