Give up trying to code for the various tmac prefix cases and just

do that part dynamically.

2 files changed, 19 insertions, 31 deletions

diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 9ceed5f7a8e..06abd7244da 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2009/12/07 00:01:04 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2010/02/04 12:49:03 tnn Exp $
 #
 
 DISTNAME=	groff-1.20.1
@@ -52,35 +52,13 @@ PLIST_SRC+=		PLIST
 # 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.
+.if ${OPSYS} == "SunOS"
 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
 
-
 BUILD_DEFS+=	PAPERSIZE
 .if defined(PAPERSIZE)
 CONFIGURE_ENV+=	PAGE=${PAPERSIZE:Q}
@@ -101,6 +79,16 @@ post-install:
 		${DESTDIR}${PREFIX}/share/groff/site-tmac
 	${FIND} ${DESTDIR}${PREFIX}/lib/groff/site-tmac -type f -print | \
 		${SED} 's;${DESTDIR}${PREFIX}/;;g' > ${WRKDIR}/PLIST-local
+	${RUN}set -e; for f in an.tmac m.tmac mm.tmac mmse.tmac		\
+	  mse.tmac s.tmac; do						\
+	  for p in "" g; do						\
+	    line="share/groff/${PKGVERSION_NOREV}/tmac/$$p$$f";		\
+	    if [ -e "${DESTDIR}${PREFIX}/$$line" ]; then		\
+	      break;							\
+	    fi;								\
+	  done;								\
+	  ${ECHO} "$$line" >> ${WRKDIR}/PLIST-local;			\
+	done
 
 # 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 b9a27423fe2..198b8dbd88a 100644
--- a/textproc/groff/PLIST
+++ b/textproc/groff/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2009/10/21 16:51:46 tnn Exp $
+@comment $NetBSD: PLIST,v 1.21 2010/02/04 12:49:03 tnn Exp $
 bin/addftinfo
 bin/afmtodit
 bin/${GNU_PREFIX}eqn
@@ -409,7 +409,7 @@ share/groff/${PKGVERSION}/tmac/Xps.tmac
 share/groff/${PKGVERSION}/tmac/a4.tmac
 share/groff/${PKGVERSION}/tmac/an-ext.tmac
 share/groff/${PKGVERSION}/tmac/an-old.tmac
-share/groff/${PKGVERSION}/tmac/${GNU_PREFIX_AN_TMAC}an.tmac
+@comment handled dynamically: share/groff/${PKGVERSION}/tmac/an.tmac
 share/groff/${PKGVERSION}/tmac/andoc.tmac
 share/groff/${PKGVERSION}/tmac/composite.tmac
 share/groff/${PKGVERSION}/tmac/cp1047.tmac
@@ -444,7 +444,7 @@ share/groff/${PKGVERSION}/tmac/latin5.tmac
 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_WRAPPER}m.tmac
+@comment handled dynamically: share/groff/${PKGVERSION}/tmac/m.tmac
 share/groff/${PKGVERSION}/tmac/man.tmac
 share/groff/${PKGVERSION}/tmac/mandoc.tmac
 share/groff/${PKGVERSION}/tmac/mdoc.tmac
@@ -453,7 +453,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/${GNU_PREFIX_TMAC_WRAPPER}mm.tmac
+@comment handled dynamically: share/groff/${PKGVERSION}/tmac/mm.tmac
 share/groff/${PKGVERSION}/tmac/mm/0.MT
 share/groff/${PKGVERSION}/tmac/mm/4.MT
 share/groff/${PKGVERSION}/tmac/mm/5.MT
@@ -461,10 +461,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/${GNU_PREFIX_TMAC_WRAPPER}mmse.tmac
+@comment handled dynamically: share/groff/${PKGVERSION}/tmac/mmse.tmac
 share/groff/${PKGVERSION}/tmac/mom.tmac
 share/groff/${PKGVERSION}/tmac/ms.tmac
-share/groff/${PKGVERSION}/tmac/${GNU_PREFIX_TMAC_WRAPPER}mse.tmac
+@comment handled dynamically: share/groff/${PKGVERSION}/tmac/mse.tmac
 share/groff/${PKGVERSION}/tmac/om.tmac
 share/groff/${PKGVERSION}/tmac/papersize.tmac
 share/groff/${PKGVERSION}/tmac/pdfmark.tmac
@@ -473,7 +473,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/${GNU_PREFIX_S_TMAC}s.tmac
+@comment handled dynamically: share/groff/${PKGVERSION}/tmac/s.tmac
 share/groff/${PKGVERSION}/tmac/safer.tmac
 share/groff/${PKGVERSION}/tmac/spdf.tmac
 share/groff/${PKGVERSION}/tmac/sv.tmac