6 files changed, 83 insertions, 34 deletions

diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index cfc6e939f552..33debcec2db5 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	afterstep
-PORTVERSION=	2.00.04
+PORTVERSION=	2.00.05
 CATEGORIES=	x11-wm afterstep
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	ftp://ftp.afterstep.org/stable/ \
+		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	AfterStep-${PORTVERSION}
 
diff --git a/x11-wm/afterstep-stable/distinfo b/x11-wm/afterstep-stable/distinfo
index 8c7edab02c11..3a46ad404fe8 100644
--- a/x11-wm/afterstep-stable/distinfo
+++ b/x11-wm/afterstep-stable/distinfo
@@ -1,2 +1,2 @@
-MD5 (AfterStep-2.00.04.tar.bz2) = 5b1459a9c8f06100d0c1c0002aa3399c
-SIZE (AfterStep-2.00.04.tar.bz2) = 4710344
+MD5 (AfterStep-2.00.05.tar.bz2) = 7b3753f9b272bf96bb081221fdc3b33b
+SIZE (AfterStep-2.00.05.tar.bz2) = 4997596
diff --git a/x11-wm/afterstep-stable/files/patch-Arrange.c b/x11-wm/afterstep-stable/files/patch-Arrange.c
new file mode 100644
index 000000000000..4c9d2d40bd98
--- /dev/null
+++ b/x11-wm/afterstep-stable/files/patch-Arrange.c
@@ -0,0 +1,33 @@
+$FreeBSD$
+
+--- src/Arrange/Arrange.c.orig	Wed May  4 14:15:17 2005
++++ src/Arrange/Arrange.c	Wed May  4 14:16:39 2005
+@@ -457,11 +457,12 @@
+ void 
+ tile_windows()
+ {
++	int n_groups;
+ 	int n_windows = 0;
+ 	iterate_asbidirlist( ArrangeState.clients_order,
+ 			     count_managed_windows, &n_windows, NULL, False);
+ 	
+-	int n_groups = ArrangeState.clients_order->count / ArrangeState.count;
++	n_groups = ArrangeState.clients_order->count / ArrangeState.count;
+ 	if(ArrangeState.clients_order->count % ArrangeState.count)
+ 		n_groups++;
+ 	
+@@ -505,12 +506,11 @@
+ Bool 
+ cascade_window(void *data, void *aux_data)
+ {
++	send_signed_data_type vals[2] ;	
++	send_signed_data_type units[2] ;	
+ 	ASWindowData *wd = fetch_window_by_id( ((client_item *) data)->cl );
+ 	if(wd == NULL)
+ 		return True;
+-
+-	send_signed_data_type vals[2] ;	
+-	send_signed_data_type units[2] ;	
+ 
+ 	if(! window_is_suitable( wd ))
+ 	  return True; /* Next window please */
diff --git a/x11-wm/afterstep-stable/files/patch-asimagexml.c b/x11-wm/afterstep-stable/files/patch-asimagexml.c
new file mode 100644
index 000000000000..b564917f4d84
--- /dev/null
+++ b/x11-wm/afterstep-stable/files/patch-asimagexml.c
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- libAfterImage/asimagexml.c.orig	Wed May  4 14:13:19 2005
++++ libAfterImage/asimagexml.c	Wed May  4 14:13:54 2005
+@@ -268,7 +268,7 @@
+ 	ASImage* im = NULL;
+ 	xml_elem_t* doc;
+ 	ASImageManager *my_imman = imman, *old_as_xml_imman = _as_xml_image_manager ;
+-	ASFontManager  *my_fontman = fontman, *old_as_xml_fontman = _as_xml_font_manager ; ;
++	ASFontManager  *my_fontman = fontman, *old_as_xml_fontman = _as_xml_font_manager ;
+ 	int my_imman_curr_dir_path_idx = MAX_SEARCH_PATHS ;
+ 
+     asxml_var_init();
diff --git a/x11-wm/afterstep-stable/files/patch-decor.c b/x11-wm/afterstep-stable/files/patch-decor.c
deleted file mode 100644
index 531e2ba2620d..000000000000
--- a/x11-wm/afterstep-stable/files/patch-decor.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$FreeBSD$
-
---- libAfterStep/decor.c.orig	Fri Apr  1 10:55:09 2005
-+++ libAfterStep/decor.c	Fri Apr  1 10:55:38 2005
-@@ -1659,8 +1659,8 @@
- void
- on_astbar_pointer_action( ASTBarData *tbar, int context, Bool leave, Bool pointer_moved )
- {
--    LOCAL_DEBUG_CALLER_OUT( "%p, %s, %d", tbar, context2text(context), leave );
- 	static ASBalloon *last_balloon = NULL ;
-+    LOCAL_DEBUG_CALLER_OUT( "%p, %s, %d", tbar, context2text(context), leave );
-     
- 	if( tbar == NULL )
-     {
diff --git a/x11-wm/afterstep-stable/pkg-plist b/x11-wm/afterstep-stable/pkg-plist
index 9a959279c5c0..e9f69c59368b 100644
--- a/x11-wm/afterstep-stable/pkg-plist
+++ b/x11-wm/afterstep-stable/pkg-plist
@@ -1,4 +1,5 @@
 bin/Animate
+bin/Arrange
 bin/Banner
 bin/Ident
 bin/MonitorWharf
@@ -44,15 +45,20 @@ include/libAfterStep/shape.h
 include/libAfterStep/wmprops.h
 lib/libAfterConf.a
 lib/libAfterStep.a
+share/afterstep/CREDITS
 share/afterstep/animate
 share/afterstep/autoexec
 share/afterstep/backgrounds/.Cell
+share/afterstep/backgrounds/.CloudsOfDoubt
 share/afterstep/backgrounds/.Japanese
+share/afterstep/backgrounds/.OceanWave
 share/afterstep/backgrounds/.StormySkies
 share/afterstep/backgrounds/Cell
 share/afterstep/backgrounds/Cell.mini
 share/afterstep/backgrounds/Cell_Colored
 share/afterstep/backgrounds/Cell_Colored.mini
+share/afterstep/backgrounds/Clouds_of_Doubt
+share/afterstep/backgrounds/Clouds_of_Doubt.mini
 share/afterstep/backgrounds/Default
 share/afterstep/backgrounds/Default.mini
 share/afterstep/backgrounds/DefaultTexture
@@ -91,6 +97,8 @@ share/afterstep/backgrounds/Mirrored_Tiles/Dorchester_Consolidated
 share/afterstep/backgrounds/Mirrored_Tiles/Dorchester_Consolidated.mini
 share/afterstep/backgrounds/Mirrored_Tiles/Evil_Car_Wash
 share/afterstep/backgrounds/Mirrored_Tiles/Evil_Car_Wash.mini
+share/afterstep/backgrounds/Ocean_Wave
+share/afterstep/backgrounds/Ocean_Wave.mini
 share/afterstep/backgrounds/Plain_Textures/.include
 share/afterstep/backgrounds/Plain_Textures/Blurts_Michelson
 share/afterstep/backgrounds/Plain_Textures/Blurts_Michelson.mini
@@ -457,6 +465,7 @@ share/afterstep/desktop/icons/dots/triangle_squared_small
 share/afterstep/desktop/icons/dots/window_medium
 share/afterstep/desktop/icons/dots/window_small
 share/afterstep/desktop/icons/dots/window_thick
+share/afterstep/desktop/icons/dots/window_unity
 share/afterstep/desktop/icons/dots/windows_medium
 share/afterstep/desktop/icons/dots/windows_small
 share/afterstep/desktop/icons/dots/x_boxy
@@ -465,6 +474,7 @@ share/afterstep/desktop/icons/dots/x_large
 share/afterstep/desktop/icons/dots/x_medium
 share/afterstep/desktop/icons/dots/x_small
 share/afterstep/desktop/icons/dots/x_thin
+share/afterstep/desktop/icons/dots/x_unity
 share/afterstep/desktop/icons/draw.xpm
 share/afterstep/desktop/icons/east.xpm
 share/afterstep/desktop/icons/eterm
@@ -827,6 +837,7 @@ share/afterstep/desktop/tiles/Transparent
 share/afterstep/desktop/tiles/Water
 share/afterstep/desktop/tiles/White
 share/afterstep/desktop/tiles/back.xpm
+share/afterstep/desktop/tiles/black_dot
 share/afterstep/desktop/tiles/empty
 share/afterstep/desktop/tiles/fore.xpm
 share/afterstep/desktop/tiles/rose512.jpg
@@ -896,6 +907,8 @@ share/afterstep/doc/html/data/backgrounds/Cell.html
 share/afterstep/doc/html/data/backgrounds/Cell.png
 share/afterstep/doc/html/data/backgrounds/Cell_Colored.html
 share/afterstep/doc/html/data/backgrounds/Cell_Colored.png
+share/afterstep/doc/html/data/backgrounds/Clouds_of_Doubt.html
+share/afterstep/doc/html/data/backgrounds/Clouds_of_Doubt.png
 share/afterstep/doc/html/data/backgrounds/Default.html
 share/afterstep/doc/html/data/backgrounds/Default.png
 share/afterstep/doc/html/data/backgrounds/DefaultTexture.html
@@ -936,6 +949,8 @@ share/afterstep/doc/html/data/backgrounds/Mirrored_Tiles/Evil_Car_Wash.html
 share/afterstep/doc/html/data/backgrounds/Mirrored_Tiles/Evil_Car_Wash.png
 share/afterstep/doc/html/data/backgrounds/Mirrored_Tiles/background.jpg
 share/afterstep/doc/html/data/backgrounds/Mirrored_Tiles/index.html
+share/afterstep/doc/html/data/backgrounds/Ocean_Wave.html
+share/afterstep/doc/html/data/backgrounds/Ocean_Wave.png
 share/afterstep/doc/html/data/backgrounds/Plain_Textures/Blurts_Michelson.html
 share/afterstep/doc/html/data/backgrounds/Plain_Textures/Blurts_Michelson.png
 share/afterstep/doc/html/data/backgrounds/Plain_Textures/Checkers.html
@@ -1586,6 +1601,8 @@ share/afterstep/doc/html/data/desktop/icons/dots/window_small.html
 share/afterstep/doc/html/data/desktop/icons/dots/window_small.png
 share/afterstep/doc/html/data/desktop/icons/dots/window_thick.html
 share/afterstep/doc/html/data/desktop/icons/dots/window_thick.png
+share/afterstep/doc/html/data/desktop/icons/dots/window_unity.html
+share/afterstep/doc/html/data/desktop/icons/dots/window_unity.png
 share/afterstep/doc/html/data/desktop/icons/dots/windows_medium.html
 share/afterstep/doc/html/data/desktop/icons/dots/windows_medium.png
 share/afterstep/doc/html/data/desktop/icons/dots/windows_small.html
@@ -1602,6 +1619,8 @@ share/afterstep/doc/html/data/desktop/icons/dots/x_small.html
 share/afterstep/doc/html/data/desktop/icons/dots/x_small.png
 share/afterstep/doc/html/data/desktop/icons/dots/x_thin.html
 share/afterstep/doc/html/data/desktop/icons/dots/x_thin.png
+share/afterstep/doc/html/data/desktop/icons/dots/x_unity.html
+share/afterstep/doc/html/data/desktop/icons/dots/x_unity.png
 share/afterstep/doc/html/data/desktop/icons/draw.xpm.html
 share/afterstep/doc/html/data/desktop/icons/draw.xpm.png
 share/afterstep/doc/html/data/desktop/icons/east.xpm.html
@@ -2304,6 +2323,8 @@ share/afterstep/doc/html/data/desktop/tiles/White.png
 share/afterstep/doc/html/data/desktop/tiles/back.xpm.html
 share/afterstep/doc/html/data/desktop/tiles/back.xpm.png
 share/afterstep/doc/html/data/desktop/tiles/background.jpg
+share/afterstep/doc/html/data/desktop/tiles/black_dot.html
+share/afterstep/doc/html/data/desktop/tiles/black_dot.png
 share/afterstep/doc/html/data/desktop/tiles/empty.html
 share/afterstep/doc/html/data/desktop/tiles/empty.png
 share/afterstep/doc/html/data/desktop/tiles/fore.xpm.html
@@ -2325,6 +2346,7 @@ share/afterstep/doc/html/data/looks/look.DEFAULT.html
 share/afterstep/doc/html/data/looks/look.Glass.html
 share/afterstep/doc/html/data/looks/look.Legacy.html
 share/afterstep/doc/html/data/looks/look.QNX.html
+share/afterstep/doc/html/data/looks/look.Tiny.html
 share/afterstep/doc/html/data/looks/look.Transparent.html
 share/afterstep/doc/html/data/looks/look.Unity.html
 share/afterstep/doc/html/data/non-configurable/0_background.html
@@ -2534,7 +2556,6 @@ share/afterstep/doc/html/data/start/1_Desktop/index.html
 share/afterstep/doc/html/data/start/2_Modules/Animate.html
 share/afterstep/doc/html/data/start/2_Modules/Audio.html
 share/afterstep/doc/html/data/start/2_Modules/Banner.html
-share/afterstep/doc/html/data/start/2_Modules/Cascade.html
 share/afterstep/doc/html/data/start/2_Modules/Clean.html
 share/afterstep/doc/html/data/start/2_Modules/Forms/1_ftp.html
 share/afterstep/doc/html/data/start/2_Modules/Forms/2_find.html
@@ -2546,7 +2567,6 @@ share/afterstep/doc/html/data/start/2_Modules/Forms/7_windowshot.html
 share/afterstep/doc/html/data/start/2_Modules/Forms/8_xlock.html
 share/afterstep/doc/html/data/start/2_Modules/Forms/background.jpg
 share/afterstep/doc/html/data/start/2_Modules/Forms/index.html
-share/afterstep/doc/html/data/start/2_Modules/Gnome.html
 share/afterstep/doc/html/data/start/2_Modules/Ident.html
 share/afterstep/doc/html/data/start/2_Modules/MonitorWharf.html
 share/afterstep/doc/html/data/start/2_Modules/Pager.html
@@ -2561,24 +2581,18 @@ share/afterstep/doc/html/data/start/2_Modules/Scroll.html
 share/afterstep/doc/html/data/start/2_Modules/Stop/Animate_Stop.html
 share/afterstep/doc/html/data/start/2_Modules/Stop/Audio_Stop.html
 share/afterstep/doc/html/data/start/2_Modules/Stop/Banner_Stop.html
-share/afterstep/doc/html/data/start/2_Modules/Stop/Cascade_Stop.html
 share/afterstep/doc/html/data/start/2_Modules/Stop/Clean_Stop.html
-share/afterstep/doc/html/data/start/2_Modules/Stop/Gnome_Stop.html
 share/afterstep/doc/html/data/start/2_Modules/Stop/Ident_Stop.html
 share/afterstep/doc/html/data/start/2_Modules/Stop/MonitorWharf_Stop.html
 share/afterstep/doc/html/data/start/2_Modules/Stop/Pager_Stop.html
 share/afterstep/doc/html/data/start/2_Modules/Stop/Scroll_Stop.html
-share/afterstep/doc/html/data/start/2_Modules/Stop/Tile_Stop.html
 share/afterstep/doc/html/data/start/2_Modules/Stop/Wharf_Stop.html
 share/afterstep/doc/html/data/start/2_Modules/Stop/WinList_Stop.html
-share/afterstep/doc/html/data/start/2_Modules/Stop/Zharf_Stop.html
 share/afterstep/doc/html/data/start/2_Modules/Stop/asetroot_Stop.html
 share/afterstep/doc/html/data/start/2_Modules/Stop/background.jpg
 share/afterstep/doc/html/data/start/2_Modules/Stop/index.html
-share/afterstep/doc/html/data/start/2_Modules/Tile.html
 share/afterstep/doc/html/data/start/2_Modules/Wharf.html
 share/afterstep/doc/html/data/start/2_Modules/WinList.html
-share/afterstep/doc/html/data/start/2_Modules/Zharf.html
 share/afterstep/doc/html/data/start/2_Modules/asetroot.html
 share/afterstep/doc/html/data/start/2_Modules/background.jpg
 share/afterstep/doc/html/data/start/2_Modules/index.html
@@ -2608,6 +2622,10 @@ share/afterstep/doc/html/data/start/3_Screen_savers/Without_password/background.
 share/afterstep/doc/html/data/start/3_Screen_savers/Without_password/index.html
 share/afterstep/doc/html/data/start/3_Screen_savers/background.jpg
 share/afterstep/doc/html/data/start/3_Screen_savers/index.html
+share/afterstep/doc/html/data/start/4_Windows/0_Arrange/Cascade.html
+share/afterstep/doc/html/data/start/4_Windows/0_Arrange/Tile.html
+share/afterstep/doc/html/data/start/4_Windows/0_Arrange/background.jpg
+share/afterstep/doc/html/data/start/4_Windows/0_Arrange/index.html
 share/afterstep/doc/html/data/start/4_Windows/0_move.html
 share/afterstep/doc/html/data/start/4_Windows/1_iconify.html
 share/afterstep/doc/html/data/start/4_Windows/1_resize.html
@@ -2653,6 +2671,7 @@ share/afterstep/looks/look.DEFAULT
 share/afterstep/looks/look.Glass
 share/afterstep/looks/look.Legacy
 share/afterstep/looks/look.QNX
+share/afterstep/looks/look.Tiny
 share/afterstep/looks/look.Transparent
 share/afterstep/looks/look.Unity
 share/afterstep/non-configurable/0_background
@@ -2682,6 +2701,7 @@ share/afterstep/start/0_Applications/Editors/1_emacs
 share/afterstep/start/0_Applications/Editors/2_vi
 share/afterstep/start/0_Applications/Editors/3_nedit
 share/afterstep/start/0_Applications/Editors/4_xjed
+share/afterstep/start/0_Applications/Emulators/.include
 share/afterstep/start/0_Applications/Emulators/0_dos
 share/afterstep/start/0_Applications/Emulators/1_mac
 share/afterstep/start/0_Applications/Emulators/2_amiga
@@ -2826,7 +2846,6 @@ share/afterstep/start/1_Desktop/f_updateall
 share/afterstep/start/2_Modules/Animate
 share/afterstep/start/2_Modules/Audio
 share/afterstep/start/2_Modules/Banner
-share/afterstep/start/2_Modules/Cascade
 share/afterstep/start/2_Modules/Clean
 share/afterstep/start/2_Modules/Forms/1_ftp
 share/afterstep/start/2_Modules/Forms/2_find
@@ -2836,7 +2855,6 @@ share/afterstep/start/2_Modules/Forms/5_run
 share/afterstep/start/2_Modules/Forms/6_screenshot
 share/afterstep/start/2_Modules/Forms/7_windowshot
 share/afterstep/start/2_Modules/Forms/8_xlock
-share/afterstep/start/2_Modules/Gnome
 share/afterstep/start/2_Modules/Ident
 share/afterstep/start/2_Modules/MonitorWharf
 share/afterstep/start/2_Modules/Pager
@@ -2849,22 +2867,16 @@ share/afterstep/start/2_Modules/Scroll
 share/afterstep/start/2_Modules/Stop/Animate_Stop
 share/afterstep/start/2_Modules/Stop/Audio_Stop
 share/afterstep/start/2_Modules/Stop/Banner_Stop
-share/afterstep/start/2_Modules/Stop/Cascade_Stop
 share/afterstep/start/2_Modules/Stop/Clean_Stop
-share/afterstep/start/2_Modules/Stop/Gnome_Stop
 share/afterstep/start/2_Modules/Stop/Ident_Stop
 share/afterstep/start/2_Modules/Stop/MonitorWharf_Stop
 share/afterstep/start/2_Modules/Stop/Pager_Stop
 share/afterstep/start/2_Modules/Stop/Scroll_Stop
-share/afterstep/start/2_Modules/Stop/Tile_Stop
 share/afterstep/start/2_Modules/Stop/Wharf_Stop
 share/afterstep/start/2_Modules/Stop/WinList_Stop
-share/afterstep/start/2_Modules/Stop/Zharf_Stop
 share/afterstep/start/2_Modules/Stop/asetroot_Stop
-share/afterstep/start/2_Modules/Tile
 share/afterstep/start/2_Modules/Wharf
 share/afterstep/start/2_Modules/WinList
-share/afterstep/start/2_Modules/Zharf
 share/afterstep/start/2_Modules/asetroot
 share/afterstep/start/3_Screen_savers/With_password/0_firework
 share/afterstep/start/3_Screen_savers/With_password/1_firework
@@ -2886,6 +2898,8 @@ share/afterstep/start/3_Screen_savers/Without_password/6_sperm
 share/afterstep/start/3_Screen_savers/Without_password/7_spline
 share/afterstep/start/3_Screen_savers/Without_password/8_startrek
 share/afterstep/start/3_Screen_savers/Without_password/9_stars
+share/afterstep/start/4_Windows/0_Arrange/Cascade
+share/afterstep/start/4_Windows/0_Arrange/Tile
 share/afterstep/start/4_Windows/0_move
 share/afterstep/start/4_Windows/1_iconify
 share/afterstep/start/4_Windows/1_resize
@@ -2919,6 +2933,7 @@ share/xsessions/AfterStep.desktop
 @dirrm share/afterstep/themes
 @dirrm share/afterstep/start/7_About_AfterStep
 @dirrm share/afterstep/start/5_Quit
+@dirrm share/afterstep/start/4_Windows/0_Arrange
 @dirrm share/afterstep/start/4_Windows
 @dirrm share/afterstep/start/3_Screen_savers/Without_password
 @dirrm share/afterstep/start/3_Screen_savers/With_password
@@ -2955,6 +2970,7 @@ share/xsessions/AfterStep.desktop
 @dirrm share/afterstep/doc/html/data/themes
 @dirrm share/afterstep/doc/html/data/start/7_About_AfterStep
 @dirrm share/afterstep/doc/html/data/start/5_Quit
+@dirrm share/afterstep/doc/html/data/start/4_Windows/0_Arrange
 @dirrm share/afterstep/doc/html/data/start/4_Windows
 @dirrm share/afterstep/doc/html/data/start/3_Screen_savers/Without_password
 @dirrm share/afterstep/doc/html/data/start/3_Screen_savers/With_password