Make this build as non-root user. Patches provided by Aleksey Cheusov

in PR pkg/34987. This also fixes PR pkg/36096.

7 files changed, 98 insertions, 1 deletions

diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo
index 79f3f422b29..df7c4eae23f 100644
--- a/lang/clisp/distinfo
+++ b/lang/clisp/distinfo
@@ -1,11 +1,17 @@
-$NetBSD: distinfo,v 1.13 2006/07/20 23:05:43 perry Exp $
+$NetBSD: distinfo,v 1.14 2007/03/29 12:00:13 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-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
diff --git a/lang/clisp/patches/patch-ab b/lang/clisp/patches/patch-ab
new file mode 100644
index 00000000000..bf4719eb028
--- /dev/null
+++ b/lang/clisp/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.11 2007/03/29 12:00:14 tron Exp $
+
+--- libcharset/Makefile.in.orig	2005-03-23 21:27:45.000000000 +0200
++++ libcharset/Makefile.in
+@@ -45,8 +45,8 @@ include/localcharset.h :
+ install-lib : all force
+ 	cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)'
+ 	$(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
+ 
+ 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
new file mode 100644
index 00000000000..746d800be74
--- /dev/null
+++ b/lang/clisp/patches/patch-ah
@@ -0,0 +1,18 @@
+$NetBSD: patch-ah,v 1.4 2007/03/29 12:00:14 tron Exp $
+
+--- libcharset/lib/Makefile.in.orig	2005-03-23 21:28:10.000000000 +0200
++++ libcharset/lib/Makefile.in
+@@ -78,11 +78,11 @@ ref-del.sed : $(srcdir)/ref-del.sin
+ # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
+ 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
+ 	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; \
+ 	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
new file mode 100644
index 00000000000..079934b7253
--- /dev/null
+++ b/lang/clisp/patches/patch-ai
@@ -0,0 +1,16 @@
+$NetBSD: patch-ai,v 1.4 2007/03/29 12:00:14 tron Exp $
+
+--- ffcall/avcall/Makefile.in.orig	2006-04-25 11:10:43.000000000 +0300
++++ ffcall/avcall/Makefile.in
+@@ -156,9 +156,9 @@ libavcall.la : $(OBJECTS)
+ # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
+ 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
+ 	if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi
+-	$(INSTALL_DATA) avcall.h $(includedir)/avcall.h
++	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
new file mode 100644
index 00000000000..d5176529c52
--- /dev/null
+++ b/lang/clisp/patches/patch-aj
@@ -0,0 +1,16 @@
+$NetBSD: patch-aj,v 1.3 2007/03/29 12:00:15 tron Exp $
+
+--- ffcall/callback/Makefile.in.orig	2005-03-27 05:13:45.000000000 +0300
++++ ffcall/callback/Makefile.in
+@@ -68,9 +68,9 @@ libcallback.la : vacall_r/libvacall.la t
+ install-lib : all force
+ 	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
+ 	if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi
+-	$(INSTALL_DATA) callback.h $(includedir)/callback.h
++	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
new file mode 100644
index 00000000000..c342d713a8d
--- /dev/null
+++ b/lang/clisp/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.3 2007/03/29 12:00:15 tron Exp $
+
+--- ffcall/callback/vacall_r/Makefile.in.orig	2006-04-25 11:10:44.000000000 +0300
++++ ffcall/callback/vacall_r/Makefile.in
+@@ -163,7 +163,7 @@ libvacall.la : $(OBJECTS)
+ # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
+ 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
+ 
+ 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
new file mode 100644
index 00000000000..66312c03609
--- /dev/null
+++ b/lang/clisp/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2007/03/29 12:00:16 tron Exp $
+
+--- ffcall/callback/trampoline_r/Makefile.in.orig	2006-04-28 11:10:31.000000000 +0300
++++ ffcall/callback/trampoline_r/Makefile.in
+@@ -124,7 +124,7 @@ libtrampoline.la : $(OBJECTS)
+ # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
+ 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
+ 
+ install : all force
+ 	if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi