Attachment 243699 Details for Bug 272810 – Patch file

[patch] Patch file

textproc_groff.patch (text/plain), 11.15 KB, created by Yasuhiro Kimura on 2023-07-30 06:47:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2023-07-30 06:47:26 UTC

Size: 11.15 KB

patch

obsolete

>From 39676f6909d9a7da864e5144b6a9be6cbe2f15ae Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Sun, 30 Jul 2023 15:30:53 +0900
>Subject: [PATCH] textproc/groff: Update to 1.23.0
>
>* Pet portclippy.
>* Re-format Makefile with portfmt.
>
>ChangeLog:	https://git.savannah.gnu.org/cgit/groff.git/tree/NEWS?h=1.23.0
>---
> textproc/groff/Makefile              | 37 ++++++-------
> textproc/groff/distinfo              |  6 +-
> textproc/groff/files/patch-configure | 28 ----------
> textproc/groff/pkg-plist             | 83 ++++++++++++++--------------
> 4 files changed, 61 insertions(+), 93 deletions(-)
> delete mode 100644 textproc/groff/files/patch-configure
>
>diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
>index ddefcaf8b7ec..25dde0060bb5 100644
>--- a/textproc/groff/Makefile
>+++ b/textproc/groff/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	groff
>-PORTVERSION=	1.22.4
>-PORTREVISION=	4
>+PORTVERSION=	1.23.0
> CATEGORIES=	textproc
> MASTER_SITES=	GNU
> 
>@@ -10,49 +9,49 @@ WWW=		https://www.gnu.org/software/groff/
> 
> LICENSE=	GPLv3
> 
>-BUILD_DEPENDS=	psselect:print/psutils \
>-		gsfonts>=0:print/gsfonts
>+BUILD_DEPENDS=	gsfonts>=0:print/gsfonts \
>+		psselect:print/psutils
> RUN_DEPENDS:=	psselect:print/psutils
> 
>-MAKE_JOBS_UNSAFE=	yes
>-
>-USES=		cpe gmake iconv:wchar_t perl5 makeinfo
>+USES=		cpe gmake iconv:wchar_t makeinfo perl5
>+CPE_VENDOR=	gnu
> USE_CXXSTD=	gnu++98
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS+=	--with-urw-fonts-dir=${LOCALBASE}/share/ghostscript/fonts/ \
>-			--with-awk=/usr/bin/awk \
>-			--without-x \
>+
>+GNU_CONFIGURE=		yes
>+CONFIGURE_ARGS+=	--with-awk=/usr/bin/awk \
>+			--with-urw-fonts-dir=${LOCALBASE}/share/ghostscript/fonts/ \
> 			--without-gs \
>+			--without-x \
> 			pnmcrop=missing \
> 			pnmcut=missing \
> 			pnmtopng=missing \
> 			pnmtops=missing \
> 			psselect=missing
> 
>-CPE_VENDOR=	gnu
>-
> # Canonicalize to A4 if set.
> .if defined(A4) || (defined(PAPERSIZE) && ${PAPERSIZE:tu} == "A4")
>-PAPERSIZE=A4
>+PAPERSIZE=	A4
> .endif
> .if defined(PAPERSIZE)
> CONFIGURE_ENV+=	PAGE=${PAPERSIZE}
> .endif
> 
>-CONFLICTS=	heirloom-doctools ja-groff
>+MAKE_JOBS_UNSAFE=	yes
> 
>-INFO=	groff
>+CONFLICTS=	heirloom-doctools ja-groff
> 
> DATADIR=	${PREFIX}/share/${PORTNAME}/${PORTVERSION}
> DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
> EXAMPLESDIR=	${DOCSDIR}/examples
> 
>-OPTIONS_DEFINE=	UCHARDET
>+INFO=		groff
>+
>+OPTIONS_DEFINE=		UCHARDET
> OPTIONS_DEFAULT=	UCHARDET
> 
>-UCHARDET_DESC=	Automatic encoding detection in preconv(1)
>+UCHARDET_DESC=		Automatic encoding detection in preconv(1)
> UCHARDET_LIB_DEPENDS=	libuchardet.so:textproc/uchardet
>-UCHARDET_USES=	pkgconfig
>+UCHARDET_USES=		pkgconfig
> UCHARDET_CONFIGURE_OFF=	--with-uchardet=no
> 
> post-install:
>diff --git a/textproc/groff/distinfo b/textproc/groff/distinfo
>index e28bcd9eaf8a..04bdbf585808 100644
>--- a/textproc/groff/distinfo
>+++ b/textproc/groff/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1545820488
>-SHA256 (groff-1.22.4.tar.gz) = e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293
>-SIZE (groff-1.22.4.tar.gz) = 4137480
>+TIMESTAMP = 1690695604
>+SHA256 (groff-1.23.0.tar.gz) = 6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13
>+SIZE (groff-1.23.0.tar.gz) = 7433031
>diff --git a/textproc/groff/files/patch-configure b/textproc/groff/files/patch-configure
>deleted file mode 100644
>index 708adca93835..000000000000
>--- a/textproc/groff/files/patch-configure
>+++ /dev/null
>@@ -1,28 +0,0 @@
>---- configure.orig	2018-12-23 14:34:25 UTC
>-+++ configure
>-@@ -24750,11 +24750,11 @@ $as_echo_n "checking whether URW fonts in pfb format a
>- 
>- 
>-    groff_have_urw_fonts=no
>--   if test "$AWK" = "missing" -o "$GHOSTSCRIPT" = "missing"; then
>--     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: awk and gs are required, can't look for URW fonts" >&5
>--$as_echo "$as_me: WARNING: awk and gs are required, can't look for URW fonts" >&2;}
>--   else
>--     _list_paths=`$GHOSTSCRIPT -h | $AWK 'BEGIN { found = 0 } /Search path:/ { found = 1 } /^ *\// { print $'0' }'| tr : ' '`
>-+  # if test "$AWK" = "missing" -o "$GHOSTSCRIPT" = "missing"; then
>-+  #   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: awk and gs are required, can't look for URW fonts" >&5
>-+#$as_echo "$as_me: WARNING: awk and gs are required, can't look for URW fonts" >&2;}
>-+  # else
>-+#     _list_paths=`$GHOSTSCRIPT -h | $AWK 'BEGIN { found = 0 } /Search path:/ { found = 1 } /^ *\// { print $'0' }'| tr : ' '`
>-      _list_paths="$_list_paths /usr/share/fonts/type1/gsfonts/ \
>-                /opt/local/share/fonts/urw-fonts/"
>-      if test -n "$urwfontsdir"; then
>-@@ -24768,7 +24768,7 @@ $as_echo "found in $k" >&6; }
>-          break
>-        fi
>-      done
>--   fi
>-+  # fi
>-    if test $groff_have_urw_fonts = no; then
>-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>- $as_echo "no" >&6; }
>diff --git a/textproc/groff/pkg-plist b/textproc/groff/pkg-plist
>index e9e099575da5..44477588223d 100644
>--- a/textproc/groff/pkg-plist
>+++ b/textproc/groff/pkg-plist
>@@ -11,7 +11,6 @@ bin/grap2graph
> bin/grn
> bin/grodvi
> bin/groff
>-bin/groffer
> bin/grog
> bin/grolbp
> bin/grolj4
>@@ -34,28 +33,10 @@ bin/post-grohtml
> bin/pre-grohtml
> bin/preconv
> bin/refer
>-bin/roff2dvi
>-bin/roff2html
>-bin/roff2pdf
>-bin/roff2ps
>-bin/roff2text
>-bin/roff2x
> bin/soelim
> bin/tbl
> bin/tfmtodit
> bin/troff
>-lib/groff/glilypond/args.pl
>-lib/groff/glilypond/oop_fh.pl
>-lib/groff/glilypond/subs.pl
>-lib/groff/gpinyin/subs.pl
>-lib/groff/groff_opts_no_arg.txt
>-lib/groff/groff_opts_with_arg.txt
>-lib/groff/groffer/main_subs.pl
>-lib/groff/groffer/man.pl
>-lib/groff/groffer/split_env.sh
>-lib/groff/groffer/subs.pl
>-lib/groff/groffer/version.sh
>-lib/groff/grog/subs.pl
> man/man1/addftinfo.1.gz
> man/man1/afmtodit.1.gz
> man/man1/chem.1.gz
>@@ -69,7 +50,6 @@ man/man1/grap2graph.1.gz
> man/man1/grn.1.gz
> man/man1/grodvi.1.gz
> man/man1/groff.1.gz
>-man/man1/groffer.1.gz
> man/man1/grog.1.gz
> man/man1/grohtml.1.gz
> man/man1/grolbp.1.gz
>@@ -91,33 +71,26 @@ man/man1/pic.1.gz
> man/man1/pic2graph.1.gz
> man/man1/preconv.1.gz
> man/man1/refer.1.gz
>-man/man1/roff2dvi.1.gz
>-man/man1/roff2html.1.gz
>-man/man1/roff2pdf.1.gz
>-man/man1/roff2ps.1.gz
>-man/man1/roff2text.1.gz
>-man/man1/roff2x.1.gz
> man/man1/soelim.1.gz
> man/man1/tbl.1.gz
> man/man1/tfmtodit.1.gz
> man/man1/troff.1.gz
>-man/man5/groff_filenames.5.gz
> man/man5/groff_font.5.gz
> man/man5/groff_out.5.gz
> man/man5/groff_tmac.5.gz
>-man/man5/lj4_font.5.gz
>-man/man7/ditroff.7.gz
> man/man7/groff.7.gz
> man/man7/groff_char.7.gz
> man/man7/groff_diff.7.gz
> man/man7/groff_hdtbl.7.gz
> man/man7/groff_man.7.gz
>+man/man7/groff_man_style.7.gz
> man/man7/groff_mdoc.7.gz
> man/man7/groff_me.7.gz
> man/man7/groff_mm.7.gz
> man/man7/groff_mmse.7.gz
> man/man7/groff_mom.7.gz
> man/man7/groff_ms.7.gz
>+man/man7/groff_rfc1345.7.gz
> man/man7/groff_trace.7.gz
> man/man7/groff_www.7.gz
> man/man7/roff.7.gz
>@@ -396,6 +369,14 @@ man/man7/roff.7.gz
> %%DATADIR%%/font/devlj4/generate/symbol.map
> %%DATADIR%%/font/devlj4/generate/text.map
> %%DATADIR%%/font/devlj4/generate/wingdings.map
>+%%DATADIR%%/font/devpdf/AB
>+%%DATADIR%%/font/devpdf/ABI
>+%%DATADIR%%/font/devpdf/AI
>+%%DATADIR%%/font/devpdf/AR
>+%%DATADIR%%/font/devpdf/BMB
>+%%DATADIR%%/font/devpdf/BMBI
>+%%DATADIR%%/font/devpdf/BMI
>+%%DATADIR%%/font/devpdf/BMR
> %%DATADIR%%/font/devpdf/CB
> %%DATADIR%%/font/devpdf/CBI
> %%DATADIR%%/font/devpdf/CI
>@@ -406,7 +387,19 @@ man/man7/roff.7.gz
> %%DATADIR%%/font/devpdf/HB
> %%DATADIR%%/font/devpdf/HBI
> %%DATADIR%%/font/devpdf/HI
>+%%DATADIR%%/font/devpdf/HNB
>+%%DATADIR%%/font/devpdf/HNBI
>+%%DATADIR%%/font/devpdf/HNI
>+%%DATADIR%%/font/devpdf/HNR
> %%DATADIR%%/font/devpdf/HR
>+%%DATADIR%%/font/devpdf/NB
>+%%DATADIR%%/font/devpdf/NBI
>+%%DATADIR%%/font/devpdf/NI
>+%%DATADIR%%/font/devpdf/NR
>+%%DATADIR%%/font/devpdf/PB
>+%%DATADIR%%/font/devpdf/PBI
>+%%DATADIR%%/font/devpdf/PI
>+%%DATADIR%%/font/devpdf/PR
> %%DATADIR%%/font/devpdf/S
> %%DATADIR%%/font/devpdf/TB
> %%DATADIR%%/font/devpdf/TBI
>@@ -447,13 +440,14 @@ man/man7/roff.7.gz
> %%DATADIR%%/font/devpdf/U-TR
> %%DATADIR%%/font/devpdf/U-ZCMI
> %%DATADIR%%/font/devpdf/U-ZD
>+%%DATADIR%%/font/devpdf/ZCMI
> %%DATADIR%%/font/devpdf/ZD
> %%DATADIR%%/font/devpdf/download
> %%DATADIR%%/font/devpdf/enc/text.enc
> %%DATADIR%%/font/devpdf/map/dingbats.map
>+%%DATADIR%%/font/devpdf/map/symbol.map
> %%DATADIR%%/font/devpdf/map/symbolchars
>-%%DATADIR%%/font/devpdf/map/symbolmap
>-%%DATADIR%%/font/devpdf/map/textmap
>+%%DATADIR%%/font/devpdf/map/text.map
> %%DATADIR%%/font/devps/AB
> %%DATADIR%%/font/devps/ABI
> %%DATADIR%%/font/devps/AI
>@@ -498,16 +492,18 @@ man/man7/roff.7.gz
> %%DATADIR%%/font/devps/freeeuro.pfa
> %%DATADIR%%/font/devps/generate/Makefile
> %%DATADIR%%/font/devps/generate/afmname
>+%%DATADIR%%/font/devps/generate/dingbats-reversed.map
> %%DATADIR%%/font/devps/generate/dingbats.map
>-%%DATADIR%%/font/devps/generate/dingbats.rmap
>-%%DATADIR%%/font/devps/generate/lgreekmap
>+%%DATADIR%%/font/devps/generate/slanted-symbol.map
>+%%DATADIR%%/font/devps/generate/symbol.map
> %%DATADIR%%/font/devps/generate/symbol.sed
> %%DATADIR%%/font/devps/generate/symbolchars
>-%%DATADIR%%/font/devps/generate/symbolsl.afm
>-%%DATADIR%%/font/devps/generate/textmap
>+%%DATADIR%%/font/devps/generate/text.map
> %%DATADIR%%/font/devps/prologue
>+%%DATADIR%%/font/devps/symbolsl.afm
> %%DATADIR%%/font/devps/symbolsl.pfa
> %%DATADIR%%/font/devps/text.enc
>+%%DATADIR%%/font/devps/zapfdr.afm
> %%DATADIR%%/font/devps/zapfdr.pfa
> %%DATADIR%%/font/devutf8/B
> %%DATADIR%%/font/devutf8/BI
>@@ -548,9 +544,7 @@ man/man7/roff.7.gz
> %%DATADIR%%/tmac/62bit.tmac
> %%DATADIR%%/tmac/X.tmac
> %%DATADIR%%/tmac/Xps.tmac
>-%%DATADIR%%/tmac/a4.tmac
> %%DATADIR%%/tmac/an-ext.tmac
>-%%DATADIR%%/tmac/an-old.tmac
> %%DATADIR%%/tmac/an.tmac
> %%DATADIR%%/tmac/andoc.tmac
> %%DATADIR%%/tmac/composite.tmac
>@@ -564,6 +558,7 @@ man/man7/roff.7.gz
> %%DATADIR%%/tmac/dvi.tmac
> %%DATADIR%%/tmac/e.tmac
> %%DATADIR%%/tmac/ec.tmac
>+%%DATADIR%%/tmac/en.tmac
> %%DATADIR%%/tmac/eqnrc
> %%DATADIR%%/tmac/europs.tmac
> %%DATADIR%%/tmac/fallbacks.tmac
>@@ -575,11 +570,13 @@ man/man7/roff.7.gz
> %%DATADIR%%/tmac/hyphen.cs
> %%DATADIR%%/tmac/hyphen.den
> %%DATADIR%%/tmac/hyphen.det
>+%%DATADIR%%/tmac/hyphen.en
> %%DATADIR%%/tmac/hyphen.fr
>+%%DATADIR%%/tmac/hyphen.it
> %%DATADIR%%/tmac/hyphen.sv
>-%%DATADIR%%/tmac/hyphen.us
> %%DATADIR%%/tmac/hyphenex.cs
>-%%DATADIR%%/tmac/hyphenex.us
>+%%DATADIR%%/tmac/hyphenex.en
>+%%DATADIR%%/tmac/it.tmac
> %%DATADIR%%/tmac/ja.tmac
> %%DATADIR%%/tmac/latin1.tmac
> %%DATADIR%%/tmac/latin2.tmac
>@@ -600,9 +597,7 @@ man/man7/roff.7.gz
> %%DATADIR%%/tmac/mm/0.MT
> %%DATADIR%%/tmac/mm/4.MT
> %%DATADIR%%/tmac/mm/5.MT
>-%%DATADIR%%/tmac/mm/locale
> %%DATADIR%%/tmac/mm/ms.cov
>-%%DATADIR%%/tmac/mm/se_locale
> %%DATADIR%%/tmac/mm/se_ms.cov
> %%DATADIR%%/tmac/mmse.tmac
> %%DATADIR%%/tmac/mom.tmac
>@@ -618,12 +613,15 @@ man/man7/roff.7.gz
> %%DATADIR%%/tmac/psatk.tmac
> %%DATADIR%%/tmac/psold.tmac
> %%DATADIR%%/tmac/pspic.tmac
>+%%DATADIR%%/tmac/ptx.tmac
> %%DATADIR%%/tmac/refer-me.tmac
> %%DATADIR%%/tmac/refer-mm.tmac
> %%DATADIR%%/tmac/refer-ms.tmac
> %%DATADIR%%/tmac/refer.tmac
>+%%DATADIR%%/tmac/rfc1345.tmac
> %%DATADIR%%/tmac/s.tmac
>-%%DATADIR%%/tmac/safer.tmac
>+%%DATADIR%%/tmac/sanitize.tmac
>+%%DATADIR%%/tmac/sboxes.tmac
> %%DATADIR%%/tmac/spdf.tmac
> %%DATADIR%%/tmac/sv.tmac
> %%DATADIR%%/tmac/trace.tmac
>@@ -632,7 +630,6 @@ man/man7/roff.7.gz
> %%DATADIR%%/tmac/troffrc-end
> %%DATADIR%%/tmac/tty-char.tmac
> %%DATADIR%%/tmac/tty.tmac
>-%%DATADIR%%/tmac/unicode.tmac
> %%DATADIR%%/tmac/www.tmac
> %%DATADIR%%/tmac/zh.tmac
> share/groff/current
>-- 
>2.41.0
>

Actions: View | Diff

Attachments on bug 272810: 243699