Use "$(TOOLS_PLATFORM.install)" instead of hard coded "install" to

fix build problems under Solaris. Based on a suggestion by Aleksey Cheusov.

8 files changed, 25 insertions, 24 deletions

diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 64df615c48b..4173a63d14f 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2006/12/29 13:54:22 joerg Exp $
+# $NetBSD: Makefile,v 1.60 2007/04/01 12:45:39 tron Exp $
 
 DISTNAME=	clisp-2.39
 PKGREVISION=	1
@@ -36,6 +36,7 @@ MODULES+=		--with-module=pcre --with-module=rawsock
 MODULES+=		--with-module=wildcard --with-module=zlib
 CONFIGURE_ARGS+=	${MODULES}
 TEST_TARGET=		check
+MAKE_ENV+=		TOOLS_PLATFORM.install=${TOOLS_PLATFORM.install:Q}
 MAKE_FLAGS+=		mandir=${PREFIX}/${PKGMANDIR}
 
 post-patch:
diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo
index df7c4eae23f..a867d2ecd91 100644
--- a/lang/clisp/distinfo
+++ b/lang/clisp/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.14 2007/03/29 12:00:13 tron Exp $
+$NetBSD: distinfo,v 1.15 2007/04/01 12:45:39 tron Exp $
 
 SHA1 (clisp-2.39.tar.bz2) = 388cc208cd0bd05a154840e83a4b824a493acbc0
 RMD160 (clisp-2.39.tar.bz2) = b31e53cb97a116c683543ee74093fe2a05ed9ea4
 Size (clisp-2.39.tar.bz2) = 8071957 bytes
 SHA1 (patch-aa) = ede749303e82d436fef9b2068949569a854c892b
-SHA1 (patch-ab) = 3d8d1899074e0902b3e7e887b99ebb75db1c29c2
+SHA1 (patch-ab) = fd045706d0cbcf6fd417eba5636d11ab1d3e9329
 SHA1 (patch-ac) = 8e784d081c8ea276661b5a11ded5d856d3b2dfdc
 SHA1 (patch-ad) = aa5cf0719299e0b8c59cdf19c52cadb9451204cf
 SHA1 (patch-ae) = e6766368b19b0d2e6ac21e9919dfb88e792caa03
 SHA1 (patch-af) = 2919a13a8ca8266f5d608f4dbe35f14803c7595d
 SHA1 (patch-ag) = f3ce92e3f0806197015b971cce24311a5a447050
-SHA1 (patch-ah) = b7d290fa06fe7d2d3648f0a981e200c25b21bd37
-SHA1 (patch-ai) = cf03b0da74bb03badee234c2eddf6a0dbeccf0c1
-SHA1 (patch-aj) = 874ee2d9be6d6a0b38ab52db398c9ab672b7bba7
-SHA1 (patch-ak) = e38b6fcaec9a2b271bc8862b1668037e58d956ab
-SHA1 (patch-al) = 660a26bbf89650d3d2c0a73518f60cb97812e6dd
+SHA1 (patch-ah) = 6a607e00e1815fe332325a91865889a03c60c3a0
+SHA1 (patch-ai) = 8291cfd4c27cbb22d5a72168cdb21c6d26400f54
+SHA1 (patch-aj) = 37af4382519ddb21587006789165ba1173e17577
+SHA1 (patch-ak) = 748c6638cab0f401d8f1f4e60df8cf5394d593ca
+SHA1 (patch-al) = 90ec5cc5028dba1ecda7d499def88303cbff2d2a
diff --git a/lang/clisp/patches/patch-ab b/lang/clisp/patches/patch-ab
index bf4719eb028..4c2bf0b440f 100644
--- a/lang/clisp/patches/patch-ab
+++ b/lang/clisp/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.11 2007/03/29 12:00:14 tron Exp $
+$NetBSD: patch-ab,v 1.12 2007/04/01 12:45:39 tron Exp $
 
 --- libcharset/Makefile.in.orig	2005-03-23 21:27:45.000000000 +0200
 +++ libcharset/Makefile.in
@@ -8,8 +8,8 @@ $NetBSD: patch-ab,v 1.11 2007/03/29 12:00:14 tron Exp $
  	$(mkinstalldirs) $(includedir)
 -	$(INSTALL_DATA) include/libcharset.h $(includedir)/libcharset.h
 -	$(INSTALL_DATA) include/localcharset.h $(includedir)/localcharset.h
-+	install -c -m 644 include/libcharset.h $(includedir)/libcharset.h
-+	install -c -m 644 include/localcharset.h $(includedir)/localcharset.h
++	$(TOOLS_PLATFORM.install) -c -m 644 include/libcharset.h $(includedir)/libcharset.h
++	$(TOOLS_PLATFORM.install) -c -m 644 include/localcharset.h $(includedir)/localcharset.h
  
  install : include/libcharset.h include/localcharset.h force
  	cd lib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
diff --git a/lang/clisp/patches/patch-ah b/lang/clisp/patches/patch-ah
index 746d800be74..e14223962cb 100644
--- a/lang/clisp/patches/patch-ah
+++ b/lang/clisp/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.4 2007/03/29 12:00:14 tron Exp $
+$NetBSD: patch-ah,v 1.5 2007/04/01 12:45:39 tron Exp $
 
 --- libcharset/lib/Makefile.in.orig	2005-03-23 21:28:10.000000000 +0200
 +++ libcharset/lib/Makefile.in
@@ -7,12 +7,12 @@ $NetBSD: patch-ah,v 1.4 2007/03/29 12:00:14 tron Exp $
  install-lib : all force
  	$(mkinstalldirs) $(libdir)
 -	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
