6 files changed, 16 insertions, 356 deletions

diff --git a/textproc/heirloom-doctools/Makefile b/textproc/heirloom-doctools/Makefile
index 6320cb375fac..3fdc22e424eb 100644
--- a/textproc/heirloom-doctools/Makefile
+++ b/textproc/heirloom-doctools/Makefile
@@ -1,11 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	heirloom-doctools
-PORTVERSION=	0.0.080407
-PORTREVISION=	1
+PORTVERSION=	0.0.150406
+DISTVERSION=	${PORTVERSION:S,0.0.,,}
 CATEGORIES=	textproc
-MASTER_SITES=	SF/heirloom/${PORTNAME}/080407
-DISTNAME=	${PORTNAME}-${PORTVERSION:S,0.0.,,}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Portable and enhanced troff, nroff, and related utilities
@@ -14,9 +12,12 @@ LICENSE=	CDDL
 
 CONFLICTS=	libotf-[0-9]*
 
-USES=	gmake tar:bzip2
+USE_GITHUB=	yes
+GH_ACCOUNT=	n-t-roff
+
+USES=	gmake
 ALL_TARGET=	#empty
-MAKE_ENV+=	INSTALL=${INSTALL} \
+MAKE_ARGS+=	INSTALL=${INSTALL} \
 		BINDIR=${BINDIR} \
 		LIBDIR=${LIBDIR} \
 		PUBDIR=${PUBDIR} \
