Index: Makefile =================================================================== --- Makefile (revision 372334) +++ Makefile (working copy) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= heirloom-doctools -PORTVERSION= 0.0.080407 +PORTVERSION= 141029 CATEGORIES= textproc -MASTER_SITES= SF/heirloom/${PORTNAME}/080407 -DISTNAME= ${PORTNAME}-${PORTVERSION:S,0.0.,,} +MASTER_SITES= https://github.com/n-t-roff/${PORTNAME}/releases/download/${PORTVERSION}/ MAINTAINER= hrs@FreeBSD.org COMMENT= Portable and enhanced troff, nroff, and related utilities @@ -12,7 +11,7 @@ USES= gmake tar:bzip2 ALL_TARGET= #empty -MAKE_ENV+= INSTALL=${INSTALL} \ +MAKE_ARGS+= INSTALL=${INSTALL} \ BINDIR=${BINDIR} \ LIBDIR=${LIBDIR} \ PUBDIR=${PUBDIR} \ @@ -40,6 +39,9 @@ PORTDOCS= * +post-patch: + @${REINPLACE_CMD} -e "s/=/?=/g" ${WRKSRC}/mk.config + post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} CHANGES README ${STAGEDIR}${DOCSDIR} Index: distinfo =================================================================== --- distinfo (revision 372334) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (heirloom-doctools-080407.tar.bz2) = 43c0f31908aa476bb16f7159a6337008674afe81754d02b577812d734d559c38 -SIZE (heirloom-doctools-080407.tar.bz2) = 837016 +SHA256 (heirloom-doctools-141029.tar.bz2) = a0cd260050aaa22f63b9e7cd01d6b391e47c3c4b0f173121b1139d1c4fc33044 +SIZE (heirloom-doctools-141029.tar.bz2) = 904309 Index: files/patch-man =================================================================== --- files/patch-man (revision 372334) +++ files/patch-man (working copy) @@ -1,46 +1,7 @@ ---- ./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 @@ +--- checknr/Makefile.mk.orig 2014-10-29 21:31:21 UTC ++++ checknr/Makefile.mk +@@ -13,7 +13,7 @@ checknr: $(OBJ) 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 @@ -48,9 +9,9 @@ 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 @@ +--- eqn/checkeq.d/Makefile.mk.orig 2014-10-29 21:31:21 UTC ++++ eqn/checkeq.d/Makefile.mk +@@ -14,8 +14,8 @@ checkeq: $(OBJ) install: $(INSTALL) -c checkeq $(ROOT)$(BINDIR)/checkeq $(STRIP) $(ROOT)$(BINDIR)/checkeq @@ -61,22 +22,9 @@ 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 @@ +--- eqn/eqn.d/Makefile.mk.orig 2014-10-29 21:31:21 UTC ++++ eqn/eqn.d/Makefile.mk +@@ -23,10 +23,10 @@ install: test -d $(ROOT)$(BINDIR) || mkdir -p $(ROOT)$(BINDIR) $(INSTALL) -c eqn $(ROOT)$(BINDIR)/eqn $(STRIP) $(ROOT)$(BINDIR)/eqn @@ -90,10 +38,39 @@ + $(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 @@ + rm -f $(OBJ) eqn e.c y.tab.* core log *~ +--- eqn/neqn.d/Makefile.mk.orig 2014-10-29 21:31:21 UTC ++++ eqn/neqn.d/Makefile.mk +@@ -23,7 +23,7 @@ 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 ++ ln -s eqn.1 $(ROOT)$(MANDIR)/man1/neqn.1 + + clean: + rm -f $(OBJ) neqn e.c y.tab.* core log *~ +--- refer/Makefile.mk.orig 2014-10-29 21:31:21 UTC ++++ refer/Makefile.mk +@@ -73,12 +73,12 @@ install: all + $(INSTALL) -c papers/Rv7man $(ROOT)$(REFDIR)/papers/Rv7man + $(INSTALL) -c papers/runinv $(ROOT)$(REFDIR)/papers/runinv + cd $(ROOT)$(REFDIR)/papers && PATH=$(ROOT)$(REFDIR):$$PATH ./runinv +- for i in addbib.1b lookbib.1b refer.1b roffbib.1b sortbib.1b; \ ++ for i in addbib.1 lookbib.1 refer.1 roffbib.1 sortbib.1; \ + do \ +- $(INSTALL) -c -m 644 $$i $(ROOT)$(MANDIR)/man1b/$$i || exit; \ ++ $(INSTALL) -c -m 644 $${i}b $(ROOT)$(MANDIR)/man1/$$i || exit; \ + done + rm -f $(ROOT)$(MANDIR)/man1b/indxbib.1b +- ln -s lookbib.1b $(ROOT)$(MANDIR)/man1b/indxbib.1b ++ ln -s lookbib.1 $(ROOT)$(MANDIR)/man1/indxbib.1 + + clean: + rm -f $(ROBJ) refer $(AOBJ) addbib $(LOBJ) lookbib \ +--- soelim/Makefile.mk.orig 2014-10-29 21:31:21 UTC ++++ soelim/Makefile.mk +@@ -13,7 +13,7 @@ soelim: $(OBJ) install: $(INSTALL) -c soelim $(ROOT)$(BINDIR)/soelim $(STRIP) $(ROOT)$(BINDIR)/soelim @@ -102,9 +79,9 @@ 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 @@ +--- tbl/Makefile.mk.orig 2014-10-29 21:31:21 UTC ++++ tbl/Makefile.mk +@@ -14,7 +14,7 @@ tbl: $(OBJ) install: $(INSTALL) -c tbl $(ROOT)$(BINDIR)/tbl $(STRIP) $(ROOT)$(BINDIR)/tbl @@ -113,9 +90,31 @@ 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 @@ +--- troff/nroff.d/Makefile.mk.orig 2014-10-29 21:31:22 UTC ++++ troff/nroff.d/Makefile.mk +@@ -21,7 +21,7 @@ nroff: $(OBJ) $(LIBHNJ)/libhnj.a + 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 *~ +--- troff/troff.d/Makefile.mk.orig 2014-10-29 21:31:22 UTC ++++ troff/troff.d/Makefile.mk +@@ -29,7 +29,7 @@ install: + $(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: +--- vgrind/Makefile.mk.orig 2014-10-29 21:31:22 UTC ++++ vgrind/Makefile.mk +@@ -26,7 +26,7 @@ install: $(INSTALL) -c vfontedpr $(ROOT)$(LIBDIR)/vfontedpr $(STRIP) $(ROOT)$(LIBDIR)/vfontedpr $(INSTALL) -c -m 644 vgrindefs.src $(ROOT)$(LIBDIR)/vgrindefs Index: files/patch-mk.config =================================================================== --- files/patch-mk.config (revision 372334) +++ files/patch-mk.config (working copy) @@ -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. Index: pkg-descr =================================================================== --- pkg-descr (revision 372334) +++ pkg-descr (working copy) @@ -4,4 +4,4 @@ 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 Index: pkg-plist =================================================================== --- pkg-plist (revision 372334) +++ pkg-plist (working copy) @@ -1,6 +1,7 @@ bin/addbib bin/checkeq bin/checknr +bin/col bin/daps bin/dpost bin/eqn @@ -393,6 +394,7 @@ %%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 @@ -463,19 +465,3 @@ %%DATADIR%%/tmac/thesis.me %%DATADIR%%/tmac/v %%DATADIR%%/tmac/vgrind -@dirrmtry %%DATADIR%%/tmac -@dirrmtry %%DATADIR%%/pub -@dirrmtry %%DATADIR%%/nterm -@dirrmtry %%DATADIR%%/hyphen -@dirrmtry %%DATADIR%%/font/devpsmed -@dirrmtry %%DATADIR%%/font/devpslow -@dirrmtry %%DATADIR%%/font/devps -@dirrmtry %%DATADIR%%/font/devpost/postscript -@dirrmtry %%DATADIR%%/font/devpost/charlib -@dirrmtry %%DATADIR%%/font/devpost -@dirrmtry %%DATADIR%%/font/devaps -@dirrmtry %%DATADIR%%/font -@dirrmtry %%DATADIR%% -@dirrmtry %%LIBEXECDIR%%/reftools/papers -@dirrmtry %%LIBEXECDIR%%/reftools -@dirrmtry %%LIBEXECDIR%%