[pkgsrc/trunk]: pkgsrc Change from using packaged install program and flags, ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Change from using packaged install program and flags, ...
From: ben <ben%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:14:30 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba95c61a5e3b
branches:  trunk
changeset: 464600:ba95c61a5e3b
user:      ben <ben%pkgsrc.org@localhost>
date:      Sat Dec 13 16:20:09 2003 +0000

description:
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.

diffstat:

 devel/libetm/Makefile       |   9 +++++----
 devel/libmemmgr/Makefile    |   9 +++++----
 devel/libportlib/Makefile   |   9 ++++++---
 devel/libts/Makefile        |   9 +++++----
 textproc/rtf-tools/Makefile |  25 +++++++++++++++++++++++--
 textproc/troffcvt/Makefile  |  29 +++++++++++++++++++++++++++--
 6 files changed, 71 insertions(+), 19 deletions(-)

diffs (182 lines):

diff -r d3102a8e7324 -r ba95c61a5e3b devel/libetm/Makefile
--- a/devel/libetm/Makefile     Sat Dec 13 12:09:24 2003 +0000
+++ b/devel/libetm/Makefile     Sat Dec 13 16:20:09 2003 +0000
@@ -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 @@
 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 -r d3102a8e7324 -r ba95c61a5e3b devel/libmemmgr/Makefile
--- a/devel/libmemmgr/Makefile  Sat Dec 13 12:09:24 2003 +0000
+++ b/devel/libmemmgr/Makefile  Sat Dec 13 16:20:09 2003 +0000
@@ -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 @@
 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 -r d3102a8e7324 -r ba95c61a5e3b devel/libportlib/Makefile
--- a/devel/libportlib/Makefile Sat Dec 13 12:09:24 2003 +0000
+++ b/devel/libportlib/Makefile Sat Dec 13 16:20:09 2003 +0000
@@ -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 @@
 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 -r d3102a8e7324 -r ba95c61a5e3b devel/libts/Makefile
--- a/devel/libts/Makefile      Sat Dec 13 12:09:24 2003 +0000
+++ b/devel/libts/Makefile      Sat Dec 13 16:20:09 2003 +0000
@@ -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 @@
 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 -r d3102a8e7324 -r ba95c61a5e3b textproc/rtf-tools/Makefile
--- a/textproc/rtf-tools/Makefile       Sat Dec 13 12:09:24 2003 +0000
+++ b/textproc/rtf-tools/Makefile       Sat Dec 13 16:20:09 2003 +0000
@@ -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 @@
        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 -r d3102a8e7324 -r ba95c61a5e3b textproc/troffcvt/Makefile
--- a/textproc/troffcvt/Makefile        Sat Dec 13 12:09:24 2003 +0000
+++ b/textproc/troffcvt/Makefile        Sat Dec 13 16:20:09 2003 +0000
@@ -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 @@
                        -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"
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of textproc/gsed to versi on 4.0.8 [bu...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc - gsed-4.0.8
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of textproc/gsed to versi on 4.0.8 [bu...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc - gsed-4.0.8
Indexes:
Home | Main Index | Thread Index | Old Index