Update to afterstep-1.7.143

Numerous cleanups and bug fixes. Also updated "looks" files;
new feature "BackPixmap 130", averages root background with a pixmap.

9 files changed, 54 insertions, 74 deletions

diff --git a/x11/afterstep-current/Makefile b/x11/afterstep-current/Makefile
index 62ff2478df7..9f01b355f61 100644
--- a/x11/afterstep-current/Makefile
+++ b/x11/afterstep-current/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 1999/08/24 10:16:38 fredb Exp $
+# $NetBSD: Makefile,v 1.7 1999/08/29 14:16:12 fredb Exp $
 
-DISTNAME=		AfterStep-1.7.126
-PKGNAME=		afterstep-1.7.137
+DISTNAME=		AfterStep-1.7.142
+PKGNAME=		AfterStep-1.7.143
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.afterstep.org/devel/snapshots/ \
 			ftp://ftp.afterstep.org/devel/archives/1.7/ \
@@ -17,17 +17,7 @@ PATCH_SITES=		ftp://ftp.afterstep.org/devel/patches/ \
 	ftp://ftp.digex.net/pub/X11/window-managers/afterstep/devel/patches/ \
 	ftp://ftp.digex.net/pub/X11/window-managers/afterstep/devel/patches/contrib/ \
 	ftp://ftp.digex.net/pub/X11/window-managers/afterstep/devel/patches/archive/
-PATCHFILES=		1.7.126-01-sasha-endian_deps.patch.gz \
-			1.7.126-02-allanon-security_and_avoidcover.patch.gz \
-			1.7.126-03-allanon-depend.patch.gz \
-			1.7.126-04-allanon-shade.patch.gz \
-			1.7.126-05-jan-menu_shortcuts.patch.gz \
-			1.7.126-06-alcorn-aslib_modules.patch.gz \
-			1.7.126-07-tildouf_allanon-icon_titles.patch.gz \
-			1.7.126-08-allanon-audit_and_wharf.patch.gz \
-			1.7.126-09-sasha_allanon-gradients.patch.gz \
-			1.7.126-10-sasha_allanon_tigr-pager_colors.patch.gz \
-			1.7.126-11-allanon-mode_130.patch.gz
+PATCHFILES=		1.7.142-01-sasha-png_jpg_warnings.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		fb@enteract.com
diff --git a/x11/afterstep-current/files/md5 b/x11/afterstep-current/files/md5
index 654c6cb754f..7baf980af57 100644
--- a/x11/afterstep-current/files/md5
+++ b/x11/afterstep-current/files/md5
@@ -1,14 +1,4 @@
-$NetBSD: md5,v 1.5 1999/08/21 15:16:57 fredb Exp $
+$NetBSD: md5,v 1.6 1999/08/29 14:16:13 fredb Exp $
 
