diff options
author | ben <ben> | 2003-12-13 16:20:09 +0000 |
---|---|---|
committer | ben <ben> | 2003-12-13 16:20:09 +0000 |
commit | 64b880c38d904fd261d18b763dbcad55ace6eb72 (patch) | |
tree | a948ec63b83a047728fe0aea6d7c9637b50bf496 | |
parent | e326f2daf165eea354952c02956a571266de2f55 (diff) | |
download | pkgsrc-64b880c38d904fd261d18b763dbcad55ace6eb72.tar.gz |
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.
-rw-r--r-- | devel/libetm/Makefile | 9 | ||||
-rw-r--r-- | devel/libmemmgr/Makefile | 9 | ||||
-rw-r--r-- | devel/libportlib/Makefile | 9 | ||||
-rw-r--r-- | devel/libts/Makefile | 9 | ||||
-rw-r--r-- | textproc/rtf-tools/Makefile | 25 | ||||
-rw-r--r-- | textproc/troffcvt/Makefile | 29 |
6 files changed, 71 insertions, 19 deletions
diff --git a/devel/libetm/Makefile b/devel/libetm/Makefile index 65d907169ca..324f857b270 100644 --- a/devel/libetm/Makefile +++ b/devel/libetm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/12/11 20:16:10 ben Exp $ +# $NetBSD: Makefile,v 1.8 2003/12/13 16:20:09 ben Exp $ # DISTNAME= ETM-1.09 @@ -14,10 +14,11 @@ COMMENT= Exception and termination manager post-patch: ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak ${SED} <${WRKSRC}/Makefile.bak >${WRKSRC}/Makefile \ - -e 's|/usr/local|${PREFIX}|' \ - -e 's|install.sh|$${BSD_INSTALL}|' + -e 's|/usr/local|${PREFIX}|' -post-install: +do-install: + ${INSTALL_DATA} ${WRKSRC}/libetm.a ${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/etm.h ${PREFIX}/include ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libetm groff -Tascii -ms ${WRKSRC}/etm.ms \ >${PREFIX}/share/doc/libetm/etm.txt diff --git a/devel/libmemmgr/Makefile b/devel/libmemmgr/Makefile index bd10fe7039b..681fc493c84 100644 --- a/devel/libmemmgr/Makefile +++ b/devel/libmemmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/12/11 20:16:10 ben Exp $ +# $NetBSD: Makefile,v 1.8 2003/12/13 16:20:09 ben Exp $ # DISTNAME= MemMgr-1.04 @@ -16,10 +16,11 @@ BUILD_DEPENDS+= libetm-1.09:../../devel/libetm post-patch: ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak ${SED} <${WRKSRC}/Makefile.bak >${WRKSRC}/Makefile \ - -e 's|/usr/local|${PREFIX}|' \ - -e 's|/usr/ucb/install|$${BSD_INSTALL}|' + -e 's|/usr/local|${PREFIX}|' -post-install: +do-install: + ${INSTALL_DATA} ${WRKSRC}/libmemmgr.a ${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/memmgr.h ${PREFIX}/include ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libmemmgr groff -Tascii -ms ${WRKSRC}/memmgr.ms \ >${PREFIX}/share/doc/libmemmgr/memmgr.txt diff --git a/devel/libportlib/Makefile b/devel/libportlib/Makefile index 0e0418b7309..c964fc8126a 100644 --- a/devel/libportlib/Makefile +++ b/devel/libportlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/12/11 20:16:10 ben Exp $ +# $NetBSD: Makefile,v 1.8 2003/12/13 16:20:09 ben Exp $ # DISTNAME= portlib-1.01 @@ -14,7 +14,10 @@ COMMENT= Portable file locking and directory reading post-patch: ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak ${SED} <${WRKSRC}/Makefile.bak >${WRKSRC}/Makefile \ - -e 's|/usr/local|${PREFIX}|' \ - -e 's|/usr/ucb/install|$${BSD_INSTALL}|' + -e 's|/usr/local|${PREFIX}|' + +do-install: + ${INSTALL_DATA} ${WRKSRC}/libport.a ${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/portlib.h ${PREFIX}/include .include "../../mk/bsd.pkg.mk" diff --git a/devel/libts/Makefile b/devel/libts/Makefile index f51dc14d8f1..7cd47e86717 100644 --- a/devel/libts/Makefile +++ b/devel/libts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/12/11 20:16:10 ben Exp $ +# $NetBSD: Makefile,v 1.8 2003/12/13 16:20:09 ben Exp $ # DISTNAME= TS-1.08 @@ -14,10 +14,11 @@ COMMENT= Library of simple token-scanning routines post-patch: ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak ${SED} <${WRKSRC}/Makefile.bak >${WRKSRC}/Makefile \ - -e "s|/usr/local|${PREFIX}|" \ - -e 's|install.sh|$${BSD_INSTALL}|' + -e "s|/usr/local|${PREFIX}|" -post-install: +do-install: + ${INSTALL_DATA} ${WRKSRC}/libtokenscan.a ${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/tokenscan.h ${PREFIX}/include ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libts groff -Tascii -ms ${WRKSRC}/tokenscan.ms \ >${PREFIX}/share/doc/libts/tokenscan.txt 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" |