diff --git a/textproc/heirloom-doctools/distinfo b/textproc/heirloom-doctools/distinfo
index 1958346a0fbf..2ee5f46d5ac3 100644
--- a/textproc/heirloom-doctools/distinfo
+++ b/textproc/heirloom-doctools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (heirloom-doctools-080407.tar.bz2) = 43c0f31908aa476bb16f7159a6337008674afe81754d02b577812d734d559c38
-SIZE (heirloom-doctools-080407.tar.bz2) = 837016
+SHA256 (heirloom-doctools-150406_GH0.tar.gz) = d34fa5a878a4865aba929c7080e73aa97f4dd5be62801c1a85affb942d02912f
+SIZE (heirloom-doctools-150406_GH0.tar.gz) = 1098200
diff --git a/textproc/heirloom-doctools/files/patch-man b/textproc/heirloom-doctools/files/patch-man
deleted file mode 100644
index 91254718a9c2..000000000000
--- a/textproc/heirloom-doctools/files/patch-man
+++ /dev/null
@@ -1,126 +0,0 @@
---- ./troff/troff.d/Makefile.mk.orig	Thu Dec 22 08:23:54 2005
-+++ ./troff/troff.d/Makefile.mk	Tue Feb 21 06:44:24 2006
-@@ -29,7 +29,7 @@
- 	$(STRIP) $(ROOT)$(BINDIR)/ta
- 	$(INSTALL) -c otfdump $(ROOT)$(BINDIR)/otfdump
- 	$(STRIP) $(ROOT)$(BINDIR)/otfdump
--	$(INSTALL) -c -m 644 troff.1b $(ROOT)$(MANDIR)/man1b/troff.1b
-+	$(INSTALL) -c -m 644 troff.1b $(ROOT)$(MANDIR)/man1/troff.1
-	$(INSTALL) -c -m 644 otfdump.1 $(ROOT)$(MANDIR)/man1/otfdump.1
- 
- clean:
- 	rm -f $(OBJ) draw.o ta.o troff ta otfdump otfdump.o otfdump_version.o \
---- ./troff/nroff.d/Makefile.mk.orig	Tue Dec  6 09:37:06 2005
-+++ ./troff/nroff.d/Makefile.mk	Tue Feb 21 06:44:24 2006
-@@ -21,7 +21,7 @@
- install:
- 	$(INSTALL) -c nroff $(ROOT)$(BINDIR)/nroff
- 	$(STRIP) $(ROOT)$(BINDIR)/nroff
--	$(INSTALL) -c -m 644 nroff.1b $(ROOT)$(MANDIR)/man1b/nroff.1b
-+	$(INSTALL) -c -m 644 nroff.1b $(ROOT)$(MANDIR)/man1/nroff.1
- 
- clean:
- 	rm -f $(OBJ) nroff core log *~
---- ./refer/Makefile.mk.orig	Thu Oct 27 07:45:08 2005
-+++ ./refer/Makefile.mk	Tue Feb 21 06:44:24 2006
-@@ -75,10 +75,10 @@
- 	cd $(ROOT)$(REFDIR)/papers && PATH=$(ROOT)$(REFDIR):$$PATH ./runinv
- 	for i in addbib.1b lookbib.1b refer.1b roffbib.1b sortbib.1b; \
- 	do \
--		$(INSTALL) -c -m 644 $$i $(ROOT)$(MANDIR)/man1b/$$i || exit; \
-+		$(INSTALL) -c -m 644 $$i $(ROOT)$(MANDIR)/man1/$${i%b} || exit; \
- 	done
--	rm -f $(ROOT)$(MANDIR)/man1b/indxbib.1b
--	ln -s lookbib.1b $(ROOT)$(MANDIR)/man1b/indxbib.1b
-+	rm -f $(ROOT)$(MANDIR)/man1/indxbib.1
-+	ln -s lookbib.1 $(ROOT)$(MANDIR)/man1/indxbib.1
- 
- clean:
- 	rm -f $(ROBJ) refer $(AOBJ) addbib $(LOBJ) lookbib \
---- ./checknr/Makefile.mk.orig	Mon Nov  7 11:50:52 2005
-+++ ./checknr/Makefile.mk	Tue Feb 21 06:44:24 2006
-@@ -13,7 +13,7 @@
- install:
- 	$(INSTALL) -c checknr $(ROOT)$(BINDIR)/checknr
- 	$(STRIP) $(ROOT)$(BINDIR)/checknr
--	$(INSTALL) -c -m 644 checknr.1b $(ROOT)$(MANDIR)/man1b/checknr.1b
-+	$(INSTALL) -c -m 644 checknr.1b $(ROOT)$(MANDIR)/man1/checknr.1
- 
- clean:
- 	rm -f $(OBJ) checknr core log *~
---- ./eqn/checkeq.d/Makefile.mk.orig	Tue Aug 16 09:21:32 2005
-+++ ./eqn/checkeq.d/Makefile.mk	Tue Feb 21 06:44:24 2006
-@@ -14,8 +14,8 @@
- install:
- 	$(INSTALL) -c checkeq $(ROOT)$(BINDIR)/checkeq
- 	$(STRIP) $(ROOT)$(BINDIR)/checkeq
--	rm -f $(ROOT)$(MANDIR)/man1b/checkeq.1b
--	ln -s eqn.1b $(ROOT)$(MANDIR)/man1b/checkeq.1b
-+	rm -f $(ROOT)$(MANDIR)/man1/checkeq.1
-+	ln -s eqn.1 $(ROOT)$(MANDIR)/man1/checkeq.1
- 
- clean:
- 	rm -f $(OBJ) checkeq core log *~
---- ./eqn/neqn.d/Makefile.mk.orig	Tue Aug 16 09:21:17 2005
-+++ ./eqn/neqn.d/Makefile.mk	Tue Feb 21 06:44:24 2006
-@@ -24,8 +24,8 @@
- install:
- 	$(INSTALL) -c neqn $(ROOT)$(BINDIR)/neqn
- 	$(STRIP) $(ROOT)$(BINDIR)/neqn
--	rm -f $(ROOT)$(MANDIR)/man1b/neqn.1b
--	ln -s eqn.1b $(ROOT)$(MANDIR)/man1b/neqn.1b
-+	rm -f $(ROOT)$(MANDIR)/man1/neqn.1
-+	ln -s eqn.1 $(ROOT)$(MANDIR)/man1/neqn.1
- 
- clean:
- 	rm -f $(OBJ) neqn e.c e.def core log *~
---- ./eqn/eqn.d/Makefile.mk.orig	Fri Dec  9 10:58:44 2005
-+++ ./eqn/eqn.d/Makefile.mk	Tue Feb 21 06:46:07 2006
-@@ -25,10 +25,10 @@
- 	test -d $(ROOT)$(BINDIR) || mkdir -p $(ROOT)$(BINDIR)
- 	$(INSTALL) -c eqn $(ROOT)$(BINDIR)/eqn
- 	$(STRIP) $(ROOT)$(BINDIR)/eqn
--	test -d $(ROOT)$(MANDIR)/man1b || mkdir -p $(ROOT)$(MANDIR)/man1b
--	test -d $(ROOT)$(MANDIR)/man7b || mkdir -p $(ROOT)$(MANDIR)/man7b
--	$(INSTALL) -c -m 644 eqn.1b $(ROOT)$(MANDIR)/man1b/eqn.1b
--	$(INSTALL) -c -m 644 eqnchar.7b $(ROOT)$(MANDIR)/man7b/eqnchar.7b
-+	test -d $(ROOT)$(MANDIR)/man1 || mkdir -p $(ROOT)$(MANDIR)/man1
-+	test -d $(ROOT)$(MANDIR)/man7 || mkdir -p $(ROOT)$(MANDIR)/man7
-+	$(INSTALL) -c -m 644 eqn.1b $(ROOT)$(MANDIR)/man1/eqn.1
-+	$(INSTALL) -c -m 644 eqnchar.7b $(ROOT)$(MANDIR)/man7/eqnchar.7
- 
- clean:
- 	rm -f $(OBJ) eqn e.c e.def core log *~
---- ./soelim/Makefile.mk.orig	Tue Aug 16 09:22:46 2005
-+++ ./soelim/Makefile.mk	Tue Feb 21 06:44:24 2006
-@@ -13,7 +13,7 @@
- install:
- 	$(INSTALL) -c soelim $(ROOT)$(BINDIR)/soelim
- 	$(STRIP) $(ROOT)$(BINDIR)/soelim
--	$(INSTALL) -c -m 644 soelim.1b $(ROOT)$(MANDIR)/man1b/soelim.1b
-+	$(INSTALL) -c -m 644 soelim.1b $(ROOT)$(MANDIR)/man1/soelim.1
- 
- clean:
- 	rm -f $(OBJ) soelim core log *~
---- ./tbl/Makefile.mk.orig	Thu Sep 15 19:36:47 2005
-+++ ./tbl/Makefile.mk	Tue Feb 21 06:44:24 2006
-@@ -14,7 +14,7 @@
- install:
- 	$(INSTALL) -c tbl $(ROOT)$(BINDIR)/tbl
- 	$(STRIP) $(ROOT)$(BINDIR)/tbl
--	$(INSTALL) -c -m 644 tbl.1b $(ROOT)$(MANDIR)/man1b/tbl.1b
-+	$(INSTALL) -c -m 644 tbl.1b $(ROOT)$(MANDIR)/man1/tbl.1
- 
- clean:
- 	rm -f $(OBJ) tbl core log *~
---- ./vgrind/Makefile.mk.orig	Thu Oct 27 07:46:35 2005
-+++ ./vgrind/Makefile.mk	Tue Feb 21 06:44:24 2006
-@@ -26,7 +26,7 @@
- 	$(INSTALL) -c vfontedpr $(ROOT)$(LIBDIR)/vfontedpr
- 	$(STRIP) $(ROOT)$(LIBDIR)/vfontedpr
- 	$(INSTALL) -c -m 644 vgrindefs.src $(ROOT)$(LIBDIR)/vgrindefs
--	$(INSTALL) -c -m 644 vgrind.1b $(ROOT)$(MANDIR)/man1b/vgrind.1b
-+	$(INSTALL) -c -m 644 vgrind.1b $(ROOT)$(MANDIR)/man1/vgrind.1
- 
- clean:
- 	rm -f $(OBJ) vfontedpr vgrind retest retest.o core log *~
diff --git a/textproc/heirloom-doctools/files/patch-mk.config b/textproc/heirloom-doctools/files/patch-mk.config
deleted file mode 100644
index 656e322ec53d..000000000000
--- a/textproc/heirloom-doctools/files/patch-mk.config
+++ /dev/null
@@ -1,122 +0,0 @@
---- mk.config.orig	2008-04-08 03:42:01.000000000 +0900
-+++ mk.config	2008-04-25 23:46:59.000000000 +0900
-@@ -1,62 +1,62 @@
- #
- # A BSD-compatible install command.
- #
--INSTALL=/usr/ucb/install
-+INSTALL?=/usr/ucb/install
- 
- #
- # Packaging prefix.
- #
--PREFIX=/usr
-+PREFIX?=/usr
- 
- #
- # Where to place binaries.
- #
--BINDIR=$(PREFIX)/ucb
-+BINDIR?=$(PREFIX)/ucb
- 
- #
- # Where to place libraries.
- #
--LIBDIR=$(PREFIX)/ucblib
-+LIBDIR?=$(PREFIX)/ucblib
- 
- #
- # Where to place ASCII charts and the like.
- #
--PUBDIR=$(PREFIX)/pub
-+PUBDIR?=$(PREFIX)/pub
- 
- #
- # Where to place manual pages.
- #
--MANDIR=$(PREFIX)/share/man/5man
-+MANDIR?=$(PREFIX)/share/man/5man
- 
- #
- # Where to place the troff macro packages.
- #
--MACDIR=$(LIBDIR)/doctools/tmac
-+MACDIR?=$(LIBDIR)/doctools/tmac
- 
- #
- # Where to place the troff font files.
- #
--FNTDIR=$(LIBDIR)/doctools/font
-+FNTDIR?=$(LIBDIR)/doctools/font
- 
- #
- # Where to place PostScript helper files.
- #
--PSTDIR=$(FNTDIR)/devpost/postscript
-+PSTDIR?=$(FNTDIR)/devpost/postscript
- 
- #
- # Where to place the nroff terminal description files.
- #
--TABDIR=$(LIBDIR)/doctools/nterm
-+TABDIR?=$(LIBDIR)/doctools/nterm
- 
- #
- # Where to place troff hyphenation files.
- #
--HYPDIR=$(LIBDIR)/doctools/hyphen
-+HYPDIR?=$(LIBDIR)/doctools/hyphen
- 
- #
- # Where to place files belonging to the "refer" utility.
- #
--REFDIR=$(LIBDIR)/reftools
-+REFDIR?=$(LIBDIR)/reftools
- 
- #
- # Define this if you want troff and nroff to be able to process
-@@ -73,17 +73,17 @@
- #
- # The C compiler.
- #
--CC=cc
-+CC?=cc
- 
- #
- # The C++ compiler.
- #
--CCC=c++
-+CCC?=c++
- 
- #
- # Compiler flags.
- #
--CFLAGS=-O
-+CFLAGS?=-O
- 
- #
- # C preprocessor flags.
-@@ -91,7 +91,7 @@
- # Use -D_GNU_SOURCE for Linux with GNU libc.
- # Use -D_INCLUDE__STDC_A1_SOURCE for HP-UX.
- #
--CPPFLAGS=-D_GNU_SOURCE
-+CPPFLAGS?=-D_GNU_SOURCE
- 
- #
- # Warning flags for the compiler.
-@@ -101,12 +101,12 @@
- #
- # Linker flags.
- #
--LDFLAGS=
-+LDFLAGS?=
- 
- #
- # Additional libraries to link with.
- #
--LIBS=
-+LIBS?=
- 
- #
- # A Bourne-compatible shell.
diff --git a/textproc/heirloom-doctools/pkg-descr b/textproc/heirloom-doctools/pkg-descr
index 4c4fd785bb1e..71500e316247 100644
--- a/textproc/heirloom-doctools/pkg-descr
+++ b/textproc/heirloom-doctools/pkg-descr
@@ -4,4 +4,4 @@ terminals and printers.  They are portable and enhanced versions of
 the utilities released by Sun as part of OpenSolaris, and, for pic,
 grap, mpm, and some minor parts, by Lucent as part of Plan 9.
 
