(Hopefully) fix Solaris PLIST. Addresses PR 32966 by Neil Hoggarth.

2 files changed, 36 insertions, 30 deletions

diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index ceb75514a43..716d8dbdbaf 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/02/05 23:11:02 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2006/03/05 19:23:21 wiz Exp $
 #
 
 DISTNAME=	groff-1.19.2
@@ -24,6 +24,12 @@ INFO_FILES=	groff
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "SunOS"
+PLIST_SUBST+=	GNU_PREFIX="g"
+.else
+PLIST_SUBST+=	GNU_PREFIX=""
+.endif
+
 .if defined(PAPERSIZE)
 CONFIGURE_ENV+=	PAGE=${PAPERSIZE:Q}
 .endif
diff --git a/textproc/groff/PLIST b/textproc/groff/PLIST
index 4cca419b1e3..be66b7231d1 100644
--- a/textproc/groff/PLIST
+++ b/textproc/groff/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2005/12/07 17:51:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/03/05 19:23:21 wiz Exp $
 bin/addftinfo
 bin/afmtodit
-bin/eqn
+bin/${GNU_PREFIX}eqn
 bin/eqn2graph
 bin/gdiffmk
 bin/grap2graph
-bin/grn
+bin/${GNU_PREFIX}grn
 bin/grodvi
 bin/groff
 bin/groffer
@@ -15,31 +15,31 @@ bin/grolj4
 bin/grops
 bin/grotty
 bin/hpftodit
-bin/indxbib
+bin/${GNU_PREFIX}indxbib
 bin/lkbib
-bin/lookbib
+bin/${GNU_PREFIX}lookbib
 bin/mmroff
-bin/neqn
-bin/nroff
+bin/${GNU_PREFIX}neqn
+bin/${GNU_PREFIX}nroff
 bin/pdfroff
 bin/pfbtops
-bin/pic
+bin/${GNU_PREFIX}pic
 bin/pic2graph
 bin/post-grohtml
 bin/pre-grohtml
-bin/refer
-bin/soelim
-bin/tbl
+bin/${GNU_PREFIX}refer
+bin/${GNU_PREFIX}soelim
+bin/${GNU_PREFIX}tbl
 bin/tfmtodit
-bin/troff
+bin/${GNU_PREFIX}troff
 lib/groff/groffer/groffer2.sh
 man/man1/addftinfo.1
 man/man1/afmtodit.1
-man/man1/eqn.1
+man/man1/${GNU_PREFIX}eqn.1
 man/man1/eqn2graph.1
 man/man1/gdiffmk.1
 man/man1/grap2graph.1
-man/man1/grn.1
+man/man1/${GNU_PREFIX}grn.1
 man/man1/grodvi.1
 man/man1/groff.1
 man/man1/groffer.1
@@ -50,21 +50,21 @@ man/man1/grolj4.1
 man/man1/grops.1
 man/man1/grotty.1
 man/man1/hpftodit.1
-man/man1/indxbib.1
+man/man1/${GNU_PREFIX}indxbib.1
 man/man1/lkbib.1
-man/man1/lookbib.1
+man/man1/${GNU_PREFIX}lookbib.1
 man/man1/mmroff.1
-man/man1/neqn.1
-man/man1/nroff.1
+man/man1/${GNU_PREFIX}neqn.1
+man/man1/${GNU_PREFIX}nroff.1
 man/man1/pdfroff.1
 man/man1/pfbtops.1
-man/man1/pic.1
+man/man1/${GNU_PREFIX}pic.1
 man/man1/pic2graph.1
-man/man1/refer.1
-man/man1/soelim.1
-man/man1/tbl.1
+man/man1/${GNU_PREFIX}refer.1
+man/man1/${GNU_PREFIX}soelim.1
+man/man1/${GNU_PREFIX}tbl.1
 man/man1/tfmtodit.1
