CVS commit: pkgsrc/editors

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Fri Oct 11 12:36:44 UTC 2019

Modified Files:
        pkgsrc/editors/xemacs: Makefile Makefile.common distinfo
        pkgsrc/editors/xemacs-nox11: Makefile

Log Message:
This package patches the texinfo sources for use with NetBSD's
makeinfo v4.8. The 6.7 update to devel/gtexinfo broke backwards
compatibility more, so we pull out the patches and conditionally apply
them on NetBSD, only. (Other candidates?)


To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 pkgsrc/editors/xemacs/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/editors/xemacs/Makefile.common
cvs rdiff -u -r1.28 -r1.29 pkgsrc/editors/xemacs/distinfo
cvs rdiff -u -r1.31 -r1.32 pkgsrc/editors/xemacs-nox11/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/xemacs/Makefile
diff -u pkgsrc/editors/xemacs/Makefile:1.125 pkgsrc/editors/xemacs/Makefile:1.126
--- pkgsrc/editors/xemacs/Makefile:1.125        Tue Oct  8 12:40:54 2019
+++ pkgsrc/editors/xemacs/Makefile      Fri Oct 11 12:36:44 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.125 2019/10/08 12:40:54 hauke Exp $
+# $NetBSD: Makefile,v 1.126 2019/10/11 12:36:44 hauke Exp $
 
 PKGNAME=       ${DISTNAME}
-PKGREVISION=   7
+PKGREVISION=   8
 COMMENT=       XEmacs text editor version 21.4
 
 # extra options for x11 support, not for sharing with xemacs-current-nox11

Index: pkgsrc/editors/xemacs/Makefile.common
diff -u pkgsrc/editors/xemacs/Makefile.common:1.31 pkgsrc/editors/xemacs/Makefile.common:1.32
--- pkgsrc/editors/xemacs/Makefile.common:1.31  Tue Oct  8 12:40:54 2019
+++ pkgsrc/editors/xemacs/Makefile.common       Fri Oct 11 12:36:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2019/10/08 12:40:54 hauke Exp $
+# $NetBSD: Makefile.common,v 1.32 2019/10/11 12:36:44 hauke Exp $
 #
 # used by editors/xemacs-nox11/Makefile
 # used by editors/xemacs/Makefile
@@ -18,7 +18,7 @@ PATCHDIR=             ${.CURDIR}/../../editors/xema
 DISTINFO_FILE=         ${.CURDIR}/../../editors/xemacs/distinfo
 PLIST_SRC=             ${.CURDIR}/../../editors/xemacs/PLIST
 
-USE_TOOLS+=    makeinfo perl
+USE_TOOLS+=            patch makeinfo perl
 
 HAS_CONFIGURE=         yes
 
@@ -28,6 +28,11 @@ FILES_SUBST+=                DISTNAME=${DISTNAME}
 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
@@ -96,6 +101,13 @@ INSTALL_MAKE_FLAGS+=        sitemoduledir=${DES
 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
        rm -f ${WRKSRC}/lisp/gui.el.orig

Index: pkgsrc/editors/xemacs/distinfo
diff -u pkgsrc/editors/xemacs/distinfo:1.28 pkgsrc/editors/xemacs/distinfo:1.29
--- pkgsrc/editors/xemacs/distinfo:1.28 Thu Dec 20 15:26:31 2018
+++ pkgsrc/editors/xemacs/distinfo      Fri Oct 11 12:36:44 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2018/12/20 15:26:31 hauke Exp $
+$NetBSD: distinfo,v 1.29 2019/10/11 12:36:44 hauke Exp $
 
 SHA1 (xemacs/xemacs-21.4.24.tar.gz) = e9ff7693adbef333b78f51b4dfdddd296bad0fcc
 RMD160 (xemacs/xemacs-21.4.24.tar.gz) = 0e01971c0dd47d9dd401d02e508edf241208969b
@@ -9,9 +9,6 @@ SHA1 (patch-configure) = 10ae7a19ada6321
 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_xemacs_custom.texi) = e564906bced48b0a7c788c217c02eafe167fee59
 SHA1 (patch-src_Makefile.in.in) = 8d2c262983ff16197c99429e7d4cc80cd8371775
 SHA1 (patch-src_config.h.in) = 25ac897560abad51d83b58818e1dc2e77a8519e4
 SHA1 (patch-src_emacs.c) = 19bbba8b9a777388060bab637b2bdc5e9027e11f

Index: pkgsrc/editors/xemacs-nox11/Makefile
diff -u pkgsrc/editors/xemacs-nox11/Makefile:1.31 pkgsrc/editors/xemacs-nox11/Makefile:1.32
--- pkgsrc/editors/xemacs-nox11/Makefile:1.31   Tue Oct  8 12:40:55 2019
+++ pkgsrc/editors/xemacs-nox11/Makefile        Fri Oct 11 12:36:44 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2019/10/08 12:40:55 hauke Exp $
+# $NetBSD: Makefile,v 1.32 2019/10/11 12:36:44 hauke Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-nox11-/}
-PKGREVISION=   8
+PKGREVISION=   9
 COMMENT=       XEmacs text editor version 21 (no x11 support)
 
 # Version information in ../../editors/xemacs/Makefile.common