CVS commit: pkgsrc/textproc/groff

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jul 24 11:29:33 UTC 2026

Modified Files:
        pkgsrc/textproc/groff: Makefile options.mk

Log Message:
groff: remove default-on netpbm dependency

This causes a dependency cycle on macOS via cmake -> ... -> groff ->
netpbm -> libjpeg-turbo -> cmake.

Add it to existing ghostscript option, since both are needed for
full-featured grohtml output now.

Add comments explaining both this and the uchardet option, based on
the configure output.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 pkgsrc/textproc/groff/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/textproc/groff/options.mk

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.105 pkgsrc/textproc/groff/Makefile:1.106
--- pkgsrc/textproc/groff/Makefile:1.105        Tue Jul 21 10:42:16 2026
+++ pkgsrc/textproc/groff/Makefile      Fri Jul 24 11:29:33 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.105 2026/07/21 10:42:16 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2026/07/24 11:29:33 wiz Exp $
 
 DISTNAME=      groff-1.24.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GNU:=groff/}
 EXTRACT_USING= bsdtar
@@ -13,7 +13,6 @@ LICENSE=      gnu-gpl-v3
 
 OVERRIDE_DIRDEPTH=     4
 
-DEPENDS+=      netpbm>=10.0:../../graphics/netpbm
 DEPENDS+=      urw-fonts-[0-9]*:../../fonts/urw-fonts
 
 USE_FEATURES=          getopt_long

Index: pkgsrc/textproc/groff/options.mk
diff -u pkgsrc/textproc/groff/options.mk:1.17 pkgsrc/textproc/groff/options.mk:1.18
--- pkgsrc/textproc/groff/options.mk:1.17       Tue Jul 21 10:42:16 2026
+++ pkgsrc/textproc/groff/options.mk    Fri Jul 24 11:29:33 2026
@@ -1,19 +1,26 @@
-# $NetBSD: options.mk,v 1.17 2026/07/21 10:42:16 wiz Exp $
+# $NetBSD: options.mk,v 1.18 2026/07/24 11:29:33 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.groff
 PKG_SUPPORTED_OPTIONS= ghostscript uchardet x11
-PKG_SUGGESTED_OPTIONS= ghostscript x11
+PKG_SUGGESTED_OPTIONS= x11
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mghostscript)
+# Consequently, groff's HTML output driver, 'grohtml', will not work
+# properly.  It will not be possible to prepare or install
+# groff-generated documentation in HTML format.
 USE_TOOLS+=            gs:run
 PLIST_SRC+=            PLIST.docs
+DEPENDS+=              netpbm>=10.0:../../graphics/netpbm
 .else
 CONFIGURE_ARGS+=       --without-gs
 .endif
 
 .if !empty(PKG_OPTIONS:Muchardet)
+# The 'preconv' preprocessor program will be unable to attempt automatic
+# inference of an input file's character encoding.  See the preconv(1)
+# man page.
 .include "../../textproc/uchardet/buildlink3.mk"
 .endif