Fri Oct 11 12:36:44 2019 UTC ()
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?)


(hauke)
diff -r1.125 -r1.126 pkgsrc/editors/xemacs/Makefile
diff -r1.31 -r1.32 pkgsrc/editors/xemacs/Makefile.common
diff -r1.28 -r1.29 pkgsrc/editors/xemacs/distinfo
diff -r1.31 -r1.32 pkgsrc/editors/xemacs-nox11/Makefile
cvs diff -r1.125 -r1.126 pkgsrc/editors/xemacs/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/xemacs/Makefile 2019/10/08 12:40:54 1.125
+++ pkgsrc/editors/xemacs/Makefile 2019/10/11 12:36:44 1.126
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.125 2019/10/08 12:40:54 hauke Exp $ 1# $NetBSD: Makefile,v 1.126 2019/10/11 12:36:44 hauke Exp $
2 2
3PKGNAME= ${DISTNAME} 3PKGNAME= ${DISTNAME}
4PKGREVISION= 7 4PKGREVISION= 8
5COMMENT= XEmacs text editor version 21.4 5COMMENT= 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
10PKG_SUPPORTED_OPTIONS+= x11 xface 10PKG_SUPPORTED_OPTIONS+= x11 xface
11PKG_SUGGESTED_OPTIONS+= x11 11PKG_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"
cvs diff -r1.31 -r1.32 pkgsrc/editors/xemacs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/xemacs/Makefile.common 2019/10/08 12:40:54 1.31
+++ pkgsrc/editors/xemacs/Makefile.common 2019/10/11 12:36:44 1.32
@@ -1,43 +1,48 @@ @@ -1,43 +1,48 @@
1# $NetBSD: Makefile.common,v 1.31 2019/10/08 12:40:54 hauke Exp $ 1# $NetBSD: Makefile.common,v 1.32 2019/10/11 12:36:44 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
6DISTNAME= xemacs-21.4.24 6DISTNAME= xemacs-21.4.24
7CATEGORIES= editors 7CATEGORIES= editors
8MASTER_SITES= ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/} 8MASTER_SITES= ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
9 9
10MAINTAINER= hauke@NetBSD.org 10MAINTAINER= hauke@NetBSD.org
11HOMEPAGE= http://www.xemacs.org/ 11HOMEPAGE= http://www.xemacs.org/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
15 15
16FILESDIR= ${.CURDIR}/../../editors/xemacs/files 16FILESDIR= ${.CURDIR}/../../editors/xemacs/files
17PATCHDIR= ${.CURDIR}/../../editors/xemacs/patches 17PATCHDIR= ${.CURDIR}/../../editors/xemacs/patches
18DISTINFO_FILE= ${.CURDIR}/../../editors/xemacs/distinfo 18DISTINFO_FILE= ${.CURDIR}/../../editors/xemacs/distinfo
19PLIST_SRC= ${.CURDIR}/../../editors/xemacs/PLIST 19PLIST_SRC= ${.CURDIR}/../../editors/xemacs/PLIST
20 20
21USE_TOOLS+= makeinfo perl 21USE_TOOLS+= patch makeinfo perl
22 22
23HAS_CONFIGURE= yes 23HAS_CONFIGURE= yes
24 24
25DIST_SUBDIR= xemacs 25DIST_SUBDIR= xemacs
26PLIST_SUBST+= DISTNAME=${DISTNAME} 26PLIST_SUBST+= DISTNAME=${DISTNAME}
27FILES_SUBST+= DISTNAME=${DISTNAME} 27FILES_SUBST+= DISTNAME=${DISTNAME}
28MESSAGE_SUBST+= DISTNAME=${DISTNAME} 28MESSAGE_SUBST+= DISTNAME=${DISTNAME}
29INFO_FILES= yes 29INFO_FILES= yes
30 30
 31# NetBSD ships with makeinfo v4 in base, and v6 format is not compatible
 32MAKEINFO_4_PATCHES= patch-man_lispref_debugging.texi \
 33 patch-man_xemacs_custom.texi \
 34 patch-man_lispref_intro.texi
 35
