Upgrade to v1.0pr5

Reviewed by:	James FitzGibbon <jfitz@FreeBSD.ORG>
Submitted by:	"Brian N. Handy" <handy@sag.space.lockheed.com>

2 files changed, 118 insertions, 82 deletions

diff --git a/x11-wm/afterstep/files/patch-aa b/x11-wm/afterstep/files/patch-aa
index afa5a688878b..600754d7e578 100644
--- a/x11-wm/afterstep/files/patch-aa
+++ b/x11-wm/afterstep/files/patch-aa
@@ -1,5 +1,5 @@
-*** configure.h.orig	Tue Sep  3 12:32:22 1996
---- configure.h	Tue Sep  3 12:38:20 1996
+*** configure.h.orig	Sun Mar  2 11:50:40 1997
+--- configure.h	Thu Mar 20 21:31:42 1997
 ***************
 *** 1,6 ****
 ! #define AFTERDIR     "/usr/lib/X11/afterstep"
@@ -16,7 +16,7 @@
   /* If you would like gradients, uncomment this */
   #define ENABLE_TEXTURE
 ***************
-*** 15,21 ****
+*** 17,23 ****
    * Imake wants to leave binaries, then choose the second line here.
    * If you want to install it in a different directory, uncomment and
    * edit the first line */
@@ -24,7 +24,7 @@
   
   /* Compiler over-ride for Imakefiles */
   /* Leave it as shown to get your default compiler */
---- 15,21 ----
+--- 17,23 ----
    * Imake wants to leave binaries, then choose the second line here.
    * If you want to install it in a different directory, uncomment and
    * edit the first line */
@@ -33,7 +33,7 @@
   /* Compiler over-ride for Imakefiles */
   /* Leave it as shown to get your default compiler */
 ***************
-*** 57,63 ****
+*** 59,65 ****
    ***************************************************************************/
   #define XPM                      
   /*  linker flags needed to locate and link in the Xpm library, if you use it */
@@ -41,7 +41,7 @@
   
   /***************************************************************************
    *#define M4
---- 57,63 ----
+--- 59,65 ----
    ***************************************************************************/
   #define XPM                      
   /*  linker flags needed to locate and link in the Xpm library, if you use it */
