[groff] 22/26: [grohtml]: Fix Savannah #65987 (psselect->ps2ps).

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 621c75426ecbe790fbd20e19324439382c79a1df
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sat Jul 13 14:05:48 2024 -0500

    [grohtml]: Fix Savannah #65987 (psselect->ps2ps).
    
    [grohtml]: Migrate from psselect(1) to ps2ps(1).
    
    * src/preproc/html/pre-html.cpp (imageList::createPage): Do it.
    * src/devices/grohtml/grohtml.1.man (Dependencies): Document
    the changed runtime requirement.
    * m4/groff.m4 (GROFF_CHECK_GROHTML_PROGRAMS):
    * src/roff/groff/tests/html_works_with_grn_and_eqn.sh:
    * src/roff/groff/tests/smoke-test_html_device.sh: Check for
    existence of `ps2ps` command instead of `psselect`.
    
    * ANNOUNCE:
    * NEWS:
    * README:
    * README.MinGW: Document change in dependencies.
    
    Fixes <https://savannah.gnu.org/bugs/?65987>.
---
 ANNOUNCE                                            |  2 +-
 ChangeLog                                           | 19 +++++++++++++++++++
 NEWS                                                |  2 ++
 README                                              |  3 +--
 README.MinGW                                        |  4 ----
 m4/groff.m4                                         |  2 +-
 src/devices/grohtml/grohtml.1.man                   | 11 ++++++-----
 src/preproc/html/pre-html.cpp                       |  2 +-
 src/roff/groff/tests/html_works_with_grn_and_eqn.sh |  2 +-
 src/roff/groff/tests/smoke-test_html_device.sh      |  2 +-
 10 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index ff4912704..981b8ebc7 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -158,7 +158,7 @@ of this release.
 
 Alex Colomar
 Alexander Kanavin
-Alexis ("no, the other one")
+Alexis (surryhill)
 Bjarni Ingi Gislason
 Brian Inglis
 Bruno Haible
diff --git a/ChangeLog b/ChangeLog
index 38817d964..eb60278fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2024-03-19  Alexis <surryhill@gmail.com>
+
+       [grohtml]: Migrate from psselect(1) to ps2ps(1).
+
+       * src/preproc/html/pre-html.cpp (imageList::createPage): Do it.
+       * src/devices/grohtml/grohtml.1.man (Dependencies): Document
+       the changed runtime requirement.
+       * m4/groff.m4 (GROFF_CHECK_GROHTML_PROGRAMS):
+       * src/roff/groff/tests/html_works_with_grn_and_eqn.sh:
+       * src/roff/groff/tests/smoke-test_html_device.sh: Check for
+       existence of `ps2ps` command instead of `psselect`.
+
+       * ANNOUNCE:
+       * NEWS:
+       * README:
+       * README.MinGW: Document change in dependencies.
+
+       Fixes <https://savannah.gnu.org/bugs/?65987>.
+
 2024-07-13  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * src/libs/libgroff/searchpath.cpp (is_directory): New function
diff --git a/NEWS b/NEWS
index fa4d7c616..009054f23 100644
--- a/NEWS
+++ b/NEWS
@@ -401,6 +401,8 @@ o The PostScript output driver grops no longer accepts 
spaces as field
 Miscellaneous
 -------------
 
+o Building groff no longer requires the PSUtils package.
+
 o Russian language input documents using the KOI8-R encoding are now
   supported, including hyphenation patterns from the ruhyphen project
   and localized strings for the man, ms, me, mm, and mom packages.
diff --git a/README b/README
index 41036e22b..77a5c527b 100644
--- a/README
+++ b/README
@@ -68,8 +68,7 @@ Build requirements are discussed in the 'INSTALL.extra' and
 dependencies.
 
 Ghostscript is required for creation of PDF and (X)HTML output.