-MD5 (AfterStep/AfterStep-1.7.126.tar.bz2) = 1a91e9fde98b2d249ab8ea6fba34c610
-MD5 (AfterStep/1.7.126-01-sasha-endian_deps.patch.gz) = 36fd29327d2d05382d031c64bdc71fbe
-MD5 (AfterStep/1.7.126-02-allanon-security_and_avoidcover.patch.gz) = 8c469aaad3c0579d58f0dca43989e717
-MD5 (AfterStep/1.7.126-03-allanon-depend.patch.gz) = 2471ccfe5ee63d6eb8481a541f767607
-MD5 (AfterStep/1.7.126-04-allanon-shade.patch.gz) = 366673f0b86fa79af9c2f08b9d19e21f
-MD5 (AfterStep/1.7.126-05-jan-menu_shortcuts.patch.gz) = 8a886d96f269981e5eae354a2db9115c
-MD5 (AfterStep/1.7.126-06-alcorn-aslib_modules.patch.gz) = f04d00e43821a3b5322e84ad68ca860d
-MD5 (AfterStep/1.7.126-07-tildouf_allanon-icon_titles.patch.gz) = 2ac34d5e98b5960c2ab8b8e5844d1f9b
-MD5 (AfterStep/1.7.126-08-allanon-audit_and_wharf.patch.gz) = 2364f27cd3d9c102c00fe8b2ca5fe956
-MD5 (AfterStep/1.7.126-09-sasha_allanon-gradients.patch.gz) = bf2172fdf59c65cc00f6bb5d5540a7c9
-MD5 (AfterStep/1.7.126-10-sasha_allanon_tigr-pager_colors.patch.gz) = 6cb8ec16f16104b1c4d7f00287887473
-MD5 (AfterStep/1.7.126-11-allanon-mode_130.patch.gz) = 2e70b8888ffff74abbbf181f45b7143e
+MD5 (AfterStep/AfterStep-1.7.142.tar.bz2) = 7378c78b10025b1a313ab1c7dad079dd
+MD5 (AfterStep/1.7.142-01-sasha-png_jpg_warnings.patch.gz) = c49f966792fbb1ae1b13e553ec08c69e
diff --git a/x11/afterstep-current/files/patch-sum b/x11/afterstep-current/files/patch-sum
index e720ba33aba..b7a6eeaec3a 100644
--- a/x11/afterstep-current/files/patch-sum
+++ b/x11/afterstep-current/files/patch-sum
@@ -1,12 +1,12 @@
-$NetBSD: patch-sum,v 1.2 1999/08/24 10:16:39 fredb Exp $
+$NetBSD: patch-sum,v 1.3 1999/08/29 14:16:13 fredb Exp $
 
 MD5 (patch-aa) = 2bc06ffa76f29ad62d02cacce903d834
 MD5 (patch-ab) = ac5e74e6c2c58222e53031f1ca28e1ea
-MD5 (patch-ac) = 4c9f9d96549030aaac1a7f01e689a226
+MD5 (patch-ac) = 074562ffc62dc230df1ac0ec96ae9bea
 MD5 (patch-ad) = f367e9473288792af59c6ffead689f4e
-MD5 (patch-ae) = d4e6f55d6a6729fabd852ed914af0763
+MD5 (patch-ae) = 906794e60e35349b8f0d5e50901fad17
 MD5 (patch-af) = 48bfd694d02caa25ead84f93c7c57133
-MD5 (patch-ag) = 8dd31d1ced382ce69724776e4ea38f4d
-MD5 (patch-ah) = e5e273f350a6d7a288c001cc0e371f42
+MD5 (patch-ag) = a49fdd4b4d25d7f92bc795dbbc792e34
+MD5 (patch-ah) = 2e13cb498a83ee7dab7adb68b803c747
 MD5 (patch-ai) = 730fdcf8154d1de21bd5b4ade47fa858
-MD5 (patch-aj) = 1830045ac8f926b344d6df86ed30c558
+MD5 (patch-aj) = 4489fef69bd2ae16d4ef79ecd4d107ae
diff --git a/x11/afterstep-current/patches/patch-ac b/x11/afterstep-current/patches/patch-ac
index 2564db0a6f0..a809a66e9f8 100644
--- a/x11/afterstep-current/patches/patch-ac
+++ b/x11/afterstep-current/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/07/31 10:36:46 fredb Exp $
+$NetBSD: patch-ac,v 1.2 1999/08/29 14:16:13 fredb Exp $
 
---- src/Audio/Makefile.in.orig	Tue Nov 10 10:51:01 1998
-+++ src/Audio/Makefile.in	Tue Dec 29 00:02:11 1998
-@@ -4,12 +4,12 @@
+--- 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 @@
  # are correct for your rplay installation.
  #
  
@@ -14,8 +14,11 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/07/31 10:36:46 fredb Exp $
  
  PROG		= Audio
  
- @MAKEFILECOMMON@
+ LIBS_ASDYN      = $(LIB_AFTERSTEP)
 +
 +EXTRA_DEFINES = -DHAVE_RPLAY
 +EXTRA_INCLUDES = -I${LOCALBASE}/include
 +EXTRA_LIBRARIES = -L${LOCALBASE}/lib -lrplay
