git: 3099c99b392d - main - textproc/heirloom-doctools: Update to 191015
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 13 Jan 2023 09:05:46 UTC
The branch main has been updated by hrs:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3099c99b392dd0ca738f9c16db7c1280f31d74a5
commit 3099c99b392dd0ca738f9c16db7c1280f31d74a5
Author: Hiroki Sato <hrs@FreeBSD.org>
AuthorDate: 2023-01-13 08:53:53 +0000
Commit: Hiroki Sato <hrs@FreeBSD.org>
CommitDate: 2023-01-13 09:03:54 +0000
textproc/heirloom-doctools: Update to 191015
- The installation directory has been changed to ${PREFIX}/heirloom
to avoid conflicts with textproc/groff[1].
Suggested by: kib [1]
---
textproc/heirloom-doctools/Makefile | 27 ++++--
textproc/heirloom-doctools/distinfo | 6 +-
.../files/heirloom-doctools.conf.in | 1 +
.../heirloom-doctools/files/patch-grap-Makefile.mk | 11 +++
.../heirloom-doctools/files/patch-ptx-Makefile.mk | 11 +++
.../files/patch-refer-Makefile.mk | 19 ++++
.../files/patch-soelim-Makefile.mk | 8 ++
.../files/patch-troff-nroff.d-Makefile.mk | 13 +++
.../files/patch-troff-troff.d-Makefile.mk | 13 +++
.../files/patch-troff_troff.d_dpost.d_draw.c | 6 +-
.../files/patch-vgrind-Makefile.mk | 10 ++
textproc/heirloom-doctools/pkg-plist | 103 +++++++++++----------
12 files changed, 162 insertions(+), 66 deletions(-)
diff --git a/textproc/heirloom-doctools/Makefile b/textproc/heirloom-doctools/Makefile
index addd271949d5..7882082f05dd 100644
--- a/textproc/heirloom-doctools/Makefile
+++ b/textproc/heirloom-doctools/Makefile
@@ -1,6 +1,5 @@
PORTNAME= heirloom-doctools
-PORTVERSION= 160308
-PORTREVISION= 1
+PORTVERSION= 191015
CATEGORIES= textproc
MAINTAINER= hrs@FreeBSD.org
@@ -13,8 +12,6 @@ USES= gmake
USE_GITHUB= yes
GH_ACCOUNT= n-t-roff
-CONFLICTS_INSTALL= grap groff ja-groff util-linux # bin/col bin/eqn bin/grap bin/indxbib
-
ALL_TARGET= #empty
MAKE_ARGS+= INSTALL="${INSTALL}" \
BINDIR=${BINDIR} \
@@ -30,18 +27,22 @@ MAKE_ARGS+= INSTALL="${INSTALL}" \
ROOT=${STAGEDIR}
MAKEFILE= makefile
CFLAGS+= -fcommon
-PLIST_SUB= LIBEXECDIR=libexec/${PORTNAME}
+SUB_FILES= ${PORTNAME}.conf
+PLIST_SUB= LIBEXECDIR=heirloom/libexec
+
+MANPREFIX= ${PREFIX}/heirloom/share
+DATADIR= ${PREFIX}/heirloom/share
MACDIR?= ${DATADIR}/tmac
FNTDIR?= ${DATADIR}/font
TABDIR?= ${DATADIR}/nterm
HYPDIR?= ${DATADIR}/hyphen
-REFDIR?= ${PREFIX}/libexec/${PORTNAME}/reftools
+REFDIR?= ${PREFIX}/heirloom/libexec/reftools
PUBDIR?= ${DATADIR}/pub
-BINDIR?= ${PREFIX}/bin
-LIBDIR?= ${PREFIX}/libexec/${PORTNAME}
+BINDIR?= ${PREFIX}/heirloom/bin
+LIBDIR?= ${PREFIX}/heirloom/libexec
PSTDIR?= ${DATADIR}/font/devpost/postscript
-MANDIR?= ${PREFIX}/man
+MANDIR?= ${MANPREFIX}/man
PORTDOCS= *
@@ -49,8 +50,14 @@ MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFINE= DOCS
-post-install-DOCS-on:
+post-install:
+ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.conf \
+ ${STAGEDIR}${PREFIX}/etc/man.d
+
+pre-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+post-install-DOCS-on:
cd ${WRKSRC} && ${INSTALL_DATA} CHANGES README ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${COPYTREE_SHARE} LICENSE ${STAGEDIR}${DOCSDIR}
diff --git a/textproc/heirloom-doctools/distinfo b/textproc/heirloom-doctools/distinfo
index f371d455a927..cd92e886d5b3 100644
--- a/textproc/heirloom-doctools/distinfo
+++ b/textproc/heirloom-doctools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463473266
-SHA256 (n-t-roff-heirloom-doctools-160308_GH0.tar.gz) = d54e22e89acfddae4cd7a1fb583ca5fce097ba4c91c7b32f634944f137af175b
-SIZE (n-t-roff-heirloom-doctools-160308_GH0.tar.gz) = 4626836
+TIMESTAMP = 1673578004
+SHA256 (n-t-roff-heirloom-doctools-191015_GH0.tar.gz) = e0d2cfbc2a9dde25705d942966ca73d004b8628d4af2bdc5029e0b91686323f2
+SIZE (n-t-roff-heirloom-doctools-191015_GH0.tar.gz) = 5441412
diff --git a/textproc/heirloom-doctools/files/heirloom-doctools.conf.in b/textproc/heirloom-doctools/files/heirloom-doctools.conf.in
new file mode 100644
index 000000000000..620e3e11dfb5
--- /dev/null
+++ b/textproc/heirloom-doctools/files/heirloom-doctools.conf.in
@@ -0,0 +1 @@
+MANPATH %%PREFIX%%/heirloom/share/man
diff --git a/textproc/heirloom-doctools/files/patch-grap-Makefile.mk b/textproc/heirloom-doctools/files/patch-grap-Makefile.mk
new file mode 100644
index 000000000000..c215df93009f
--- /dev/null
+++ b/textproc/heirloom-doctools/files/patch-grap-Makefile.mk
@@ -0,0 +1,11 @@
+--- grap/Makefile.mk.orig 2023-01-13 08:00:09 UTC
++++ grap/Makefile.mk
+@@ -28,7 +28,7 @@ clean:
+ mrproper: clean
+
+ grap.1: grap.1.in
+- sed 's"/usr/ucblib/"$(ROOT)$(LIBDIR)/"' grap.1.in > $@
++ sed 's"/usr/ucblib/"$(LIBDIR)/"' grap.1.in > $@
+
+ coord.o: coord.c grap.h y.tab.h
+ for.o: for.c grap.h y.tab.h
diff --git a/textproc/heirloom-doctools/files/patch-ptx-Makefile.mk b/textproc/heirloom-doctools/files/patch-ptx-Makefile.mk
new file mode 100644
index 000000000000..20a8240e1d2c
--- /dev/null
+++ b/textproc/heirloom-doctools/files/patch-ptx-Makefile.mk
@@ -0,0 +1,11 @@
+--- ptx/Makefile.mk.orig 2023-01-13 07:59:44 UTC
++++ ptx/Makefile.mk
+@@ -24,6 +24,6 @@ mrproper: clean
+
+ ptx.1: ptx.1.in
+ sed -e "s'/usr/5bin/sort'`which sort`'" \
+- -e 's"/usr/ucblib/doctools/tmac/"$(ROOT)$(BINDIR)/"' \
+- -e 's"/usr/ucblib/"$(ROOT)$(LIBDIR)/"' \
++ -e 's"/usr/ucblib/doctools/tmac/"$(MACDIR)/"' \
++ -e 's"/usr/ucblib/"$(LIBDIR)/"' \
+ ptx.1.in > $@
diff --git a/textproc/heirloom-doctools/files/patch-refer-Makefile.mk b/textproc/heirloom-doctools/files/patch-refer-Makefile.mk
new file mode 100644
index 000000000000..e9faa73f10b4
--- /dev/null
+++ b/textproc/heirloom-doctools/files/patch-refer-Makefile.mk
@@ -0,0 +1,19 @@
+--- refer/Makefile.mk.orig 2023-01-13 07:59:22 UTC
++++ refer/Makefile.mk
+@@ -95,13 +95,13 @@ clean:
+ mrproper: clean
+
+ lookbib.1: lookbib.1.in
+- sed 's"/usr/ucblib/reftools/"$(ROOT)$(REFDIR)/"' lookbib.1.in > $@
++ sed 's"/usr/ucblib/reftools/"$(REFDIR)/"' lookbib.1.in > $@
+
+ refer.1: refer.1.in
+- sed 's"/usr/ucblib/reftools/"$(ROOT)$(REFDIR)/"' refer.1.in > $@
++ sed 's"/usr/ucblib/reftools/"$(REFDIR)/"' refer.1.in > $@
+
+ roffbib.1: roffbib.1.in
+- sed 's"/usr/ucblib/doctools/tmac/"$(ROOT)$(MACDIR)/"' roffbib.1.in > $@
++ sed 's"/usr/ucblib/doctools/tmac/"$(MACDIR)/"' roffbib.1.in > $@
+
+ addbib.o: addbib.c
+ deliv2.o: deliv2.c refer..c
diff --git a/textproc/heirloom-doctools/files/patch-soelim-Makefile.mk b/textproc/heirloom-doctools/files/patch-soelim-Makefile.mk
new file mode 100644
index 000000000000..f24b6b6d22c9
--- /dev/null
+++ b/textproc/heirloom-doctools/files/patch-soelim-Makefile.mk
@@ -0,0 +1,8 @@
+--- soelim/Makefile.mk.orig 2023-01-13 07:59:03 UTC
++++ soelim/Makefile.mk
+@@ -21,4 +21,4 @@ clean:
+ mrproper: clean
+
+ soelim.1: soelim.1.in
+- sed 's"/usr/ucblib/doctools/tmac/"$(ROOT)$(MACDIR)/"' soelim.1.in > $@
++ sed 's"/usr/ucblib/doctools/tmac/"$(MACDIR)/"' soelim.1.in > $@
diff --git a/textproc/heirloom-doctools/files/patch-troff-nroff.d-Makefile.mk b/textproc/heirloom-doctools/files/patch-troff-nroff.d-Makefile.mk
new file mode 100644
index 000000000000..e1b5c0393c95
--- /dev/null
+++ b/textproc/heirloom-doctools/files/patch-troff-nroff.d-Makefile.mk
@@ -0,0 +1,13 @@
+--- troff/nroff.d/Makefile.mk.orig 2023-01-13 07:58:41 UTC
++++ troff/nroff.d/Makefile.mk
+@@ -31,8 +31,8 @@ clean:
+ mrproper: clean
+
+ nroff.1: nroff.1.in
+- sed -e 's"/usr/ucblib/doctools/tmac/"$(ROOT)$(MACDIR)/"' \
+- -e 's"/usr/ucblib/doctools/nterm/"$(ROOT)$(TABDIR)/"' \
++ sed -e 's"/usr/ucblib/doctools/tmac/"$(MACDIR)/"' \
++ -e 's"/usr/ucblib/doctools/nterm/"$(TABDIR)/"' \
+ nroff.1.in > $@
+
+ draw.o: ../tdef.h ../ext.h
diff --git a/textproc/heirloom-doctools/files/patch-troff-troff.d-Makefile.mk b/textproc/heirloom-doctools/files/patch-troff-troff.d-Makefile.mk
new file mode 100644
index 000000000000..cc79f2d41315
--- /dev/null
+++ b/textproc/heirloom-doctools/files/patch-troff-troff.d-Makefile.mk
@@ -0,0 +1,13 @@
+--- troff/troff.d/Makefile.mk.orig 2023-01-13 07:58:22 UTC
++++ troff/troff.d/Makefile.mk
+@@ -40,8 +40,8 @@ clean:
+ mrproper: clean
+
+ troff.1: troff.1.in
+- sed -e 's"/usr/ucblib/doctools/font/"$(ROOT)$(FNTDIR)/"' \
+- -e 's"/usr/ucblib/doctools/tmac/"$(ROOT)$(MACDIR)/"' \
++ sed -e 's"/usr/ucblib/doctools/font/"$(FNTDIR)/"' \
++ -e 's"/usr/ucblib/doctools/tmac/"$(MACDIR)/"' \
+ troff.1.in > $@
+
+ draw.o: draw.c
diff --git a/textproc/heirloom-doctools/files/patch-troff_troff.d_dpost.d_draw.c b/textproc/heirloom-doctools/files/patch-troff_troff.d_dpost.d_draw.c
index 207feb9c5fcf..46988710fc2f 100644
--- a/textproc/heirloom-doctools/files/patch-troff_troff.d_dpost.d_draw.c
+++ b/textproc/heirloom-doctools/files/patch-troff_troff.d_dpost.d_draw.c
@@ -1,11 +1,11 @@
---- troff/troff.d/dpost.d/draw.c.orig 2016-03-09 21:27:38 UTC
+--- troff/troff.d/dpost.d/draw.c.orig 2019-10-26 04:51:56 UTC
+++ troff/troff.d/dpost.d/draw.c
-@@ -348,7 +348,7 @@ drawspline(
+@@ -345,7 +345,7 @@ drawspline(
{
- int x[100], y[100];
+ int x[5000], y[5000];
- int i, N;
+ size_t i, N;
diff --git a/textproc/heirloom-doctools/files/patch-vgrind-Makefile.mk b/textproc/heirloom-doctools/files/patch-vgrind-Makefile.mk
new file mode 100644
index 000000000000..dbc1a04af7ef
--- /dev/null
+++ b/textproc/heirloom-doctools/files/patch-vgrind-Makefile.mk
@@ -0,0 +1,10 @@
+--- vgrind/Makefile.mk.orig 2023-01-13 07:57:50 UTC
++++ vgrind/Makefile.mk
+@@ -34,5 +34,5 @@ clean:
+ mrproper: clean
+
+ vgrind.1: vgrind.1.in
+- sed -e 's"/usr/ucblib/tmac/"$(ROOT)$(MACDIR)/"' \
+- -e 's"/usr/ucblib/"$(ROOT)$(LIBDIR)/"' vgrind.1.in > $@
++ sed -e 's"/usr/ucblib/tmac/"$(MACDIR)/"' \
++ -e 's"/usr/ucblib/"$(LIBDIR)/"' vgrind.1.in > $@
diff --git a/textproc/heirloom-doctools/pkg-plist b/textproc/heirloom-doctools/pkg-plist
index 871af4409f22..05a5a152a545 100644
--- a/textproc/heirloom-doctools/pkg-plist
+++ b/textproc/heirloom-doctools/pkg-plist
@@ -1,27 +1,28 @@
-bin/addbib
-bin/checkeq
-bin/checknr
-bin/col
-bin/dhtml
-bin/dpost
-bin/eqn
-bin/grap
-bin/indxbib
-bin/lookbib
-bin/neqn
-bin/nroff
-bin/otf_info
-bin/pic
-bin/picpack
-bin/ptx
-bin/refer
-bin/roffbib
-bin/soelim
-bin/sortbib
-bin/ta
-bin/tbl
-bin/troff
-bin/vgrind
+etc/man.d/heirloom-doctools.conf
+heirloom/bin/addbib
+heirloom/bin/checkeq
+heirloom/bin/checknr
+heirloom/bin/col
+heirloom/bin/dhtml
+heirloom/bin/dpost
+heirloom/bin/eqn
+heirloom/bin/grap
+heirloom/bin/indxbib
+heirloom/bin/lookbib
+heirloom/bin/neqn
+heirloom/bin/nroff
+heirloom/bin/otf_info
+heirloom/bin/pic
+heirloom/bin/picpack
+heirloom/bin/ptx
+heirloom/bin/refer
+heirloom/bin/roffbib
+heirloom/bin/soelim
+heirloom/bin/sortbib
+heirloom/bin/ta
+heirloom/bin/tbl
+heirloom/bin/troff
+heirloom/bin/vgrind
%%LIBEXECDIR%%/eign
%%LIBEXECDIR%%/grap.defines
%%LIBEXECDIR%%/pm
@@ -36,31 +37,33 @@ bin/vgrind
%%LIBEXECDIR%%/reftools/papers/runinv
%%LIBEXECDIR%%/vfontedpr
%%LIBEXECDIR%%/vgrindefs
-man/man1/addbib.1.gz
-man/man1/checkeq.1.gz
-man/man1/checknr.1.gz
-man/man1/dhtml.1.gz
-man/man1/dpost.1.gz
-man/man1/eqn.1.gz
-man/man1/grap.1.gz
-man/man1/indxbib.1.gz
-man/man1/lookbib.1.gz
-man/man1/neqn.1.gz
-man/man1/nroff.1.gz
-man/man1/otf_info.1.gz
-man/man1/pic.1.gz
-man/man1/picpack.1.gz
-man/man1/ptx.1.gz
-man/man1/refer.1.gz
-man/man1/roffbib.1.gz
-man/man1/soelim.1.gz
-man/man1/sortbib.1.gz
-man/man1/tbl.1.gz
-man/man1/troff.1.gz
-man/man1/vgrind.1.gz
-man/man7/eqnchar.7.gz
-man/man7/mcolor.7.gz
-man/man7/mpictures.7.gz
+heirloom/share/man/man1/addbib.1.gz
+heirloom/share/man/man1/checkeq.1.gz
+heirloom/share/man/man1/checknr.1.gz
+heirloom/share/man/man1/dhtml.1.gz
+heirloom/share/man/man1/dpost.1.gz
+heirloom/share/man/man1/eqn.1.gz
+heirloom/share/man/man1/grap.1.gz
+heirloom/share/man/man1/indxbib.1.gz
+heirloom/share/man/man1/lookbib.1.gz
+heirloom/share/man/man1/neqn.1.gz
+heirloom/share/man/man1/nroff.1.gz
+heirloom/share/man/man1/otf_info.1.gz
+heirloom/share/man/man1/pic.1.gz
+heirloom/share/man/man1/picpack.1.gz
+heirloom/share/man/man1/ptx.1.gz
+heirloom/share/man/man1/refer.1.gz
+heirloom/share/man/man1/roffbib.1.gz
+heirloom/share/man/man1/soelim.1.gz
+heirloom/share/man/man1/sortbib.1.gz
+heirloom/share/man/man1/tbl.1.gz
+heirloom/share/man/man1/troff.1.gz
+heirloom/share/man/man1/vgrind.1.gz
+heirloom/share/man/man7/eqnchar.7.gz
+heirloom/share/man/man7/man.7.gz
+heirloom/share/man/man7/mcolor.7.gz
+heirloom/share/man/man7/mdoc.7.gz
+heirloom/share/man/man7/mpictures.7.gz
%%DATADIR%%/font/devhtml/B
%%DATADIR%%/font/devhtml/BI
%%DATADIR%%/font/devhtml/C
@@ -177,7 +180,7 @@ man/man7/mpictures.7.gz
%%DATADIR%%/font/devpost/charlib/Fl
%%DATADIR%%/font/devpost/charlib/L1
%%DATADIR%%/font/devpost/charlib/L1.map
-%%DATADIR%%/font/devpost/charlib/LH
+%%DATADIR%%/font/devpost/charlib/LH_uc
%%DATADIR%%/font/devpost/charlib/LH.map
%%DATADIR%%/font/devpost/charlib/Lb
%%DATADIR%%/font/devpost/charlib/Lb.map