Update to version 0.14.2.

PR:		17948
Submitted by:	maintainer

2 files changed, 70 insertions, 34 deletions

diff --git a/x11-wm/sapphire/files/patch-aa b/x11-wm/sapphire/files/patch-aa
index 7fb82408f93b..7ed51b6525e0 100644
--- a/x11-wm/sapphire/files/patch-aa
+++ b/x11-wm/sapphire/files/patch-aa
@@ -1,54 +1,62 @@
---- sapphire.inst.orig	Sun Feb 13 14:27:43 2000
-+++ sapphire.inst	Thu Feb 17 22:35:52 2000
+--- sapphire.inst.orig	Tue Feb 22 08:30:53 2000
++++ sapphire.inst	Fri Mar 24 03:27:02 2000
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  #
- # Sapphire 0.14.0
+ # Sapphire 0.14.1
  #
-@@ -9,6 +9,7 @@
- # 13 Feb 2000 at 12:27am
+@@ -9,6 +9,8 @@
+ # 21 Feb 2000 at 18:10
  # frankhale@yahoo.com
  #
-+DATADIR = %%PREFIX%%/share/sapphire
++DATADIR=%%PREFIX%%/share/sapphire
++
  if [ -d ~/.sapphire ]
  then
- 	echo "~/.sapphire directory exists, deleting it now.";
-@@ -33,15 +34,15 @@
- 	
- 	echo "created directory ~/.sapphire/menu";		
- 	
+ 	echo "~/.sapphire directory exists";
+@@ -21,12 +23,12 @@
+ if [ -d ~/.sapphire/themes ]
+ then
+ 	echo "~/.sapphire/themes directory exists, copying themes there";	
 -	cp data/themes/* ~/.sapphire/themes
-+	cp $DATADIR/themes/* ~/.sapphire/themes
- 
- 	echo "copied themes";
++	cp -pPR $DATADIR/themes/* ~/.sapphire/themes
+ else
+ 	mkdir ~/.sapphire/themes
+ 	echo "created directory ~/.sapphire/themes";
  	
--	cp data/wmconfig/* ~/.sapphire/wmconfig
-+	cp $DATADIR/wmconfig/* ~/.sapphire/wmconfig
- 
- 	echo "copied wmconfig";
+-	cp data/themes/* ~/.sapphire/themes
++	cp -pPR $DATADIR/themes/* ~/.sapphire/themes
+ 	echo "themes were copied to ~/.sapphire/themes";
+ fi
  	
+@@ -34,12 +36,12 @@
+ if [ -d ~/.sapphire/menu ]
+ then
+ 	echo "~/.sapphire/menu directory exists, copying menu files there";
 -	cp data/menu/* ~/.sapphire/menu
 +	cp $DATADIR/menu/* ~/.sapphire/menu
+ else
+ 	mkdir ~/.sapphire/menu
+ 	echo "created directory ~/.sapphire/menu";	
  	
- 	echo "copied menu";
+-	cp data/menu/* ~/.sapphire/menu
++	cp $DATADIR/menu/* ~/.sapphire/menu
+ 	echo "menu files were copied to ~/.sapphire/menu";
+ fi
  
-@@ -65,15 +66,15 @@
- 	
- 	echo "created directory ~/.sapphire/menu";		
- 	
--	cp data/themes/* ~/.sapphire/themes
-+	cp $DATADIR/themes/* ~/.sapphire/themes
+@@ -47,12 +49,12 @@
+ if [ -d ~/.sapphire/wmconfig ]
+ then
+ 	echo "~/.sapphire/wmconfig directory exists, copying configuration files there";
+-	cp data/wmconfig/* ~/.sapphire/wmconfig		
++	cp $DATADIR/wmconfig/* ~/.sapphire/wmconfig		
+ else
+ 	mkdir ~/.sapphire/wmconfig
+ 	echo "created directory ~/.sapphire/wmconfig";
  
- 	echo "copied themes";
- 	
 -	cp data/wmconfig/* ~/.sapphire/wmconfig
 +	cp $DATADIR/wmconfig/* ~/.sapphire/wmconfig
- 
- 	echo "copied wmconfig";
- 	
--	cp data/menu/* ~/.sapphire/menu
-+	cp $DATADIR/menu/* ~/.sapphire/menu
- 	
- 	echo "copied menu";
+ 	echo "configuration files were copied to ~/.sapphire/wmconfig";	
+ fi
  
diff --git a/x11-wm/sapphire/files/patch-ad b/x11-wm/sapphire/files/patch-ad
new file mode 100644
index 000000000000..233546bd5bd5
--- /dev/null
+++ b/x11-wm/sapphire/files/patch-ad
@@ -0,0 +1,28 @@
+--- data/menu/default.orig	Mon Feb 21 23:06:19 2000
++++ data/menu/default	Mon Apr 10 22:06:34 2000
+@@ -38,11 +38,20 @@
+ 
+ 	submenu (themes)
+ 	{
+-		theme (default) {~/.sapphire/themes/default.theme}
+-		theme (darkblue){~/.sapphire/themes/darkblue.theme}
+-		theme (slate)   {~/.sapphire/themes/slate.theme}
+-		theme (rose)    {~/.sapphire/themes/rose.theme}
+-		theme (green)   {~/.sapphire/themes/green.theme}
++		theme (default)  {~/.sapphire/themes/default.theme}
++		theme (atomic)   {~/.sapphire/themes/atomic.theme}
++		theme (bevel)    {~/.sapphire/themes/bevel.theme}
++		theme (blues)    {~/.sapphire/themes/blues.theme}
++		theme (darkblue) {~/.sapphire/themes/darkblue.theme}
++		theme (dtheater) {~/.sapphire/themes/dtheater.theme}
++		theme (klamath)  {~/.sapphire/themes/klamath.theme}
++		theme (metal)    {~/.sapphire/themes/metal.theme}
++		theme (nocturne) {~/.sapphire/themes/nocturne.theme}
++		theme (river)    {~/.sapphire/themes/river.theme}
++		theme (rose)     {~/.sapphire/themes/rose.theme}
++		theme (sapphire) {~/.sapphire/themes/sapphire.theme}
++		theme (slate)    {~/.sapphire/themes/slate.theme}
++		theme (synopsis) {~/.sapphire/themes/synopsis.theme}
+ 	}
+ 		
+ 	separator