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.

4 files changed, 21 insertions, 15 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