Fixed so it now works without needed to install itcl & itk, and HI EVERYBODY!

2 files changed, 51 insertions, 43 deletions

diff --git a/dev-util/sourcenav/ChangeLog b/dev-util/sourcenav/ChangeLog
index d9f5ec64e806..c68606062a0b 100644
--- a/dev-util/sourcenav/ChangeLog
+++ b/dev-util/sourcenav/ChangeLog
@@ -1,12 +1,16 @@
 # ChangeLog for dev-util/sourcenav
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/ChangeLog,v 1.2 2002/12/09 04:21:16 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/ChangeLog,v 1.3 2002/12/11 21:09:31 cretin Exp $
 
 \* Autoupdate keywords (12-6-02)
   06 Dec 2002; Rodney Rees <manson@gentoo.org> changed sparc ~sparc keywords
  
 *sourcenav-5.1.1 (01 Nov 2002)
 
+  11 Dec 2002; Stefan Jones	<cretin@gentoo.org> :
+  Updated the patch to fix the sandbox violation,
+  which caused itcl not to be installed.
+
   01 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
   New name and version bump. Found by Nicholas Wourms <nwourms@netscape.net> in #5863.
 
diff --git a/dev-util/sourcenav/files/sourcenav-5.1.1-gentoo.diff b/dev-util/sourcenav/files/sourcenav-5.1.1-gentoo.diff
index 1ddbef8bee31..eaa6ee72b0c2 100644
--- a/dev-util/sourcenav/files/sourcenav-5.1.1-gentoo.diff
+++ b/dev-util/sourcenav/files/sourcenav-5.1.1-gentoo.diff
@@ -1,6 +1,6 @@
 diff -ru /tmp/sourcenav-5.1.1/Makefile.in ./Makefile.in
---- /tmp/sourcenav-5.1.1/Makefile.in	2002-06-25 18:05:44.000000000 +0000
-+++ ./Makefile.in	2002-11-04 11:40:09.000000000 +0000
+--- /tmp/sourcenav-5.1.1/Makefile.in	2002-06-25 19:05:44.000000000 +0100
++++ ./Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -24,6 +24,8 @@
  NOTPARALLEL = .NOTPARALLEL
  $(NOTPARALLEL):
@@ -21,13 +21,15 @@ diff -ru /tmp/sourcenav-5.1.1/Makefile.in ./Makefile.in
  # For any flags above that may contain shell code that varies from one
  # target library to another.  When doing recursive invocations of the
 diff -ru /tmp/sourcenav-5.1.1/itcl/itcl/Makefile.in ./itcl/itcl/Makefile.in
---- /tmp/sourcenav-5.1.1/itcl/itcl/Makefile.in	2001-09-09 19:49:04.000000000 +0000
-+++ ./itcl/itcl/Makefile.in	2002-11-04 11:40:09.000000000 +0000
-@@ -273,15 +273,15 @@
+--- /tmp/sourcenav-5.1.1/itcl/itcl/Makefile.in	2001-09-09 20:49:04.000000000 +0100
++++ ./itcl/itcl/Makefile.in	2002-12-11 20:55:29.000000000 +0000
+@@ -272,16 +272,17 @@
+ #========================================================================
  
  install-libraries: libraries
- 	$(mkinstalldirs) $(includedir)
+-	$(mkinstalldirs) $(includedir)
 -	@echo "Installing header files in $(includedir)"
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
 +	@echo "Installing header files in $(DESTDIR)$(includedir)"
  	@for i in $(GENERIC_HDRS) ; do \
  	    echo "Installing $$i" ; \
@@ -35,6 +37,7 @@ diff -ru /tmp/sourcenav-5.1.1/itcl/itcl/Makefile.in ./itcl/itcl/Makefile.in
 +	    $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
  	done;
 -	@echo "Installing library files in $(ITCL_LIBRARY)"