+ LIBS_DEPEND     = $(LIB_AFTERSTEP)
+ 
+ @MAKEFILECOMMON@
diff --git a/x11/afterstep-current/patches/patch-ae b/x11/afterstep-current/patches/patch-ae
index bb5f559b8dd..b08d331d6fc 100644
--- a/x11/afterstep-current/patches/patch-ae
+++ b/x11/afterstep-current/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 1999/08/24 10:16:40 fredb Exp $
+$NetBSD: patch-ae,v 1.2 1999/08/29 14:16:13 fredb Exp $
 
---- autoconf/configure.in.orig
-+++ autoconf/configure.in
-@@ -84,6 +84,7 @@
+--- autoconf/configure.in.orig	Fri Aug 27 11:34:54 1999
++++ autoconf/configure.in	Fri Aug 27 21:56:09 1999
+@@ -83,6 +83,7 @@
  AC_PATH_PROG(MV, mv, mv)
  AC_PATH_PROG(CP, cp, cp)
  AC_PATH_PROG(MKDIR, mkdir, mkdir)
@@ -10,7 +10,7 @@ $NetBSD: patch-ae,v 1.1 1999/08/24 10:16:40 fredb Exp $
  
  dnl# let's check for endiannes of our box
  AC_C_BIGENDIAN
-@@ -223,19 +224,16 @@
+@@ -222,19 +223,16 @@
  dnl# AFTERSTEP_LIB="-lafterstep" 
  dnl# ASIMAGE_LIB="-lasimage"
  dnl# WIDGETS_LIB="-lWidgets"
@@ -37,7 +37,7 @@ $NetBSD: patch-ae,v 1.1 1999/08/24 10:16:40 fredb Exp $
     LIBINSTALL="install.dyn"
  fi
  
-@@ -320,6 +318,7 @@
+@@ -317,6 +315,7 @@
  AC_SUBST(enable_fixeditems)
  AC_SUBST(enable_audit)
  AC_SUBST(SCRIPT_DIR)
diff --git a/x11/afterstep-current/patches/patch-ag b/x11/afterstep-current/patches/patch-ag
index 92fd496f93c..f84f312def6 100644
--- a/x11/afterstep-current/patches/patch-ag
+++ b/x11/afterstep-current/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1 1999/08/24 10:16:40 fredb Exp $
+$NetBSD: patch-ag,v 1.2 1999/08/29 14:16:13 fredb Exp $
 
---- autoconf/Makefile.common.in.orig
-+++ autoconf/Makefile.common.in
+--- autoconf/Makefile.common.in.orig	Wed Aug 25 17:44:20 1999
++++ autoconf/Makefile.common.in	Fri Aug 27 21:56:14 1999
 @@ -7,7 +7,7 @@
  all:            $(PROG)
  
@@ -24,9 +24,9 @@ $NetBSD: patch-ag,v 1.1 1999/08/24 10:16:40 fredb Exp $
  
  #
  # include dependency files if they exist
-@@ -82,23 +82,17 @@
+@@ -84,23 +84,17 @@
  include .depend
- endif
+ #endif
  
 -../../lib/libafterstep.a:
 +../../lib/libafterstep.la:
diff --git a/x11/afterstep-current/patches/patch-ah b/x11/afterstep-current/patches/patch-ah
index 4086d708102..3cf2fbe4d19 100644
--- a/x11/afterstep-current/patches/patch-ah
+++ b/x11/afterstep-current/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1 1999/08/24 10:16:40 fredb Exp $
+$NetBSD: patch-ah,v 1.2 1999/08/29 14:16:13 fredb Exp $
 
---- autoconf/Makefile.common.lib.in.orig
-+++ autoconf/Makefile.common.lib.in
+--- 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
 @@ -4,7 +4,7 @@
  
  @MAKEFILEDEFINES@
@@ -52,10 +52,10 @@ $NetBSD: patch-ah,v 1.1 1999/08/24 10:16:40 fredb Exp $
  
  #
  # include dependency files if they exist
-@@ -82,13 +63,3 @@
- ifneq ($(wildcard .depend),)
+@@ -84,14 +65,4 @@
+ #ifneq ($(wildcard .depend),)
  include .depend
