1 files changed, 61 insertions, 5 deletions
diff --git a/math/scilab/patches/patch-aw b/math/scilab/patches/patch-aw
index 3bffa57ea6c..ee2e32098c4 100644
--- a/math/scilab/patches/patch-aw
+++ b/math/scilab/patches/patch-aw
@@ -1,13 +1,69 @@
-$NetBSD: patch-aw,v 1.6 2006/05/12 12:39:32 joerg Exp $
+$NetBSD: patch-aw,v 1.7 2007/03/23 22:08:58 dmcmahill Exp $
 
---- Makefile.in.orig	2005-05-31 07:57:32.000000000 +0000
+--- Makefile.in.orig	2006-12-11 12:41:55.000000000 +0000
 +++ Makefile.in
-@@ -293,7 +293,7 @@ postinstall: 
+@@ -4,7 +4,7 @@ binary:
+ 	@if test -f .binary; then \
+ 		echo "Humm... this is a binary version"; \
+ 		config/findpath; \
+-		(cd scripts; make); \
++		(cd scripts; $(MAKE)); \
+ 		echo "Installation done"; \
+ 	else \
+ 		echo "***************************************"; \
+@@ -103,7 +103,7 @@ manclean:	
+ 	done
+ 
+ tests:
+-	@echo "Type \"make tests\" in $(SCIDIR)/tests directory "
++	@echo "Type \"$(MAKE) tests\" in $(SCIDIR)/tests directory "
+ 	@echo "  to test the  distribution"
+ 
+ distclean::
+@@ -184,7 +184,7 @@ BINDISTFILES = \
+ tarbindist:
+ 	touch .binary
+ 	@STRIP@ bin/scilex
+-	cd examples; make distclean
++	cd examples; $(MAKE) distclean
+ 	cd .. ; tar cvf $(SCIBASE)/$(SCIBASE)-bin.tar $(BINDISTFILES) @PVMINST@ 
+ 	$(RM) .binary
+ 
+@@ -263,14 +263,14 @@ DOCNAME=$(SCIBASE)
+ 
+ install:
+ 	@if test `pwd`/..  != $(PREFIX)/lib ; then \
+-		install -d $(PREFIX)/lib/$(SCIBASE); \
++		$(BSD_INSTALL_LIB_DIR) $(PREFIX)/lib/$(SCIBASE); \
+ 		( for file in $(INSTBINDISTFILES) @PVMINST1@; do tar cf - $${file}  | (cd $(PREFIX)/lib/$(SCIBASE); tar xf -); done); \
+-		(cd $(PREFIX)/lib/$(SCIBASE);touch .binary; make postinstall PREFIX=$(PREFIX) ) \
++		(cd $(PREFIX)/lib/$(SCIBASE);touch .binary; $(MAKE) postinstall PREFIX=$(PREFIX) ) \
+ 	fi
+-	install -d $(PREFIX)/share/doc/$(DOCNAME)/
+-	install ACKNOWLEDGEMENTS CHANGES README_Unix Version.incl \
+-		licence.txt license.txt  $(PREFIX)/share/doc/$(DOCNAME)
+-	install -d $(PREFIX)/bin 
++	$(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/doc/$(DOCNAME)/
++	for f in  ACKNOWLEDGEMENTS CHANGES README_Unix Version.incl licence.txt license.txt  ; do \
++		$(BSD_INSTALL_DATA) $$f $(PREFIX)/share/doc/$(DOCNAME) ; done
++	$(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin 
+ 	$(RM)  $(PREFIX)/bin/scilab
+ 	ln -fs $(PREFIX)/lib/$(SCIBASE)/bin/scilab $(PREFIX)/bin/scilab
+ 	$(RM)  $(PREFIX)/bin/intersci
+@@ -287,13 +287,13 @@ DESTDIR=$(PREFIX)/lib
+ postinstall: 
+ 	@echo "creating Path.incl SCIDIR=$(DESTDIR)/$(SCIBASE)"
+ 	@echo "SCIDIR=$(DESTDIR)/$(SCIBASE)"  > Path.incl
+-	@cd scripts; make
+-	@cd examples ; make distclean > /dev/null
++	@cd scripts; $(MAKE)
++	@cd examples ; $(MAKE) distclean > /dev/null
+ 	@cp contrib/loader.sce contrib-loader.sce 
  	@$(RM) -f -r contrib 
  	@mkdir contrib 
  	@mv contrib-loader.sce contrib/loader.sce
--	@$(RM) man/*/*/*.xml 
-+	@find man -name \*.xml -exec ${RM} {} \;
+-	@find man -name "*.xml" -print0 | xargs -0 $(RM)
++	@find man -name "*.xml" -exec $(RM) {} \;
  	@@STRIP@ bin/scilex;
  
  uninstall: