4 files changed, 36 insertions, 19 deletions

diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 4f0d15804b54..68832562eede 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	afterstep
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 CATEGORIES=	x11-wm afterstep
 MASTER_SITES=	ftp://ftp.afterstep.org/stable/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -25,9 +25,10 @@ LIB_DEPENDS=	rplay.1:${PORTSDIR}/audio/rplay \
 RUN_DEPENDS=	${X11BASE}/bin/xli:${PORTSDIR}/graphics/xli
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_GNOME=	gtk20
 USE_PERL5=	yes
 USE_XPM=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--enable-i18n \
@@ -47,8 +48,8 @@ MAN1=		ASDatabase.1x ASDatabaseEntry.1x AfterStep.1x Align.1x \
 		FeelWindowBox.1x Functions.1x Gravity.1x Look.1x \
 		MyBackground.1x MyFrame.1x MyStyle.1x Pager.1x \
 		PagerDecorations.1x Placement.1x SupportedHints.1x \
-		TbarLayout.1x Wharf.1x WharfSounds.1x WinList.1x WinTabs.1x \
-		afterstep_faq.1x asimagexml.1x
+		TbarLayout.1x Wharf.1x WharfSounds.1x WinCommand.1x \
+		WinList.1x WinTabs.1x afterstep_faq.1x asimagexml.1x
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
diff --git a/x11-wm/afterstep-stable/distinfo b/x11-wm/afterstep-stable/distinfo
index c0c31d1dcf58..edc53d871371 100644
--- a/x11-wm/afterstep-stable/distinfo
+++ b/x11-wm/afterstep-stable/distinfo
@@ -1,2 +1,2 @@
-MD5 (AfterStep-2.1.1.tar.bz2) = 5b02ebcab3be1227cd227e39ab169bd3
-SIZE (AfterStep-2.1.1.tar.bz2) = 5025858
+MD5 (AfterStep-2.1.2.tar.bz2) = 6e356978680403fcedde547912c4cabf
+SIZE (AfterStep-2.1.2.tar.bz2) = 5079333
diff --git a/x11-wm/afterstep-stable/files/patch-asimagexml.c b/x11-wm/afterstep-stable/files/patch-asimagexml.c
deleted file mode 100644
index b564917f4d84..000000000000
--- a/x11-wm/afterstep-stable/files/patch-asimagexml.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$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/pkg-plist b/x11-wm/afterstep-stable/pkg-plist
index 55d477384b7f..29aae497ac2f 100644
--- a/x11-wm/afterstep-stable/pkg-plist
+++ b/x11-wm/afterstep-stable/pkg-plist
@@ -1,10 +1,13 @@
+bin/ASWallpaper
 bin/Animate
 bin/Arrange
 bin/Banner
+bin/GWCommand
 bin/Ident
 bin/MonitorWharf
 bin/Pager
 bin/Wharf
+bin/WinCommand
 bin/WinList
 bin/WinTabs
 bin/Xpm2Jpg
@@ -13,13 +16,24 @@ bin/afterstep-config
 bin/afterstepdoc
 bin/ascolor
 bin/ascommand.pl
+bin/asgtk-config
 bin/importasmenu
 bin/installastheme.pl
 bin/makeastheme.pl
 bin/postcard.sh
+include/libASGTK/asgtk.h
+include/libASGTK/asgtkai.h
+include/libASGTK/asgtkapp.h
+include/libASGTK/asgtkcolorsel.h
+include/libASGTK/asgtkgradient.h
+include/libASGTK/asgtkimagebrowser.h
+include/libASGTK/asgtkimagedir.h
+include/libASGTK/asgtkimageview.h
+include/libASGTK/asgtkxmleditor.h
 include/libAfterConf/afterconf.h
 include/libAfterStep/afterstep.h
 include/libAfterStep/asapp.h
+include/libAfterStep/ascommand.h
 include/libAfterStep/asdatabase.h
 include/libAfterStep/asfeel.h
 include/libAfterStep/aswindata.h
@@ -43,6 +57,7 @@ include/libAfterStep/screen.h
 include/libAfterStep/session.h
 include/libAfterStep/shape.h
 include/libAfterStep/wmprops.h
+lib/libASGTK.a
 lib/libAfterConf.a
 lib/libAfterStep.a
 %%DATADIR%%/CREDITS
@@ -555,10 +570,12 @@ lib/libAfterStep.a
 %%DATADIR%%/desktop/icons/mini-recycler.xpm
 %%DATADIR%%/desktop/icons/mini/AS
 %%DATADIR%%/desktop/icons/mini/App
