4 files changed, 7 insertions, 80 deletions

diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index d0118968c081..4f0d15804b54 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	afterstep
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 CATEGORIES=	x11-wm afterstep
 MASTER_SITES=	ftp://ftp.afterstep.org/stable/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-wm/afterstep-stable/distinfo b/x11-wm/afterstep-stable/distinfo
index 66ad74fe9b26..c0c31d1dcf58 100644
--- a/x11-wm/afterstep-stable/distinfo
+++ b/x11-wm/afterstep-stable/distinfo
@@ -1,2 +1,2 @@
-MD5 (AfterStep-2.1.0.tar.bz2) = b2dba216770c322aadf3953bae1502d7
-SIZE (AfterStep-2.1.0.tar.bz2) = 5004033
+MD5 (AfterStep-2.1.1.tar.bz2) = 5b02ebcab3be1227cd227e39ab169bd3
+SIZE (AfterStep-2.1.1.tar.bz2) = 5025858
diff --git a/x11-wm/afterstep-stable/files/patch-Arrange.c b/x11-wm/afterstep-stable/files/patch-Arrange.c
deleted file mode 100644
index 9983898f945b..000000000000
--- a/x11-wm/afterstep-stable/files/patch-Arrange.c
+++ /dev/null
@@ -1,57 +0,0 @@
-$FreeBSD$
-
---- src/Arrange/Arrange.c.orig	Wed May 18 10:38:10 2005
-+++ src/Arrange/Arrange.c	Wed May 18 10:39:48 2005
-@@ -488,15 +488,14 @@
- {
- 	int buf_size = 256;
- 	char buf[buf_size];
--	
--	ASWindowData *wd = fetch_window_by_id( ((client_item *) data)->cl );
--	if(!wd)
--		return True;
--
- 	/* used by SendNumCommand */
- 	send_signed_data_type vals[2] ;	
- 	send_signed_data_type units[2] ;
- 
-+	ASWindowData *wd = fetch_window_by_id( ((client_item *) data)->cl );
-+	if(!wd)
-+		return True;
-+
- 	if(! window_is_suitable( wd ))
- 	  return True; /* Next window please */
- 
-@@ -550,6 +549,7 @@
- void 
- tile_windows()
- {
-+	int n_groups;
- 	int n_windows = 0;
- 	iterate_asbidirlist( ArrangeState.clients_order,
- 			     count_managed_windows, &n_windows, NULL, False);
-@@ -561,7 +561,7 @@
- 	if(ArrangeState.count == 0)
- 	  ArrangeState.count = n_windows; /*Put all elements in one group*/
- 	
--	int n_groups = n_windows / ArrangeState.count;
-+	n_groups = n_windows / ArrangeState.count;
- 	/* If not all windows fit in n_groups groups, an
- 	 * extra group for remaining windows is needed.*/
- 	if(n_windows % ArrangeState.count)
-@@ -614,13 +614,12 @@
- {
- 	int buf_size = 256;
- 	char buf[buf_size];
-+	send_signed_data_type vals[2] ;	
-+	send_signed_data_type units[2] ;	
- 	
- 	ASWindowData *wd = fetch_window_by_id( ((client_item *) data)->cl );
- 	if(!wd)
- 		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-configure b/x11-wm/afterstep-stable/files/patch-configure
index 650f48db55e1..e37779b740eb 100644
--- a/x11-wm/afterstep-stable/files/patch-configure
+++ b/x11-wm/afterstep-stable/files/patch-configure
@@ -1,8 +1,8 @@
 $FreeBSD$
 
---- configure.old	Thu May 19 20:16:44 2005
-+++ configure	Thu May 19 20:25:36 2005
-@@ -1791,7 +1791,7 @@
+--- configure.orig	Mon Sep 13 11:43:06 2004
++++ configure	Mon Sep 13 11:43:30 2004
+@@ -1734,7 +1734,7 @@
  # Check whether --enable-reuse-font or --disable-reuse-font was given.
  if test "${enable_reuse_font+set}" = set; then
    enableval="$enable_reuse_font"
@@ -11,7 +11,7 @@ $FreeBSD$
  cat >>confdefs.h <<\_ACEOF
  #define MODULE_REUSE_LOADED_FONT 1
  _ACEOF
-@@ -5833,7 +5833,7 @@
+@@ -5450,7 +5450,7 @@
  
  have_shmimage=no
  
@@ -20,19 +20,3 @@ $FreeBSD$
  	enable_shmimage=no
  fi
  
-@@ -7983,7 +7983,6 @@
- echo "${ECHO_T}neither fltk nor GTK found" >&6
- 		echo "You have to install FLTK or GTK libaries in order to be able to compile ascp."
-     fi;
--fi;
- 
- pkg_modules="gtk+-2.0 >= 2.0.0"
- 
-@@ -8086,6 +8085,7 @@
- 
- ASCP_GTK_LIBS=$PACKAGE_LIBS
- ASCP_GTK_INCLUDES=$PACKAGE_CFLAGS
-+fi;
- 
- 
- if test "x$with_libefence" = "xyes"; then