-man/man1/troff.1
+man/man1/${GNU_PREFIX}troff.1
 man/man5/groff_font.5
 man/man5/groff_out.5
 man/man5/groff_tmac.5
@@ -407,7 +407,7 @@ share/groff/${PKGVERSION}/tmac/X.tmac
 share/groff/${PKGVERSION}/tmac/Xps.tmac
 share/groff/${PKGVERSION}/tmac/a4.tmac
 share/groff/${PKGVERSION}/tmac/an-old.tmac
-share/groff/${PKGVERSION}/tmac/an.tmac
+share/groff/${PKGVERSION}/tmac/${GNU_PREFIX}an.tmac
 share/groff/${PKGVERSION}/tmac/andoc.tmac
 share/groff/${PKGVERSION}/tmac/composite.tmac
 share/groff/${PKGVERSION}/tmac/cp1047.tmac
@@ -428,7 +428,7 @@ share/groff/${PKGVERSION}/tmac/latin2.tmac
 share/groff/${PKGVERSION}/tmac/latin9.tmac
 share/groff/${PKGVERSION}/tmac/lbp.tmac
 share/groff/${PKGVERSION}/tmac/lj4.tmac
-share/groff/${PKGVERSION}/tmac/m.tmac
+share/groff/${PKGVERSION}/tmac/${GNU_PREFIX}m.tmac
 share/groff/${PKGVERSION}/tmac/man.tmac
 share/groff/${PKGVERSION}/tmac/mandoc.tmac
 share/groff/${PKGVERSION}/tmac/mdoc.tmac
@@ -437,7 +437,7 @@ share/groff/${PKGVERSION}/tmac/mdoc/doc-ditroff
 share/groff/${PKGVERSION}/tmac/mdoc/doc-nroff
 share/groff/${PKGVERSION}/tmac/mdoc/doc-syms
 share/groff/${PKGVERSION}/tmac/me.tmac
-share/groff/${PKGVERSION}/tmac/mm.tmac
+share/groff/${PKGVERSION}/tmac/${GNU_PREFIX}mm.tmac
 share/groff/${PKGVERSION}/tmac/mm/0.MT
 share/groff/${PKGVERSION}/tmac/mm/4.MT
 share/groff/${PKGVERSION}/tmac/mm/5.MT
@@ -445,10 +445,10 @@ share/groff/${PKGVERSION}/tmac/mm/locale
 share/groff/${PKGVERSION}/tmac/mm/ms.cov
 share/groff/${PKGVERSION}/tmac/mm/se_locale
 share/groff/${PKGVERSION}/tmac/mm/se_ms.cov
-share/groff/${PKGVERSION}/tmac/mmse.tmac
+share/groff/${PKGVERSION}/tmac/${GNU_PREFIX}mmse.tmac
 share/groff/${PKGVERSION}/tmac/mom.tmac
 share/groff/${PKGVERSION}/tmac/ms.tmac
-share/groff/${PKGVERSION}/tmac/mse.tmac
+share/groff/${PKGVERSION}/tmac/${GNU_PREFIX}mse.tmac
 share/groff/${PKGVERSION}/tmac/om.tmac
 share/groff/${PKGVERSION}/tmac/papersize.tmac
 share/groff/${PKGVERSION}/tmac/pdfmark.tmac
@@ -457,7 +457,7 @@ share/groff/${PKGVERSION}/tmac/ps.tmac
 share/groff/${PKGVERSION}/tmac/psatk.tmac
 share/groff/${PKGVERSION}/tmac/psold.tmac
 share/groff/${PKGVERSION}/tmac/pspic.tmac
-share/groff/${PKGVERSION}/tmac/s.tmac
+share/groff/${PKGVERSION}/tmac/${GNU_PREFIX}s.tmac
 share/groff/${PKGVERSION}/tmac/safer.tmac
 share/groff/${PKGVERSION}/tmac/spdf.tmac
 share/groff/${PKGVERSION}/tmac/trace.tmac