31.if defined(MANZ) 36.if defined(MANZ)
32PLIST_SUBST+= ELSUFX='.gz' 37PLIST_SUBST+= ELSUFX='.gz'
33.else 38.else
34PLIST_SUBST+= ELSUFX='' 39PLIST_SUBST+= ELSUFX=''
35.endif 40.endif
36 41
37CONFIGURE_ARGS+= ${MACHINE_GNU_PLATFORM} 42CONFIGURE_ARGS+= ${MACHINE_GNU_PLATFORM}
38CONFIGURE_ARGS+= --prefix=${PREFIX} 43CONFIGURE_ARGS+= --prefix=${PREFIX}
39CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}/man1 44CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}/man1
40CONFIGURE_ARGS+= --infopath=${PREFIX}/${PKGINFODIR} 45CONFIGURE_ARGS+= --infopath=${PREFIX}/${PKGINFODIR}
41CONFIGURE_ARGS+= --with-clash-detection 46CONFIGURE_ARGS+= --with-clash-detection
42CONFIGURE_ARGS+= --with-mule=yes 47CONFIGURE_ARGS+= --with-mule=yes
43CONFIGURE_ARGS+= --with-msw=no 48CONFIGURE_ARGS+= --with-msw=no
@@ -86,26 +91,33 @@ INSTALL_MAKE_FLAGS+= exec_prefix=${DESTD @@ -86,26 +91,33 @@ INSTALL_MAKE_FLAGS+= exec_prefix=${DESTD
86INSTALL_MAKE_FLAGS+= infodir=${DESTDIR}${LIBDIR}/info 91INSTALL_MAKE_FLAGS+= infodir=${DESTDIR}${LIBDIR}/info
87INSTALL_MAKE_FLAGS+= libdir=${DESTDIR}/lib 92INSTALL_MAKE_FLAGS+= libdir=${DESTDIR}/lib
88INSTALL_MAKE_FLAGS+= lispdir=${DESTDIR}${LIBDIR}/lisp 93INSTALL_MAKE_FLAGS+= lispdir=${DESTDIR}${LIBDIR}/lisp
89INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 94INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
90INSTALL_MAKE_FLAGS+= moduledir=${DESTDIR}${ARCHLIBDIR}/modules 95INSTALL_MAKE_FLAGS+= moduledir=${DESTDIR}${ARCHLIBDIR}/modules
91INSTALL_MAKE_FLAGS+= pkgdir=${DESTDIR}${LIBDIR}/lisp 96INSTALL_MAKE_FLAGS+= pkgdir=${DESTDIR}${LIBDIR}/lisp
92INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} 97INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX}
93INSTALL_MAKE_FLAGS+= sitelispdir=${DESTDIR}${PREFIX}/lib/xemacs/site-lisp 98INSTALL_MAKE_FLAGS+= sitelispdir=${DESTDIR}${PREFIX}/lib/xemacs/site-lisp
94INSTALL_MAKE_FLAGS+= sitemoduledir=${DESTDIR}${PREFIX}/lib/xemacs/site-modules 99INSTALL_MAKE_FLAGS+= sitemoduledir=${DESTDIR}${PREFIX}/lib/xemacs/site-modules
95 100
96post-extract: 101post-extract:
97 cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s/ 102 cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s/
98 103
 104.if (${OPSYS} == "NetBSD")
 105post-patch:
 106.for xpatch in ${MAKEINFO_4_PATCHES}
 107 cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/${xpatch}
 108.endfor
 109.endif
 110
