4 files changed, 73 insertions, 8 deletions

diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index c2cdf13ef5e8..e5d4662fde54 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	afterstep
-PORTVERSION=	2.2.3
+PORTVERSION=	2.2.4
 CATEGORIES=	x11-wm afterstep
 MASTER_SITES=	ftp://ftp.afterstep.org/stable/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -22,7 +22,8 @@ LIB_DEPENDS=	rplay.1:${PORTSDIR}/audio/rplay \
 		png.5:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		execinfo.1:${PORTSDIR}/devel/libexecinfo
+		execinfo.1:${PORTSDIR}/devel/libexecinfo \
+		rsvg-2.2:${PORTSDIR}/graphics/librsvg2
 RUN_DEPENDS=	${X11BASE}/bin/xli:${PORTSDIR}/graphics/xli
 
 USE_BZIP2=	yes
diff --git a/x11-wm/afterstep-stable/distinfo b/x11-wm/afterstep-stable/distinfo
index e0f468323008..66ee4ef9b275 100644
--- a/x11-wm/afterstep-stable/distinfo
+++ b/x11-wm/afterstep-stable/distinfo
@@ -1,3 +1,3 @@
-MD5 (AfterStep-2.2.3.tar.bz2) = c4dd1739a3e76599815d91f0212d1a43
-SHA256 (AfterStep-2.2.3.tar.bz2) = 6aa1dedb8760abc66ade5a8b29eba03d40d06e0c0c4ec8c2b98f7e986388d8c5
-SIZE (AfterStep-2.2.3.tar.bz2) = 5611790
+MD5 (AfterStep-2.2.4.tar.bz2) = a382ad2fd2947d26010d1ec5f6a80392
+SHA256 (AfterStep-2.2.4.tar.bz2) = e1787184faaee583435730666ef3dd1c221ced493ccd9ba0a06f94ac5e5b05ec
+SIZE (AfterStep-2.2.4.tar.bz2) = 5707951
diff --git a/x11-wm/afterstep-stable/files/patch-libAfterStep::screen.c b/x11-wm/afterstep-stable/files/patch-libAfterStep::screen.c
new file mode 100644
index 000000000000..8a9456c14949
--- /dev/null
+++ b/x11-wm/afterstep-stable/files/patch-libAfterStep::screen.c
@@ -0,0 +1,15 @@
+$FreeBSD$
+
+--- libAfterStep/screen.c.orig	Sat Feb  3 21:34:23 2007
++++ libAfterStep/screen.c	Sat Feb  3 21:34:45 2007
+@@ -135,9 +135,9 @@
+ 
+ 		if ((s = XineramaQueryScreens (dpy, &(scr->xinerama_screens_num))) != NULL)
+ 		{
++			static char buf[256] ; 
+ 			scr->xinerama_screens = safemalloc (sizeof (XRectangle) * scr->xinerama_screens_num);
+ 	    	asxml_var_insert("xroot.xinerama_screens_num", scr->xinerama_screens_num);
+-			static char buf[256] ; 
+ 			for (i = 0; i < scr->xinerama_screens_num; ++i)
+ 			{
+ 				char *append_point = &buf[0]; 
diff --git a/x11-wm/afterstep-stable/pkg-plist b/x11-wm/afterstep-stable/pkg-plist
index 47ef66d8ab62..6d3f34891ecc 100644
--- a/x11-wm/afterstep-stable/pkg-plist
+++ b/x11-wm/afterstep-stable/pkg-plist
@@ -27,6 +27,7 @@ bin/postcard.sh
 include/libASGTK/asgtk.h
 include/libASGTK/asgtkai.h
 include/libASGTK/asgtkapp.h
+include/libASGTK/asgtkcframe.h
 include/libASGTK/asgtkcolorsel.h
 include/libASGTK/asgtkdirtree.h
 include/libASGTK/asgtkgradient.h
@@ -219,15 +220,19 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/bars/darkblue
 %%DATADIR%%/desktop/bars/east
 %%DATADIR%%/desktop/bars/frame_e_qnx
+%%DATADIR%%/desktop/bars/frame_e_smooth
 %%DATADIR%%/desktop/bars/frame_east_breeze
 %%DATADIR%%/desktop/bars/frame_east_glass_transp
 %%DATADIR%%/desktop/bars/frame_ne_glass_transp
 %%DATADIR%%/desktop/bars/frame_north_glass_transp
 %%DATADIR%%/desktop/bars/frame_nw_glass_transp
 %%DATADIR%%/desktop/bars/frame_s_qnx
+%%DATADIR%%/desktop/bars/frame_s_smooth
 %%DATADIR%%/desktop/bars/frame_se_breeze
 %%DATADIR%%/desktop/bars/frame_se_glass_transp
 %%DATADIR%%/desktop/bars/frame_se_qnx
+%%DATADIR%%/desktop/bars/frame_se_smooth
+%%DATADIR%%/desktop/bars/frame_se_smooth_white
 %%DATADIR%%/desktop/bars/frame_se_unity
 %%DATADIR%%/desktop/bars/frame_se_unity_grey
 %%DATADIR%%/desktop/bars/frame_south_breeze
@@ -236,12 +241,18 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/bars/frame_sw_breeze
 %%DATADIR%%/desktop/bars/frame_sw_glass_transp
 %%DATADIR%%/desktop/bars/frame_sw_qnx
+%%DATADIR%%/desktop/bars/frame_sw_smooth
 %%DATADIR%%/desktop/bars/frame_sw_unity_grey
 %%DATADIR%%/desktop/bars/frame_w_qnx
+%%DATADIR%%/desktop/bars/frame_w_smooth
 %%DATADIR%%/desktop/bars/frame_west_breeze
 %%DATADIR%%/desktop/bars/frame_west_glass_transp
 %%DATADIR%%/desktop/bars/frame_west_unity
 %%DATADIR%%/desktop/bars/green
+%%DATADIR%%/desktop/bars/lspacer_smooth
+%%DATADIR%%/desktop/bars/lspacer_smooth_white
+%%DATADIR%%/desktop/bars/ltitle_spacer_smooth
+%%DATADIR%%/desktop/bars/ltitle_spacer_smooth_white
 %%DATADIR%%/desktop/bars/menu_hilite_breeze
 %%DATADIR%%/desktop/bars/os8-title
 %%DATADIR%%/desktop/bars/ostx
@@ -252,10 +263,18 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/bars/postcard_no
 %%DATADIR%%/desktop/bars/postcard_yes
 %%DATADIR%%/desktop/bars/red
+%%DATADIR%%/desktop/bars/rounded_corners_smooth
+%%DATADIR%%/desktop/bars/rounded_corners_smooth_transp
+%%DATADIR%%/desktop/bars/rounded_cornersf_smooth
+%%DATADIR%%/desktop/bars/rounded_cornerss_smooth
+%%DATADIR%%/desktop/bars/rounded_cornersu_smooth
+%%DATADIR%%/desktop/bars/rspacer_smooth
+%%DATADIR%%/desktop/bars/rtitle_spacer_smooth
 %%DATADIR%%/desktop/bars/south
 %%DATADIR%%/desktop/bars/southeast
 %%DATADIR%%/desktop/bars/southwest
 %%DATADIR%%/desktop/bars/title_btn_breeze
+%%DATADIR%%/desktop/bars/title_btn_smooth
 %%DATADIR%%/desktop/bars/title_lbtn_glass
 %%DATADIR%%/desktop/bars/title_lbtn_qnx
 %%DATADIR%%/desktop/bars/title_lbtn_qnx_1
@@ -277,6 +296,8 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/bars/title_rtitle_spacer_breeze
 %%DATADIR%%/desktop/bars/title_rtitle_spacer_unity
 %%DATADIR%%/desktop/bars/title_rtitle_spacer_unity_grey
+%%DATADIR%%/desktop/bars/title_smooth
+%%DATADIR%%/desktop/bars/title_smooth_white
 %%DATADIR%%/desktop/bars/title_tile_breeze
 %%DATADIR%%/desktop/bars/title_tile_breeze_gloss
 %%DATADIR%%/desktop/bars/title_tile_glass_focused
@@ -340,6 +361,7 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/buttons/breeze-menu
 %%DATADIR%%/desktop/buttons/breeze-shade
 %%DATADIR%%/desktop/buttons/breeze-switchwindow
+%%DATADIR%%/desktop/buttons/close_smooth
 %%DATADIR%%/desktop/buttons/default-iconize-dark
 %%DATADIR%%/desktop/buttons/default-iconize-dark-pressed
 %%DATADIR%%/desktop/buttons/default-iconize-light
@@ -388,6 +410,8 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/buttons/glass-shade-pressed
 %%DATADIR%%/desktop/buttons/glass-switchwindow
 %%DATADIR%%/desktop/buttons/glass-switchwindow-pressed
+%%DATADIR%%/desktop/buttons/menu_smooth
+%%DATADIR%%/desktop/buttons/minmax_smooth
 %%DATADIR%%/desktop/buttons/qnx-close
 %%DATADIR%%/desktop/buttons/qnx-close-pressed
 %%DATADIR%%/desktop/buttons/qnx-iconify
@@ -400,6 +424,7 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/buttons/qnx-shade-pressed
 %%DATADIR%%/desktop/buttons/qnx-switchwindow
 %%DATADIR%%/desktop/buttons/qnx-switchwindow-pressed
+%%DATADIR%%/desktop/buttons/shade_smooth
 %%DATADIR%%/desktop/buttons/tiny-close
 %%DATADIR%%/desktop/buttons/tiny-maxmin
 %%DATADIR%%/desktop/buttons/tiny-shade
@@ -473,7 +498,10 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/icons/FileFolders.xpm
 %%DATADIR%%/desktop/icons/Folder-Brushes
 %%DATADIR%%/desktop/icons/Folder-Cardgames
+%%DATADIR%%/desktop/icons/Folder-ChessBishop
+%%DATADIR%%/desktop/icons/Folder-ChessKnight
 %%DATADIR%%/desktop/icons/Folder-Desktop2
+%%DATADIR%%/desktop/icons/Folder-Dice
 %%DATADIR%%/desktop/icons/Folder-GNOME2
 %%DATADIR%%/desktop/icons/Folder-GameController
 %%DATADIR%%/desktop/icons/Folder-Gear2
@@ -483,6 +511,7 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/icons/Folder-Headphones
 %%DATADIR%%/desktop/icons/Folder-Info
 %%DATADIR%%/desktop/icons/Folder-KDE
+%%DATADIR%%/desktop/icons/Folder-Knight
 %%DATADIR%%/desktop/icons/Folder-Library
 %%DATADIR%%/desktop/icons/Folder-Lightswitch
 %%DATADIR%%/desktop/icons/Folder-MagnifyingGlass
@@ -496,11 +525,17 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/icons/Folder-Pallette
 %%DATADIR%%/desktop/icons/Folder-Pen1
 %%DATADIR%%/desktop/icons/Folder-PencilCup
+%%DATADIR%%/desktop/icons/Folder-People
+%%DATADIR%%/desktop/icons/Folder-Pistol
 %%DATADIR%%/desktop/icons/Folder-PlayerLoad
 %%DATADIR%%/desktop/icons/Folder-PlayerStop
 %%DATADIR%%/desktop/icons/Folder-Puzzle
+%%DATADIR%%/desktop/icons/Folder-RaceCar
 %%DATADIR%%/desktop/icons/Folder-Screwdriver
+%%DATADIR%%/desktop/icons/Folder-SoccerBall
 %%DATADIR%%/desktop/icons/Folder-Stopsign
+%%DATADIR%%/desktop/icons/Folder-TeddyBear
+%%DATADIR%%/desktop/icons/Folder-TetrisBlocks
 %%DATADIR%%/desktop/icons/Folder-Touch
 %%DATADIR%%/desktop/icons/Folder-View
 %%DATADIR%%/desktop/icons/Folder-Windows
@@ -564,15 +599,19 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/icons/dots/arrow_tiny
 %%DATADIR%%/desktop/icons/dots/bar_medium
 %%DATADIR%%/desktop/icons/dots/circle_medium
+%%DATADIR%%/desktop/icons/dots/close_smooth_white
 %%DATADIR%%/desktop/icons/dots/lined_arrow
 %%DATADIR%%/desktop/icons/dots/maxmin_unity
 %%DATADIR%%/desktop/icons/dots/menu_medium
+%%DATADIR%%/desktop/icons/dots/menu_smooth_white
+%%DATADIR%%/desktop/icons/dots/minmax_smooth_white
 %%DATADIR%%/desktop/icons/dots/oval_medium
 %%DATADIR%%/desktop/icons/dots/pin
 %%DATADIR%%/desktop/icons/dots/qnx-close-red
 %%DATADIR%%/desktop/icons/dots/qnx-iconify-red
 %%DATADIR%%/desktop/icons/dots/qnx-menu-red
 %%DATADIR%%/desktop/icons/dots/qnx-shade-red
+%%DATADIR%%/desktop/icons/dots/shade_smooth_white
 %%DATADIR%%/desktop/icons/dots/shade_unity
 %%DATADIR%%/desktop/icons/dots/square_medium
 %%DATADIR%%/desktop/icons/dots/square_small
@@ -753,6 +792,8 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/icons/normal/Charts
 %%DATADIR%%/desktop/icons/normal/Chat
 %%DATADIR%%/desktop/icons/normal/Chess
+%%DATADIR%%/desktop/icons/normal/ChessBishop
+%%DATADIR%%/desktop/icons/normal/ChessKnight
 %%DATADIR%%/desktop/icons/normal/Chip
 %%DATADIR%%/desktop/icons/normal/Clock
 %%DATADIR%%/desktop/icons/normal/Coffee
@@ -766,6 +807,7 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/icons/normal/Desktop
 %%DATADIR%%/desktop/icons/normal/Desktop2
 %%DATADIR%%/desktop/icons/normal/DialogEdit
+%%DATADIR%%/desktop/icons/normal/Dice
 %%DATADIR%%/desktop/icons/normal/Document
 %%DATADIR%%/desktop/icons/normal/Dollar
 %%DATADIR%%/desktop/icons/normal/Dollars
@@ -822,6 +864,7 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/icons/normal/Key
 %%DATADIR%%/desktop/icons/normal/Keyboard
 %%DATADIR%%/desktop/icons/normal/KeysOnChain
+%%DATADIR%%/desktop/icons/normal/Knight
 %%DATADIR%%/desktop/icons/normal/LaserPrinter
 %%DATADIR%%/desktop/icons/normal/LeatherBag
 %%DATADIR%%/desktop/icons/normal/Leatherman
@@ -889,6 +932,7 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/icons/normal/PencilCup
 %%DATADIR%%/desktop/icons/normal/People
 %%DATADIR%%/desktop/icons/normal/Piano
+%%DATADIR%%/desktop/icons/normal/Pistol
 %%DATADIR%%/desktop/icons/normal/Player
 %%DATADIR%%/desktop/icons/normal/PlayerBack
 %%DATADIR%%/desktop/icons/normal/PlayerForward
@@ -903,6 +947,7 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/icons/normal/Puzzle
 %%DATADIR%%/desktop/icons/normal/Pyramid
 %%DATADIR%%/desktop/icons/normal/Python
+%%DATADIR%%/desktop/icons/normal/RaceCar
 %%DATADIR%%/desktop/icons/normal/Recycle
 %%DATADIR%%/desktop/icons/normal/RedLight
 %%DATADIR%%/desktop/icons/normal/Rembrandt
@@ -920,6 +965,7 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/icons/normal/Screwdriver2
 %%DATADIR%%/desktop/icons/normal/Shell
 %%DATADIR%%/desktop/icons/normal/Shredder
+%%DATADIR%%/desktop/icons/normal/SoccerBall
 %%DATADIR%%/desktop/icons/normal/Speaker
 %%DATADIR%%/desktop/icons/normal/Stamp
 %%DATADIR%%/desktop/icons/normal/Stickynote
@@ -930,6 +976,8 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/icons/normal/TV
 %%DATADIR%%/desktop/icons/normal/Table
 %%DATADIR%%/desktop/icons/normal/Tapemeasure
+%%DATADIR%%/desktop/icons/normal/TeddyBear
+%%DATADIR%%/desktop/icons/normal/TetrisBlocks
 %%DATADIR%%/desktop/icons/normal/Thumbsup
 %%DATADIR%%/desktop/icons/normal/Timer
 %%DATADIR%%/desktop/icons/normal/ToolbarInHand
@@ -1163,6 +1211,7 @@ lib/libAfterStep.a
 %%DATADIR%%/looks/look.Glass
 %%DATADIR%%/looks/look.Legacy
 %%DATADIR%%/looks/look.QNX
+%%DATADIR%%/looks/look.Smooth
 %%DATADIR%%/looks/look.Tiny
 %%DATADIR%%/looks/look.Transparent
 %%DATADIR%%/looks/look.Unity
@@ -1197,8 +1246,7 @@ lib/libAfterStep.a
 %%DATADIR%%/start/0_Applications/Office/.include
 %%DATADIR%%/start/0_Applications/System/.include
 %%DATADIR%%/start/0_Search/.include
-%%DATADIR%%/start/0_run
-%%DATADIR%%/start/0_zzznop
+%%DATADIR%%/start/11_nop
 %%DATADIR%%/start/1_Desktop/.include
 %%DATADIR%%/start/1_Desktop/Color_Scheme/.include
 %%DATADIR%%/start/1_Desktop/ConfigFiles/.include
@@ -1230,6 +1278,7 @@ lib/libAfterStep.a
 %%DATADIR%%/start/3_Screen_savers/With_password/.include
 %%DATADIR%%/start/3_Screen_savers/Without_password/.include
 %%DATADIR%%/start/3_System_Settings/.include
+%%DATADIR%%/start/3_run
 %%DATADIR%%/start/4_Windows/.include
 %%DATADIR%%/start/4_Windows/0_Arrange/.include
 %%DATADIR%%/start/4_Windows/0_Arrange/Cascade
@@ -1245,10 +1294,10 @@ lib/libAfterStep.a
 %%DATADIR%%/start/4_Windows/5_destroy
 %%DATADIR%%/start/4_Windows/6_winprop
 %%DATADIR%%/start/4_Windows/7_fullscreen
+%%DATADIR%%/start/4_zzznop
 %%DATADIR%%/start/5_Quit/.include
 %%DATADIR%%/start/5_Quit/0_close
 %%DATADIR%%/start/5_Quit/3_restartsession
-%%DATADIR%%/start/6_nop
 %%DATADIR%%/start/7_About_AfterStep/.include
 %%DATADIR%%/themes/DEFAULT.tar.gz
 %%DATADIR%%/themes/Default