-WWW: http://heirloom.sourceforge.net/
+WWW: http://n-t-roff.github.io/heirloom/doctools.html
diff --git a/textproc/heirloom-doctools/pkg-plist b/textproc/heirloom-doctools/pkg-plist
index a3e6c25ed3c2..0a1f018b0808 100644
--- a/textproc/heirloom-doctools/pkg-plist
+++ b/textproc/heirloom-doctools/pkg-plist
@@ -1,7 +1,7 @@
 bin/addbib
 bin/checkeq
 bin/checknr
-bin/daps
+bin/col
 bin/dpost
 bin/eqn
 bin/grap
@@ -9,7 +9,7 @@ bin/indxbib
 bin/lookbib
 bin/neqn
 bin/nroff
-bin/otfdump
+bin/otf_info
 bin/pic
 bin/picpack
 bin/ptx
@@ -45,7 +45,7 @@ man/man1/indxbib.1.gz
 man/man1/lookbib.1.gz
 man/man1/neqn.1.gz
 man/man1/nroff.1.gz
-man/man1/otfdump.1.gz
+man/man1/otf_info.1.gz
 man/man1/pic.1.gz
 man/man1/picpack.1.gz
 man/man1/ptx.1.gz
@@ -59,102 +59,6 @@ man/man1/vgrind.1.gz
 man/man7/eqnchar.7.gz
 man/man7/mcolor.7.gz
 man/man7/mpictures.7.gz