99pre-build: 111pre-build:
100 rm -f ${WRKSRC}/etc/ctags.1.orig 112 rm -f ${WRKSRC}/etc/ctags.1.orig
101 rm -f ${WRKSRC}/lisp/gui.el.orig 113 rm -f ${WRKSRC}/lisp/gui.el.orig
102 114
103post-install: 115post-install:
104 ${INSTALL_DATA} ${WRKSRC}/Installation ${DESTDIR}${LIBDIR}/etc/ 116 ${INSTALL_DATA} ${WRKSRC}/Installation ${DESTDIR}${LIBDIR}/etc/
105.if defined(MANZ) 117.if defined(MANZ)
106 find ${DESTDIR}${LIBDIR} -name "*.el" -type f -print | xargs ${GZIP_CMD} 118 find ${DESTDIR}${LIBDIR} -name "*.el" -type f -print | xargs ${GZIP_CMD}
107.endif 119.endif
108 120
109.include "../../databases/gdbm/buildlink3.mk" 121.include "../../databases/gdbm/buildlink3.mk"
110.include "../../mk/oss.buildlink3.mk" 122.include "../../mk/oss.buildlink3.mk"
111.include "../../mk/termcap.buildlink3.mk" 123.include "../../mk/termcap.buildlink3.mk"
cvs diff -r1.28 -r1.29 pkgsrc/editors/xemacs/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/xemacs/distinfo 2018/12/20 15:26:31 1.28
+++ pkgsrc/editors/xemacs/distinfo 2019/10/11 12:36:44 1.29
@@ -1,21 +1,18 @@ @@ -1,21 +1,18 @@
1$NetBSD: distinfo,v 1.28 2018/12/20 15:26:31 hauke Exp $ 1$NetBSD: distinfo,v 1.29 2019/10/11 12:36:44 hauke Exp $
2 2
3SHA1 (xemacs/xemacs-21.4.24.tar.gz) = e9ff7693adbef333b78f51b4dfdddd296bad0fcc 3SHA1 (xemacs/xemacs-21.4.24.tar.gz) = e9ff7693adbef333b78f51b4dfdddd296bad0fcc
4RMD160 (xemacs/xemacs-21.4.24.tar.gz) = 0e01971c0dd47d9dd401d02e508edf241208969b 4RMD160 (xemacs/xemacs-21.4.24.tar.gz) = 0e01971c0dd47d9dd401d02e508edf241208969b
5SHA512 (xemacs/xemacs-21.4.24.tar.gz) = b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213 5SHA512 (xemacs/xemacs-21.4.24.tar.gz) = b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
6Size (xemacs/xemacs-21.4.24.tar.gz) = 8543879 bytes 6Size (xemacs/xemacs-21.4.24.tar.gz) = 8543879 bytes
7SHA1 (patch-Makefile.in.in) = a65cf383a343bb582f6950a28c4e7219e3dd22e7 7SHA1 (patch-Makefile.in.in) = a65cf383a343bb582f6950a28c4e7219e3dd22e7
8SHA1 (patch-configure) = 10ae7a19ada6321996d9f57b8129ee91c326ac72 8SHA1 (patch-configure) = 10ae7a19ada6321996d9f57b8129ee91c326ac72
9SHA1 (patch-lib-src_Makefile.in.in) = 5e11bf2904145804f521fed0ef956da94e5f21bd 9SHA1 (patch-lib-src_Makefile.in.in) = 5e11bf2904145804f521fed0ef956da94e5f21bd
10SHA1 (patch-lisp_gui.el) = 686bc5a7c4bf6e3c4f010dba22aee109d94f6cb3 10SHA1 (patch-lisp_gui.el) = 686bc5a7c4bf6e3c4f010dba22aee109d94f6cb3
11SHA1 (patch-lwlib_Makefile.in.in) = 97fcf6de4299dfd5ba7a9827ee88bc037df0491e 11SHA1 (patch-lwlib_Makefile.in.in) = 97fcf6de4299dfd5ba7a9827ee88bc037df0491e
12SHA1 (patch-man_lispref_debugging.texi) = 4d6f99c17bc8e25e700a663f7eff147b72fd9a14 
13SHA1 (patch-man_lispref_intro.texi) = 5837f8a0e8057649921cdbddd8e8329165ec1104 
14SHA1 (patch-man_xemacs_custom.texi) = e564906bced48b0a7c788c217c02eafe167fee59 
15SHA1 (patch-src_Makefile.in.in) = 8d2c262983ff16197c99429e7d4cc80cd8371775 12SHA1 (patch-src_Makefile.in.in) = 8d2c262983ff16197c99429e7d4cc80cd8371775
16SHA1 (patch-src_config.h.in) = 25ac897560abad51d83b58818e1dc2e77a8519e4 13SHA1 (patch-src_config.h.in) = 25ac897560abad51d83b58818e1dc2e77a8519e4
17SHA1 (patch-src_emacs.c) = 19bbba8b9a777388060bab637b2bdc5e9027e11f 14SHA1 (patch-src_emacs.c) = 19bbba8b9a777388060bab637b2bdc5e9027e11f
18SHA1 (patch-src_lisp.h) = ed1210a179f7dce537634e3129acc93f9c9b5966 15SHA1 (patch-src_lisp.h) = ed1210a179f7dce537634e3129acc93f9c9b5966
19SHA1 (patch-src_sound.c) = fd3717943310c049fbcc8598b072d80d9812ae20 16SHA1 (patch-src_sound.c) = fd3717943310c049fbcc8598b072d80d9812ae20
20SHA1 (patch-src_unexelf.c) = 5147a3f41d1188aaf08b99e768d8b93e9e28d305 17SHA1 (patch-src_unexelf.c) = 5147a3f41d1188aaf08b99e768d8b93e9e28d305
21SHA1 (patch-src_unexfreebsd.c) = 8bcbd103884430cec31c584bc489e4ab98d79448 18SHA1 (patch-src_unexfreebsd.c) = 8bcbd103884430cec31c584bc489e4ab98d79448
cvs diff -r1.31 -r1.32 pkgsrc/editors/xemacs-nox11/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/xemacs-nox11/Makefile 2019/10/08 12:40:55 1.31
+++ pkgsrc/editors/xemacs-nox11/Makefile 2019/10/11 12:36:44 1.32
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: Makefile,v 1.31 2019/10/08 12:40:55 hauke Exp $ 1# $NetBSD: Makefile,v 1.32 2019/10/11 12:36:44 hauke Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-nox11-/} 3PKGNAME= ${DISTNAME:S/-/-nox11-/}
4PKGREVISION= 8 4PKGREVISION= 9
5COMMENT= XEmacs text editor version 21 (no x11 support) 5COMMENT= 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"