CVS commit: pkgsrc/textproc/groff

"Jonathan Perkin" <[email protected]> Thu, 30 Jul 2026 11:22:04 +0000

Newsgroups	gmane.os.netbsd.devel.pkgsrc.cvs
Message-ID	<[email protected]>

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Thu Jul 30 11:22:04 UTC 2026

Modified Files:
	pkgsrc/textproc/groff: Makefile PLIST

Log Message:
groff: Enable new compatibility wrappers option.

Adam's update also broke groff on illumos by dropping a patch required to avoid
the non-GNU system macros.  Upstream now provides a new compatibility wrappers
argument that has a "manual" option which will install the wrappers with "-os"
suffixes, rather than doing the previous renaming dance.

This helps to simplify the install a lot.  The groff-native an.tmac, m.tmac,
etc files can now be specified directly in the PLIST, and any -os.tmac wrapper
files installed to site-tmac will be picked up by the existing PLIST-local.

While here add TEST_TARGET, I guess they haven't been ran for recent updates.


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 pkgsrc/textproc/groff/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/textproc/groff/PLIST

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

(unnamed) (text/x-diff, 4.9 KB)

Modified files:

Index: pkgsrc/textproc/groff/Makefile
diff -u pkgsrc/textproc/groff/Makefile:1.107 pkgsrc/textproc/groff/Makefile:1.108
--- pkgsrc/textproc/groff/Makefile:1.107	Mon Jul 27 11:07:02 2026
+++ pkgsrc/textproc/groff/Makefile	Thu Jul 30 11:22:04 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.107 2026/07/27 11:07:02 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2026/07/30 11:22:04 jperkin Exp $
 
 DISTNAME=	groff-1.24.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=groff/}
 EXTRACT_USING=	bsdtar
@@ -19,6 +19,7 @@ USE_FEATURES=		getopt_long
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		awk:run gmake perl pkg-config sed:run yacc
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-compatibility-wrappers=manual
 CONFIGURE_ARGS+=	--with-urw-fonts-dir=${PREFIX}/share/fonts/urw
 CONFIGURE_ENV+=		PERLPATH=${PERL5:Q}
 INFO_FILES=		yes
