Update to Afterstep-1.8.8. Bug fixes to many modules. Shaped icons are

back, and the completely re-written "Audio" module makes all kinds
of funny noises! Update submitted by Martti Kuparinin in PR pkg/12380.

4 files changed, 23 insertions, 30 deletions

diff --git a/wm/afterstep/patches/patch-ac b/wm/afterstep/patches/patch-ac
index 9a3ea50879d..43f1aa074e2 100644
--- a/wm/afterstep/patches/patch-ac
+++ b/wm/afterstep/patches/patch-ac
@@ -1,24 +1,17 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2001/03/11 19:58:59 fredb Exp $
 
---- src/Audio/Makefile.in.orig	Mon Aug  9 17:43:38 1999
-+++ src/Audio/Makefile.in	Fri Aug 27 22:25:12 1999
-@@ -4,15 +4,15 @@
+--- src/Audio/Makefile.in.orig	Fri Oct 20 06:27:55 2000
++++ src/Audio/Makefile.in	Sun Mar 11 15:03:38 2001
+@@ -4,9 +4,9 @@
  # are correct for your rplay installation.
  #
  
 -#EXTRA_DEFINES = -DHAVE_RPLAY
 -#EXTRA_INCLUDES = -I/usr/local/include
 -#EXTRA_LIBRARIES = -L/usr/local/lib -lrplay
--
- OBJS		= Audio.o
- 
- PROG		= Audio
- 
- LIBS_ASDYN      = $(LIB_AFTERSTEP)
-+
 +EXTRA_DEFINES = -DHAVE_RPLAY
 +EXTRA_INCLUDES = -I${LOCALBASE}/include
 +EXTRA_LIBRARIES = -L${LOCALBASE}/lib -lrplay
- LIBS_DEPEND     = $(LIB_AFTERSTEP)
  
- @MAKEFILECOMMON@
+ OBJS		= Audio.o
+ 
diff --git a/wm/afterstep/patches/patch-ae b/wm/afterstep/patches/patch-ae
index 755f0b45092..ab1dc74c713 100644
--- a/wm/afterstep/patches/patch-ae
+++ b/wm/afterstep/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2001/03/11 19:58:59 fredb Exp $
 
---- autoconf/configure.in.orig	Tue Feb  8 11:11:35 2000
-+++ autoconf/configure.in	Sun Feb 13 23:55:34 2000
+--- autoconf/configure.in.orig	Thu Dec 21 08:21:07 2000
++++ autoconf/configure.in	Sun Mar 11 15:15:16 2001
 @@ -83,6 +83,7 @@
  AC_PATH_PROG(CP, cp, cp)
  AC_PATH_PROG(MKDIR, mkdir, mkdir)
@@ -10,7 +10,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $
  
  dnl# let's check for endiannes of our box
  AC_C_BIGENDIAN
-@@ -222,19 +223,16 @@
+@@ -246,19 +247,16 @@
  dnl# AFTERSTEP_LIB="-lafterstep" 
  dnl# ASIMAGE_LIB="-lasimage"
  dnl# WIDGETS_LIB="-lWidgets"
@@ -37,7 +37,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $
     LIBINSTALL="install.dyn"
  fi
  
-@@ -316,6 +314,7 @@
+@@ -342,6 +340,7 @@
  AC_SUBST(enable_audit)
  AC_SUBST(SCRIPT_DIR)
  AC_SUBST(PERL)
diff --git a/wm/afterstep/patches/patch-ag b/wm/afterstep/patches/patch-ag
index 45b49c5d173..0f6669f76a6 100644
--- a/wm/afterstep/patches/patch-ag
+++ b/wm/afterstep/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2001/03/11 19:59:00 fredb Exp $
 
---- autoconf/Makefile.common.in.orig	Wed Aug 25 17:44:20 1999
-+++ autoconf/Makefile.common.in	Fri Aug 27 21:56:14 1999
+--- autoconf/Makefile.common.in.orig	Fri Oct 20 06:27:57 2000
++++ autoconf/Makefile.common.in	Sun Mar 11 15:15:53 2001
 @@ -7,7 +7,7 @@
  all:            $(PROG)
  
@@ -11,8 +11,8 @@ $NetBSD: patch-ag,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $
  
  install.lib:	@LIBPROG@ @LIBINSTALL@
  
-@@ -70,10 +70,10 @@
- 		done
+@@ -92,10 +92,10 @@
+ 		fi
  
  $(PROG):        $(OBJS) $(LIBS_DEPEND)
 -		$(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
@@ -24,7 +24,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $
  
  #
  # include dependency files if they exist
-@@ -84,23 +84,17 @@
+@@ -106,23 +106,17 @@
  include .depend
  #endif
  
diff --git a/wm/afterstep/patches/patch-ah b/wm/afterstep/patches/patch-ah
index 530d4505666..f60b1aec89f 100644
--- a/wm/afterstep/patches/patch-ah
+++ b/wm/afterstep/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2001/03/11 19:59:00 fredb Exp $
 
---- autoconf/Makefile.common.lib.in.orig	Wed Aug 25 17:44:20 1999
-+++ autoconf/Makefile.common.lib.in	Fri Aug 27 22:05:30 1999
+--- autoconf/Makefile.common.lib.in.orig	Fri Oct 20 06:27:57 2000
++++ autoconf/Makefile.common.lib.in	Sun Mar 11 15:16:36 2001
 @@ -4,7 +4,7 @@
  
  @MAKEFILEDEFINES@
@@ -37,8 +37,8 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $
  
  uninstall.bin:
  
-@@ -69,12 +52,10 @@
- 		done
+@@ -80,12 +63,10 @@
+ 		fi
  
  $(PROG):	$(OBJS)
 -		$(RMF) $(PROG)
@@ -52,7 +52,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $
  
  #
  # include dependency files if they exist
-@@ -84,14 +65,4 @@
+@@ -95,14 +76,4 @@
  #ifneq ($(wildcard .depend),)
  include .depend
  #endif