-Production of (X)HTML furthermore demands tools from the 'netpbm' and
-'psutils' packages.
+Production of (X)HTML furthermore demands tools from the Netpbm package.
 
 Perl is required for production of PDF output using the 'gropdf' output
 driver.  (You can alternatively produce PostScript with 'grops' and
diff --git a/README.MinGW b/README.MinGW
index 6787b5703..9a5445ef7 100644
--- a/README.MinGW
+++ b/README.MinGW
@@ -231,10 +231,6 @@
 
          zlib-1.dll, which must be renamed to zlib.dll
 
-    4. from the psutils-<version>-bin.zip package:
-
-         psselect.exe
-
   Note that it is not necessary to install the above four packages in
   their entirety; of course, you may do so if you wish.
 
diff --git a/m4/groff.m4 b/m4/groff.m4
index fd4545b8c..69b00b3bb 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -182,7 +182,7 @@ AC_DEFUN([GROFF_CHECK_GROHTML_PROGRAMS], [
   missing=
   m4_foreach([groff_prog],
 dnl Keep this list of programs in sync with grohtml test scripts.
-    [[pnmcrop], [pamcut], [pnmtopng], [pnmtops], [psselect]], [
+    [[pnmcrop], [pamcut], [pnmtopng], [pnmtops], [ps2ps]], [
       AC_CHECK_PROG(groff_prog, groff_prog, [found], [missing])
       if test $[]groff_prog = missing
       then
diff --git a/src/devices/grohtml/grohtml.1.man 
b/src/devices/grohtml/grohtml.1.man
index 2e097e4a2..28953e31f 100644
--- a/src/devices/grohtml/grohtml.1.man
+++ b/src/devices/grohtml/grohtml.1.man
@@ -310,11 +310,12 @@ These include the \%Netpbm tools
 .IR \%pamcut ,
 .IR \%pnmcrop ,
 and
-.IR \%pnmtopng ;
-\%Ghostscript
-.RI ( gs );
-and the \%PSUtils tool
-.IR \%psselect .
+.IR \%pnmtopng ,
+as well as
+\%Ghostscript's
+.I \%gs
+and
+.IR \%ps2ps .
 .
 .
 .\" ====================================================================
diff --git a/src/preproc/html/pre-html.cpp b/src/preproc/html/pre-html.cpp
index 0fd9a39c3..e0788c234 100644
--- a/src/preproc/html/pre-html.cpp
+++ b/src/preproc/html/pre-html.cpp
@@ -918,7 +918,7 @@ int imageList::createPage(int pageno)
     fprintf(stderr, "creating page %d\n", pageno);
 #endif
 
-  s = make_string("psselect -q -p%d %s %s\n",
+  s = make_string("ps2ps -sPageList=%d %s %s\n",
                   pageno, psFileName, psPageName);
   html_system(s, 1);
   assert(strlen(image_gen) > 0);
diff --git a/src/roff/groff/tests/html_works_with_grn_and_eqn.sh 
b/src/roff/groff/tests/html_works_with_grn_and_eqn.sh
index c0daf9171..d757bf58a 100755
--- a/src/roff/groff/tests/html_works_with_grn_and_eqn.sh
+++ b/src/roff/groff/tests/html_works_with_grn_and_eqn.sh
@@ -22,7 +22,7 @@ groff="${abs_top_builddir:-.}/test-groff"
 
 # Keep this list of programs in sync with GROFF_CHECK_GROHTML_PROGRAMS
 # in m4/groff.m4.
-for cmd in pnmcrop pamcut pnmtopng pnmtops psselect
+for cmd in pnmcrop pamcut pnmtopng pnmtops ps2ps
 do
     if ! command -v $cmd >/dev/null
     then
diff --git a/src/roff/groff/tests/smoke-test_html_device.sh 
b/src/roff/groff/tests/smoke-test_html_device.sh
index 7a70a300b..952022966 100755
--- a/src/roff/groff/tests/smoke-test_html_device.sh
+++ b/src/roff/groff/tests/smoke-test_html_device.sh
@@ -22,7 +22,7 @@ groff="${abs_top_builddir:-.}/test-groff"
 
 # Keep this list of programs in sync with GROFF_CHECK_GROHTML_PROGRAMS
 # in m4/groff.m4.
-for cmd in pnmcrop pamcut pnmtopng pnmtops psselect
+for cmd in pnmcrop pamcut pnmtopng pnmtops ps2ps
 do
     if ! command -v $cmd >/dev/null
     then