-+	$(LIBTOOL_INSTALL) install -c -m 644 libcharset.la $(libdir)/libcharset.la
++	$(LIBTOOL_INSTALL) $(TOOLS_PLATFORM.install) -c -m 644 libcharset.la $(libdir)/libcharset.la
  	test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
  	                                || orig=charset.alias; \
  	sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
 -	$(INSTALL_DATA) $(libdir)/t-charset.alias $(libdir)/charset.alias; \
-+	install -c -m 644 $(libdir)/t-charset.alias $(libdir)/charset.alias; \
++	$(TOOLS_PLATFORM.install) -c -m 644 $(libdir)/t-charset.alias $(libdir)/charset.alias; \
  	rm -f $(libdir)/t-charset.alias
  
  # The following is needed in order to install a simple file in $(libdir)
diff --git a/lang/clisp/patches/patch-ai b/lang/clisp/patches/patch-ai
index 079934b7253..a6541326da6 100644
--- a/lang/clisp/patches/patch-ai
+++ b/lang/clisp/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.4 2007/03/29 12:00:14 tron Exp $
+$NetBSD: patch-ai,v 1.5 2007/04/01 12:45:39 tron Exp $
 
 --- ffcall/avcall/Makefile.in.orig	2006-04-25 11:10:43.000000000 +0300
 +++ ffcall/avcall/Makefile.in
@@ -7,10 +7,10 @@ $NetBSD: patch-ai,v 1.4 2007/03/29 12:00:14 tron Exp $
  install-lib : all force
  	if [ ! -d $(libdir) ] ; then mkdir $(libdir) ; fi
 -	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libavcall.la $(libdir)/libavcall.la
-+	$(LIBTOOL_INSTALL) install -c -m 644 libavcall.la $(libdir)/libavcall.la
++	$(LIBTOOL_INSTALL) $(TOOLS_PLATFORM.install) -c -m 644 libavcall.la $(libdir)/libavcall.la
  	if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi
 -	$(INSTALL_DATA) avcall.h $(includedir)/avcall.h
-+	install -c -m 644 avcall.h $(includedir)/avcall.h
++	$(TOOLS_PLATFORM.install) -c -m 644 avcall.h $(includedir)/avcall.h
  
  install : all force
  	if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi
diff --git a/lang/clisp/patches/patch-aj b/lang/clisp/patches/patch-aj
index d5176529c52..d998ce2db31 100644
--- a/lang/clisp/patches/patch-aj
+++ b/lang/clisp/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.3 2007/03/29 12:00:15 tron Exp $
+$NetBSD: patch-aj,v 1.4 2007/04/01 12:45:40 tron Exp $
 
 --- ffcall/callback/Makefile.in.orig	2005-03-27 05:13:45.000000000 +0300
 +++ ffcall/callback/Makefile.in
@@ -7,10 +7,10 @@ $NetBSD: patch-aj,v 1.3 2007/03/29 12:00:15 tron Exp $
  	cd @subdir@; $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)'
  	if [ ! -d $(libdir) ] ; then mkdir $(libdir) ; fi
 -	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcallback.la $(libdir)/libcallback.la
-+	$(LIBTOOL_INSTALL) install -c -m 644 libcallback.la $(libdir)/libcallback.la
++	$(LIBTOOL_INSTALL) $(TOOLS_PLATFORM.install) -c -m 644 libcallback.la $(libdir)/libcallback.la
  	if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi
 -	$(INSTALL_DATA) callback.h $(includedir)/callback.h
-+	install -c -m 644 callback.h $(includedir)/callback.h
++	$(TOOLS_PLATFORM.install) -c -m 644 callback.h $(includedir)/callback.h
  
  install : force
  	cd @subdir@; $(MAKE) install
diff --git a/lang/clisp/patches/patch-ak b/lang/clisp/patches/patch-ak
index c342d713a8d..9a7292361a7 100644
--- a/lang/clisp/patches/patch-ak
+++ b/lang/clisp/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.3 2007/03/29 12:00:15 tron Exp $
+$NetBSD: patch-ak,v 1.4 2007/04/01 12:45:40 tron Exp $
 
 --- ffcall/callback/vacall_r/Makefile.in.orig	2006-04-25 11:10:44.000000000 +0300
 +++ ffcall/callback/vacall_r/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ak,v 1.3 2007/03/29 12:00:15 tron Exp $
  install-lib : all force
  	if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi
 -	$(INSTALL_DATA) vacall_r.h $(includedir)/vacall_r.h
-+	install -c -m 644 vacall_r.h $(includedir)/vacall_r.h
++	$(TOOLS_PLATFORM.install) -c -m 644 vacall_r.h $(includedir)/vacall_r.h
  
  install : all force
  	if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi
diff --git a/lang/clisp/patches/patch-al b/lang/clisp/patches/patch-al
index 66312c03609..17d1fd36a85 100644
--- a/lang/clisp/patches/patch-al
+++ b/lang/clisp/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.1 2007/03/29 12:00:16 tron Exp $
+$NetBSD: patch-al,v 1.2 2007/04/01 12:45:40 tron Exp $
 
 --- ffcall/callback/trampoline_r/Makefile.in.orig	2006-04-28 11:10:31.000000000 +0300
 +++ ffcall/callback/trampoline_r/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-al,v 1.1 2007/03/29 12:00:16 tron Exp $
  install-lib : all force
  	if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi
 -	$(INSTALL_DATA) trampoline_r.h $(includedir)/trampoline_r.h
-+	install -c -m 644 trampoline_r.h $(includedir)/trampoline_r.h
++	$(TOOLS_PLATFORM.install) -c -m 644 trampoline_r.h $(includedir)/trampoline_r.h
  
  install : all force
  	if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi