From e13354284e22ed94a6a080cb39d9fb7334cdec01 Mon Sep 17 00:00:00 2001 From: fredb Date: Sun, 11 Mar 2001 19:58:58 +0000 Subject: 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. --- wm/afterstep/Makefile | 6 +++--- wm/afterstep/files/md5 | 4 ++-- wm/afterstep/files/patch-sum | 22 +++++++++++----------- wm/afterstep/patches/patch-ac | 19 ++++++------------- wm/afterstep/patches/patch-ae | 10 +++++----- wm/afterstep/patches/patch-ag | 12 ++++++------ wm/afterstep/patches/patch-ah | 12 ++++++------ wm/afterstep/pkg/PLIST | 6 +++--- 8 files changed, 42 insertions(+), 49 deletions(-) (limited to 'wm/afterstep') diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile index b8bc07dff7f..291f37ba799 100644 --- a/wm/afterstep/Makefile +++ b/wm/afterstep/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2001/03/04 09:06:18 tron Exp $ +# $NetBSD: Makefile,v 1.8 2001/03/11 19:58:58 fredb Exp $ -DISTNAME= AfterStep-1.8.0 -PKGNAME= afterstep-1.8.0 +DISTNAME= AfterStep-1.8.8 +PKGNAME= afterstep-1.8.8 CATEGORIES= x11 wm MASTER_SITES= ftp://ftp.afterstep.org/stable/ \ ftp://ftp.digex.net/pub/X11/window-managers/afterstep/AfterStep/stable/ diff --git a/wm/afterstep/files/md5 b/wm/afterstep/files/md5 index 8cef56aae73..5b932ceba71 100644 --- a/wm/afterstep/files/md5 +++ b/wm/afterstep/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $ +$NetBSD: md5,v 1.2 2001/03/11 19:58:59 fredb Exp $ -MD5 (AfterStep-1.8.0.tar.bz2) = 516beeca339259290f3115b6d7ecbbc9 +SHA1 (AfterStep-1.8.8.tar.bz2) = 571025239499cdde57307f3d35018311a3e68e63 diff --git a/wm/afterstep/files/patch-sum b/wm/afterstep/files/patch-sum index ef875e7f409..119577e08da 100644 --- a/wm/afterstep/files/patch-sum +++ b/wm/afterstep/files/patch-sum @@ -1,12 +1,12 @@ -$NetBSD: patch-sum,v 1.2 2001/01/25 18:55:08 fredb Exp $ +$NetBSD: patch-sum,v 1.3 2001/03/11 19:58:59 fredb Exp $ -MD5 (patch-aa) = fb096cf9211373cb607cc508cbafbb1b -MD5 (patch-ab) = ac5e74e6c2c58222e53031f1ca28e1ea -MD5 (patch-ac) = 074562ffc62dc230df1ac0ec96ae9bea -MD5 (patch-ad) = f367e9473288792af59c6ffead689f4e -MD5 (patch-ae) = 2aafad0134ed4211311c72c542b09e10 -MD5 (patch-af) = 48bfd694d02caa25ead84f93c7c57133 -MD5 (patch-ag) = a49fdd4b4d25d7f92bc795dbbc792e34 -MD5 (patch-ah) = 2e13cb498a83ee7dab7adb68b803c747 -MD5 (patch-ai) = 730fdcf8154d1de21bd5b4ade47fa858 -MD5 (patch-aj) = 4489fef69bd2ae16d4ef79ecd4d107ae +SHA1 (patch-aa) = 79d732f26da21d069a53443e3799730733bc050b +SHA1 (patch-ab) = 24c9f8569c88ea661cc6eb79390b5ecc825500b4 +SHA1 (patch-ac) = 46a57e819fa2893041e90fa37c5453173df29fa5 +SHA1 (patch-ad) = e0e5cd8182bdf7b3b6ada61e58a2a2c0dd4e243c +SHA1 (patch-ae) = 995ec52cbdc08d55277dc3c8dbaee0355d48e1aa +SHA1 (patch-af) = 7e1cd2b8e184fca8ee38cae2c02dc1520b899d37 +SHA1 (patch-ag) = 8e018c8ca7c46d60b14513ad091f2dd87030a3ef +SHA1 (patch-ah) = e64aac1b3902405c5733bc6a7e136344e610a222 +SHA1 (patch-ai) = e543bfb27d16b49d1844a4fc29dd0cca5e262bfc +SHA1 (patch-aj) = ceca49e410ec22e5b5fdf8132ab80fa920514eb3 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 diff --git a/wm/afterstep/pkg/PLIST b/wm/afterstep/pkg/PLIST index 164360c0820..e9992119783 100644 --- a/wm/afterstep/pkg/PLIST +++ b/wm/afterstep/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:57 agc Exp $ +@comment $NetBSD: PLIST,v 1.3 2001/03/11 19:59:00 fredb Exp $ bin/ASSound bin/Animate bin/Audio @@ -201,7 +201,6 @@ share/afterstep/desktop/icons/16bpp/Publish.xpm share/afterstep/desktop/icons/16bpp/RayTracedGear.xpm share/afterstep/desktop/icons/16bpp/Recycler.xpm share/afterstep/desktop/icons/16bpp/RedFire.xpm -share/afterstep/desktop/icons/16bpp/ShutDown.xpm share/afterstep/desktop/icons/16bpp/Start.xpm share/afterstep/desktop/icons/16bpp/Text.xpm share/afterstep/desktop/icons/16bpp/WWW.xpm @@ -216,6 +215,7 @@ share/afterstep/desktop/icons/16bpp/linux-penguin.xpm share/afterstep/desktop/icons/16bpp/monalisa.xpm share/afterstep/desktop/icons/16bpp/netscape.xpm share/afterstep/desktop/icons/16bpp/shutdown.xpm +share/afterstep/desktop/icons/16bpp/shutdown2.xpm share/afterstep/desktop/icons/16bpp/spreadsheet.xpm share/afterstep/desktop/icons/16bpp/spreadsheet2.xpm share/afterstep/desktop/icons/16bpp/wharf.xpm @@ -268,7 +268,6 @@ share/afterstep/desktop/icons/8bpp/Publish.xpm share/afterstep/desktop/icons/8bpp/RayTracedGear.xpm share/afterstep/desktop/icons/8bpp/Recycler.xpm share/afterstep/desktop/icons/8bpp/RedFire.xpm -share/afterstep/desktop/icons/8bpp/ShutDown.xpm share/afterstep/desktop/icons/8bpp/Start.xpm share/afterstep/desktop/icons/8bpp/Text.xpm share/afterstep/desktop/icons/8bpp/WWW.xpm @@ -283,6 +282,7 @@ share/afterstep/desktop/icons/8bpp/linux-penguin.xpm share/afterstep/desktop/icons/8bpp/monalisa.xpm share/afterstep/desktop/icons/8bpp/netscape.xpm share/afterstep/desktop/icons/8bpp/shutdown.xpm +share/afterstep/desktop/icons/8bpp/shutdown2.xpm share/afterstep/desktop/icons/8bpp/spreadsheet.xpm share/afterstep/desktop/icons/8bpp/spreadsheet2.xpm share/afterstep/desktop/icons/8bpp/wharf.xpm -- cgit v1.2.3