4 files changed, 19 insertions, 74 deletions

diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index 66cce059035b..a0ab6c02e17e 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	afterstep
-# Version required:	0.98b30
+# Version required:	0.98b32
 # Date created:		17 July 96
 # Whom:			james@bdd.net
 #
-# $Id: Makefile,v 1.7 1996/08/24 15:19:15 jfitz Exp $
+# $Id: Makefile,v 1.8 1996/08/27 17:48:59 jfitz Exp $
 #
 
-DISTNAME=	as-b30
-PKGNAME=	afterstep-0.98b30
+DISTNAME=	as-b32
+PKGNAME=	afterstep-0.98b32
 CATEGORIES+=	x11
 MASTER_SITES=	ftp://oak.sfasu.edu/pub/AfterStep/
 
@@ -17,7 +17,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 RUN_DEPENDS=	fvwm:${PORTSDIR}/x11/fvwm
 
 USE_X11=	yes
-WRKSRC=		${WRKDIR}/AfterStep-0.98aBETA30
+WRKSRC=		${WRKDIR}/AfterStep-0.98aBETA32
 
 pre-build:
 		@cd ${WRKSRC}; sh MakeMakefiles
diff --git a/x11-wm/afterstep/distinfo b/x11-wm/afterstep/distinfo
index 8a9d85c83e95..03e2d54db47d 100644
--- a/x11-wm/afterstep/distinfo
+++ b/x11-wm/afterstep/distinfo
@@ -1 +1 @@
-MD5 (as-b30.tar.gz) = 99fbb1bef5dbb43c60ad5159493f4ccb
+MD5 (as-b32.tar.gz) = a79c7c9c5490e20144bc43ffee1793e0
diff --git a/x11-wm/afterstep/files/patch-aa b/x11-wm/afterstep/files/patch-aa
index 6b400b2a87d2..be189e7e5394 100644
--- a/x11-wm/afterstep/files/patch-aa
+++ b/x11-wm/afterstep/files/patch-aa
@@ -1,5 +1,5 @@
-*** configure.h.orig	Mon Aug 26 15:09:46 1996
---- configure.h	Mon Aug 26 16:32:09 1996
+*** configure.h.orig	Tue Sep  3 12:32:22 1996
+--- configure.h	Tue Sep  3 12:38:20 1996
 ***************
 *** 1,6 ****
 ! #define AFTERDIR     "/usr/lib/X11/afterstep"
diff --git a/x11-wm/afterstep/files/patch-ab b/x11-wm/afterstep/files/patch-ab
index 2790baf62855..e4defe461f8d 100644
--- a/x11-wm/afterstep/files/patch-ab
+++ b/x11-wm/afterstep/files/patch-ab
@@ -1,7 +1,7 @@
-*** sample.steprc.orig	Mon Aug 26 14:45:47 1996
---- sample.steprc	Mon Aug 26 16:36:13 1996
+*** sample.steprc.orig	Tue Sep  3 12:32:19 1996
+--- sample.steprc	Tue Sep  3 12:36:49 1996
 ***************
-*** 141,151 ****
+*** 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
@@ -13,11 +13,11 @@
   
   # Various styles which can be associated with specific applications
   # Sticky -- remains "stuck" on all desks
---- 141,151 ----
+--- 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/fvwm
+! 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
@@ -26,45 +26,7 @@
   # Various styles which can be associated with specific applications
   # Sticky -- remains "stuck" on all desks
 ***************
-*** 193,201 ****
-    # Open up an xterm
-  *Wharf xterm monitor.xpm   Exec "-" xterm -geometry 80x25 -sl 256 -sb -ls -T 'xterm@afterstep.org' &
-    # Start up the LyX word processor
-! *Wharf lyx text.xpm Exec "-" /home/frank/bin/lyx &>/dev/null &
-    # Create amazing art with the freeware masterpiece, The GIMP
-! *Wharf gimp 3dpaint.xpm Exec "-" gimp &
-    # Read some mail
-  *Wharf pine writeletter.xpm Exec "-" xterm -T "pine" -e pine &
-    # Surf the web
---- 193,201 ----
-    # Open up an xterm
-  *Wharf xterm monitor.xpm   Exec "-" xterm -geometry 80x25 -sl 256 -sb -ls -T 'xterm@afterstep.org' &
-    # Start up the LyX word processor
-! #*Wharf lyx text.xpm Exec "-" /home/frank/bin/lyx &>/dev/null &
-    # Create amazing art with the freeware masterpiece, The GIMP
-! #*Wharf gimp 3dpaint.xpm Exec "-" gimp &
-    # Read some mail
-  *Wharf pine writeletter.xpm Exec "-" xterm -T "pine" -e pine &
-    # Surf the web
-***************
-*** 204,210 ****
-    # Click on the different "desks" to change in between them
-  *Wharf pager nil SwallowModule "Pager" Pager 0 0
-    # Edit this file in its own window
-! *Wharf config interface.xpm Exec "-" xterm -T "AfterStep Configuration" -e vi ~/.steprc &
-    # Recycle your AfterStep session (Restart)
-  *Wharf Recycler  recycler.xpm  Restart " " afterstep
-  
---- 204,210 ----
-    # Click on the different "desks" to change in between them
-  *Wharf pager nil SwallowModule "Pager" Pager 0 0
-    # Edit this file in its own window
-! #*Wharf config interface.xpm Exec "-" xterm -T "AfterStep Configuration" -e vi ~/.steprc &
-    # Recycle your AfterStep session (Restart)
-  *Wharf Recycler  recycler.xpm  Restart " " afterstep
-  
-***************
-*** 239,245 ****
+*** 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 
@@ -72,7 +34,7 @@
   EndFunction
   
   # These will load up upon every subsequent Restart
---- 239,245 ----
+--- 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 
@@ -81,7 +43,7 @@
   
   # These will load up upon every subsequent Restart
 ***************
-*** 412,432 ****
+*** 419,439 ****
   # Images ... quick way to view the included default background images
   Popup "Images"
   	Title	"Images"
@@ -103,7 +65,7 @@
   EndPopup
   
   # Background settings ... choose from either Solid Colors or Color Images
---- 412,432 ----
+--- 419,439 ----
   # Images ... quick way to view the included default background images
   Popup "Images"
   	Title	"Images"
@@ -126,24 +88,7 @@
   
   # Background settings ... choose from either Solid Colors or Color Images
 ***************
-*** 444,450 ****
-  Popup "HotList"
-  	Title 	"HotList"
-          Exec    "Xterm"         exec xterm -ls -sl 256 -sb -T 'xterm@afterstep.org' &
-!         Exec    "Netscape 3.0"  exec netscape &
-          Popup   "Applications"  Applications
-  	Popup	"Utilities"	Utilities
-          Popup   "Games"         Games
---- 444,450 ----
-  Popup "HotList"
-  	Title 	"HotList"
-          Exec    "Xterm"         exec xterm -ls -sl 256 -sb -T 'xterm@afterstep.org' &
-!         Exec    "Netscape"	exec netscape &
-          Popup   "Applications"  Applications
-  	Popup	"Utilities"	Utilities
-          Popup   "Games"         Games
-***************
-*** 550,559 ****
+*** 559,568 ****
   Module Audio    
   
   # Select your normal audio player
@@ -154,7 +99,7 @@
   
   #*AudioDelay 1
   
---- 550,559 ----
+--- 559,568 ----
   Module Audio    
   
   # Select your normal audio player