- endif
+ #endif
 -
 -$(DYNPROG): $(DYNPROG).$(LIBVERMAJOR)
 -	ln -sf $(DYNPROG).$(LIBVERMAJOR) $(DYNPROG)
@@ -66,3 +66,4 @@ $NetBSD: patch-ah,v 1.1 1999/08/24 10:16:40 fredb Exp $
 -$(DYNPROG).$(LIBVER): $(OBJSDLL)
 -	$(CC) -shared -Wl,-soname,$(DYNPROG).$(LIBVERMAJOR) -o $(DYNPROG).$(LIBVER) \
 -	 $(OBJSDLL)
+ 
diff --git a/x11/afterstep-current/patches/patch-aj b/x11/afterstep-current/patches/patch-aj
index dfd7f1eb996..fb4a57934c0 100644
--- a/x11/afterstep-current/patches/patch-aj
+++ b/x11/afterstep-current/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.1 1999/08/24 10:16:40 fredb Exp $
+$NetBSD: patch-aj,v 1.2 1999/08/29 14:16:14 fredb Exp $
 
---- lib/Makefile.in.orig
-+++ lib/Makefile.in
+--- lib/Makefile.in.orig        Mon Aug 23 16:37:48 1999
++++ lib/Makefile.in     Fri Aug 27 22:25:21 1999
 @@ -11,11 +11,9 @@
  
  OBJSDLL         = $(OBJS)
diff --git a/x11/afterstep-current/pkg/PLIST b/x11/afterstep-current/pkg/PLIST
index 4c02df31d39..d153a92a9e2 100644
--- a/x11/afterstep-current/pkg/PLIST
+++ b/x11/afterstep-current/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1999/08/24 10:16:40 fredb Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/08/29 14:16:14 fredb Exp $
 bin/ASSound
 bin/Animate
 bin/Audio
@@ -98,6 +98,8 @@ share/afterstep/desktop/buttons/5-e.xpm
 share/afterstep/desktop/buttons/5.xpm
 share/afterstep/desktop/buttons/5p-e.xpm
 share/afterstep/desktop/buttons/5p.xpm
+share/afterstep/desktop/buttons/as1.5-iconizeR.xpm
+share/afterstep/desktop/buttons/as1.5-iconizeR-p.xpm
 share/afterstep/desktop/buttons/as-iconize-pressed.xpm
 share/afterstep/desktop/buttons/as-iconize.xpm
 share/afterstep/desktop/buttons/as-kill-pressed.xpm
@@ -134,9 +136,10 @@ share/afterstep/desktop/buttons/fuf-shade-pressed.xpm
 share/afterstep/desktop/buttons/fuf-shade.xpm
 share/afterstep/desktop/buttons/fuf-switchwindow-pressed.xpm
 share/afterstep/desktop/buttons/fuf-switchwindow.xpm
-share/afterstep/desktop/buttons/fuf-test.xpm
 share/afterstep/desktop/buttons/fuf-windowmenu-pressed.xpm
 share/afterstep/desktop/buttons/fuf-windowmenu.xpm
+share/afterstep/desktop/buttons/g_iconize.xpm
+share/afterstep/desktop/buttons/g_shut.xpm
 share/afterstep/desktop/buttons/os8-iconize-pressed.xpm
 share/afterstep/desktop/buttons/os8-iconize.xpm
 share/afterstep/desktop/buttons/os8-kill-pressed.xpm
@@ -326,7 +329,6 @@ share/afterstep/desktop/icons/8bpp/widget.xpm
 share/afterstep/desktop/icons/8bpp/workshop.xpm
 share/afterstep/desktop/icons/8bpp/writeletter.xpm
 share/afterstep/desktop/icons/common/3_dots.xpm
-share/afterstep/desktop/icons/common/98.xpm
 share/afterstep/desktop/icons/common/AfterStep7.xpm
 share/afterstep/desktop/icons/common/AfterStep8.xpm
 share/afterstep/desktop/icons/common/Earth.xpm
