Sorry, barked up the wrong tree. gtexinfo 6.7 appears to default to utf8, and error out on non-7bit ascii gremlins. Fixing those lets the texinfo files compile (with warnings) both with the NetBSD base makeinfo and the v6.7 pkgsrc one. OTOH, I don't have to remove the patches I forgot to add in the previous commit...diff -r1.126 -r1.127 pkgsrc/editors/xemacs/Makefile
(hauke)
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.126 2019/10/11 12:36:44 hauke Exp $ | 1 | # $NetBSD: Makefile,v 1.127 2019/10/11 14:42:48 hauke Exp $ | |
2 | 2 | |||
3 | PKGNAME= ${DISTNAME} | 3 | PKGNAME= ${DISTNAME} | |
4 | PKGREVISION= 8 | 4 | PKGREVISION= 9 | |
5 | COMMENT= XEmacs text editor version 21.4 | 5 | COMMENT= XEmacs text editor version 21.4 | |
6 | 6 | |||
7 | # extra options for x11 support, not for sharing with xemacs-current-nox11 | 7 | # extra options for x11 support, not for sharing with xemacs-current-nox11 | |
8 | # Version information in ../../editors/xemacs/Makefile.common | 8 | # Version information in ../../editors/xemacs/Makefile.common | |
9 | 9 | |||
10 | PKG_SUPPORTED_OPTIONS+= x11 xface | 10 | PKG_SUPPORTED_OPTIONS+= x11 xface | |
11 | PKG_SUGGESTED_OPTIONS+= x11 | 11 | PKG_SUGGESTED_OPTIONS+= x11 | |
12 | 12 | |||
13 | .include "options.mk" | 13 | .include "options.mk" | |
14 | 14 | |||
15 | .include "Makefile.common" | 15 | .include "Makefile.common" | |
16 | 16 | |||
17 | .include "../../mk/bsd.pkg.mk" | 17 | .include "../../mk/bsd.pkg.mk" |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.32 2019/10/11 12:36:44 hauke Exp $ | 1 | # $NetBSD: Makefile.common,v 1.33 2019/10/11 14:42:48 hauke Exp $ | |
2 | # | 2 | # | |
3 | # used by editors/xemacs-nox11/Makefile | 3 | # used by editors/xemacs-nox11/Makefile | |
4 | # used by editors/xemacs/Makefile | 4 | # used by editors/xemacs/Makefile | |
5 | 5 | |||
6 | DISTNAME= xemacs-21.4.24 | 6 | DISTNAME= xemacs-21.4.24 | |
7 | CATEGORIES= editors | 7 | CATEGORIES= editors | |
8 | MASTER_SITES= ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/} | 8 | MASTER_SITES= ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/} | |
9 | 9 | |||
10 | MAINTAINER= hauke@NetBSD.org | 10 | MAINTAINER= hauke@NetBSD.org | |
11 | HOMEPAGE= http://www.xemacs.org/ | 11 | HOMEPAGE= http://www.xemacs.org/ | |
12 | LICENSE= gnu-gpl-v2 | 12 | LICENSE= gnu-gpl-v2 | |
13 | 13 | |||
14 | .include "../../mk/bsd.prefs.mk" | 14 | .include "../../mk/bsd.prefs.mk" | |
@@ -18,31 +18,26 @@ PATCHDIR= ${.CURDIR}/../../editors/xema | @@ -18,31 +18,26 @@ PATCHDIR= ${.CURDIR}/../../editors/xema | |||
18 | DISTINFO_FILE= ${.CURDIR}/../../editors/xemacs/distinfo | 18 | DISTINFO_FILE= ${.CURDIR}/../../editors/xemacs/distinfo | |
19 | PLIST_SRC= ${.CURDIR}/../../editors/xemacs/PLIST | 19 | PLIST_SRC= ${.CURDIR}/../../editors/xemacs/PLIST | |
20 | 20 | |||
21 | USE_TOOLS+= patch makeinfo perl | 21 | USE_TOOLS+= patch makeinfo perl | |
22 | 22 | |||
23 | HAS_CONFIGURE= yes | 23 | HAS_CONFIGURE= yes | |
24 | 24 | |||
25 | DIST_SUBDIR= xemacs | 25 | DIST_SUBDIR= xemacs | |
26 | PLIST_SUBST+= DISTNAME=${DISTNAME} | 26 | PLIST_SUBST+= DISTNAME=${DISTNAME} | |
27 | FILES_SUBST+= DISTNAME=${DISTNAME} | 27 | FILES_SUBST+= DISTNAME=${DISTNAME} | |
28 | MESSAGE_SUBST+= DISTNAME=${DISTNAME} | 28 | MESSAGE_SUBST+= DISTNAME=${DISTNAME} | |
29 | INFO_FILES= yes | 29 | INFO_FILES= yes | |
30 | 30 | |||
31 | # NetBSD ships with makeinfo v4 in base, and v6 format is not compatible | |||
32 | MAKEINFO_4_PATCHES= patch-man_lispref_debugging.texi \ | |||
33 | patch-man_xemacs_custom.texi \ | |||
34 | patch-man_lispref_intro.texi | |||
35 | ||||
36 | .if defined(MANZ) | 31 | .if defined(MANZ) | |
37 | PLIST_SUBST+= ELSUFX='.gz' | 32 | PLIST_SUBST+= ELSUFX='.gz' | |
38 | .else | 33 | .else | |
39 | PLIST_SUBST+= ELSUFX='' | 34 | PLIST_SUBST+= ELSUFX='' | |
40 | .endif | 35 | .endif | |
41 | 36 | |||
42 | CONFIGURE_ARGS+= ${MACHINE_GNU_PLATFORM} | 37 | CONFIGURE_ARGS+= ${MACHINE_GNU_PLATFORM} | |
43 | CONFIGURE_ARGS+= --prefix=${PREFIX} | 38 | CONFIGURE_ARGS+= --prefix=${PREFIX} | |
44 | CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}/man1 | 39 | CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}/man1 | |
45 | CONFIGURE_ARGS+= --infopath=${PREFIX}/${PKGINFODIR} | 40 | CONFIGURE_ARGS+= --infopath=${PREFIX}/${PKGINFODIR} | |
46 | CONFIGURE_ARGS+= --with-clash-detection | 41 | CONFIGURE_ARGS+= --with-clash-detection | |
47 | CONFIGURE_ARGS+= --with-mule=yes | 42 | CONFIGURE_ARGS+= --with-mule=yes | |
48 | CONFIGURE_ARGS+= --with-msw=no | 43 | CONFIGURE_ARGS+= --with-msw=no | |
@@ -91,33 +86,26 @@ INSTALL_MAKE_FLAGS+= exec_prefix=${DESTD | @@ -91,33 +86,26 @@ INSTALL_MAKE_FLAGS+= exec_prefix=${DESTD | |||
91 | INSTALL_MAKE_FLAGS+= infodir=${DESTDIR}${LIBDIR}/info | 86 | INSTALL_MAKE_FLAGS+= infodir=${DESTDIR}${LIBDIR}/info | |
92 | INSTALL_MAKE_FLAGS+= libdir=${DESTDIR}/lib | 87 | INSTALL_MAKE_FLAGS+= libdir=${DESTDIR}/lib | |
93 | INSTALL_MAKE_FLAGS+= lispdir=${DESTDIR}${LIBDIR}/lisp | 88 | INSTALL_MAKE_FLAGS+= lispdir=${DESTDIR}${LIBDIR}/lisp | |
94 | INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 | 89 | INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 | |
95 | INSTALL_MAKE_FLAGS+= moduledir=${DESTDIR}${ARCHLIBDIR}/modules | 90 | INSTALL_MAKE_FLAGS+= moduledir=${DESTDIR}${ARCHLIBDIR}/modules | |
96 | INSTALL_MAKE_FLAGS+= pkgdir=${DESTDIR}${LIBDIR}/lisp | 91 | INSTALL_MAKE_FLAGS+= pkgdir=${DESTDIR}${LIBDIR}/lisp | |
97 | INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} | 92 | INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} | |
98 | INSTALL_MAKE_FLAGS+= sitelispdir=${DESTDIR}${PREFIX}/lib/xemacs/site-lisp | 93 | INSTALL_MAKE_FLAGS+= sitelispdir=${DESTDIR}${PREFIX}/lib/xemacs/site-lisp | |
99 | INSTALL_MAKE_FLAGS+= sitemoduledir=${DESTDIR}${PREFIX}/lib/xemacs/site-modules | 94 | INSTALL_MAKE_FLAGS+= sitemoduledir=${DESTDIR}${PREFIX}/lib/xemacs/site-modules | |
100 | 95 | |||
101 | post-extract: | 96 | post-extract: | |
102 | cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s/ | 97 | cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s/ | |
103 | 98 | |||
104 | .if (${OPSYS} == "NetBSD") | |||
105 | post-patch: | |||
106 | .for xpatch in ${MAKEINFO_4_PATCHES} | |||
107 | cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/${xpatch} | |||
108 | .endfor | |||
109 | .endif | |||
110 | ||||
111 | pre-build: | 99 | pre-build: | |
112 | rm -f ${WRKSRC}/etc/ctags.1.orig | 100 | rm -f ${WRKSRC}/etc/ctags.1.orig | |
113 | rm -f ${WRKSRC}/lisp/gui.el.orig | 101 | rm -f ${WRKSRC}/lisp/gui.el.orig | |
114 | 102 | |||
115 | post-install: | 103 | post-install: | |
116 | ${INSTALL_DATA} ${WRKSRC}/Installation ${DESTDIR}${LIBDIR}/etc/ | 104 | ${INSTALL_DATA} ${WRKSRC}/Installation ${DESTDIR}${LIBDIR}/etc/ | |
117 | .if defined(MANZ) | 105 | .if defined(MANZ) | |
118 | find ${DESTDIR}${LIBDIR} -name "*.el" -type f -print | xargs ${GZIP_CMD} | 106 | find ${DESTDIR}${LIBDIR} -name "*.el" -type f -print | xargs ${GZIP_CMD} | |
119 | .endif | 107 | .endif | |
120 | 108 | |||
121 | .include "../../databases/gdbm/buildlink3.mk" | 109 | .include "../../databases/gdbm/buildlink3.mk" | |
122 | .include "../../mk/oss.buildlink3.mk" | 110 | .include "../../mk/oss.buildlink3.mk" | |
123 | .include "../../mk/termcap.buildlink3.mk" | 111 | .include "../../mk/termcap.buildlink3.mk" |
@@ -1,18 +1,23 @@ | @@ -1,18 +1,23 @@ | |||
1 | $NetBSD: distinfo,v 1.29 2019/10/11 12:36:44 hauke Exp $ | 1 | $NetBSD: distinfo,v 1.30 2019/10/11 14:42:48 hauke Exp $ | |
2 | 2 | |||
3 | SHA1 (xemacs/xemacs-21.4.24.tar.gz) = e9ff7693adbef333b78f51b4dfdddd296bad0fcc | 3 | SHA1 (xemacs/xemacs-21.4.24.tar.gz) = e9ff7693adbef333b78f51b4dfdddd296bad0fcc | |
4 | RMD160 (xemacs/xemacs-21.4.24.tar.gz) = 0e01971c0dd47d9dd401d02e508edf241208969b | 4 | RMD160 (xemacs/xemacs-21.4.24.tar.gz) = 0e01971c0dd47d9dd401d02e508edf241208969b | |
5 | SHA512 (xemacs/xemacs-21.4.24.tar.gz) = b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213 | 5 | SHA512 (xemacs/xemacs-21.4.24.tar.gz) = b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213 | |
6 | Size (xemacs/xemacs-21.4.24.tar.gz) = 8543879 bytes | 6 | Size (xemacs/xemacs-21.4.24.tar.gz) = 8543879 bytes | |
7 | SHA1 (patch-Makefile.in.in) = a65cf383a343bb582f6950a28c4e7219e3dd22e7 | 7 | SHA1 (patch-Makefile.in.in) = a65cf383a343bb582f6950a28c4e7219e3dd22e7 | |
8 | SHA1 (patch-configure) = 10ae7a19ada6321996d9f57b8129ee91c326ac72 | 8 | SHA1 (patch-configure) = 10ae7a19ada6321996d9f57b8129ee91c326ac72 | |
9 | SHA1 (patch-lib-src_Makefile.in.in) = 5e11bf2904145804f521fed0ef956da94e5f21bd | 9 | SHA1 (patch-lib-src_Makefile.in.in) = 5e11bf2904145804f521fed0ef956da94e5f21bd | |
10 | SHA1 (patch-lisp_gui.el) = 686bc5a7c4bf6e3c4f010dba22aee109d94f6cb3 | 10 | SHA1 (patch-lisp_gui.el) = 686bc5a7c4bf6e3c4f010dba22aee109d94f6cb3 | |
11 | SHA1 (patch-lwlib_Makefile.in.in) = 97fcf6de4299dfd5ba7a9827ee88bc037df0491e | 11 | SHA1 (patch-lwlib_Makefile.in.in) = 97fcf6de4299dfd5ba7a9827ee88bc037df0491e | |
12 | SHA1 (patch-man_lispref_debugging.texi) = 4d6f99c17bc8e25e700a663f7eff147b72fd9a14 | |||
13 | SHA1 (patch-man_lispref_intro.texi) = 5837f8a0e8057649921cdbddd8e8329165ec1104 | |||
14 | SHA1 (patch-man_lispref_ldap.texi) = e66dd13905ab8b34e2346865d529a99bed35a23b | |||
15 | SHA1 (patch-man_xemacs-faq.texi) = 4229ea06a7f9a9361639fb50af1a58c51211eb49 | |||
16 | SHA1 (patch-man_xemacs_custom.texi) = e564906bced48b0a7c788c217c02eafe167fee59 | |||
12 | SHA1 (patch-src_Makefile.in.in) = 8d2c262983ff16197c99429e7d4cc80cd8371775 | 17 | SHA1 (patch-src_Makefile.in.in) = 8d2c262983ff16197c99429e7d4cc80cd8371775 | |
13 | SHA1 (patch-src_config.h.in) = 25ac897560abad51d83b58818e1dc2e77a8519e4 | 18 | SHA1 (patch-src_config.h.in) = 25ac897560abad51d83b58818e1dc2e77a8519e4 | |
14 | SHA1 (patch-src_emacs.c) = 19bbba8b9a777388060bab637b2bdc5e9027e11f | 19 | SHA1 (patch-src_emacs.c) = 19bbba8b9a777388060bab637b2bdc5e9027e11f | |
15 | SHA1 (patch-src_lisp.h) = ed1210a179f7dce537634e3129acc93f9c9b5966 | 20 | SHA1 (patch-src_lisp.h) = ed1210a179f7dce537634e3129acc93f9c9b5966 | |
16 | SHA1 (patch-src_sound.c) = fd3717943310c049fbcc8598b072d80d9812ae20 | 21 | SHA1 (patch-src_sound.c) = fd3717943310c049fbcc8598b072d80d9812ae20 | |
17 | SHA1 (patch-src_unexelf.c) = 5147a3f41d1188aaf08b99e768d8b93e9e28d305 | 22 | SHA1 (patch-src_unexelf.c) = 5147a3f41d1188aaf08b99e768d8b93e9e28d305 | |
18 | SHA1 (patch-src_unexfreebsd.c) = 8bcbd103884430cec31c584bc489e4ab98d79448 | 23 | SHA1 (patch-src_unexfreebsd.c) = 8bcbd103884430cec31c584bc489e4ab98d79448 |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | # $NetBSD: Makefile,v 1.32 2019/10/11 12:36:44 hauke Exp $ | 1 | # $NetBSD: Makefile,v 1.33 2019/10/11 14:42:48 hauke Exp $ | |
2 | 2 | |||
3 | PKGNAME= ${DISTNAME:S/-/-nox11-/} | 3 | PKGNAME= ${DISTNAME:S/-/-nox11-/} | |
4 | PKGREVISION= 9 | 4 | PKGREVISION= 10 | |
5 | COMMENT= XEmacs text editor version 21 (no x11 support) | 5 | COMMENT= XEmacs text editor version 21 (no x11 support) | |
6 | 6 | |||
7 | # Version information in ../../editors/xemacs/Makefile.common | 7 | # Version information in ../../editors/xemacs/Makefile.common | |
8 | 8 | |||
9 | .include "../../editors/xemacs/options.mk" | 9 | .include "../../editors/xemacs/options.mk" | |
10 | 10 | |||
11 | .include "../../editors/xemacs/Makefile.common" | 11 | .include "../../editors/xemacs/Makefile.common" | |
12 | 12 | |||
13 | .include "../../mk/bsd.pkg.mk" | 13 | .include "../../mk/bsd.pkg.mk" |
$NetBSD: patch-man_lispref_ldap.texi,v 1.1 2019/10/11 14:42:48 hauke Exp $
GC non-ascii gremlins that devel/gtexinfo v6.7 objects to.
--- man/lispref/ldap.texi.orig 2015-03-25 11:25:33.000000000 +0000
+++ man/lispref/ldap.texi
@@ -105,7 +105,7 @@ The authentication method to use, possib
library XEmacs was compiled with, they may include @code{simple},
@code{krbv41} and @code{krbv42}.
@item base
-The base for the search. This may look like @samp{cÿ, o¬me}, see
+The base for the search. This may look like @samp{c@"y, o@!me}, see
RFC 1779 for syntax details.
@item scope
One of the symbols @code{base}, @code{onelevel} or @code{subtree}
$NetBSD: patch-man_xemacs-faq.texi,v 1.1 2019/10/11 14:42:48 hauke Exp $
GC non-ascii gremlins that devel/gtexinfo v6.7 objects to.
--- man/xemacs-faq.texi.orig 2015-03-25 11:25:33.000000000 +0000
+++ man/xemacs-faq.texi
@@ -2831,7 +2831,7 @@ methods for almost all the character set
all of the ISO 8859 family, the Indic languages, Thai, and so on), and
SKK, for Japanese. (SKK also supports an interface to an external
"dictionary server" process.) Quail supports both typical "dead-key"
-methods (eg, in the "latin-1-prefix" method, @kbd{" a} produces ä, LATIN
+methods (eg, in the "latin-1-prefix" method, @kbd{" a} produces @"a, LATIN
SMALL LETTER A WITH DIAERESIS), and the complex dictionary-based phonetic
methods used for Asian ideographic languages like Chinese.
@@ -2877,7 +2877,7 @@ patches available (no URL, sorry) to sup
Wnn and SJ3 use the @code{egg} user interface. The interface for Canna
is specialized to Canna.
-Wnn supports Japanese, Chinese and Korean. It is made by OMRON and Kyôto
+Wnn supports Japanese, Chinese and Korean. It is made by OMRON and Kyoto
University. It is a powerful and complex system. Wnn4 is free and Wnn6
is not. Wnn uses grammatical hints and probability of word association,
so in principle Wnn can be cleverer than other methods.
@@ -4800,10 +4800,10 @@ the null binding @code{OpenWindows.Keybo
@node Q3.0.6, Q3.0.7, Q3.0.5, Editing
@unnumberedsubsec Q3.0.6: How can you type in special characters in XEmacs?
One way is to use the package @code{x-compose}. Then you can use
-sequences like @kbd{Compose " a} to get ä, etc.
+sequences like @kbd{Compose " a} to get @"a, etc.
Another way is to use the @code{iso-insert} package. Then you can use
-sequences like @kbd{C-x 8 " a} to get ä, etc.
+sequences like @kbd{C-x 8 " a} to get @"a, etc.
@email{glynn@@sensei.co.uk, Glynn Clements} writes:
@@ -4826,9 +4826,9 @@ define the right `Windows' key as Multi_
Once you have Multi_key defined, you can use e.g.
@example
- Multi a ' => á
- Multi e " => ë
- Multi c , => ç
+ Multi a ' => @'a
+ Multi e " => @"e
+ Multi c , => @,{c}
@end example
etc.