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...


(hauke)

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.126 2019/10/11 12:36:44 hauke Exp $
+# $NetBSD: Makefile,v 1.127 2019/10/11 14:42:48 hauke Exp $
 
 PKGNAME=	${DISTNAME}
-PKGREVISION=	8
+PKGREVISION=	9
 COMMENT=	XEmacs text editor version 21.4
 
 # extra options for x11 support, not for sharing with xemacs-current-nox11

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2019/10/11 12:36:44 hauke Exp $
+# $NetBSD: Makefile.common,v 1.33 2019/10/11 14:42:48 hauke Exp $
 #
 # used by editors/xemacs-nox11/Makefile
 # used by editors/xemacs/Makefile
@@ -28,11 +28,6 @@
 MESSAGE_SUBST+=		DISTNAME=${DISTNAME}
 INFO_FILES=		yes
 
-# NetBSD ships with makeinfo v4 in base, and v6 format is not compatible
-MAKEINFO_4_PATCHES=	patch-man_lispref_debugging.texi \
-			patch-man_xemacs_custom.texi \
-			patch-man_lispref_intro.texi
-
 .if defined(MANZ)
 PLIST_SUBST+=		ELSUFX='.gz'
 .else
@@ -100,13 +95,6 @@
 
 post-extract:
 	cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s/
-
-.if (${OPSYS} == "NetBSD")
-post-patch:
-.for xpatch in ${MAKEINFO_4_PATCHES}
-	cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/${xpatch}
-.endfor
-.endif
 
 pre-build:
 	rm -f ${WRKSRC}/etc/ctags.1.orig

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2019/10/11 12:36:44 hauke Exp $
+$NetBSD: distinfo,v 1.30 2019/10/11 14:42:48 hauke Exp $
 
 SHA1 (xemacs/xemacs-21.4.24.tar.gz) = e9ff7693adbef333b78f51b4dfdddd296bad0fcc
 RMD160 (xemacs/xemacs-21.4.24.tar.gz) = 0e01971c0dd47d9dd401d02e508edf241208969b
@@ -9,6 +9,11 @@
 SHA1 (patch-lib-src_Makefile.in.in) = 5e11bf2904145804f521fed0ef956da94e5f21bd
 SHA1 (patch-lisp_gui.el) = 686bc5a7c4bf6e3c4f010dba22aee109d94f6cb3
 SHA1 (patch-lwlib_Makefile.in.in) = 97fcf6de4299dfd5ba7a9827ee88bc037df0491e
+SHA1 (patch-man_lispref_debugging.texi) = 4d6f99c17bc8e25e700a663f7eff147b72fd9a14
+SHA1 (patch-man_lispref_intro.texi) = 5837f8a0e8057649921cdbddd8e8329165ec1104
+SHA1 (patch-man_lispref_ldap.texi) = e66dd13905ab8b34e2346865d529a99bed35a23b
+SHA1 (patch-man_xemacs-faq.texi) = 4229ea06a7f9a9361639fb50af1a58c51211eb49
+SHA1 (patch-man_xemacs_custom.texi) = e564906bced48b0a7c788c217c02eafe167fee59
 SHA1 (patch-src_Makefile.in.in) = 8d2c262983ff16197c99429e7d4cc80cd8371775
 SHA1 (patch-src_config.h.in) = 25ac897560abad51d83b58818e1dc2e77a8519e4
 SHA1 (patch-src_emacs.c) = 19bbba8b9a777388060bab637b2bdc5e9027e11f

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2019/10/11 12:36:44 hauke Exp $
+# $NetBSD: Makefile,v 1.33 2019/10/11 14:42:48 hauke Exp $
 
 PKGNAME=	${DISTNAME:S/-/-nox11-/}
-PKGREVISION=	9
+PKGREVISION=	10
 COMMENT=	XEmacs text editor version 21 (no x11 support)
 
 # Version information in ../../editors/xemacs/Makefile.common

$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.