@@ -339,18 +341,13 @@ share/afterstep/desktop/icons/common/arrow.xpm
 share/afterstep/desktop/icons/common/bebutton.xpm
 share/afterstep/desktop/icons/common/bluebar.xpm
 share/afterstep/desktop/icons/common/darkbluebar.xpm
-share/afterstep/desktop/icons/common/dk.xpm
 share/afterstep/desktop/icons/common/e.xpm
-share/afterstep/desktop/icons/common/fr.xpm
+share/afterstep/desktop/icons/common/east.xpm
 share/afterstep/desktop/icons/common/fuf-new-menu-top.xpm
 share/afterstep/desktop/icons/common/fuf-new-top-focused.xpm
 share/afterstep/desktop/icons/common/fuf-new-top-unfocused.xpm
 share/afterstep/desktop/icons/common/fuf-wharf.xpm
-share/afterstep/desktop/icons/common/g_iconize.xpm
-share/afterstep/desktop/icons/common/g_shut.xpm
-share/afterstep/desktop/icons/common/gnome-logo.xpm
 share/afterstep/desktop/icons/common/greenbar.xpm
-share/afterstep/desktop/icons/common/hr.xpm
 share/afterstep/desktop/icons/common/mini-app.xpm
 share/afterstep/desktop/icons/common/mini-as.xpm
 share/afterstep/desktop/icons/common/mini-exit.xpm
@@ -380,9 +377,12 @@ share/afterstep/desktop/icons/common/ostxu.xpm
 share/afterstep/desktop/icons/common/redbar.xpm
 share/afterstep/desktop/icons/common/s.xpm
 share/afterstep/desktop/icons/common/se.xpm
+share/afterstep/desktop/icons/common/south.xpm
+share/afterstep/desktop/icons/common/southeast.xpm
+share/afterstep/desktop/icons/common/southwest.xpm
 share/afterstep/desktop/icons/common/sw.xpm
-share/afterstep/desktop/icons/common/vr.xpm
 share/afterstep/desktop/icons/common/w.xpm
+share/afterstep/desktop/icons/common/west.xpm
 share/afterstep/desktop/icons/common/xiterm.xpm
 share/afterstep/desktop/sounds/bong.au
 share/afterstep/desktop/sounds/clink.au
@@ -421,11 +421,12 @@ share/afterstep/looks/look.DEFAULT
 share/afterstep/looks/look.DeepBlue
 share/afterstep/looks/look.Ethan
 share/afterstep/looks/look.Ethan2
+share/afterstep/looks/look.Frames
 share/afterstep/looks/look.Guylhem
-share/afterstep/looks/look.Guylhem2
 share/afterstep/looks/look.MacOS8
 share/afterstep/looks/look.Metallic
 share/afterstep/looks/look.Nextish
+share/afterstep/looks/look.NEW-stuff
 share/afterstep/looks/look.Ostx
 share/afterstep/looks/look.PureNext
 share/afterstep/looks/look.Sea
@@ -436,10 +437,8 @@ share/afterstep/looks/look.grey
 share/afterstep/looks/look.greyblue
 share/afterstep/looks/look.lightblue
 share/afterstep/looks/look.lightgrey
-share/afterstep/looks/look.nek
 share/afterstep/looks/look.orchid
 share/afterstep/looks/look.purple
-share/afterstep/looks/look.turquoise
 share/afterstep/non-configurable/0_background
 share/afterstep/non-configurable/0_feel.15bpp
 share/afterstep/non-configurable/0_feel.16bpp
@@ -484,9 +483,6 @@ share/afterstep/non-configurable/3_look.16bpp
 share/afterstep/non-configurable/3_look.24bpp
 share/afterstep/non-configurable/3_look.32bpp
 share/afterstep/non-configurable/3_look.8bpp
-share/afterstep/non-configurable/Make8bitXPMs
-share/afterstep/non-configurable/Xpm2Jpg
-share/afterstep/non-configurable/startmenu
 share/afterstep/pager
 share/afterstep/scripts/Animate
 share/afterstep/scripts/BellSetup