-%%DATADIR%%/font/devaps/B
-%%DATADIR%%/font/devaps/B.add
-%%DATADIR%%/font/devaps/B.out
-%%DATADIR%%/font/devaps/BI
-%%DATADIR%%/font/devaps/BI.out
-%%DATADIR%%/font/devaps/C
-%%DATADIR%%/font/devaps/C.out
-%%DATADIR%%/font/devaps/CE
-%%DATADIR%%/font/devaps/CE.out
-%%DATADIR%%/font/devaps/CI
-%%DATADIR%%/font/devaps/CI.out
-%%DATADIR%%/font/devaps/CT
-%%DATADIR%%/font/devaps/CT.add
-%%DATADIR%%/font/devaps/CT.out
-%%DATADIR%%/font/devaps/CW
-%%DATADIR%%/font/devaps/CW.add
-%%DATADIR%%/font/devaps/CW.out
-%%DATADIR%%/font/devaps/CX
-%%DATADIR%%/font/devaps/CX.add
-%%DATADIR%%/font/devaps/CX.out
-%%DATADIR%%/font/devaps/DESC
-%%DATADIR%%/font/devaps/DESC.out
-%%DATADIR%%/font/devaps/G
-%%DATADIR%%/font/devaps/G.out
-%%DATADIR%%/font/devaps/GB
-%%DATADIR%%/font/devaps/GB.add
-%%DATADIR%%/font/devaps/GB.out
-%%DATADIR%%/font/devaps/GI
-%%DATADIR%%/font/devaps/GI.add
-%%DATADIR%%/font/devaps/GI.out
-%%DATADIR%%/font/devaps/GR
-%%DATADIR%%/font/devaps/GR.add
-%%DATADIR%%/font/devaps/GR.out
-%%DATADIR%%/font/devaps/GS
-%%DATADIR%%/font/devaps/GS.add
-%%DATADIR%%/font/devaps/GS.out
-%%DATADIR%%/font/devaps/H
-%%DATADIR%%/font/devaps/H.out
-%%DATADIR%%/font/devaps/HB
-%%DATADIR%%/font/devaps/HB.out
-%%DATADIR%%/font/devaps/HI
-%%DATADIR%%/font/devaps/HI.add
-%%DATADIR%%/font/devaps/HI.out
-%%DATADIR%%/font/devaps/HK
-%%DATADIR%%/font/devaps/HK.add
-%%DATADIR%%/font/devaps/HK.out
-%%DATADIR%%/font/devaps/HL
-%%DATADIR%%/font/devaps/HL.out
-%%DATADIR%%/font/devaps/HM.out
-%%DATADIR%%/font/devaps/HX
-%%DATADIR%%/font/devaps/HX.add
-%%DATADIR%%/font/devaps/HX.out
-%%DATADIR%%/font/devaps/I
-%%DATADIR%%/font/devaps/I.add
-%%DATADIR%%/font/devaps/I.out
-%%DATADIR%%/font/devaps/MB
-%%DATADIR%%/font/devaps/MB.out
-%%DATADIR%%/font/devaps/MI
-%%DATADIR%%/font/devaps/MI.out
-%%DATADIR%%/font/devaps/MR
-%%DATADIR%%/font/devaps/MR.out
-%%DATADIR%%/font/devaps/MX
-%%DATADIR%%/font/devaps/MX.out
-%%DATADIR%%/font/devaps/PA
-%%DATADIR%%/font/devaps/PA.out
-%%DATADIR%%/font/devaps/PB
-%%DATADIR%%/font/devaps/PB.out
-%%DATADIR%%/font/devaps/PI
-%%DATADIR%%/font/devaps/PI.out
-%%DATADIR%%/font/devaps/PO
-%%DATADIR%%/font/devaps/PO.add
-%%DATADIR%%/font/devaps/PO.out
-%%DATADIR%%/font/devaps/PX
-%%DATADIR%%/font/devaps/PX.add
-%%DATADIR%%/font/devaps/PX.out
-%%DATADIR%%/font/devaps/R
-%%DATADIR%%/font/devaps/R.add
-%%DATADIR%%/font/devaps/R.out
-%%DATADIR%%/font/devaps/S
-%%DATADIR%%/font/devaps/S.add
-%%DATADIR%%/font/devaps/S.out
-%%DATADIR%%/font/devaps/S1
-%%DATADIR%%/font/devaps/S1.add
-%%DATADIR%%/font/devaps/S1.out
-%%DATADIR%%/font/devaps/SC
-%%DATADIR%%/font/devaps/SC.add
-%%DATADIR%%/font/devaps/SC.out
-%%DATADIR%%/font/devaps/SM
-%%DATADIR%%/font/devaps/SM.add
-%%DATADIR%%/font/devaps/SM.out
-%%DATADIR%%/font/devaps/TB
-%%DATADIR%%/font/devaps/TB.out
-%%DATADIR%%/font/devaps/TX
-%%DATADIR%%/font/devaps/TX.add
-%%DATADIR%%/font/devaps/TX.out
-%%DATADIR%%/font/devaps/version
 %%DATADIR%%/font/devpost/AB
 %%DATADIR%%/font/devpost/AB.name
 %%DATADIR%%/font/devpost/AI