diff --git a/x11-wm/afterstep/files/patch-ab b/x11-wm/afterstep/files/patch-ab
index b2a780815166..2f9a5cb43737 100644
--- a/x11-wm/afterstep/files/patch-ab
+++ b/x11-wm/afterstep/files/patch-ab
@@ -1,76 +1,112 @@
---- sample.steprc.orig	Fri Oct 25 11:35:36 1996
-+++ sample.steprc	Tue Oct 29 13:57:05 1996
-@@ -156,11 +156,11 @@
- # ModulePath is a colon-separated list, just like a regular unix PATH
- # Any Module must be found within the path in order to be located
- # and executed
--ModulePath          /usr/lib/X11/afterstep:/usr/X11R6/lib/X11/afterstep
-+ModulePath          %%PREFIX%%/lib/X11/afterstep
- # Another colon-separated list pointing to your pixmaps (color icons)
--PixmapPath          /usr/include/X11/pixmaps/
-+PixmapPath          %%PREFIX%%/include/X11/pixmaps/
- # Path for your ugly black&white icons
--IconPath            /usr/include/X11/bitmaps/
-+IconPath            %%PREFIX%%/include/X11/bitmaps/
- 
- # Various styles which can be associated with specific applications
- # Sticky -- remains "stuck" on all desks
-@@ -259,7 +259,7 @@
-         # Place the green carpet image onto the background upon startup
-         # I personally recommend xli/xloadimage, but xv seems to be
-         # ubiquitous in the unix world so I'll use that 
--	# Exec	"I"	exec xv -root -quit /backgrounds/carpet.green.jpg
-+	# Exec	"I"	exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/carpet.green.jpg
- 	Exec	"I"	exec xsetroot -solid DarkGrey
- EndFunction
- 
-@@ -433,21 +433,21 @@
- # Images ... quick way to view the included default background images
- Popup "Images"
- 	Title	"Images"
--	Exec	"Brick"		exec xv -root -quit /backgrounds/brick.jpg
--	Exec	"Coins"		exec xv -root -quit /backgrounds/coins.jpg
--	Exec	"Dark Wood"	exec xv -root -quit /backgrounds/darkwood.jpg
--	Exec	"Eyes"		exec xv -root -quit /backgrounds/eyes.jpg
--	Exec	"Glass"		exec xv -root -quit /backgrounds/glass.jpg
--	Exec	"Green Carpet"	exec xv -root -quit /backgrounds/carpet.green.jpg
--	Exec	"Parquet"	exec xv -root -quit /backgrounds/parquet.jpg
--	Exec	"Pebbles"	exec xv -root -quit /backgrounds/pebbles.jpg
--	Exec	"Rock"		exec xv -root -quit /backgrounds/rock.tile.jpg
--	Exec	"Rope"		exec xv -root -quit /backgrounds/rope.weave.jpg
--	Exec	"Stucco"	exec xv -root -quit /backgrounds/stucco.jpg
--	Exec	"Tile"		exec xv -root -quit /backgrounds/tile.check.jpg
--	Exec	"Tree Bark"	exec xv -root -quit /backgrounds/bark.jpg
--	Exec	"Volcanic"	exec xv -root -quit /backgrounds/volcanic.jpg
--	Exec	"Wood"		exec xv -root -quit /backgrounds/wood.jpg
-+	Exec	"Brick"		exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/brick.jpg
-+	Exec	"Coins"		exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/coins.jpg
-+	Exec	"Dark Wood"	exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/darkwood.jpg
-+	Exec	"Eyes"		exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/eyes.jpg
-+	Exec	"Glass"		exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/glass.jpg
-+	Exec	"Green Carpet"	exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/carpet.green.jpg
-+	Exec	"Parquet"	exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/parquet.jpg
-+	Exec	"Pebbles"	exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/pebbles.jpg
-+	Exec	"Rock"		exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/rock.tile.jpg
-+	Exec	"Rope"		exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/rope.weave.jpg
-+	Exec	"Stucco"	exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/stucco.jpg
-+	Exec	"Tile"		exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/tile.check.jpg
-+	Exec	"Tree Bark"	exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/bark.jpg
-+	Exec	"Volcanic"	exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/volcanic.jpg
-+	Exec	"Wood"		exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/wood.jpg
- EndPopup
- 
- # Background settings ... choose from either Solid Colors or Color Images
-@@ -573,10 +573,10 @@
- Module Audio    
- 
- # Select your normal audio player
--#*AudioPlayCmd /usr/bin/showaudio
-+#*AudioPlayCmd /usr/local/bin/showaudio
- 
- # Select the directory containing your sounds
--#*AudioDir /home/frank/mac/sounds
-+#*AudioDir %%PREFIX%%/lib/X11/afterstep/sounds
- 
- #*AudioDelay 1
- 
+*** sample.steprc.orig	Sun Mar  9 06:30:22 1997
+--- sample.steprc	Thu Mar 20 21:37:46 1997
+***************
+*** 166,176 ****
+  # ModulePath is a colon-separated list, just like a regular unix PATH
+  # Any Module must be found within the path in order to be located
+  # and executed
+! ModulePath          /usr/lib/X11/afterstep:/usr/X11R6/lib/X11/afterstep
+  # Another colon-separated list pointing to your pixmaps (color icons)
+! PixmapPath          /usr/include/X11/pixmaps/
+  # Path for your ugly black&white icons
+! IconPath            /usr/include/X11/bitmaps/
+  
+  # Various styles which can be associated with specific applications
+  # Sticky -- remains "stuck" on all desks
+--- 166,176 ----
+  # ModulePath is a colon-separated list, just like a regular unix PATH
+  # Any Module must be found within the path in order to be located
+  # and executed
+! ModulePath          %%PREFIX%%/lib/X11/afterstep
+  # Another colon-separated list pointing to your pixmaps (color icons)
+! PixmapPath          %%PREFIX%%/include/X11/pixmaps/
+  # Path for your ugly black&white icons
+! IconPath            %%PREFIX%%/include/X11/bitmaps/
+  
+  # Various styles which can be associated with specific applications
+  # Sticky -- remains "stuck" on all desks
+***************
+*** 290,296 ****
+          # Place the green carpet image onto the background upon startup
+          # I personally recommend xli/xloadimage, but xv seems to be
+          # ubiquitous in the unix world so I'll use that 
+! 	# Exec	"I"	exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/carpet.green.jpg
+  	Exec	"I"	exec xsetroot -solid DarkGrey
+  EndFunction
+  
+--- 290,296 ----
+          # Place the green carpet image onto the background upon startup
+          # I personally recommend xli/xloadimage, but xv seems to be
+          # ubiquitous in the unix world so I'll use that 
+! 	# Exec	"I"	exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/carpet.green.jpg
+  	Exec	"I"	exec xsetroot -solid DarkGrey
+  EndFunction
+  
+***************
+*** 465,485 ****
+  # Images ... quick way to view the included default background images
+  Popup "Images"
+  	Title	"Images"
+! 	Exec	"Brick"		exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/brick.jpg
+! 	Exec	"Coins"		exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/coins.jpg
+! 	Exec	"Dark Wood"	exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/darkwood.jpg
+! 	Exec	"Eyes"		exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/eyes.jpg
+! 	Exec	"Glass"		exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/glass.jpg
+! 	Exec	"Green Carpet"	exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/carpet.green.jpg
+! 	Exec	"Parquet"	exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/parquet.jpg
+! 	Exec	"Pebbles"	exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/pebbles.jpg
+! 	Exec	"Rock"		exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/rock.tile.jpg
+! 	Exec	"Rope"		exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/rope.weave.jpg
+! 	Exec	"Stucco"	exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/stucco.jpg
+! 	Exec	"Tile"		exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/tile.check.jpg
+! 	Exec	"Tree Bark"	exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/bark.jpg
+! 	Exec	"Volcanic"	exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/volcanic.jpg
+! 	Exec	"Wood"		exec xv -root -quit /usr/lib/X11/afterstep/backgrounds/wood.jpg
+  EndPopup
+  
+  # Background settings ... choose from either Solid Colors or Color Images
+--- 465,485 ----
+  # Images ... quick way to view the included default background images
+  Popup "Images"
+  	Title	"Images"
+! 	Exec	"Brick"		exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/brick.jpg
+! 	Exec	"Coins"		exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/coins.jpg
+! 	Exec	"Dark Wood"	exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/darkwood.jpg
+! 	Exec	"Eyes"		exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/eyes.jpg
+! 	Exec	"Glass"		exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/glass.jpg
+! 	Exec	"Green Carpet"	exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/carpet.green.jpg
+! 	Exec	"Parquet"	exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/parquet.jpg
+! 	Exec	"Pebbles"	exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/pebbles.jpg
+! 	Exec	"Rock"		exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/rock.tile.jpg
+! 	Exec	"Rope"		exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/rope.weave.jpg
+! 	Exec	"Stucco"	exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/stucco.jpg
+! 	Exec	"Tile"		exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/tile.check.jpg
+! 	Exec	"Tree Bark"	exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/bark.jpg
+! 	Exec	"Volcanic"	exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/volcanic.jpg
+! 	Exec	"Wood"		exec xv -root -quit %%PREFIX%%/lib/X11/afterstep/backgrounds/wood.jpg
+  EndPopup
+  
+  # Background settings ... choose from either Solid Colors or Color Images
+***************
+*** 605,614 ****
+  Module Audio    
+  
+  # Select your normal audio player
+! #*AudioPlayCmd /usr/bin/showaudio
+  
+  # Select the directory containing your sounds
+! #*AudioDir /home/frank/mac/sounds
+  
+  #*AudioDelay 1
+  
+--- 605,614 ----
+  Module Audio    
+  
+  # Select your normal audio player
+! #*AudioPlayCmd /usr/local/bin/showaudio
+  
+  # Select the directory containing your sounds
+! #*AudioDir %%PREFIX%%/lib/X11/afterstep/sounds
+  
+  #*AudioDelay 1
+