gnu updates for groff with special fixup for chem.1 manpage not g' prefixed

add dependency to gtexinfo when building docs
remove special SunOS processing which seems unnecessary now.

TODO: there are still some apparent fonts issues indicated in the build logs

3 files changed, 79 insertions, 33 deletions

diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index ba0b5fb812a..54ce92251ad 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2015/06/12 10:51:20 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2015/10/02 11:33:14 richard Exp $
 
 DISTNAME=	groff-1.22.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=groff/}
 
@@ -49,11 +49,6 @@ BUILD_DEFS+=	PAPERSIZE
 CONFIGURE_ENV+=	PAGE=${PAPERSIZE:Q}
 .endif
 
-.include "../../mk/compiler.mk"
-.if !empty(CC_VERSION:Mgcc-4.[6-9].*)
-CFLAGS.SunOS+=		-std=c99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
-.endif
-
 post-extract:
 	${CP} -p ${FILESDIR}/*.c ${WRKSRC}
 
@@ -75,6 +70,12 @@ post-patch:
 # It also installs wrappers around the system macros for a variety of
 # other traditional macro packages, if those macros don't have an FSF
 # copyright.
+SYMLINK_FILES=	chem diffmk eqn grn indxbib lookbib neqn nroff pic refer \
+		soelim tbl troff
+SYMLINK_MANFILES=	chem.1 eqn.1 grn.1 indxbib.1 lookbib.1 neqn.1 nroff.1 \
+		pic.1 refer.1 soelim.1 tbl.1 troff.1
+
+INSTALLATION_DIRS=	${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/mdoc.local \
@@ -91,6 +92,24 @@ post-install:
 	  done;								\
 	  ${ECHO} "$$line" >> ${WRKDIR}/PLIST-local;			\
 	done
+.for f in ${SYMLINK_FILES}
+	if [ -f ${DESTDIR}${PREFIX}/bin/g${f} ]; then			\
+	    ${LN} -sf ../../bin/g${f}					\
+		${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f};		\
+	fi
+.endfor
+# fixup where necessary and symlink man pages
+.for f in ${SYMLINK_MANFILES}
+	if [ -f ${DESTDIR}${PREFIX}/man/man1/g${f} ]; then		\
+	    ${LN} -sf ../../../man/man1/g${f}				\
+		${DESTDIR}${PREFIX}/${PKGGNUDIR}man/man1/${f};		\
+	elif [ -f ${DESTDIR}${PREFIX}/man/man1/${f} ]; then		\
+	    ${MV} -f ${DESTDIR}${PREFIX}/man/man1/${f}			\
+		${DESTDIR}${PREFIX}/man/man1/g${f};			\
+	    ${LN} -sf ../../../man/man1/g${f}				\
+		${DESTDIR}${PREFIX}/${PKGGNUDIR}man/man1/${f};		\
+	fi
+.endfor
 
 # we only want the charset.alias file, so no buildlinkery for libiconv
 DEPENDS+=	libiconv-[0-9]*:../../converters/libiconv
diff --git a/textproc/groff/PLIST b/textproc/groff/PLIST
index 0cf2be2a5b0..bf590f99f29 100644
--- a/textproc/groff/PLIST
+++ b/textproc/groff/PLIST
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.24 2015/01/08 09:02:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.25 2015/10/02 11:33:14 richard Exp $
 bin/addftinfo
 bin/afmtodit
-bin/chem
-bin/eqn
+bin/gchem
+bin/geqn
 bin/eqn2graph
 bin/gdiffmk
 bin/glilypond
 bin/gperl
 bin/gpinyin
 bin/grap2graph
-bin/grn
+bin/ggrn
 bin/grodvi
 bin/groff
 bin/groffer
@@ -20,31 +20,56 @@ bin/gropdf
 bin/grops
 bin/grotty
 bin/hpftodit
-bin/indxbib
+bin/gindxbib
 bin/lkbib
-bin/lookbib
+bin/glookbib
 bin/mmroff
-bin/neqn
-bin/nroff
+bin/gneqn
+bin/gnroff
 bin/pdfmom
 bin/pdfroff
 bin/pfbtops
-bin/pic
+bin/gpic
 bin/pic2graph
 bin/post-grohtml
 bin/pre-grohtml
 bin/preconv
-bin/refer
+bin/grefer
 bin/roff2dvi
 bin/roff2html
 bin/roff2pdf
 bin/roff2ps
 bin/roff2text
 bin/roff2x
-bin/soelim
-bin/tbl
+bin/gsoelim
+bin/gtbl
 bin/tfmtodit
-bin/troff
+bin/gtroff
+gnu/bin/chem
+gnu/bin/diffmk
+gnu/bin/eqn
+gnu/bin/grn
+gnu/bin/indxbib
+gnu/bin/lookbib
+gnu/bin/neqn
+gnu/bin/nroff
+gnu/bin/pic
+gnu/bin/refer
+gnu/bin/soelim
+gnu/bin/tbl
+gnu/bin/troff
+gnu/man/man1/chem.1
+gnu/man/man1/eqn.1
+gnu/man/man1/grn.1
+gnu/man/man1/indxbib.1
+gnu/man/man1/lookbib.1
+gnu/man/man1/neqn.1
+gnu/man/man1/nroff.1
+gnu/man/man1/pic.1
+gnu/man/man1/refer.1
+gnu/man/man1/soelim.1
+gnu/man/man1/tbl.1
+gnu/man/man1/troff.1
 info/groff.info
 lib/groff/glilypond/args.pl
 lib/groff/glilypond/oop_fh.pl
@@ -60,15 +85,15 @@ lib/groff/groffer/version.sh
 lib/groff/grog/subs.pl
 man/man1/addftinfo.1
 man/man1/afmtodit.1
-man/man1/chem.1
-man/man1/eqn.1
+man/man1/gchem.1
+man/man1/geqn.1
 man/man1/eqn2graph.1
 man/man1/gdiffmk.1
 man/man1/glilypond.1
 man/man1/gperl.1
 man/man1/gpinyin.1
 man/man1/grap2graph.1
-man/man1/grn.1
+man/man1/ggrn.1
 man/man1/grodvi.1
 man/man1/groff.1
 man/man1/groffer.1
@@ -80,29 +105,29 @@ man/man1/gropdf.1
 man/man1/grops.1
 man/man1/grotty.1
 man/man1/hpftodit.1
-man/man1/indxbib.1
+man/man1/gindxbib.1
 man/man1/lkbib.1
-man/man1/lookbib.1
+man/man1/glookbib.1
 man/man1/mmroff.1
-man/man1/neqn.1
-man/man1/nroff.1
+man/man1/gneqn.1
+man/man1/gnroff.1
 man/man1/pdfmom.1
 man/man1/pdfroff.1
 man/man1/pfbtops.1
-man/man1/pic.1
+man/man1/gpic.1
 man/man1/pic2graph.1
 man/man1/preconv.1
-man/man1/refer.1
+man/man1/grefer.1
 man/man1/roff2dvi.1
 man/man1/roff2html.1
 man/man1/roff2pdf.1
 man/man1/roff2ps.1
 man/man1/roff2text.1
 man/man1/roff2x.1
-man/man1/soelim.1
-man/man1/tbl.1
+man/man1/gsoelim.1
+man/man1/gtbl.1
 man/man1/tfmtodit.1
-man/man1/troff.1
+man/man1/gtroff.1
 man/man5/groff_font.5
 man/man5/groff_out.5
 man/man5/groff_tmac.5
diff --git a/textproc/groff/options.mk b/textproc/groff/options.mk
index 5eaa8f47bfe..8f1e534f7b1 100644
--- a/textproc/groff/options.mk
+++ b/textproc/groff/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2007/02/22 19:27:13 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2015/10/02 11:33:14 richard Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.groff
 PKG_SUPPORTED_OPTIONS=	groff-docs x11
@@ -7,6 +7,8 @@ PKG_SUGGESTED_OPTIONS=	groff-docs x11
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgroff-docs)
+BUILD_DEPENDS+=	gtexinfo>=4.8:../../devel/gtexinfo
+CONFIGURE_ARGS+=	ac_cv_prog_MAKEINFO=${LOCALBASE}/bin/makeinfo
 DEPENDS+=		netpbm>=10.0:../../graphics/netpbm
 DEPENDS+=		psutils>=1.17:../../print/psutils
 USE_TOOLS+=		gs:run