CVS commit: pkgsrc/textproc/groff

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jul 21 10:42:16 UTC 2026

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

Log Message:
groff: make uchardet dependency optional, default off

Bump PKGREVISION.

This should fix a dependency cycle observed in the macOS builds;
uchardet needs cmake, and cmake there wants groff.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 pkgsrc/textproc/groff/Makefile
cvs rdiff -u -r1.16 -r1.17 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.104 pkgsrc/textproc/groff/Makefile:1.105
--- pkgsrc/textproc/groff/Makefile:1.104        Sun Jul 19 08:05:45 2026
+++ pkgsrc/textproc/groff/Makefile      Tue Jul 21 10:42:16 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.104 2026/07/19 08:05:45 adam Exp $
+# $NetBSD: Makefile,v 1.105 2026/07/21 10:42:16 wiz Exp $
 
 DISTNAME=      groff-1.24.1
+PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GNU:=groff/}
 EXTRACT_USING= bsdtar
@@ -100,5 +101,4 @@ post-install:
        fi
 .endfor
 
-.include "../../textproc/uchardet/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/groff/options.mk
diff -u pkgsrc/textproc/groff/options.mk:1.16 pkgsrc/textproc/groff/options.mk:1.17
--- pkgsrc/textproc/groff/options.mk:1.16       Sun Jul 19 08:05:45 2026
+++ pkgsrc/textproc/groff/options.mk    Tue Jul 21 10:42:16 2026
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.16 2026/07/19 08:05:45 adam Exp $
+# $NetBSD: options.mk,v 1.17 2026/07/21 10:42:16 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.groff
-PKG_SUPPORTED_OPTIONS= ghostscript x11
+PKG_SUPPORTED_OPTIONS= ghostscript uchardet x11
 PKG_SUGGESTED_OPTIONS= ghostscript x11
 
 .include "../../mk/bsd.options.mk"
@@ -13,6 +13,10 @@ PLIST_SRC+=          PLIST.docs
 CONFIGURE_ARGS+=       --without-gs
 .endif
 
+.if !empty(PKG_OPTIONS:Muchardet)
+.include "../../textproc/uchardet/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=       --with-x
 CONFIGURE_ARGS+=       --with-appresdir=${PREFIX}/lib/X11/app-defaults