++	$(mkinstalldirs) $(DESTDIR)$(ITCL_LIBRARY)
 +	@echo "Installing library files in $(DESTDIR)$(ITCL_LIBRARY)"
  	@for i in $(srcdir)/library/*.tcl ; do \
  	    echo "Installing $$i" ; \
@@ -44,9 +47,9 @@ diff -ru /tmp/sourcenav-5.1.1/itcl/itcl/Makefile.in ./itcl/itcl/Makefile.in
  
  #========================================================================
 diff -ru /tmp/sourcenav-5.1.1/itcl/itk/Makefile.in ./itcl/itk/Makefile.in
---- /tmp/sourcenav-5.1.1/itcl/itk/Makefile.in	2001-09-09 19:49:05.000000000 +0000
-+++ ./itcl/itk/Makefile.in	2002-11-04 11:40:09.000000000 +0000
-@@ -267,16 +267,16 @@
+--- /tmp/sourcenav-5.1.1/itcl/itk/Makefile.in	2001-09-09 20:49:05.000000000 +0100
++++ ./itcl/itk/Makefile.in	2002-12-11 20:56:07.000000000 +0000
+@@ -267,16 +267,17 @@
  #========================================================================
  
  install-libraries: libraries
@@ -60,6 +63,7 @@ diff -ru /tmp/sourcenav-5.1.1/itcl/itk/Makefile.in ./itcl/itk/Makefile.in
 +	    $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
  	done;
 -	@echo "Installing library files in $(ITK_LIBRARY)"
++	$(mkinstalldirs) $(DESTDIR)$(ITK_LIBRARY)
 +	@echo "Installing library files in $(DESTDIR)$(ITK_LIBRARY)"
  	@for i in $(srcdir)/library/*.* $(srcdir)/library/tclIndex ; do \
  	    echo "Installing $$i" ; \
@@ -70,7 +74,7 @@ diff -ru /tmp/sourcenav-5.1.1/itcl/itk/Makefile.in ./itcl/itk/Makefile.in
  #========================================================================
 diff -ru /tmp/sourcenav-5.1.1/itcl/iwidgets3.0.0/Makefile.in ./itcl/iwidgets3.0.0/Makefile.in
 --- /tmp/sourcenav-5.1.1/itcl/iwidgets3.0.0/Makefile.in	2002-01-11 20:18:03.000000000 +0000
-+++ ./itcl/iwidgets3.0.0/Makefile.in	2002-11-04 11:44:39.000000000 +0000
++++ ./itcl/iwidgets3.0.0/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -1,3 +1,5 @@
 +DESTDIR = 
 +
@@ -93,8 +97,8 @@ diff -ru /tmp/sourcenav-5.1.1/itcl/iwidgets3.0.0/Makefile.in ./itcl/iwidgets3.0.
  
  # Directory in which to install the archive libtcl.a:
 diff -ru /tmp/sourcenav-5.1.1/snavigator/Makefile.in ./snavigator/Makefile.in
---- /tmp/sourcenav-5.1.1/snavigator/Makefile.in	2002-05-09 07:54:48.000000000 +0000
-+++ ./snavigator/Makefile.in	2002-11-04 11:40:09.000000000 +0000
+--- /tmp/sourcenav-5.1.1/snavigator/Makefile.in	2002-05-09 08:54:48.000000000 +0100
++++ ./snavigator/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -518,7 +518,7 @@
  
  
@@ -105,8 +109,8 @@ diff -ru /tmp/sourcenav-5.1.1/snavigator/Makefile.in ./snavigator/Makefile.in
  	(cd ../tk; $(MAKE) install-libraries)
  	(cd ../tix; $(MAKE) install-libraries)
 diff -ru /tmp/sourcenav-5.1.1/snavigator/bitmaps/Makefile.in ./snavigator/bitmaps/Makefile.in
---- /tmp/sourcenav-5.1.1/snavigator/bitmaps/Makefile.in	2002-04-26 07:14:27.000000000 +0000
-+++ ./snavigator/bitmaps/Makefile.in	2002-11-04 11:40:09.000000000 +0000
+--- /tmp/sourcenav-5.1.1/snavigator/bitmaps/Makefile.in	2002-04-26 08:14:27.000000000 +0100
++++ ./snavigator/bitmaps/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -333,8 +333,8 @@
  
  
@@ -119,8 +123,8 @@ diff -ru /tmp/sourcenav-5.1.1/snavigator/bitmaps/Makefile.in ./snavigator/bitmap
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
 diff -ru /tmp/sourcenav-5.1.1/snavigator/db/Makefile.in ./snavigator/db/Makefile.in
---- /tmp/sourcenav-5.1.1/snavigator/db/Makefile.in	2002-04-26 07:14:28.000000000 +0000
-+++ ./snavigator/db/Makefile.in	2002-11-04 11:40:09.000000000 +0000
+--- /tmp/sourcenav-5.1.1/snavigator/db/Makefile.in	2002-04-26 08:14:28.000000000 +0100
++++ ./snavigator/db/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -582,8 +582,8 @@
  
  
@@ -133,8 +137,8 @@ diff -ru /tmp/sourcenav-5.1.1/snavigator/db/Makefile.in ./snavigator/db/Makefile
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
 diff -ru /tmp/sourcenav-5.1.1/snavigator/demo/Makefile.in ./snavigator/demo/Makefile.in
---- /tmp/sourcenav-5.1.1/snavigator/demo/Makefile.in	2002-04-26 07:14:28.000000000 +0000
-+++ ./snavigator/demo/Makefile.in	2002-11-04 11:40:09.000000000 +0000
+--- /tmp/sourcenav-5.1.1/snavigator/demo/Makefile.in	2002-04-26 08:14:28.000000000 +0100
++++ ./snavigator/demo/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -288,16 +288,16 @@
  
  
@@ -157,8 +161,8 @@ diff -ru /tmp/sourcenav-5.1.1/snavigator/demo/Makefile.in ./snavigator/demo/Make
  	  rm $$p.tar-$$$$ ; \
            ) \
 diff -ru /tmp/sourcenav-5.1.1/snavigator/doc/html/Makefile.in ./snavigator/doc/html/Makefile.in
---- /tmp/sourcenav-5.1.1/snavigator/doc/html/Makefile.in	2002-04-26 07:14:28.000000000 +0000
-+++ ./snavigator/doc/html/Makefile.in	2002-11-04 11:40:09.000000000 +0000
+--- /tmp/sourcenav-5.1.1/snavigator/doc/html/Makefile.in	2002-04-26 08:14:28.000000000 +0100
++++ ./snavigator/doc/html/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -333,18 +333,18 @@
  
  
@@ -186,8 +190,8 @@ diff -ru /tmp/sourcenav-5.1.1/snavigator/doc/html/Makefile.in ./snavigator/doc/h
  		rm $$p.tar-$$$$ ;\
  		) \
 diff -ru /tmp/sourcenav-5.1.1/snavigator/packages/Makefile.in ./snavigator/packages/Makefile.in
---- /tmp/sourcenav-5.1.1/snavigator/packages/Makefile.in	2002-04-26 07:14:28.000000000 +0000
-+++ ./snavigator/packages/Makefile.in	2002-11-04 11:40:09.000000000 +0000
+--- /tmp/sourcenav-5.1.1/snavigator/packages/Makefile.in	2002-04-26 08:14:28.000000000 +0100
++++ ./snavigator/packages/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -312,8 +312,8 @@
  install-data-local:
  	for i in $(packages); \
@@ -200,8 +204,8 @@ diff -ru /tmp/sourcenav-5.1.1/snavigator/packages/Makefile.in ./snavigator/packa
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
 diff -ru /tmp/sourcenav-5.1.1/snavigator/sdk/Makefile.in ./snavigator/sdk/Makefile.in
---- /tmp/sourcenav-5.1.1/snavigator/sdk/Makefile.in	2002-04-26 07:14:28.000000000 +0000
-+++ ./snavigator/sdk/Makefile.in	2002-11-04 11:40:09.000000000 +0000
+--- /tmp/sourcenav-5.1.1/snavigator/sdk/Makefile.in	2002-04-26 08:14:28.000000000 +0100
++++ ./snavigator/sdk/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -412,7 +412,7 @@
  
  
@@ -212,8 +216,8 @@ diff -ru /tmp/sourcenav-5.1.1/snavigator/sdk/Makefile.in ./snavigator/sdk/Makefi
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
 diff -ru /tmp/sourcenav-5.1.1/snavigator/sdk/api/c/Makefile.in ./snavigator/sdk/api/c/Makefile.in
---- /tmp/sourcenav-5.1.1/snavigator/sdk/api/c/Makefile.in	2002-04-26 07:14:28.000000000 +0000
-+++ ./snavigator/sdk/api/c/Makefile.in	2002-11-04 11:40:09.000000000 +0000
+--- /tmp/sourcenav-5.1.1/snavigator/sdk/api/c/Makefile.in	2002-04-26 08:14:28.000000000 +0100
++++ ./snavigator/sdk/api/c/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -415,9 +415,9 @@
  
  
@@ -227,8 +231,8 @@ diff -ru /tmp/sourcenav-5.1.1/snavigator/sdk/api/c/Makefile.in ./snavigator/sdk/
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
 diff -ru /tmp/sourcenav-5.1.1/snavigator/snavigator/unix/Makefile.in ./snavigator/snavigator/unix/Makefile.in
---- /tmp/sourcenav-5.1.1/snavigator/snavigator/unix/Makefile.in	2002-04-26 07:14:29.000000000 +0000
-+++ ./snavigator/snavigator/unix/Makefile.in	2002-11-04 11:40:09.000000000 +0000
+--- /tmp/sourcenav-5.1.1/snavigator/snavigator/unix/Makefile.in	2002-04-26 08:14:29.000000000 +0100
++++ ./snavigator/snavigator/unix/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -339,7 +339,7 @@
  install-exec-local: $(bindir)/@SN_LAUNCH_SHELL@
  
@@ -240,7 +244,7 @@ diff -ru /tmp/sourcenav-5.1.1/snavigator/snavigator/unix/Makefile.in ./snavigato
  # Otherwise a system limit (for SysV at least) may be exceeded.
 diff -ru /tmp/sourcenav-5.1.1/tcl/unix/Makefile.in ./tcl/unix/Makefile.in
 --- /tmp/sourcenav-5.1.1/tcl/unix/Makefile.in	2002-01-10 20:17:57.000000000 +0000
-+++ ./tcl/unix/Makefile.in	2002-11-04 11:40:09.000000000 +0000
++++ ./tcl/unix/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -1,3 +1,5 @@
 +DESTDIR = 
 +
@@ -257,8 +261,8 @@ diff -ru /tmp/sourcenav-5.1.1/tcl/unix/Makefile.in ./tcl/unix/Makefile.in
  TCL_LIBRARY =	@datadir@/tcl$(VERSION)
  
 diff -ru /tmp/sourcenav-5.1.1/tcl/win/Makefile.in ./tcl/win/Makefile.in
---- /tmp/sourcenav-5.1.1/tcl/win/Makefile.in	2001-09-09 23:56:10.000000000 +0000
-+++ ./tcl/win/Makefile.in	2002-11-04 11:40:09.000000000 +0000
+--- /tmp/sourcenav-5.1.1/tcl/win/Makefile.in	2001-09-10 00:56:10.000000000 +0100
++++ ./tcl/win/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -1,3 +1,5 @@
 +DESTDIR = 
 +
@@ -276,7 +280,7 @@ diff -ru /tmp/sourcenav-5.1.1/tcl/win/Makefile.in ./tcl/win/Makefile.in
  # scripts (note: you can set the TCL_LIBRARY environment variable at
 diff -ru /tmp/sourcenav-5.1.1/tix/unix/Makefile.in ./tix/unix/Makefile.in
 --- /tmp/sourcenav-5.1.1/tix/unix/Makefile.in	2002-01-07 09:52:42.000000000 +0000
-+++ ./tix/unix/Makefile.in	2002-11-04 11:40:09.000000000 +0000
++++ ./tix/unix/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -1,3 +1,5 @@
 +DESTDIR = 
 +
@@ -323,8 +327,8 @@ diff -ru /tmp/sourcenav-5.1.1/tix/unix/Makefile.in ./tix/unix/Makefile.in
  # Some versions of make, like SGI's, use the following variable to
  # determine which shell to use for executing commands:
 diff -ru /tmp/sourcenav-5.1.1/tix/unix/tk8.0/Makefile.in ./tix/unix/tk8.0/Makefile.in
---- /tmp/sourcenav-5.1.1/tix/unix/tk8.0/Makefile.in	2001-09-08 23:25:55.000000000 +0000
-+++ ./tix/unix/tk8.0/Makefile.in	2002-11-04 11:40:09.000000000 +0000
+--- /tmp/sourcenav-5.1.1/tix/unix/tk8.0/Makefile.in	2001-09-09 00:25:55.000000000 +0100
++++ ./tix/unix/tk8.0/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -1,3 +1,5 @@
 +DESTDIR = 
 +
@@ -351,8 +355,8 @@ diff -ru /tmp/sourcenav-5.1.1/tix/unix/tk8.0/Makefile.in ./tix/unix/tk8.0/Makefi
  # To change the compiler switches, for example to change from -O
  # to -g, change the following line:
 diff -ru /tmp/sourcenav-5.1.1/tix/unix/tk8.1/Makefile.in ./tix/unix/tk8.1/Makefile.in
---- /tmp/sourcenav-5.1.1/tix/unix/tk8.1/Makefile.in	2001-09-08 23:25:55.000000000 +0000
-+++ ./tix/unix/tk8.1/Makefile.in	2002-11-04 11:40:09.000000000 +0000
+--- /tmp/sourcenav-5.1.1/tix/unix/tk8.1/Makefile.in	2001-09-09 00:25:55.000000000 +0100
++++ ./tix/unix/tk8.1/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -1,3 +1,5 @@
 +DESTDIR = 
 +
@@ -380,7 +384,7 @@ diff -ru /tmp/sourcenav-5.1.1/tix/unix/tk8.1/Makefile.in ./tix/unix/tk8.1/Makefi
  # to -g, change the following line:
 diff -ru /tmp/sourcenav-5.1.1/tix/unix/tk8.3/Makefile.in ./tix/unix/tk8.3/Makefile.in
 --- /tmp/sourcenav-5.1.1/tix/unix/tk8.3/Makefile.in	2002-01-11 23:43:38.000000000 +0000
-+++ ./tix/unix/tk8.3/Makefile.in	2002-11-04 11:40:09.000000000 +0000
++++ ./tix/unix/tk8.3/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -1,3 +1,5 @@
 +DESTDIR = 
 +
@@ -407,8 +411,8 @@ diff -ru /tmp/sourcenav-5.1.1/tix/unix/tk8.3/Makefile.in ./tix/unix/tk8.3/Makefi
  # To change the compiler switches, for example to change from -O
  # to -g, change the following line:
 diff -ru /tmp/sourcenav-5.1.1/tix/win/Makefile.in ./tix/win/Makefile.in
---- /tmp/sourcenav-5.1.1/tix/win/Makefile.in	2001-09-13 00:43:23.000000000 +0000
-+++ ./tix/win/Makefile.in	2002-11-04 11:40:09.000000000 +0000
+--- /tmp/sourcenav-5.1.1/tix/win/Makefile.in	2001-09-13 01:43:23.000000000 +0100
++++ ./tix/win/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -469,27 +469,27 @@
  # CYGNUS LOCAL: dj - change to autoconf'd directories
  
@@ -446,7 +450,7 @@ diff -ru /tmp/sourcenav-5.1.1/tix/win/Makefile.in ./tix/win/Makefile.in
  INSTALL_PROGRAM =	@INSTALL_PROGRAM@
 diff -ru /tmp/sourcenav-5.1.1/tk/unix/Makefile.in ./tk/unix/Makefile.in
 --- /tmp/sourcenav-5.1.1/tk/unix/Makefile.in	2002-01-10 20:21:26.000000000 +0000
-+++ ./tk/unix/Makefile.in	2002-11-04 11:40:09.000000000 +0000
++++ ./tk/unix/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -1,3 +1,5 @@
 +DESTDIR =
 +
@@ -463,8 +467,8 @@ diff -ru /tmp/sourcenav-5.1.1/tk/unix/Makefile.in ./tk/unix/Makefile.in
  # Directory from which applications will reference the library of Tcl
  # scripts (note: you can set the TK_LIBRARY environment variable at
 diff -ru /tmp/sourcenav-5.1.1/tk/win/Makefile.in ./tk/win/Makefile.in
---- /tmp/sourcenav-5.1.1/tk/win/Makefile.in	2001-09-10 01:16:55.000000000 +0000
-+++ ./tk/win/Makefile.in	2002-11-04 11:40:09.000000000 +0000
+--- /tmp/sourcenav-5.1.1/tk/win/Makefile.in	2001-09-10 02:16:55.000000000 +0100
++++ ./tk/win/Makefile.in	2002-12-11 20:55:29.000000000 +0000
 @@ -1,3 +1,5 @@
 +DESTDIR = 
 +