git: 809adcb6a0a8 - main - textproc/groff: Improve port (non-functional changes)

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Mon, 26 Jan 2026 17:02:26 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=809adcb6a0a8f387589a848a1ff1ef9ef41cc86a

commit 809adcb6a0a8f387589a848a1ff1ef9ef41cc86a
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-01-26 16:57:59 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-01-26 16:57:59 +0000

    textproc/groff: Improve port (non-functional changes)
    
    - Replace PORTVERSION with DISTVERSION.
    - Replace spaces with tab in PORTREVISION line.
    - Replace RUN_DEPENDS:= with RUN_DEPENDS= - unnecessary ":".
    - Remove GNU_CONFIGURE_MANPREFIX - this is default value.
    - Refresh local patches.
    - Sort plist.
    
    PR:     292630
---
 textproc/groff/Makefile                  |  11 ++-
 textproc/groff/files/patch-Makefile.in   |   8 +--
 textproc/groff/files/patch-lib_math.in.h |   4 +-
 textproc/groff/pkg-plist                 | 114 +++++++++++++++----------------
 4 files changed, 68 insertions(+), 69 deletions(-)

diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 67bf93a38c6b..771ebd9ce3b9 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	groff
-PORTVERSION=	1.23.0
-PORTREVISION=   5
+DISTVERSION=	1.23.0
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 
@@ -12,14 +12,13 @@ LICENSE=	GPLv3
 
 BUILD_DEPENDS=	gsfonts>=0:print/gsfonts \
 		psselect:print/psutils
-RUN_DEPENDS:=	psselect:print/psutils
+RUN_DEPENDS=	psselect:print/psutils
 
 USES=		cpe gmake iconv:wchar_t makeinfo perl5
 CPE_VENDOR=	gnu
 USE_CXXSTD=	gnu++98
 
 GNU_CONFIGURE=		yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS+=	--with-awk=/usr/bin/awk \
 			--with-urw-fonts-dir=${LOCALBASE}/share/ghostscript/fonts/ \
 			--without-gs \
@@ -42,8 +41,8 @@ MAKE_JOBS_UNSAFE=	yes
 
 CONFLICTS=	heirloom-doctools ja-groff
 
-DATADIR=	${PREFIX}/share/${PORTNAME}/${PORTVERSION}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+DATADIR=	${PREFIX}/share/${PORTNAME}/${DISTVERSION}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
 EXAMPLESDIR=	${DOCSDIR}/examples
 
 INFO=		groff
diff --git a/textproc/groff/files/patch-Makefile.in b/textproc/groff/files/patch-Makefile.in
index bdb64e38f06d..6a9c4dee5b39 100644
--- a/textproc/groff/files/patch-Makefile.in
+++ b/textproc/groff/files/patch-Makefile.in
@@ -1,8 +1,8 @@
---- Makefile.in.orig	2018-12-23 14:34:27 UTC
+--- Makefile.in.orig	2023-07-05 20:58:38 UTC
 +++ Makefile.in
-@@ -12527,7 +12527,7 @@ ref-del.sed : $(libgroff_srcdir)/ref-del.sin
- 	    -e 's/@''PACKAGE''@/$(LIBGROFF_PACKAGE)/g' $(libgroff_srcdir)/ref-del.sin > t-$@
- 	mv t-$@ $@
+@@ -15157,7 +15157,7 @@ ref-del.sed: $(libgroff_srcdir)/ref-del.sin
+ 	    $(libgroff_srcdir)/ref-del.sin > t-$@ \
+ 	  && mv t-$@ $@
  
 -install-data-local: install_charset_data
 +install-data-local: 
diff --git a/textproc/groff/files/patch-lib_math.in.h b/textproc/groff/files/patch-lib_math.in.h
index b5e2d6a81837..dde8df96f971 100644
--- a/textproc/groff/files/patch-lib_math.in.h
+++ b/textproc/groff/files/patch-lib_math.in.h
@@ -1,6 +1,6 @@
---- lib/math.in.h.orig	2018-12-23 14:34:15 UTC
+--- lib/math.in.h.orig	2023-07-05 20:58:27 UTC
 +++ lib/math.in.h
-@@ -34,7 +34,7 @@
+@@ -54,7 +54,7 @@
  #endif
  
  #ifndef _GL_INLINE_HEADER_BEGIN
diff --git a/textproc/groff/pkg-plist b/textproc/groff/pkg-plist
index e97ede36b2ac..6a1811c1732d 100644
--- a/textproc/groff/pkg-plist
+++ b/textproc/groff/pkg-plist
@@ -37,63 +37,6 @@ bin/soelim
 bin/tbl
 bin/tfmtodit
 bin/troff
-share/man/man1/addftinfo.1.gz
-share/man/man1/afmtodit.1.gz
-share/man/man1/chem.1.gz
-share/man/man1/eqn.1.gz
-share/man/man1/eqn2graph.1.gz
-share/man/man1/gdiffmk.1.gz
-share/man/man1/glilypond.1.gz
-share/man/man1/gperl.1.gz
-share/man/man1/gpinyin.1.gz
-share/man/man1/grap2graph.1.gz
-share/man/man1/grn.1.gz
-share/man/man1/grodvi.1.gz
-share/man/man1/groff.1.gz
-share/man/man1/grog.1.gz
-share/man/man1/grohtml.1.gz
-share/man/man1/grolbp.1.gz
-share/man/man1/grolj4.1.gz
-share/man/man1/gropdf.1.gz
-share/man/man1/grops.1.gz
-share/man/man1/grotty.1.gz
-share/man/man1/hpftodit.1.gz
-share/man/man1/indxbib.1.gz
-share/man/man1/lkbib.1.gz
-share/man/man1/lookbib.1.gz
-share/man/man1/mmroff.1.gz
-share/man/man1/neqn.1.gz
-share/man/man1/nroff.1.gz
-share/man/man1/pdfmom.1.gz
-share/man/man1/pdfroff.1.gz
-share/man/man1/pfbtops.1.gz
-share/man/man1/pic.1.gz
-share/man/man1/pic2graph.1.gz
-share/man/man1/preconv.1.gz
-share/man/man1/refer.1.gz
-share/man/man1/soelim.1.gz
-share/man/man1/tbl.1.gz
-share/man/man1/tfmtodit.1.gz
-share/man/man1/troff.1.gz
-share/man/man5/groff_font.5.gz
-share/man/man5/groff_out.5.gz
-share/man/man5/groff_tmac.5.gz
-share/man/man7/groff.7.gz
-share/man/man7/groff_char.7.gz
-share/man/man7/groff_diff.7.gz
-share/man/man7/groff_hdtbl.7.gz
-share/man/man7/groff_man.7.gz
-share/man/man7/groff_man_style.7.gz
-share/man/man7/groff_mdoc.7.gz
-share/man/man7/groff_me.7.gz
-share/man/man7/groff_mm.7.gz
-share/man/man7/groff_mmse.7.gz
-share/man/man7/groff_mom.7.gz
-share/man/man7/groff_ms.7.gz
-share/man/man7/groff_rfc1345.7.gz
-share/man/man7/groff_trace.7.gz
-share/man/man7/groff_www.7.gz
-share/man/man7/roff.7.gz
 %%EXAMPLESDIR%%/chem/122/README
 %%EXAMPLESDIR%%/chem/122/ch2a_ethyl.chem
 %%EXAMPLESDIR%%/chem/122/ch2b_benzene.chem
@@ -635,5 +578,62 @@ share/man/man7/roff.7.gz
 share/groff/current
 share/groff/site-tmac/man.local
 share/groff/site-tmac/mdoc.local
+share/man/man1/addftinfo.1.gz
+share/man/man1/afmtodit.1.gz
+share/man/man1/chem.1.gz
+share/man/man1/eqn.1.gz
+share/man/man1/eqn2graph.1.gz
+share/man/man1/gdiffmk.1.gz
+share/man/man1/glilypond.1.gz
+share/man/man1/gperl.1.gz
+share/man/man1/gpinyin.1.gz
+share/man/man1/grap2graph.1.gz
+share/man/man1/grn.1.gz
+share/man/man1/grodvi.1.gz
+share/man/man1/groff.1.gz
+share/man/man1/grog.1.gz
+share/man/man1/grohtml.1.gz
+share/man/man1/grolbp.1.gz
+share/man/man1/grolj4.1.gz
+share/man/man1/gropdf.1.gz
+share/man/man1/grops.1.gz
+share/man/man1/grotty.1.gz
+share/man/man1/hpftodit.1.gz
+share/man/man1/indxbib.1.gz
+share/man/man1/lkbib.1.gz
+share/man/man1/lookbib.1.gz
+share/man/man1/mmroff.1.gz
+share/man/man1/neqn.1.gz
+share/man/man1/nroff.1.gz
+share/man/man1/pdfmom.1.gz
+share/man/man1/pdfroff.1.gz
+share/man/man1/pfbtops.1.gz
+share/man/man1/pic.1.gz
+share/man/man1/pic2graph.1.gz
+share/man/man1/preconv.1.gz
+share/man/man1/refer.1.gz
+share/man/man1/soelim.1.gz
+share/man/man1/tbl.1.gz
+share/man/man1/tfmtodit.1.gz
+share/man/man1/troff.1.gz
+share/man/man5/groff_font.5.gz
+share/man/man5/groff_out.5.gz
+share/man/man5/groff_tmac.5.gz
+share/man/man7/groff.7.gz
+share/man/man7/groff_char.7.gz
+share/man/man7/groff_diff.7.gz
+share/man/man7/groff_hdtbl.7.gz
+share/man/man7/groff_man.7.gz
+share/man/man7/groff_man_style.7.gz
+share/man/man7/groff_mdoc.7.gz
+share/man/man7/groff_me.7.gz
+share/man/man7/groff_mm.7.gz
+share/man/man7/groff_mmse.7.gz
+share/man/man7/groff_mom.7.gz
+share/man/man7/groff_ms.7.gz
+share/man/man7/groff_rfc1345.7.gz
+share/man/man7/groff_trace.7.gz
+share/man/man7/groff_www.7.gz
+share/man/man7/roff.7.gz
 @dir lib/groff/site-tmac
 @dir share/groff/site-font