CVS commit: pkgsrc/editors

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

Module Name:    pkgsrc
Committed By:   hauke
Date:           Wed May 24 11:40:11 UTC 2023

Modified Files:
        pkgsrc/editors/xemacs-current: Makefile distinfo
        pkgsrc/editors/xemacs-current-nox11: Makefile
Added Files:
        pkgsrc/editors/xemacs-current/patches: patch-configure

Log Message:
The 21.5 requirement of makeinfo 4.12 seems arbitrary - the
NetBSD-enclosed makeinfo 4.8 appears to work just fine.

Plus, simply not setting MAKEINFO will leave us without .info files.


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 pkgsrc/editors/xemacs-current/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/editors/xemacs-current/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/editors/xemacs-current-nox11/Makefile
cvs rdiff -u -r0 -r1.6 pkgsrc/editors/xemacs-current/patches/patch-configure

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-current/Makefile
diff -u pkgsrc/editors/xemacs-current/Makefile:1.115 pkgsrc/editors/xemacs-current/Makefile:1.116
--- pkgsrc/editors/xemacs-current/Makefile:1.115        Sun May 21 00:13:55 2023
+++ pkgsrc/editors/xemacs-current/Makefile      Wed May 24 11:40:11 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.115 2023/05/21 00:13:55 hauke Exp $
+# $NetBSD: Makefile,v 1.116 2023/05/24 11:40:11 hauke Exp $
 
 PKGNAME=       ${DISTNAME}
+PKGREVISION=   1
 COMMENT=       *BETA* XEmacs text editor version ${PKGVERSION_NOREV}
 
 .include "Makefile.common"

Index: pkgsrc/editors/xemacs-current/distinfo
diff -u pkgsrc/editors/xemacs-current/distinfo:1.42 pkgsrc/editors/xemacs-current/distinfo:1.43
--- pkgsrc/editors/xemacs-current/distinfo:1.42 Sun May 21 00:13:55 2023
+++ pkgsrc/editors/xemacs-current/distinfo      Wed May 24 11:40:11 2023
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.42 2023/05/21 00:13:55 hauke Exp $
+$NetBSD: distinfo,v 1.43 2023/05/24 11:40:11 hauke Exp $
 
 BLAKE2s (xemacs-21.5.35.tar.gz) = 4b1b0fc5f7302180a16168bde9b85b05797e6ad883e1f0d72d77102cd5f36b11
 SHA512 (xemacs-21.5.35.tar.gz) = e592af6ffbb6f95299039de28f59ee770bf62f54a15b1358b9d1059ed25dcb410c01dcf6e88c1d2196d54f0c6902f309d709fe003accee82e516023fa4363019
 Size (xemacs-21.5.35.tar.gz) = 16403617 bytes
 SHA1 (patch-Makefile.in.in) = 8ac4bc8cb73529dbf58e9465f014dfd8164b1577
+SHA1 (patch-configure) = 67c6d4e1114aba256156c3d1d286ac509bbba440
 SHA1 (patch-lib-src_Makefile.in.in) = f09f99c363d988f356a3a49a1bf96136502d16aa
 SHA1 (patch-lib-src_fakemail.c) = d786ead6ccf1c640d7310b863202e7bde0e9e93a
 SHA1 (patch-lwlib_Makefile.in.in) = 8d243f1c85122429187b8250c18221dee8423ed0

Index: pkgsrc/editors/xemacs-current-nox11/Makefile
diff -u pkgsrc/editors/xemacs-current-nox11/Makefile:1.15 pkgsrc/editors/xemacs-current-nox11/Makefile:1.16
--- pkgsrc/editors/xemacs-current-nox11/Makefile:1.15   Sun May 21 00:13:56 2023
+++ pkgsrc/editors/xemacs-current-nox11/Makefile        Wed May 24 11:40:11 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2023/05/21 00:13:56 hauke Exp $
+# $NetBSD: Makefile,v 1.16 2023/05/24 11:40:11 hauke Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-nox11-/}
+PKGREVISION=   1
 COMMENT=       *BETA* XEmacs text editor version 21.5 (no X11 support)
 
 .include "../../editors/xemacs-current/Makefile.common"

Added files:

Index: pkgsrc/editors/xemacs-current/patches/patch-configure
diff -u /dev/null pkgsrc/editors/xemacs-current/patches/patch-configure:1.6
--- /dev/null   Wed May 24 11:40:11 2023
+++ pkgsrc/editors/xemacs-current/patches/patch-configure       Wed May 24 11:40:11 2023
@@ -0,0 +1,37 @@
+$NetBSD: patch-configure,v 1.6 2023/05/24 11:40:11 hauke Exp $
+
+The 21.5 requirement of makeinfo 4.12 seems arbitrary - the
+NetBSD-enclosed makeinfo 4.8 appears to work just fine. Plus, simply
+not setting MAKEINFO will leave us without .info files.
+
+--- configure.orig     2023-05-13 18:09:51.000000000 +0000
++++ configure
+@@ -11434,14 +11434,14 @@ done
+ test -n "$YACC" || YACC="yacc"
+ 
+ 
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for makeinfo >= 4.12" >&5
+-printf %s "checking for makeinfo >= 4.12... " >&6; }
++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for makeinfo >= 4.8" >&5
++printf %s "checking for makeinfo >= 4.8... " >&6; }
+ MAKEINFO=
+ for prog in `which -a makeinfo`; do
+   mi_verstr=`$prog --version | sed -n '1s/^.* \([0-9][0-9.]*\)$/\1/p'`
+   mi_major=`echo $mi_verstr | cut -d. -f1`
+   mi_minor=`echo $mi_verstr | cut -d. -f2`
+-  if test "$mi_major" -gt 4 || ( test "$mi_major" -eq 4 && test "$mi_minor" -gt 11 );
++  if test "$mi_major" -gt 4 || ( test "$mi_major" -eq 4 && test "$mi_minor" -ge 8 );
+   then
+     MAKEINFO=$prog
+     break
+@@ -11450,8 +11450,8 @@ done
+ if test -z $MAKEINFO; then
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ printf "%s\n" "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Found Makeinfo $mi_verstr.  4.12 or later required." >&5
+-printf "%s\n" "$as_me: WARNING: Found Makeinfo $mi_verstr.  4.12 or later required." >&2;}
++  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Found Makeinfo $mi_verstr.  4.8 or later required." >&5
++printf "%s\n" "$as_me: WARNING: Found Makeinfo $mi_verstr.  4.8 or later required." >&2;}
+ else
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ printf "%s\n" "yes" >&6; }