+%%DATADIR%%/desktop/icons/mini/Desktop
 %%DATADIR%%/desktop/icons/mini/Exit
 %%DATADIR%%/desktop/icons/mini/Folder
 %%DATADIR%%/desktop/icons/mini/Menu
 %%DATADIR%%/desktop/icons/mini/Recycler
+%%DATADIR%%/desktop/icons/mini/RemoteControl
 %%DATADIR%%/desktop/icons/mini/scale16.sh
 %%DATADIR%%/desktop/icons/monalisa.xpm
 %%DATADIR%%/desktop/icons/monitor-bsd.xpm
@@ -899,6 +916,7 @@ lib/libAfterStep.a
 %%DATADIR%%/doc/html/TbarLayout.html
 %%DATADIR%%/doc/html/Wharf.html
 %%DATADIR%%/doc/html/WharfSounds.html
+%%DATADIR%%/doc/html/WinCommand.html
 %%DATADIR%%/doc/html/WinList.html
 %%DATADIR%%/doc/html/WinTabs.html
 %%DATADIR%%/doc/html/afterstep_faq.html
@@ -1789,6 +1807,8 @@ lib/libAfterStep.a
 %%DATADIR%%/doc/html/data/desktop/icons/mini/AS.png
 %%DATADIR%%/doc/html/data/desktop/icons/mini/App.html
 %%DATADIR%%/doc/html/data/desktop/icons/mini/App.png
+%%DATADIR%%/doc/html/data/desktop/icons/mini/Desktop.html
+%%DATADIR%%/doc/html/data/desktop/icons/mini/Desktop.png
 %%DATADIR%%/doc/html/data/desktop/icons/mini/Exit.html
 %%DATADIR%%/doc/html/data/desktop/icons/mini/Exit.png
 %%DATADIR%%/doc/html/data/desktop/icons/mini/Folder.html
@@ -1797,6 +1817,8 @@ lib/libAfterStep.a
 %%DATADIR%%/doc/html/data/desktop/icons/mini/Menu.png
 %%DATADIR%%/doc/html/data/desktop/icons/mini/Recycler.html
 %%DATADIR%%/doc/html/data/desktop/icons/mini/Recycler.png
+%%DATADIR%%/doc/html/data/desktop/icons/mini/RemoteControl.html
+%%DATADIR%%/doc/html/data/desktop/icons/mini/RemoteControl.png
 %%DATADIR%%/doc/html/data/desktop/icons/mini/background.jpg
 %%DATADIR%%/doc/html/data/desktop/icons/mini/index.html
 %%DATADIR%%/doc/html/data/desktop/icons/mini/scale16.sh.html
@@ -2565,6 +2587,9 @@ lib/libAfterStep.a
 %%DATADIR%%/doc/html/data/start/1_Desktop/d_nop.html
 %%DATADIR%%/doc/html/data/start/1_Desktop/e_updatestart.html
 %%DATADIR%%/doc/html/data/start/1_Desktop/f_updateall.html
+%%DATADIR%%/doc/html/data/start/1_Desktop/g_nop.html
+%%DATADIR%%/doc/html/data/start/1_Desktop/h_aswallpaper.html
+%%DATADIR%%/doc/html/data/start/1_Desktop/i_gwcommand.html
 %%DATADIR%%/doc/html/data/start/1_Desktop/index.html
 %%DATADIR%%/doc/html/data/start/2_Modules/Animate.html
 %%DATADIR%%/doc/html/data/start/2_Modules/Audio.html
@@ -2856,6 +2881,9 @@ lib/libAfterStep.a
 %%DATADIR%%/start/1_Desktop/d_nop
 %%DATADIR%%/start/1_Desktop/e_updatestart
 %%DATADIR%%/start/1_Desktop/f_updateall
+%%DATADIR%%/start/1_Desktop/g_nop
+%%DATADIR%%/start/1_Desktop/h_aswallpaper
+%%DATADIR%%/start/1_Desktop/i_gwcommand
 %%DATADIR%%/start/2_Modules/Animate
 %%DATADIR%%/start/2_Modules/Audio
 %%DATADIR%%/start/2_Modules/Banner
@@ -3059,3 +3087,4 @@ share/xsessions/AfterStep.desktop
 @dirrm %%DATADIR%%
 @dirrm include/libAfterStep
 @dirrm include/libAfterConf
+@dirrm include/libASGTK