CVS commit: pkgsrc/textproc/groff

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jan 29 10:31:53 UTC 2025

Modified Files:
        pkgsrc/textproc/groff: Makefile distinfo
        pkgsrc/textproc/groff/patches: patch-aa

Log Message:
groff: Fix another regression in previous update.

an.tmac was changed to load an.tmac, causing infinite loops.  Revert back to
loading andoc.tmac as per previous version.  Fixes build of e.g. enchant2.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/textproc/groff/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/textproc/groff/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/groff/patches/patch-aa

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

Modified files:

Index: pkgsrc/textproc/groff/Makefile
diff -u pkgsrc/textproc/groff/Makefile:1.101 pkgsrc/textproc/groff/Makefile:1.102
--- pkgsrc/textproc/groff/Makefile:1.101        Mon Jan 13 06:31:28 2025
+++ pkgsrc/textproc/groff/Makefile      Wed Jan 29 10:31:53 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.101 2025/01/13 06:31:28 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2025/01/29 10:31:53 jperkin Exp $
 
 DISTNAME=      groff-1.23.0
+PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GNU:=groff/}
 

Index: pkgsrc/textproc/groff/distinfo
diff -u pkgsrc/textproc/groff/distinfo:1.32 pkgsrc/textproc/groff/distinfo:1.33
--- pkgsrc/textproc/groff/distinfo:1.32 Sat Jan 11 15:30:22 2025
+++ pkgsrc/textproc/groff/distinfo      Wed Jan 29 10:31:53 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.32 2025/01/11 15:30:22 ktnb Exp $
+$NetBSD: distinfo,v 1.33 2025/01/29 10:31:53 jperkin Exp $
 
 BLAKE2s (groff-1.23.0.tar.gz) = e8cffb11a7d2bf3449546d89940646cfddd89e0a3c7edd7957bfea0ea42e3530
 SHA512 (groff-1.23.0.tar.gz) = eff473fd1d0e6b27527318452ef2b7c6c7aba0b1c27fc529036496eccba5717f3639df0b81a297a57f700e27543196d7086b15e43d7e3c7bf075f95feb7f4089
 Size (groff-1.23.0.tar.gz) = 7433031 bytes
-SHA1 (patch-aa) = 98c10a0ef1854ee4baca00c702746a948f5a0fe2
+SHA1 (patch-aa) = b2f2942d66455a02d9178030d5019cf81aafa6d3
 SHA1 (patch-configure) = 24bc3ac283a8aa988021c2c4053519410de314f2
 SHA1 (patch-src_libs_libgroff_tmpfile.cpp) = 3794a028dc7c569e5adea6b7b876c3ac085376ba

Index: pkgsrc/textproc/groff/patches/patch-aa
diff -u pkgsrc/textproc/groff/patches/patch-aa:1.7 pkgsrc/textproc/groff/patches/patch-aa:1.8
--- pkgsrc/textproc/groff/patches/patch-aa:1.7  Mon Apr  1 16:48:37 2019
+++ pkgsrc/textproc/groff/patches/patch-aa      Wed Jan 29 10:31:53 2025
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.7 2019/04/01 16:48:37 ryoon Exp $
+$NetBSD: patch-aa,v 1.8 2025/01/29 10:31:53 jperkin Exp $
 
 Fix path to papers directory on NetBSD.
 Avoid arbitrary decisions wrt troff being present or not to use a g'prefix.
 Force it instead and use PKGGNUDIR logic to work it out.
+Fix infinite loop an.tmac -> an.tmac.
 
---- Makefile.in.orig   2018-12-23 14:34:27.000000000 +0000
+--- Makefile.in.orig   2023-07-05 20:58:38.000000000 +0000
 +++ Makefile.in
-@@ -3681,7 +3681,7 @@ tmac_an_prefix = \
+@@ -3963,7 +3963,7 @@ tmac_an_prefix = \
  indexext = .i
  
  # Directory containing the default index for refer.
@@ -15,3 +16,12 @@ Force it instead and use PKGGNUDIR logic
  
  # The filename (without suffix) of the default index for refer.
  indexname = Ind
+@@ -15592,7 +15592,7 @@ tmac/stamp-wrap:
+         for m in ""$(tmac_wrap); do \
+           $(RM) $(top_builddir)/tmac/$$m-wrap; \
+           if test "$$m" = an; then \
+-            echo .do mso an.tmac >>$(top_builddir)/tmac/$$m-wrap; \
++            echo .do mso andoc.tmac >>$(top_builddir)/tmac/$$m-wrap; \
+           fi; \
+           echo .cp 1 >>$(top_builddir)/tmac/$$m-wrap; \
+           echo .so $(sys_tmac_prefix)$$m \