Change from using packaged install program and flags, to a do-install

target in pkgsrc, in order to have a better chance of installing on
Solaris and other platforms.

2 files changed, 50 insertions, 4 deletions

diff --git a/textproc/rtf-tools/Makefile b/textproc/rtf-tools/Makefile
index 9123493d459..d561a405a4f 100644
--- a/textproc/rtf-tools/Makefile
+++ b/textproc/rtf-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/12/11 20:16:10 ben Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/13 16:20:09 ben Exp $
 #
 
 DISTNAME=		RTF-1.10
@@ -21,11 +21,32 @@ post-patch:
 	for i in `${FIND} ${WRKSRC} -name Makefile`; do \
 		${MV} $$i $$i.bak;\
 		${SED} <$$i.bak >$$i \
-			-e 's|INSTALL = install|INSTALL = $${BSD_INSTALL}|g' \
 			-e "s|-DVARARGS|-DSTDARGS|g" \
 			-e "s|/usr/local|${PREFIX}|g" \
 			-e "s|/usr/man|${PREFIX}/man|" \
 			-e "s|\(LOCALBINDIR =.*\)|\1/bin|" ;\
 	done
 
+do-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/rtf-tools
+	${INSTALL_DATA} ${WRKSRC}/h/standard-names ${PREFIX}/lib/rtf-tools
+	cd ${WRKSRC}/lib && ${INSTALL_DATA} ansi-gen ansi-sym \
+		mac-gen mac-sym pc-gen pc-sym pca-gen pca-sym \
+		${PREFIX}/lib/rtf-tools
+	${INSTALL_DATA} ${WRKSRC}/rtf2text/text-map ${PREFIX}/lib/rtf-tools
+	cd ${WRKSRC}/rtf2troff && ${INSTALL_DATA} troff-map groff-map \
+		xroff-map dwbtroff-map troff-man-map troff-me-map \
+		troff-mm-map troff-ms-map ${PREFIX}/lib/rtf-tools
+	${INSTALL_SCRIPT} ${WRKSRC}/util/rtfchkmap ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/util/rtfmaptortf ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/rtf2null/rtf2null ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/rtf2text/rtf2text ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/rtf2troff/rtf2troff ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/rtf2troff/rtf2groff ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/rtfdiag/rtfdiag ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/rtfindent/rtfindent ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/rtfwc/rtfwc ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/rtf2troff.man \
+		${PREFIX}/man/manl/rtf2troff.l
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/troffcvt/Makefile b/textproc/troffcvt/Makefile
index 9d9e600e1b3..4376768ef68 100644
--- a/textproc/troffcvt/Makefile
+++ b/textproc/troffcvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/12/11 20:16:10 ben Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/13 16:20:09 ben Exp $
 #
 
 DISTNAME=		troffcvt-1.04
@@ -27,9 +27,34 @@ post-patch:
 			-e "s| -Xc||" \
 			-e "s|/usr/include/sys/feature_tests.h||" \
 			-e "s|/usr/tmp|/tmp|g" \
-			-e 's|/usr/ucb/install|$${BSD_INSTALL}|' \
 			-e "s|/usr/local|${PREFIX}|g" \
 			-e "s|/usr/local/man|${PREFIX}/man|" ;\
 	done
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/troffcvt/troffcvt ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tblcvt/tblcvt ${PREFIX}/bin
+	cd ${WRKSRC}/post && ${INSTALL_PROGRAM} tc2null tc2html tc2rtf tc2text \
+		${PREFIX}/bin
+	cd ${WRKSRC}/post && ${INSTALL_SCRIPT} troff2null tc2html-toc \
+		troff2html troff2rtf unroff ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/troffcvt
+	cd ${WRKSRC}/troffcvt && ${INSTALL_DATA} actions actions-html \
+		tc.man tc.man-html tc.me tc.me-html tc.mm tc.mm-html tc.ms \
+		tc.ms-html tc.mdoc tc.mdoc-html ${PREFIX}/lib/troffcvt
+	cd ${WRKSRC}/post && ${INSTALL_DATA} tcr-fonts html-fonts \
+		html-specials rtf-fonts rtf-spec-ansi rtf-spec-mac \
+		rtf-spec-pc rtf-spec-pca text-specials text-8-specials \
+		${PREFIX}/lib/troffcvt
+	${INSTALL_MAN} ${WRKSRC}/man/tblcvt.man ${PREFIX}/man/man1/tblcvt.1
+	${INSTALL_MAN} ${WRKSRC}/man/unroff.man ${PREFIX}/man/man1/unroff.1
+	${INSTALL_MAN} ${WRKSRC}/man/troff2rtf.man \
+		${PREFIX}/man/man1/troff2rtf.1
+	${INSTALL_MAN} ${WRKSRC}/man/tc2html-toc.man \
+		${PREFIX}/man/man1/tc2html-toc.1
+	${INSTALL_MAN} ${WRKSRC}/man/troff2html.man \
+		${PREFIX}/man/man1/troff2html.1
+	${INSTALL_MAN} ${WRKSRC}/man/tc2html.man ${PREFIX}/man/man1/tc2html.1
+	${INSTALL_MAN} ${WRKSRC}/man/troffcvt.man ${PREFIX}/man/man1/troffcvt.1
+
 .include "../../mk/bsd.pkg.mk"