[pkgsrc/trunk]: pkgsrc Give these packages a higher chance to install on Sola...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a8423eb8a0dd
branches:  trunk
changeset: 464517:a8423eb8a0dd
user:      ben <ben%pkgsrc.org@localhost>
date:      Thu Dec 11 20:16:10 2003 +0000

description:
Give these packages a higher chance to install on Solaris.

diffstat:

 devel/libetm/Makefile       |  4 ++--
 devel/libmemmgr/Makefile    |  4 ++--
 devel/libportlib/Makefile   |  4 ++--
 devel/libts/Makefile        |  4 ++--
 textproc/rtf-tools/Makefile |  3 ++-
 textproc/troffcvt/Makefile  |  4 ++--
 6 files changed, 12 insertions(+), 11 deletions(-)

diffs (106 lines):

diff -r 8a8bb888d22c -r a8423eb8a0dd devel/libetm/Makefile
--- a/devel/libetm/Makefile     Thu Dec 11 19:41:56 2003 +0000
+++ b/devel/libetm/Makefile     Thu Dec 11 20:16:10 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/12/11 19:24:33 ben Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/11 20:16:10 ben Exp $
 #
 
 DISTNAME=              ETM-1.09
@@ -15,7 +15,7 @@
        ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak
        ${SED} <${WRKSRC}/Makefile.bak >${WRKSRC}/Makefile \
                -e 's|/usr/local|${PREFIX}|' \
-               -e 's|install.sh|${INSTALL}|'
+               -e 's|install.sh|$${BSD_INSTALL}|'
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libetm
diff -r 8a8bb888d22c -r a8423eb8a0dd devel/libmemmgr/Makefile
--- a/devel/libmemmgr/Makefile  Thu Dec 11 19:41:56 2003 +0000
+++ b/devel/libmemmgr/Makefile  Thu Dec 11 20:16:10 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/12/11 19:24:33 ben Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/11 20:16:10 ben Exp $
 #
 
 DISTNAME=              MemMgr-1.04
@@ -17,7 +17,7 @@
        ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak
        ${SED} <${WRKSRC}/Makefile.bak >${WRKSRC}/Makefile \
                -e 's|/usr/local|${PREFIX}|' \
-               -e 's|/usr/ucb/install|${INSTALL}|'
+               -e 's|/usr/ucb/install|$${BSD_INSTALL}|'
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libmemmgr
diff -r 8a8bb888d22c -r a8423eb8a0dd devel/libportlib/Makefile
--- a/devel/libportlib/Makefile Thu Dec 11 19:41:56 2003 +0000
+++ b/devel/libportlib/Makefile Thu Dec 11 20:16:10 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/12/11 19:24:33 ben Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/11 20:16:10 ben Exp $
 #
 
 DISTNAME=              portlib-1.01
@@ -15,6 +15,6 @@
        ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak
        ${SED} <${WRKSRC}/Makefile.bak >${WRKSRC}/Makefile \
                -e 's|/usr/local|${PREFIX}|' \
-               -e 's|/usr/ucb/install|${INSTALL}|'
+               -e 's|/usr/ucb/install|$${BSD_INSTALL}|'
 
 .include "../../mk/bsd.pkg.mk"
diff -r 8a8bb888d22c -r a8423eb8a0dd devel/libts/Makefile
--- a/devel/libts/Makefile      Thu Dec 11 19:41:56 2003 +0000
+++ b/devel/libts/Makefile      Thu Dec 11 20:16:10 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/12/11 19:24:33 ben Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/11 20:16:10 ben Exp $
 #
 
 DISTNAME=              TS-1.08
@@ -15,7 +15,7 @@
        ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak
        ${SED} <${WRKSRC}/Makefile.bak >${WRKSRC}/Makefile \
                -e "s|/usr/local|${PREFIX}|" \
-               -e "s|install.sh|${INSTALL}|"
+               -e 's|install.sh|$${BSD_INSTALL}|'
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libts
diff -r 8a8bb888d22c -r a8423eb8a0dd textproc/rtf-tools/Makefile
--- a/textproc/rtf-tools/Makefile       Thu Dec 11 19:41:56 2003 +0000
+++ b/textproc/rtf-tools/Makefile       Thu Dec 11 20:16:10 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/12/11 19:41:56 ben Exp $
+# $NetBSD: Makefile,v 1.10 2003/12/11 20:16:10 ben Exp $
 #
 
 DISTNAME=              RTF-1.10
@@ -21,6 +21,7 @@
        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|" \
diff -r 8a8bb888d22c -r a8423eb8a0dd textproc/troffcvt/Makefile
--- a/textproc/troffcvt/Makefile        Thu Dec 11 19:41:56 2003 +0000
+++ b/textproc/troffcvt/Makefile        Thu Dec 11 20:16:10 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/12/11 19:24:33 ben Exp $
+# $NetBSD: Makefile,v 1.6 2003/12/11 20:16:10 ben Exp $
 #
 
 DISTNAME=              troffcvt-1.04
@@ -27,7 +27,7 @@
                        -e "s| -Xc||" \
                        -e "s|/usr/include/sys/feature_tests.h||" \
                        -e "s|/usr/tmp|/tmp|g" \
-                       -e "s|/usr/ucb/install|${INSTALL}|" \
+                       -e 's|/usr/ucb/install|$${BSD_INSTALL}|' \
                        -e "s|/usr/local|${PREFIX}|g" \
                        -e "s|/usr/local/man|${PREFIX}/man|" ;\
        done