@@ -393,6 +297,7 @@ man/man7/mpictures.7.gz
 %%DATADIR%%/hyphen/hyph_fr_FR.dic
 %%DATADIR%%/hyphen/hyph_it_IT.dic
 %%DATADIR%%/hyphen/hyph_la_VA.dic
+%%DATADIR%%/hyphen/hyph_nl_NL.dic
 %%DATADIR%%/nterm/tab.2631
 %%DATADIR%%/nterm/tab.2631-c
 %%DATADIR%%/nterm/tab.2631-e
@@ -413,6 +318,7 @@ man/man7/mpictures.7.gz
 %%DATADIR%%/nterm/tab.X
 %%DATADIR%%/nterm/tab.lp
 %%DATADIR%%/nterm/tab.tn300
+%%DATADIR%%/nterm/tab.utf8
 %%DATADIR%%/pub/ascii
 %%DATADIR%%/pub/eqnchar
 %%DATADIR%%/pub/greek
@@ -461,5 +367,6 @@ man/man7/mpictures.7.gz
 %%DATADIR%%/tmac/taa
 %%DATADIR%%/tmac/tbl.me
 %%DATADIR%%/tmac/thesis.me
+%%DATADIR%%/tmac/tmac.gchar
 %%DATADIR%%/tmac/v
 %%DATADIR%%/tmac/vgrind