Upgrade to v1.0prerelease-1

Now includes manpages!

2 files changed, 81 insertions, 117 deletions

diff --git a/x11-wm/afterstep/files/patch-aa b/x11-wm/afterstep/files/patch-aa
index be189e7e5394..afa5a688878b 100644
--- a/x11-wm/afterstep/files/patch-aa
+++ b/x11-wm/afterstep/files/patch-aa
@@ -9,9 +9,9 @@
   /* If you would like gradients, uncomment this */
   #define ENABLE_TEXTURE
 --- 1,6 ----
-! #define AFTERDIR     "@@PREFIX@@/lib/X11/afterstep"
-! #define AFTER_ICONDIR   "@@PREFIX@@/include/X11/bitmaps:@@PREFIX@@/include/X11/pixmaps"
-! #define STEPRC         "@@PREFIX@@/lib/X11/afterstep/system.steprc"
+! #define AFTERDIR     "%%PREFIX%%/lib/X11/afterstep"
+! #define AFTER_ICONDIR   "%%PREFIX%%/include/X11/bitmaps:%%PREFIX%%/include/X11/pixmaps"
+! #define STEPRC         "%%PREFIX%%/lib/X11/afterstep/system.steprc"
   
   /* If you would like gradients, uncomment this */
   #define ENABLE_TEXTURE
@@ -28,7 +28,7 @@
    * 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 */
-! #define AFTER_BIN_DIR BINDIR=@@PREFIX@@/bin
+! #define AFTER_BIN_DIR BINDIR=%%PREFIX%%/bin
   
   /* Compiler over-ride for Imakefiles */
   /* Leave it as shown to get your default compiler */
@@ -45,7 +45,7 @@
    ***************************************************************************/
   #define XPM                      
   /*  linker flags needed to locate and link in the Xpm library, if you use it */
-! #define XPMLIBRARY -L@@PREFIX@@/lib -lXpm
+! #define XPMLIBRARY -L%%PREFIX%%/lib -lXpm
   
   /***************************************************************************
    *#define M4
diff --git a/x11-wm/afterstep/files/patch-ab b/x11-wm/afterstep/files/patch-ab
index e4defe461f8d..b2a780815166 100644
--- a/x11-wm/afterstep/files/patch-ab
+++ b/x11-wm/afterstep/files/patch-ab
@@ -1,112 +1,76 @@
-*** sample.steprc.orig	Tue Sep  3 12:32:19 1996
---- sample.steprc	Tue Sep  3 12:36:49 1996
-***************
-*** 145,155 ****
-  # 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
---- 145,155 ----
-  # 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:@@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
-***************
-*** 246,252 ****
-          # 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
-  EndFunction
-  
-  # These will load up upon every subsequent Restart
---- 246,252 ----
-          # 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
-  EndFunction
-  
-  # These will load up upon every subsequent Restart
-***************
-*** 419,439 ****
-  # 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
-  EndPopup
-  
-  # Background settings ... choose from either Solid Colors or Color Images
---- 419,439 ----
-  # 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
-***************
-*** 559,568 ****
-  Module Audio    
-  
-  # Select your normal audio player
-! #*AudioPlayCmd /usr/bin/showaudio
-  
-  # Select the directory containing your sounds
-! #*AudioDir /home/frank/mac/sounds
-  
-  #*AudioDelay 1
-  
---- 559,568 ----
-  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
-  
+--- 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
+