@@ -26,6 +27,8 @@ TEXINFO_REQD+=		4.8
 
 REPLACE_PERL+=		contrib/*/*.pl
 
+TEST_TARGET=	check
+
 .include "options.mk"
 
 PLIST_SRC+=	${WRKDIR}/PLIST-local PLIST
@@ -50,14 +53,6 @@ post-patch:
 		-e "s,@@OPERATING_SYSTEM@@,pkgsrc,g"	\
 		${FILESDIR}/mdoc.local > ${WRKDIR}/mdoc.local
 
-# Groff installs its own man and ms macros as mgan and mgs if the
-# configure script thinks replacing the system ones is not safe. Since
-# this depends heavily on exactly what the system macros are, each
-# vendor OS is likely to be different and possibly differ by version.
-#
-# It also installs wrappers around the system macros for a variety of
-# other traditional macro packages, if those macros don't have an FSF
-# copyright.
 SYMLINK_FILES=		chem diffmk eqn grn indxbib lookbib neqn nroff pic refer \
 			soelim tbl troff
 SYMLINK_MANFILES=	chem.1 eqn.1 grn.1 indxbib.1 lookbib.1 neqn.1 nroff.1 \
@@ -71,23 +66,12 @@ post-install:
 		${DESTDIR}${PREFIX}/share/groff/site-tmac
 	${FIND} ${DESTDIR}${PREFIX}/lib/groff/site-tmac -type f -print | \
 		${SED} 's;${DESTDIR}${PREFIX}/;;g' > ${WRKDIR}/PLIST-local
-	${RUN}set -e; for f in an.tmac m.tmac mm.tmac mmse.tmac		\
-	  mse.tmac s.tmac; do						\
-	  for p in "" g; do						\
-	    line="share/groff/${PKGVERSION_NOREV}/tmac/$$p$$f";		\
-	    if [ -e "${DESTDIR}${PREFIX}/$$line" ]; then		\
-	      break;							\
-	    fi;								\
-	  done;								\
-	  ${ECHO} "$$line" >> ${WRKDIR}/PLIST-local;			\
-	done
 .for f in ${SYMLINK_FILES}
 	if [ -f ${DESTDIR}${PREFIX}/bin/g${f} ]; then			\
 	    ${LN} -sf ${PREFIX}/bin/g${f}				\
 		${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f};		\
 	fi
 .endfor
-# fixup where necessary and symlink man pages
 .for f in ${SYMLINK_MANFILES}
 	if [ -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/g${f} ]; then	\
 	    ${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}			\

Index: pkgsrc/textproc/groff/PLIST
diff -u pkgsrc/textproc/groff/PLIST:1.33 pkgsrc/textproc/groff/PLIST:1.34
--- pkgsrc/textproc/groff/PLIST:1.33	Sun Jul 19 08:05:45 2026
+++ pkgsrc/textproc/groff/PLIST	Thu Jul 30 11:22:04 2026
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.33 2026/07/19 08:05:45 adam Exp $
-@comment $NetBSD: PLIST,v 1.33 2026/07/19 08:05:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.34 2026/07/30 11:22:04 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.34 2026/07/30 11:22:04 jperkin Exp $
 bin/addftinfo
 bin/afmtodit
 bin/eqn2graph
@@ -628,6 +628,7 @@ share/groff/${PKGVERSION}/tmac/62bit.tma
 share/groff/${PKGVERSION}/tmac/X.tmac
 share/groff/${PKGVERSION}/tmac/Xps.tmac
 share/groff/${PKGVERSION}/tmac/an-ext.tmac
+share/groff/${PKGVERSION}/tmac/an.tmac
 share/groff/${PKGVERSION}/tmac/andoc.tmac
 share/groff/${PKGVERSION}/tmac/chem.pic
 share/groff/${PKGVERSION}/tmac/composite.tmac
@@ -671,6 +672,7 @@ share/groff/${PKGVERSION}/tmac/latin5.tm
 share/groff/${PKGVERSION}/tmac/latin9.tmac
 share/groff/${PKGVERSION}/tmac/lbp.tmac
 share/groff/${PKGVERSION}/tmac/lj4.tmac
+share/groff/${PKGVERSION}/tmac/m.tmac
 share/groff/${PKGVERSION}/tmac/man.tmac
 share/groff/${PKGVERSION}/tmac/mandoc.tmac
 share/groff/${PKGVERSION}/tmac/mdoc.tmac
@@ -679,13 +681,16 @@ share/groff/${PKGVERSION}/tmac/mdoc/doc-
 share/groff/${PKGVERSION}/tmac/mdoc/doc-nroff
 share/groff/${PKGVERSION}/tmac/mdoc/doc-syms
 share/groff/${PKGVERSION}/tmac/me.tmac
+share/groff/${PKGVERSION}/tmac/mm.tmac
 share/groff/${PKGVERSION}/tmac/mm/0.MT
 share/groff/${PKGVERSION}/tmac/mm/4.MT
 share/groff/${PKGVERSION}/tmac/mm/5.MT
 share/groff/${PKGVERSION}/tmac/mm/ms.cov
 share/groff/${PKGVERSION}/tmac/mm/se_ms.cov
+share/groff/${PKGVERSION}/tmac/mmse.tmac
 share/groff/${PKGVERSION}/tmac/mom.tmac
 share/groff/${PKGVERSION}/tmac/ms.tmac
+share/groff/${PKGVERSION}/tmac/mse.tmac
 share/groff/${PKGVERSION}/tmac/om.tmac
 share/groff/${PKGVERSION}/tmac/papersize.tmac
 share/groff/${PKGVERSION}/tmac/pdf.tmac
@@ -704,6 +709,7 @@ share/groff/${PKGVERSION}/tmac/refer-ms.
 share/groff/${PKGVERSION}/tmac/refer.tmac
 share/groff/${PKGVERSION}/tmac/rfc1345.tmac
 share/groff/${PKGVERSION}/tmac/ru.tmac
+share/groff/${PKGVERSION}/tmac/s.tmac
 share/groff/${PKGVERSION}/tmac/sboxes.tmac
 share/groff/${PKGVERSION}/tmac/sv.tmac
 share/groff/${PKGVERSION}/tmac/trace.tmac