[pkgsrc/trunk]: pkgsrc/textproc/groff Rearrange how the conditional plist sub...

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/29c65ecc4652
branches:  trunk
changeset: 396721:29c65ecc4652
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sat Aug 01 19:13:15 2009 +0000

description:
Rearrange how the conditional plist substitutions are done to be more
flexible. Adjust Solaris case to not expect gan.tmac. Fixes PR 35295.
Bump PKGREVISION as a precaution.

diffstat:

 textproc/groff/Makefile |  52 ++++++++++++++++++++++++++++++++++++------------
 textproc/groff/PLIST    |  12 +++++-----
 2 files changed, 45 insertions(+), 19 deletions(-)

diffs (123 lines):

diff -r 74609c94e19d -r 29c65ecc4652 textproc/groff/Makefile
--- a/textproc/groff/Makefile   Sat Aug 01 18:59:47 2009 +0000
+++ b/textproc/groff/Makefile   Sat Aug 01 19:13:15 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2009/02/24 20:41:45 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2009/08/01 19:13:15 dholland Exp $
 #
 
 DISTNAME=      groff-1.20.1
+PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GNU:=groff/}
 
@@ -36,23 +37,48 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS"
+#
+# Groff installs its own man and ms macros as mgan and mgs if the
+# configure script thinks replacing the system ones is not safe. Since
+# this depends heavily on exactly what the system macros are, each
+# vendor OS is likely to be different and possibly differ by version.
+#
+# 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.
+#
+# It also defaults to installing some of its own tools with a 'g'
+# prefix on some platforms.
+#
+
+.if ${OPSYS} == "HPUX"
+PLIST_SUBST+=  GNU_PREFIX=""
+PLIST_SUBST+=  GNU_PREFIX_TMAC_WRAPPER="g"
+PLIST_SUBST+=  GNU_PREFIX_AN_TMAC="g"
+PLIST_SUBST+=  GNU_PREFIX_S_TMAC="g"
+
+.elif ${OPSYS} == "OSF1"
+PLIST_SUBST+=  GNU_PREFIX=""
+PLIST_SUBST+=  GNU_PREFIX_TMAC_WRAPPER="g"
+PLIST_SUBST+=  GNU_PREFIX_AN_TMAC="g"
+PLIST_SUBST+=  GNU_PREFIX_S_TMAC="g"
+
+.elif ${OPSYS} == "SunOS"
+# According to PR 35295, on (at least) Solaris 10 for x86 you get
+# an.tmac and not gan.tmac. If this turns out not to be true for
+# earlier/other Solaris revs we'll need more conditionals in here.
 PLIST_SUBST+=  GNU_PREFIX="g"
+PLIST_SUBST+=  GNU_PREFIX_TMAC_WRAPPER="g"
+PLIST_SUBST+=  GNU_PREFIX_AN_TMAC=""
+PLIST_SUBST+=  GNU_PREFIX_S_TMAC="g"
+
 .else
 PLIST_SUBST+=  GNU_PREFIX=""
+PLIST_SUBST+=  GNU_PREFIX_TMAC_WRAPPER=""
+PLIST_SUBST+=  GNU_PREFIX_AN_TMAC=""
+PLIST_SUBST+=  GNU_PREFIX_S_TMAC=""
 .endif
 
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "HPUX"
-PLIST_SUBST+=  GNU_PREFIX_TMAC="g"
-.else
-PLIST_SUBST+=  GNU_PREFIX_TMAC=""
-.endif
-
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "HPUX" || ${OPSYS} == "OSF1"
-PLIST_SUBST+=  GNU_PREFIX_AN_TMAC="g"
-.else
-PLIST_SUBST+=  GNU_PREFIX_AN_TMAC=""
-.endif
 
 BUILD_DEFS+=   PAPERSIZE
 .if defined(PAPERSIZE)
diff -r 74609c94e19d -r 29c65ecc4652 textproc/groff/PLIST
--- a/textproc/groff/PLIST      Sat Aug 01 18:59:47 2009 +0000
+++ b/textproc/groff/PLIST      Sat Aug 01 19:13:15 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2009/06/14 21:36:31 joerg Exp $
+@comment $NetBSD: PLIST,v 1.19 2009/08/01 19:13:15 dholland Exp $
 bin/addftinfo
 bin/afmtodit
 bin/${GNU_PREFIX}eqn
@@ -445,7 +445,7 @@
 share/groff/${PKGVERSION}/tmac/latin9.tmac
 share/groff/${PKGVERSION}/tmac/lbp.tmac
 share/groff/${PKGVERSION}/tmac/lj4.tmac
-share/groff/${PKGVERSION}/tmac/${GNU_PREFIX_TMAC}m.tmac
+share/groff/${PKGVERSION}/tmac/${GNU_PREFIX_TMAC_WRAPPER}m.tmac
 share/groff/${PKGVERSION}/tmac/man.tmac
 share/groff/${PKGVERSION}/tmac/mandoc.tmac
 share/groff/${PKGVERSION}/tmac/mdoc.tmac
@@ -454,7 +454,7 @@
 share/groff/${PKGVERSION}/tmac/mdoc/doc-nroff
 share/groff/${PKGVERSION}/tmac/mdoc/doc-syms
 share/groff/${PKGVERSION}/tmac/me.tmac
-share/groff/${PKGVERSION}/tmac/${GNU_PREFIX_TMAC}mm.tmac
+share/groff/${PKGVERSION}/tmac/${GNU_PREFIX_TMAC_WRAPPER}mm.tmac
 share/groff/${PKGVERSION}/tmac/mm/0.MT
 share/groff/${PKGVERSION}/tmac/mm/4.MT
 share/groff/${PKGVERSION}/tmac/mm/5.MT
@@ -462,10 +462,10 @@
 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/${GNU_PREFIX_TMAC}mmse.tmac
+share/groff/${PKGVERSION}/tmac/${GNU_PREFIX_TMAC_WRAPPER}mmse.tmac
 share/groff/${PKGVERSION}/tmac/mom.tmac
 share/groff/${PKGVERSION}/tmac/ms.tmac
-share/groff/${PKGVERSION}/tmac/${GNU_PREFIX_TMAC}mse.tmac
+share/groff/${PKGVERSION}/tmac/${GNU_PREFIX_TMAC_WRAPPER}mse.tmac
 share/groff/${PKGVERSION}/tmac/om.tmac
 share/groff/${PKGVERSION}/tmac/papersize.tmac
 share/groff/${PKGVERSION}/tmac/pdfmark.tmac
@@ -474,7 +474,7 @@
 share/groff/${PKGVERSION}/tmac/psatk.tmac
 share/groff/${PKGVERSION}/tmac/psold.tmac
 share/groff/${PKGVERSION}/tmac/pspic.tmac
-share/groff/${PKGVERSION}/tmac/${GNU_PREFIX_AN_TMAC}s.tmac
+share/groff/${PKGVERSION}/tmac/${GNU_PREFIX_S_TMAC}s.tmac
 share/groff/${PKGVERSION}/tmac/safer.tmac
 share/groff/${PKGVERSION}/tmac/spdf.tmac
 share/groff/${PKGVERSION}/tmac/sv.tmac