Update afterstep to new, stable version 1.8.0. Way too many changes

from 1.6.10 to list. [1.7.x were all development versions.]

A complete history of changes is available online at
<ftp://ftp.afterstep.org/stable/ChangeLog>. The home page,
<http://www.afterstep.org>, has links to a source code browser
and more documentation.

15 files changed, 783 insertions, 578 deletions

diff --git a/x11/afterstep/Makefile b/x11/afterstep/Makefile
index 55932d7d39b..6a27368a69e 100644
--- a/x11/afterstep/Makefile
+++ b/x11/afterstep/Makefile
@@ -1,36 +1,52 @@
-# $NetBSD: Makefile,v 1.16 2000/02/09 20:20:58 tron Exp $
+# $NetBSD: Makefile,v 1.17 2000/02/14 12:42:15 fredb Exp $
 
-DISTNAME=	AfterStep-1.6.10
-PKGNAME=	afterstep-1.6.10
+DISTNAME=	AfterStep-1.8.0
+PKGNAME=	afterstep-1.8.0
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.afterstep.org/pub/stable/ \
-		ftp://ftp.digex.net/pub/X11/window-managers/afterstep/AfterStep/pub/stable/
+MASTER_SITES=	ftp://ftp.afterstep.org/stable/ \
+		ftp://ftp.digex.net/pub/X11/window-managers/afterstep/AfterStep/stable/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.afterstep.org/
+MAINTAINER=		fb@enteract.com
+HOMEPAGE=		http://www.afterstep.org/
 
-DEPENDS+=	asclock-1.0:../../x11/asclock
-DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	png>=1.0.3:../../graphics/png
-DEPENDS+=	rplay-3.2.*:../../audio/rplay
-DEPENDS+=	xli-1.16:../../graphics/xli
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
+BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
+DEPENDS+=		jpeg>=6b:../../graphics/jpeg
+DEPENDS+=		png>=1.0.3:../../graphics/png
+DEPENDS+=		rplay>=3.2.0b6:../../audio/rplay
+DEPENDS+=		xpm>=3.4k:../../graphics/xpm
+DEPENDS+=		asclock-*:../../x11/asclock
+DEPENDS+=		xp-*:../../x11/xp
 
-USE_X11BASE=	yes
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+USE_PERL=		yes
+USE_X11=		yes
 
-CONFIGURE_ARGS+=	--with-png-includes=${LOCALBASE}/include \
-			--with-png-lib=${LOCALBASE}/lib \
-			--with-jpeg-includes=${LOCALBASE}/include \
-			--with-jpeg-lib=${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--disable-staticlibs
+CONFIGURE_ARGS+=	--with-helpcommand="xpman"
+CONFIGURE_ARGS+=	--with-jpeg-includes=${LOCALBASE}/include
+CONFIGURE_ARGS+=	--with-jpeg-lib=${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--with-png-includes=${LOCALBASE}/include
+CONFIGURE_ARGS+=	--with-png-lib=${LOCALBASE}/lib
 CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
 
+MESSAGE_FILE=		${WRKDIR}/MESSAGE
+
 post-patch:
-	for i in ` ${FIND} ${WRKSRC} -name "*.man" -print `; do \
+	for i in `${FIND} ${WRKSRC} -name "*.man" -print` \
+		${WRKSRC}/autoconf/Makefile.common.in; do \
 	  ${MV} $$i $$i.orig ;\
-	  ${SED} -e 's@/usr/local/@${PREFIX}/@g' < $$i.orig > $$i ; \
-	  ${RM} $$i.orig ;\
+	  ${SED} -e 's|/usr/local/|${PREFIX}/|g' -e 's|1x|1|g' < $$i.orig > $$i ; \
 	done
 
+pre-configure:
+	cd ${WRKSRC} && \
+	  autoconf --localdir=autoconf autoconf/configure.in > configure; \
+	  ${CHMOD} 755 configure; \
+	  autoheader --localdir=autoconf autoconf/configure.in > autoconf/config.h.in;
+
+post-build:
+	${SED} 's|@PREFIX@|${PREFIX}|g' < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/afterstep/files/md5 b/x11/afterstep/files/md5
index e3904253f2f..8e912bbb2f5 100644
--- a/x11/afterstep/files/md5
+++ b/x11/afterstep/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/06/06 20:22:45 tron Exp $
+$NetBSD: md5,v 1.4 2000/02/14 12:42:17 fredb Exp $
 
-MD5 (AfterStep-1.6.10.tar.bz2) = 09f3303ca1e599fe0ce74c54ba8611ad
+MD5 (AfterStep-1.8.0.tar.bz2) = 516beeca339259290f3115b6d7ecbbc9
diff --git a/x11/afterstep/files/patch-sum b/x11/afterstep/files/patch-sum
index 95adf36882a..221cf5bb24a 100644
--- a/x11/afterstep/files/patch-sum
+++ b/x11/afterstep/files/patch-sum
@@ -1,6 +1,12 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:21 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/02/14 12:42:17 fredb Exp $
 
-MD5 (patch-aa) = c98ca0db95afa381b915e68fedc4aecc
-MD5 (patch-ab) = 18e2bacf40cdaef82a99f2b2084c5a7c
-MD5 (patch-ac) = 4c9f9d96549030aaac1a7f01e689a226
-MD5 (patch-ad) = f64c62819dae1b6f9c5d28e6190451b0
+MD5 (patch-aa) = 2bc06ffa76f29ad62d02cacce903d834
+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
diff --git a/x11/afterstep/patches/patch-aa b/x11/afterstep/patches/patch-aa
index 4b5a946a04e..5cb3a7e8394 100644
--- a/x11/afterstep/patches/patch-aa
+++ b/x11/afterstep/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1998/12/28 23:36:44 tron Exp $
+$NetBSD: patch-aa,v 1.3 2000/02/14 12:42:18 fredb Exp $
 
 --- doc/afterstepdoc.in.orig	Tue Nov 10 10:51:01 1998
 +++ doc/afterstepdoc.in	Tue Dec 29 00:20:54 1998
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.2 1998/12/28 23:36:44 tron Exp $
  done
  
 -for lynx in /usr/bin/lynx /bin/lynx /usr/local/bin/lynx ; do
-+for lynx in @LOCALBASE@/bin/lynx /usr/local/bin/lynx ; do
++for lynx in /usr/pkg/bin/lynx /usr/local/bin/lynx ; do
      if [ -x $lynx ] ; then
         exec xterm -bg black -fg white -sl 500 -vb -e $lynx @datadir@/afterstep/doc/afterstep.html &
      fi
diff --git a/x11/afterstep/patches/patch-ab b/x11/afterstep/patches/patch-ab
index dfad6995555..21d6a83265d 100644
--- a/x11/afterstep/patches/patch-ab
+++ b/x11/afterstep/patches/patch-ab
@@ -1,18 +1,18 @@
-$NetBSD: patch-ab,v 1.2 1998/12/28 23:36:44 tron Exp $
+$NetBSD: patch-ab,v 1.3 2000/02/14 12:42:18 fredb Exp $
 
---- autoconf/Makefile.common.in.orig	Fri Dec 25 00:35:58 1998
-+++ autoconf/Makefile.common.in	Fri Dec 25 00:36:22 1998
-@@ -10,11 +10,11 @@
- 		$(INSTALL_PROGRAM) $(PROG) $(AFTER_BIN_DIR)
+--- asimagelib/Makefile.in.orig	Tue Jul 27 10:38:01 1999
++++ asimagelib/Makefile.in	Sun Aug 22 11:43:11 1999
+@@ -7,11 +7,9 @@
+ 		  pixmap.o balloon.o background.o
+ OBJSDLL         = $(OBJS)
  
- install.man:
--		@if test -f $(PROG).man; then $(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1x; fi
-+		@if test -f $(PROG).man; then $(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1; fi
+-PROG            = libasimage.a
+-DYNPROG         = libasimage.so
+-LIBVER          = 1.9
++PROG            = libasimage.la
+ LIBVERMAJOR     = 1
+-#INSTALLONBUILD  = install
++LIBVERMINOR     = 9
  
- uninstall:
- 		$(RMF) $(AFTER_BIN_DIR)/$(PROG)
--		$(RMF) $(AFTER_MAN_DIR)/$(PROG).1x
-+		$(RMF) $(AFTER_MAN_DIR)/$(PROG).1
+ @MAKEFILECOMMONLIB@
  
- clean:
- 		$(RMF) $(PROG) *.o *~ *% *.bak \#* core
diff --git a/x11/afterstep/patches/patch-ac b/x11/afterstep/patches/patch-ac
index 7e1b6808833..90eb2ff7c5e 100644
--- a/x11/afterstep/patches/patch-ac
+++ b/x11/afterstep/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 1998/12/28 23:36:44 tron Exp $
+$NetBSD: patch-ac,v 1.3 2000/02/14 12:42:18 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.2 1998/12/28 23:36:44 tron 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/patches/patch-ad b/x11/afterstep/patches/patch-ad
index 80e64c3d5f0..486f967ba47 100644
--- a/x11/afterstep/patches/patch-ad
+++ b/x11/afterstep/patches/patch-ad
@@ -1,12 +1,18 @@
-$NetBSD: patch-ad,v 1.2 1998/12/28 23:36:44 tron Exp $
+$NetBSD: patch-ad,v 1.3 2000/02/14 12:42:18 fredb Exp $
 
---- configure.orig	Thu Dec 10 05:52:19 1998
-+++ configure	Tue Dec 29 00:26:35 1998
-@@ -4012,6 +4012,7 @@
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
- s%@LIBS@%$LIBS%g
-+s%@LOCALBASE@%$LOCALBASE%g
- s%@exec_prefix@%$exec_prefix%g
- s%@prefix@%$prefix%g
- s%@program_transform_name@%$program_transform_name%g
+--- src/Config/Makefile.in.orig	Sun Jul 11 12:33:27 1999
++++ src/Config/Makefile.in	Sun Aug 22 11:44:16 1999
+@@ -5,11 +5,9 @@
+ OBJS            = Pager.o Base.o MyStyle.o ASetRoot.o
+ OBJSDLL         = $(OBJS)
+ 
+-PROG            = libasConfig.a
+-DYNPROG         = libasConfig.so
+-LIBVER          = 1.0
++PROG            = libasConfig.la
+ LIBVERMAJOR     = 1
+-#INSTALLONBUILD  = install
++LIBVERMINOR     = 0
+ 
+ @MAKEFILECOMMONLIB@
+ 
diff --git a/x11/afterstep/patches/patch-ae b/x11/afterstep/patches/patch-ae
new file mode 100644
index 00000000000..dea224946a1
--- /dev/null
+++ b/x11/afterstep/patches/patch-ae
@@ -0,0 +1,47 @@
+$NetBSD: patch-ae,v 1.5 2000/02/14 12:42:19 fredb Exp $
+
+--- autoconf/configure.in.orig	Tue Feb  8 11:11:35 2000
++++ autoconf/configure.in	Sun Feb 13 23:55:34 2000
+@@ -83,6 +83,7 @@
+ AC_PATH_PROG(CP, cp, cp)
+ AC_PATH_PROG(MKDIR, mkdir, mkdir)
+ AC_PATH_PROG(PERL, perl, perl)
++AC_PATH_PROG(LIBTOOL, libtool, libtool)
+ 
+ dnl# let's check for endiannes of our box
+ AC_C_BIGENDIAN
+@@ -222,19 +223,16 @@
+ dnl# AFTERSTEP_LIB="-lafterstep" 
+ dnl# ASIMAGE_LIB="-lasimage"
+ dnl# WIDGETS_LIB="-lWidgets"
++AFTERSTEP_LIB="../../lib/libafterstep.la" 
++ASIMAGE_LIB="../../asimagelib/libasimage.la"
++WIDGETS_LIB="../Script/Widgets/libWidgets.la"
++CONFIG_LIB="../Config/libasConfig.la"
++LIBPROG='$(PROG)'
+ if test "x$enable_staticlibs" = "xyes"; then
+-   AFTERSTEP_LIB="../../lib/libafterstep.a" 
+-   ASIMAGE_LIB="../../asimagelib/libasimage.a"
+-   WIDGETS_LIB="../Script/Widgets/libWidgets.a"
+-   CONFIG_LIB="../Config/libasConfig.a"
+-   LIBPROG='$(PROG)'
++   LDSTATIC="-static"
+    LIBINSTALL=""
+ else
+-   AFTERSTEP_LIB="../../lib/libafterstep.so" 
+-   ASIMAGE_LIB="../../asimagelib/libasimage.so"
+-   WIDGETS_LIB="../Script/Widgets/libWidgets.so"
+-   CONFIG_LIB="../Config/libasConfig.so"
+-   LIBPROG='$(DYNPROG)'
++   LDSTATIC=""
+    LIBINSTALL="install.dyn"
+ fi
+ 
+@@ -316,6 +314,7 @@
+ AC_SUBST(enable_audit)
+ AC_SUBST(SCRIPT_DIR)
+ AC_SUBST(PERL)
++AC_SUBST(LDSTATIC)
+ 
+ dnl# Write results
+ 
diff --git a/x11/afterstep/patches/patch-af b/x11/afterstep/patches/patch-af
new file mode 100644
index 00000000000..46abecc5025
--- /dev/null
+++ b/x11/afterstep/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.3 2000/02/14 12:42:20 fredb Exp $
+
+--- autoconf/Makefile.defines.in.orig	Thu Mar 25 20:07:08 1999
++++ autoconf/Makefile.defines.in	Sat Aug 21 11:25:30 1999
+@@ -7,6 +7,9 @@
+ # -march=pentiumpro -mcpu=pentiumpro
+ EXTRA_DEFINES	= @DEFINE_XLOCALE@
+ 
++LIBTOOL		= @LIBTOOL@
++LDSTATIC	= @LDSTATIC@
++
+ RANLIB		= @RANLIB@
+ AR		= ar clq
+ CP		= @CP@
diff --git a/x11/afterstep/patches/patch-ag b/x11/afterstep/patches/patch-ag
new file mode 100644
index 00000000000..dfc46f69d75
--- /dev/null
+++ b/x11/afterstep/patches/patch-ag
@@ -0,0 +1,55 @@
+$NetBSD: patch-ag,v 1.3 2000/02/14 12:42:20 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
+@@ -7,7 +7,7 @@
+ all:            $(PROG)
+ 
+ install.bin:	$(PROG)
+-		$(INSTALL_PROGRAM) $(PROG) $(AFTER_BIN_DIR)
++		$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(PROG) $(AFTER_BIN_DIR)/$(PROG)
+ 
+ install.lib:	@LIBPROG@ @LIBINSTALL@
+ 
+@@ -70,10 +70,10 @@
+ 		done
+ 
+ $(PROG):        $(OBJS) $(LIBS_DEPEND)
+-		$(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
++		$(LIBTOOL) --mode=link $(CC) $(OBJS:.o=.lo) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
+ 
+ .c.o:
+-		$(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
++		$(LIBTOOL) --mode=compile $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
+ 
+ #
+ # include dependency files if they exist
+@@ -84,23 +84,17 @@
+ include .depend
+ #endif
+ 
+-../../lib/libafterstep.a:
++../../lib/libafterstep.la:
+ 		cd ../../lib/; ${MAKE}
+ 
+-../../asimagelib/libasimage.a:
++../../asimagelib/libasimage.la:
+ 		cd ../../asimagelib/; ${MAKE}
+ 
+-../Config/libasConfig.a:
++../Config/libasConfig.la:
+ 		cd ../Config/; ${MAKE}
+ 
+-../../lib/libafterstep.so:
+-		cd ../../lib/; ${MAKE}
+-
+-../../asimagelib/libasimage.so:
+-		cd ../../asimagelib/; ${MAKE}
+-
+-../Config/libasConfig.so:
+-		cd ../Config/; ${MAKE}
++../Script/Widgets/Widgets.la:
++		cd ../Script/Widgets/; ${MAKE}
+ 
+ #
+ # End of Make.common
diff --git a/x11/afterstep/patches/patch-ah b/x11/afterstep/patches/patch-ah
new file mode 100644
index 00000000000..75b0049e7d7
--- /dev/null
+++ b/x11/afterstep/patches/patch-ah
@@ -0,0 +1,69 @@
+$NetBSD: patch-ah,v 1.3 2000/02/14 12:42:21 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
+@@ -4,7 +4,7 @@
+ 
+ @MAKEFILEDEFINES@
+ 
+-all:            @LIBPROG@ $(INSTALLONBUILD)
++all:            @LIBPROG@
+ 
+ install.bin:
+ 
+@@ -15,24 +15,7 @@
+ install.script:
+ 
+ install.dyn:
+-		$(INSTALL_LIB) $(DYNPROG).$(LIBVER) $(LIBDIR)
+-		-@/bin/rm -f $(LIBDIR)/$(DYNPROG).$(LIBVERMAJOR) $(LIBDIR)/$(DYNPROG)
+-		ln -sf $(DYNPROG).$(LIBVER) $(LIBDIR)/$(DYNPROG).$(LIBVERMAJOR)
+-		ln -sf $(DYNPROG).$(LIBVERMAJOR) $(LIBDIR)/$(DYNPROG)
+-		@( \
+-		 if test `uname` = "Linux"; then \
+-		   if test $(LIBDIR) = "/lib" || test $(LIBDIR) = "/usr/lib"; then \
+-		     echo "" > /dev/null; \
+-		   elif grep -q $(LIBDIR) /etc/ld.so.conf > /dev/null 2>&1; then \
+-		     echo "" > /dev/null; \
+-		   else \
+-		     echo "Unable to find $(LIBDIR) in ld.so.conf. In order to use "; \
+-		     echo "$(DYNPROG), you may need to add it or set LD_LIBRARY_PATH."; \
+-		   fi; \
+-		   echo "ldconfig"; \
+-		   ldconfig; \
+-		 fi \
+-		)
++		$(LIBTOOL) --mode=install $(INSTALL_LIB) $(PROG) $(LIBDIR)/$(PROG:.la=.so).$(LIBVERMAJOR).$(LIBVERMINOR)
+ 
+ uninstall.bin:
+ 
+@@ -69,12 +52,10 @@
+ 		done
+ 
+ $(PROG):	$(OBJS)
+-		$(RMF) $(PROG)
+-		$(AR) $(PROG) $(OBJS)
+-		$(RANLIB) $(PROG)
++		$(LIBTOOL) --mode=link $(CC) $(LDSTATIC) $(OBJS:.o=.lo) -rpath $(LIBDIR) -version-info $(LIBVERMAJOR):$(LIBVERMINOR) -o $(@)
+ 
+ .c.o:
+-		$(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
++		$(LIBTOOL) --mode=compile $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
+ 
+ #
+ # include dependency files if they exist
+@@ -84,14 +65,4 @@
+ #ifneq ($(wildcard .depend),)
+ include .depend
+ #endif
+-
+-$(DYNPROG): $(DYNPROG).$(LIBVERMAJOR)
+-	ln -sf $(DYNPROG).$(LIBVERMAJOR) $(DYNPROG)
+-
+-$(DYNPROG).$(LIBVERMAJOR): $(DYNPROG).$(LIBVER)
+-	ln -sf $(DYNPROG).$(LIBVER) $(DYNPROG).$(LIBVERMAJOR)
+-
+-$(DYNPROG).$(LIBVER): $(OBJSDLL)
+-	$(CC) -shared -Wl,-soname,$(DYNPROG).$(LIBVERMAJOR) -o $(DYNPROG).$(LIBVER) \
+-	 $(OBJSDLL)
+ 
diff --git a/x11/afterstep/patches/patch-ai b/x11/afterstep/patches/patch-ai
new file mode 100644
index 00000000000..1f3455445da
--- /dev/null
+++ b/x11/afterstep/patches/patch-ai
@@ -0,0 +1,18 @@
+$NetBSD: patch-ai,v 1.1 2000/02/14 12:42:21 fredb Exp $
+
+--- src/Script/Widgets/Makefile.in.orig	Mon Mar  8 10:47:14 1999
++++ src/Script/Widgets/Makefile.in	Sun Aug 22 11:45:33 1999
+@@ -3,11 +3,9 @@
+        Swallow.o TextField.o Tools.o VDipstick.o VScrollBar.o Widget.o
+ OBJSDLL         = $(OBJS)
+ 
+-PROG            = libWidgets.a
+-DYNPROG         = libWidgets.so
+-LIBVER          = 1.5
++PROG            = libWidgets.la
+ LIBVERMAJOR     = 1
+-#INSTALLONBUILD  = install
++LIBVERMINOR     = 5
+ 
+ @MAKEFILECOMMONLIB@
+ 
diff --git a/x11/afterstep/patches/patch-aj b/x11/afterstep/patches/patch-aj
new file mode 100644
index 00000000000..ac4c22f4aa3
--- /dev/null
+++ b/x11/afterstep/patches/patch-aj
@@ -0,0 +1,18 @@
+$NetBSD: patch-aj,v 1.1 2000/02/14 12:42:22 fredb Exp $
+
+--- 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)
+ 
+-PROG            = libafterstep.a
+-DYNPROG         = libafterstep.so
+-LIBVER          = 1.5
++PROG            = libafterstep.la
+ LIBVERMAJOR     = 1
+-#INSTALLONBUILD  = install
++LIBVERMINOR     = 5
+ 
+ @MAKEFILECOMMONLIB@
+ 
diff --git a/x11/afterstep/pkg/MESSAGE b/x11/afterstep/pkg/MESSAGE
index 2af6fb04ba3..d0232bb8b33 100644
--- a/x11/afterstep/pkg/MESSAGE
+++ b/x11/afterstep/pkg/MESSAGE
@@ -1,32 +1,22 @@
 FIRST TIME USERS:
-To use afterstep, put "exec afterstep" at the end of your .xinitrc
-or .xsession file, as applies, commenting out any line(s) for your
-current window manager.
-
+To use afterstep as your window manager, simply invoke "exec afterstep"
+at the end of your .xinitrc (for "startx), or .xsession file (for xdm).
+Don't forget to comment out any line(s) for your current window manager.
 
 UPGRADERS:
-The format of many of the config files may change with the minor
-version number, as from 1.5.x to 1.6.10. Upgraders are advised to
-back up their old custom configs,
-"cp ~/GNUstep/Library/AfterStep ~/GNUstep/Library/AfterStep.old",
-review the defaults in ~/usr/X11R6/share/afterstep for compatibility,
-and edit as required before moving them back.
-
+Afterstep-1.8.x is more configurable than ever, but note: the format of
+many of the configuration files has changed! In particular, it is no
+longer necessary to maintain a complete copy of @PREFIX@/share/afterstep
+in each home directory--your ~/Gnu/Library/Afterstep directory now need
+only contain changes from the defaults in @PREFIX@/share/afterstep.
+Upgraders are advised to back up their old ~/Gnu/Library/Afterstep directory,
+and review the documentation before merging diffs carefully. 
 
 EVERYBODY:
-Try the AfterStep Control Panel (available as a separate package,
-x11/ascp) for configuring AfterStep.
-
-If the "Afterstep Documentation" item in the default start menu
-fails to work, it's probably because you don't have a binary called
-either "netscape" or "lynx" on your system.  With your favorite
-browser, try
-
-	file://usr/X11R6/share/afterstep/doc/afterstep.html
-
-AfterStep has a homepage,
-
-	http://www.afterstep.org/FAQ/
+The AfterStep Control Panel for 1.8.x is still under development.
+See the online docs--Wharf top button, or bottom item of start menu,
+or view @PREFIX@/share/afterstep/doc/afterstep.html with any browser.
+If you are connected to the Internet, a FAQ, mailing lists, and other
+resources may be found on the Afterstep Home Page:
 
-There find the latest version of the FAQ and links to subscribe to
-the mailing list.
+http://www.afterstep.org/
diff --git a/x11/afterstep/pkg/PLIST b/x11/afterstep/pkg/PLIST
index a71d63c5104..ff933dc6943 100644
--- a/x11/afterstep/pkg/PLIST
+++ b/x11/afterstep/pkg/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 1999/06/06 20:22:46 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/02/14 12:42:24 fredb Exp $
 bin/ASSound
 bin/Animate
 bin/Audio
-bin/Auto
 bin/Banner
 bin/Cascade
 bin/Clean
 bin/Form
+bin/Gnome
 bin/Ident
 bin/Pager
 bin/Save
@@ -18,171 +18,133 @@ bin/WinList
 bin/Zharf
 bin/afterstep
 bin/afterstepdoc
+bin/ascommand.pl
+bin/asetroot
+bin/importasmenu
+bin/installastheme.pl
+bin/makeastheme.pl
+lib/libafterstep.a
+lib/libafterstep.so.1.5
+lib/libasConfig.a
+lib/libasConfig.so.1.0
+lib/libasimage.a
+lib/libasimage.so.1.9
+lib/libWidgets.a
+lib/libWidgets.so.1.5
 man/man1/Animate.1
 man/man1/Audio.1
-man/man1/Auto.1
 man/man1/Banner.1
 man/man1/Cascade.1
 man/man1/Clean.1
 man/man1/Form.1
+man/man1/Gnome.1
 man/man1/Ident.1
 man/man1/Pager.1
 man/man1/Save.1
+man/man1/Script.1
 man/man1/Scroll.1
 man/man1/Tile.1
 man/man1/Wharf.1
 man/man1/WinList.1
 man/man1/Zharf.1
-man/man1/Script.1
 man/man1/afterstep.1
-share/afterstep/looks/look.PureNext
-share/afterstep/looks/look.Ethan2
-share/afterstep/looks/look.Transparent
-share/afterstep/looks/look.AfterStep
-share/afterstep/looks/look.Water
-share/afterstep/looks/look.Ostx
-share/afterstep/looks/look.DeepBlue
-share/afterstep/looks/look.Guylhem
-share/afterstep/looks/look.Sea
-share/afterstep/looks/look.MacOS8
-share/afterstep/looks/look.greyblue
-share/afterstep/looks/look.lightblue
-share/afterstep/looks/look.lightgrey
-share/afterstep/looks/look.orchid
-share/afterstep/looks/look.turquoise
-share/afterstep/looks/look.Ethan
-share/afterstep/looks/look.purple
-share/afterstep/looks/look.Metallic
-share/afterstep/looks/look.Guylhem2
-share/afterstep/looks/look.AfterStep1.5
-share/afterstep/looks/look.grey
-share/afterstep/looks/look.fuf
-share/afterstep/looks/look.Nextish
-share/afterstep/looks/look.DEFAULT
-share/afterstep/looks/look.Black
-share/afterstep/desktop/icons/8bpp/AfterStep1.5_startmenu.xpm
-share/afterstep/desktop/icons/8bpp/ASBBlockConvexBlue.xpm
-share/afterstep/desktop/icons/8bpp/ASBBlockGreen.xpm
-share/afterstep/desktop/icons/8bpp/ASBBlockMarble.xpm
-share/afterstep/desktop/icons/8bpp/ASBBlockRed.xpm
-share/afterstep/desktop/icons/8bpp/ASBBlockSlate.xpm
-share/afterstep/desktop/icons/8bpp/ASBBlockWater.xpm
-share/afterstep/desktop/icons/8bpp/3dpaint.xpm
-share/afterstep/desktop/icons/8bpp/Eyecon.xpm
-share/afterstep/desktop/icons/8bpp/Paint.xpm
-share/afterstep/desktop/icons/8bpp/Plasma.xpm
-share/afterstep/desktop/icons/8bpp/ShutDown.xpm
-share/afterstep/desktop/icons/8bpp/Folder.xpm
-share/afterstep/desktop/icons/8bpp/interface.xpm
-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/wharf.xpm
-share/afterstep/desktop/icons/8bpp/writeletter.xpm
-share/afterstep/desktop/icons/8bpp/WWW.xpm
-share/afterstep/desktop/icons/8bpp/FileFolders.xpm
-share/afterstep/desktop/icons/8bpp/ASBBlockWhite.xpm
-share/afterstep/desktop/icons/8bpp/Text.xpm
-share/afterstep/desktop/icons/8bpp/Monitor.xpm
-share/afterstep/desktop/icons/8bpp/shutdown.xpm
-share/afterstep/desktop/icons/8bpp/CDrom.xpm
-share/afterstep/desktop/icons/8bpp/Recycler.xpm
-share/afterstep/desktop/icons/8bpp/ASBBlockDefault.xpm
-share/afterstep/desktop/icons/8bpp/ASBBlockClear.xpm
-share/afterstep/desktop/icons/8bpp/OldFashionedRadio.xpm
-share/afterstep/desktop/icons/8bpp/YellowBlueRedGeometry.xpm
-share/afterstep/desktop/icons/8bpp/AfterStep2.xpm
-share/afterstep/desktop/icons/8bpp/KeysOnChain.xpm
-share/afterstep/desktop/icons/8bpp/AfterStep6.xpm
-share/afterstep/desktop/icons/8bpp/AfterStep.xpm
-share/afterstep/desktop/icons/8bpp/AfterStep4.xpm
-share/afterstep/desktop/icons/8bpp/ComputerPC.xpm
-share/afterstep/desktop/icons/8bpp/Bookshelf.xpm
-share/afterstep/desktop/icons/8bpp/Brush.xpm
-share/afterstep/desktop/icons/8bpp/CDrom2.xpm
-share/afterstep/desktop/icons/8bpp/Publish.xpm
-share/afterstep/desktop/icons/8bpp/Computer.xpm
-share/afterstep/desktop/icons/8bpp/draw.xpm
-share/afterstep/desktop/icons/8bpp/cpuchip.xpm
-share/afterstep/desktop/icons/8bpp/Database.xpm
-share/afterstep/desktop/icons/8bpp/Debug.xpm
-share/afterstep/desktop/icons/8bpp/DeskGlobe.xpm
-share/afterstep/desktop/icons/8bpp/disk.builder.xpm
-share/afterstep/desktop/icons/8bpp/hostmanager.xpm
-share/afterstep/desktop/icons/8bpp/Install.xpm
-share/afterstep/desktop/icons/8bpp/KeyPower.xpm
-share/afterstep/desktop/icons/8bpp/RayTracedGear.xpm
-share/afterstep/desktop/icons/8bpp/Start.xpm
-share/afterstep/desktop/icons/8bpp/Network.xpm
-share/afterstep/desktop/icons/8bpp/workshop.xpm
-share/afterstep/desktop/icons/8bpp/widget.xpm
-share/afterstep/desktop/icons/8bpp/spreadsheet.xpm
-share/afterstep/desktop/icons/8bpp/spreadsheet2.xpm
-share/afterstep/desktop/icons/8bpp/e-no.xpm
-share/afterstep/desktop/icons/8bpp/e0.xpm
-share/afterstep/desktop/icons/8bpp/BookArrows.xpm
-share/afterstep/desktop/icons/8bpp/GNUSpace.xpm
-share/afterstep/desktop/icons/8bpp/Info.xpm
-share/afterstep/desktop/icons/8bpp/e1.xpm
-share/afterstep/desktop/icons/8bpp/e10.xpm
-share/afterstep/desktop/icons/8bpp/NetworkInfoManager.xpm
-share/afterstep/desktop/icons/8bpp/e11.xpm
-share/afterstep/desktop/icons/8bpp/e2.xpm
-share/afterstep/desktop/icons/8bpp/e3.xpm
-share/afterstep/desktop/icons/8bpp/e4.xpm
-share/afterstep/desktop/icons/8bpp/e5.xpm
-share/afterstep/desktop/icons/8bpp/e6.xpm
-share/afterstep/desktop/icons/8bpp/e7.xpm
-share/afterstep/desktop/icons/8bpp/author.xpm
-share/afterstep/desktop/icons/8bpp/AfterStep3.xpm
-share/afterstep/desktop/icons/8bpp/e8.xpm
-share/afterstep/desktop/icons/8bpp/e9.xpm
-share/afterstep/desktop/icons/8bpp/AfterStep5.xpm
-share/afterstep/desktop/icons/8bpp/RedFire.xpm
-share/afterstep/desktop/icons/8bpp/ASBBlockTransparent.xpm
-share/afterstep/desktop/icons/8bpp/ASBBlockBlue.xpm
-share/afterstep/desktop/icons/common/fuf-wharf.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
-share/afterstep/desktop/icons/common/Mail1.xpm
-share/afterstep/desktop/icons/common/Mail2.xpm
-share/afterstep/desktop/icons/common/Mail3.xpm
-share/afterstep/desktop/icons/common/World.xpm
-share/afterstep/desktop/icons/common/arrow.xpm
-share/afterstep/desktop/icons/common/dk.xpm
-share/afterstep/desktop/icons/common/fr.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
-share/afterstep/desktop/icons/common/mini-folder.xpm
-share/afterstep/desktop/icons/common/mini-recycler.xpm
-share/afterstep/desktop/icons/common/monitor-e0.xpm
-share/afterstep/desktop/icons/common/monitor-e1.xpm
-share/afterstep/desktop/icons/common/monitor-e10.xpm
-share/afterstep/desktop/icons/common/monitor-e11.xpm
-share/afterstep/desktop/icons/common/monitor-e2.xpm
-share/afterstep/desktop/icons/common/monitor-e3.xpm
-share/afterstep/desktop/icons/common/monitor-e4.xpm
-share/afterstep/desktop/icons/common/monitor-e5.xpm
-share/afterstep/desktop/icons/common/monitor-e6.xpm
-share/afterstep/desktop/icons/common/monitor-e7.xpm
-share/afterstep/desktop/icons/common/monitor-e8.xpm
-share/afterstep/desktop/icons/common/monitor-e9.xpm
-share/afterstep/desktop/icons/common/monitor-no.xpm
-share/afterstep/desktop/icons/common/xiterm.xpm
-share/afterstep/desktop/icons/common/mini-menu.xpm
-share/afterstep/desktop/icons/common/arrow-dots.xpm
-share/afterstep/desktop/icons/common/os8-title.xpm
-share/afterstep/desktop/icons/common/ostx.xpm
-share/afterstep/desktop/icons/common/ostxs.xpm
-share/afterstep/desktop/icons/common/ostxu.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/3_dots.xpm
-share/afterstep/desktop/icons/16bpp/AfterStep1.5_startmenu.xpm
+man/man1/asetroot.1
+share/afterstep/.workspace_state
+share/afterstep/Gnome
+share/afterstep/animate
+share/afterstep/asetroot
+share/afterstep/audio
+share/afterstep/autoexec
+share/afterstep/backgrounds/Back.xpm
+share/afterstep/backgrounds/BlueStone.xpm
+share/afterstep/backgrounds/aquamarine.xpm
+share/afterstep/backgrounds/black.xpm
+share/afterstep/backgrounds/darkblue.xpm
+share/afterstep/backgrounds/darkgreen.xpm
+share/afterstep/backgrounds/midnightblue.xpm
+share/afterstep/backgrounds/purple.xpm
+share/afterstep/backgrounds/red.xpm
+share/afterstep/backgrounds/wheat.xpm
+share/afterstep/base.15bpp
+share/afterstep/base.16bpp
+share/afterstep/base.24bpp
+share/afterstep/base.32bpp
+share/afterstep/base.8bpp
+share/afterstep/clean
+share/afterstep/compatibility
+share/afterstep/database
+share/afterstep/desktop/buttons/1.xpm
+share/afterstep/desktop/buttons/1p.xpm
+share/afterstep/desktop/buttons/2.xpm
+share/afterstep/desktop/buttons/2p.xpm
+share/afterstep/desktop/buttons/3.xpm
+share/afterstep/desktop/buttons/3p.xpm
+share/afterstep/desktop/buttons/4.xpm
+share/afterstep/desktop/buttons/4p.xpm
+share/afterstep/desktop/buttons/5.xpm
+share/afterstep/desktop/buttons/5p.xpm
+share/afterstep/desktop/buttons/as-iconize-pressed.xpm
+share/afterstep/desktop/buttons/as-iconize.xpm
+share/afterstep/desktop/buttons/as-kill-pressed.xpm
+share/afterstep/desktop/buttons/as-kill.xpm
+share/afterstep/desktop/buttons/as-maximize-a-pressed.xpm
+share/afterstep/desktop/buttons/as-maximize-a.xpm
+share/afterstep/desktop/buttons/as-menu-a-pressed.xpm
+share/afterstep/desktop/buttons/as-menu-a.xpm
+share/afterstep/desktop/buttons/as-menu-b-pressed.xpm
+share/afterstep/desktop/buttons/as-menu-b.xpm
+share/afterstep/desktop/buttons/as-minimize-a-pressed.xpm
+share/afterstep/desktop/buttons/as-minimize-a.xpm
+share/afterstep/desktop/buttons/as-shade-a-pressed.xpm
+share/afterstep/desktop/buttons/as-shade-a.xpm
+share/afterstep/desktop/buttons/as-switchwindow-a-pressed.xpm
+share/afterstep/desktop/buttons/as-switchwindow-a.xpm
+share/afterstep/desktop/buttons/as-switchwindow-b-pressed.xpm
+share/afterstep/desktop/buttons/as-switchwindow-b.xpm
+share/afterstep/desktop/buttons/as-switchwindow-c-pressed.xpm
+share/afterstep/desktop/buttons/as-switchwindow-c.xpm
+share/afterstep/desktop/buttons/as1.5-iconize-p.xpm
+share/afterstep/desktop/buttons/as1.5-iconize.xpm
+share/afterstep/desktop/buttons/as1.5-iconizeR-p.xpm
+share/afterstep/desktop/buttons/as1.5-iconizeR.xpm
+share/afterstep/desktop/buttons/as1.5-kill-p.xpm
+share/afterstep/desktop/buttons/as1.5-kill.xpm
+share/afterstep/desktop/buttons/as1.5-menu-p.xpm
+share/afterstep/desktop/buttons/as1.5-menu.xpm
+share/afterstep/desktop/buttons/as1.5-shade-p.xpm
+share/afterstep/desktop/buttons/as1.5-shade.xpm
+share/afterstep/desktop/buttons/fuf-iconify-pressed.xpm
+share/afterstep/desktop/buttons/fuf-iconify.xpm
+share/afterstep/desktop/buttons/fuf-kill-pressed.xpm
+share/afterstep/desktop/buttons/fuf-kill.xpm
+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-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/cursors/cursor.xbm
+share/afterstep/desktop/cursors/cursor.xbm.mask
+share/afterstep/desktop/cursors/iconify.xbm
+share/afterstep/desktop/cursors/iconify.xbm.mask
+share/afterstep/desktop/cursors/kill.xbm
+share/afterstep/desktop/cursors/kill.xbm.mask
+share/afterstep/desktop/cursors/move.xbm
+share/afterstep/desktop/cursors/move.xbm.mask
+share/afterstep/desktop/cursors/resize_br.xbm
+share/afterstep/desktop/cursors/resize_br.xbm.mask
+share/afterstep/desktop/cursors/resize_h.xbm
+share/afterstep/desktop/cursors/resize_h.xbm.mask
+share/afterstep/desktop/cursors/resize_tr.xbm
+share/afterstep/desktop/cursors/resize_tr.xbm.mask
+share/afterstep/desktop/cursors/resize_v.xbm
+share/afterstep/desktop/cursors/resize_v.xbm.mask
+share/afterstep/desktop/cursors/xm_hour32
+share/afterstep/desktop/cursors/xm_hour32m
+share/afterstep/desktop/icons/16bpp/3dpaint.xpm
+share/afterstep/desktop/icons/16bpp/ASBBlockBlue.xpm
 share/afterstep/desktop/icons/16bpp/ASBBlockClear.xpm
 share/afterstep/desktop/icons/16bpp/ASBBlockConvexBlue.xpm
 share/afterstep/desktop/icons/16bpp/ASBBlockDefault.xpm
@@ -190,364 +152,309 @@ share/afterstep/desktop/icons/16bpp/ASBBlockGreen.xpm
 share/afterstep/desktop/icons/16bpp/ASBBlockMarble.xpm
 share/afterstep/desktop/icons/16bpp/ASBBlockRed.xpm
 share/afterstep/desktop/icons/16bpp/ASBBlockSlate.xpm
+share/afterstep/desktop/icons/16bpp/ASBBlockTransparent.xpm
 share/afterstep/desktop/icons/16bpp/ASBBlockWater.xpm
 share/afterstep/desktop/icons/16bpp/ASBBlockWhite.xpm
-share/afterstep/desktop/icons/16bpp/CDrom.xpm
-share/afterstep/desktop/icons/16bpp/Eyecon.xpm
-share/afterstep/desktop/icons/16bpp/RedFire.xpm
-share/afterstep/desktop/icons/16bpp/Folder.xpm
-share/afterstep/desktop/icons/16bpp/KeysOnChain.xpm
-share/afterstep/desktop/icons/16bpp/Monitor.xpm
-share/afterstep/desktop/icons/16bpp/Paint.xpm
-share/afterstep/desktop/icons/16bpp/Plasma.xpm
-share/afterstep/desktop/icons/16bpp/Recycler.xpm
-share/afterstep/desktop/icons/16bpp/Text.xpm
-share/afterstep/desktop/icons/16bpp/ShutDown.xpm
-share/afterstep/desktop/icons/16bpp/interface.xpm
-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/wharf.xpm
-share/afterstep/desktop/icons/16bpp/writeletter.xpm
-share/afterstep/desktop/icons/16bpp/3dpaint.xpm
-share/afterstep/desktop/icons/16bpp/OldFashionedRadio.xpm
-share/afterstep/desktop/icons/16bpp/YellowBlueRedGeometry.xpm
-share/afterstep/desktop/icons/16bpp/AfterStep2.xpm
-share/afterstep/desktop/icons/16bpp/shutdown.xpm
-share/afterstep/desktop/icons/16bpp/FileFolders.xpm
 share/afterstep/desktop/icons/16bpp/AfterStep.xpm
+share/afterstep/desktop/icons/16bpp/AfterStep2.xpm
 share/afterstep/desktop/icons/16bpp/AfterStep3.xpm
 share/afterstep/desktop/icons/16bpp/AfterStep4.xpm
+share/afterstep/desktop/icons/16bpp/AfterStep5.xpm
+share/afterstep/desktop/icons/16bpp/AfterStep6.xpm
 share/afterstep/desktop/icons/16bpp/BookArrows.xpm
 share/afterstep/desktop/icons/16bpp/Bookshelf.xpm
 share/afterstep/desktop/icons/16bpp/Brush.xpm
+share/afterstep/desktop/icons/16bpp/CDrom.xpm
 share/afterstep/desktop/icons/16bpp/CDrom2.xpm
 share/afterstep/desktop/icons/16bpp/Computer.xpm
-share/afterstep/desktop/icons/16bpp/Info.xpm
-share/afterstep/desktop/icons/16bpp/e-no.xpm
 share/afterstep/desktop/icons/16bpp/ComputerPC.xpm
 share/afterstep/desktop/icons/16bpp/Database.xpm
 share/afterstep/desktop/icons/16bpp/Debug.xpm
 share/afterstep/desktop/icons/16bpp/DeskGlobe.xpm
+share/afterstep/desktop/icons/16bpp/Eyecon.xpm
+share/afterstep/desktop/icons/16bpp/FileFolders.xpm
+share/afterstep/desktop/icons/16bpp/Folder.xpm
 share/afterstep/desktop/icons/16bpp/GNUSpace.xpm
+share/afterstep/desktop/icons/16bpp/Info.xpm
 share/afterstep/desktop/icons/16bpp/Install.xpm
 share/afterstep/desktop/icons/16bpp/KeyPower.xpm
+share/afterstep/desktop/icons/16bpp/KeysOnChain.xpm
+share/afterstep/desktop/icons/16bpp/Monitor.xpm
 share/afterstep/desktop/icons/16bpp/Network.xpm
 share/afterstep/desktop/icons/16bpp/NetworkInfoManager.xpm
+share/afterstep/desktop/icons/16bpp/OldFashionedRadio.xpm
+share/afterstep/desktop/icons/16bpp/Paint.xpm
+share/afterstep/desktop/icons/16bpp/Plasma.xpm
 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
+share/afterstep/desktop/icons/16bpp/YellowBlueRedGeometry.xpm
 share/afterstep/desktop/icons/16bpp/author.xpm
 share/afterstep/desktop/icons/16bpp/cpuchip.xpm
 share/afterstep/desktop/icons/16bpp/disk.builder.xpm
 share/afterstep/desktop/icons/16bpp/draw.xpm
 share/afterstep/desktop/icons/16bpp/hostmanager.xpm
-share/afterstep/desktop/icons/16bpp/e0.xpm
+share/afterstep/desktop/icons/16bpp/interface.xpm
+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/spreadsheet.xpm
-share/afterstep/desktop/icons/16bpp/e1.xpm
 share/afterstep/desktop/icons/16bpp/spreadsheet2.xpm
+share/afterstep/desktop/icons/16bpp/wharf.xpm
 share/afterstep/desktop/icons/16bpp/widget.xpm
 share/afterstep/desktop/icons/16bpp/workshop.xpm
-share/afterstep/desktop/icons/16bpp/Start.xpm
-share/afterstep/desktop/icons/16bpp/e10.xpm
-share/afterstep/desktop/icons/16bpp/e11.xpm
-share/afterstep/desktop/icons/16bpp/e2.xpm
-share/afterstep/desktop/icons/16bpp/e3.xpm
-share/afterstep/desktop/icons/16bpp/e4.xpm
-share/afterstep/desktop/icons/16bpp/e5.xpm
-share/afterstep/desktop/icons/16bpp/e6.xpm
-share/afterstep/desktop/icons/16bpp/e7.xpm
-share/afterstep/desktop/icons/16bpp/e8.xpm
-share/afterstep/desktop/icons/16bpp/e9.xpm
-share/afterstep/desktop/icons/16bpp/AfterStep5.xpm
-share/afterstep/desktop/icons/16bpp/AfterStep6.xpm
-share/afterstep/desktop/icons/16bpp/ASBBlockTransparent.xpm
-share/afterstep/desktop/icons/16bpp/ASBBlockBlue.xpm
-share/afterstep/desktop/buttons/fuf-iconify-pressed.xpm
-share/afterstep/desktop/buttons/1p-e.xpm
-share/afterstep/desktop/buttons/1.xpm
-share/afterstep/desktop/buttons/as-iconize-pressed.xpm
-share/afterstep/desktop/buttons/as-iconize.xpm
-share/afterstep/desktop/buttons/as-kill-pressed.xpm
-share/afterstep/desktop/buttons/as-kill.xpm
-share/afterstep/desktop/buttons/as-maximize-a-pressed.xpm
-share/afterstep/desktop/buttons/as-maximize-a.xpm
-share/afterstep/desktop/buttons/as-menu-a-pressed.xpm
-share/afterstep/desktop/buttons/as-menu-a.xpm
-share/afterstep/desktop/buttons/as-menu-b-pressed.xpm
-share/afterstep/desktop/buttons/as-menu-b.xpm
-share/afterstep/desktop/buttons/as-minimize-a-pressed.xpm
-share/afterstep/desktop/buttons/as-minimize-a.xpm
-share/afterstep/desktop/buttons/as-shade-a-pressed.xpm
-share/afterstep/desktop/buttons/as-shade-a.xpm
-share/afterstep/desktop/buttons/1p.xpm
-share/afterstep/desktop/buttons/as-switchwindow-a.xpm
-share/afterstep/desktop/buttons/as-switchwindow-a-pressed.xpm
-share/afterstep/desktop/buttons/as-switchwindow-b.xpm
-share/afterstep/desktop/buttons/as-switchwindow-b-pressed.xpm
-share/afterstep/desktop/buttons/as-switchwindow-c-pressed.xpm
-share/afterstep/desktop/buttons/as-switchwindow-c.xpm
-share/afterstep/desktop/buttons/2.xpm
-share/afterstep/desktop/buttons/2p.xpm
-share/afterstep/desktop/buttons/3.xpm
-share/afterstep/desktop/buttons/3p.xpm
-share/afterstep/desktop/buttons/4.xpm
-share/afterstep/desktop/buttons/4p.xpm
-share/afterstep/desktop/buttons/5.xpm
-share/afterstep/desktop/buttons/5p.xpm
-share/afterstep/desktop/buttons/2-e.xpm
-share/afterstep/desktop/buttons/2p-e.xpm
-share/afterstep/desktop/buttons/3-e.xpm
-share/afterstep/desktop/buttons/3p-e.xpm
-share/afterstep/desktop/buttons/4-e.xpm
-share/afterstep/desktop/buttons/4p-e.xpm
-share/afterstep/desktop/buttons/5-e.xpm
-share/afterstep/desktop/buttons/5p-e.xpm
-share/afterstep/desktop/buttons/os8-iconize.xpm
-share/afterstep/desktop/buttons/os8-iconize-pressed.xpm
-share/afterstep/desktop/buttons/os8-kill-pressed.xpm
-share/afterstep/desktop/buttons/os8-kill.xpm
-share/afterstep/desktop/buttons/os8-maximize-pressed.xpm
-share/afterstep/desktop/buttons/os8-maximize.xpm
-share/afterstep/desktop/buttons/os8-shade-pressed.xpm
-share/afterstep/desktop/buttons/os8-shade.xpm
-share/afterstep/desktop/buttons/as1.5-iconize-p.xpm
-share/afterstep/desktop/buttons/as1.5-iconize.xpm
-share/afterstep/desktop/buttons/as1.5-kill-p.xpm
-share/afterstep/desktop/buttons/as1.5-kill.xpm
-share/afterstep/desktop/buttons/as1.5-menu-p.xpm
-share/afterstep/desktop/buttons/as1.5-menu.xpm
-share/afterstep/desktop/buttons/as1.5-shade-p.xpm
-share/afterstep/desktop/buttons/as1.5-shade.xpm
-share/afterstep/desktop/buttons/fuf-iconify.xpm
-share/afterstep/desktop/buttons/fuf-kill-pressed.xpm
-share/afterstep/desktop/buttons/fuf-kill.xpm
-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/1-e.xpm
-share/afterstep/desktop/sounds/train.au
+share/afterstep/desktop/icons/16bpp/writeletter.xpm
+share/afterstep/desktop/icons/8bpp/3dpaint.xpm
+share/afterstep/desktop/icons/8bpp/ASBBlockBlue.xpm
+share/afterstep/desktop/icons/8bpp/ASBBlockClear.xpm
+share/afterstep/desktop/icons/8bpp/ASBBlockConvexBlue.xpm
+share/afterstep/desktop/icons/8bpp/ASBBlockDefault.xpm
+share/afterstep/desktop/icons/8bpp/ASBBlockGreen.xpm
+share/afterstep/desktop/icons/8bpp/ASBBlockMarble.xpm
+share/afterstep/desktop/icons/8bpp/ASBBlockRed.xpm
+share/afterstep/desktop/icons/8bpp/ASBBlockSlate.xpm
+share/afterstep/desktop/icons/8bpp/ASBBlockTransparent.xpm
+share/afterstep/desktop/icons/8bpp/ASBBlockWater.xpm
+share/afterstep/desktop/icons/8bpp/ASBBlockWhite.xpm
+share/afterstep/desktop/icons/8bpp/AfterStep.xpm
+share/afterstep/desktop/icons/8bpp/AfterStep2.xpm
+share/afterstep/desktop/icons/8bpp/AfterStep3.xpm
+share/afterstep/desktop/icons/8bpp/AfterStep4.xpm
+share/afterstep/desktop/icons/8bpp/AfterStep5.xpm
+share/afterstep/desktop/icons/8bpp/AfterStep6.xpm
+share/afterstep/desktop/icons/8bpp/BookArrows.xpm
+share/afterstep/desktop/icons/8bpp/Bookshelf.xpm
+share/afterstep/desktop/icons/8bpp/Brush.xpm
+share/afterstep/desktop/icons/8bpp/CDrom.xpm
+share/afterstep/desktop/icons/8bpp/CDrom2.xpm
+share/afterstep/desktop/icons/8bpp/Computer.xpm
+share/afterstep/desktop/icons/8bpp/ComputerPC.xpm
+share/afterstep/desktop/icons/8bpp/Database.xpm
+share/afterstep/desktop/icons/8bpp/Debug.xpm
+share/afterstep/desktop/icons/8bpp/DeskGlobe.xpm
+share/afterstep/desktop/icons/8bpp/Eyecon.xpm
+share/afterstep/desktop/icons/8bpp/FileFolders.xpm
+share/afterstep/desktop/icons/8bpp/Folder.xpm
+share/afterstep/desktop/icons/8bpp/GNUSpace.xpm
+share/afterstep/desktop/icons/8bpp/Info.xpm
+share/afterstep/desktop/icons/8bpp/Install.xpm
+share/afterstep/desktop/icons/8bpp/KeyPower.xpm
+share/afterstep/desktop/icons/8bpp/KeysOnChain.xpm
+share/afterstep/desktop/icons/8bpp/Monitor.xpm
+share/afterstep/desktop/icons/8bpp/Network.xpm
+share/afterstep/desktop/icons/8bpp/NetworkInfoManager.xpm
+share/afterstep/desktop/icons/8bpp/OldFashionedRadio.xpm
+share/afterstep/desktop/icons/8bpp/Paint.xpm
+share/afterstep/desktop/icons/8bpp/Plasma.xpm
+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
+share/afterstep/desktop/icons/8bpp/YellowBlueRedGeometry.xpm
+share/afterstep/desktop/icons/8bpp/author.xpm
+share/afterstep/desktop/icons/8bpp/cpuchip.xpm
+share/afterstep/desktop/icons/8bpp/disk.builder.xpm
+share/afterstep/desktop/icons/8bpp/draw.xpm
+share/afterstep/desktop/icons/8bpp/hostmanager.xpm
+share/afterstep/desktop/icons/8bpp/interface.xpm
+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/spreadsheet.xpm
+share/afterstep/desktop/icons/8bpp/spreadsheet2.xpm
+share/afterstep/desktop/icons/8bpp/wharf.xpm
+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/arrow-dots.xpm
+share/afterstep/desktop/icons/common/arrow.xpm
+share/afterstep/desktop/icons/common/bluebar.xpm
+share/afterstep/desktop/icons/common/darkbluebar.xpm
+share/afterstep/desktop/icons/common/east.xpm
+share/afterstep/desktop/icons/common/greenbar.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
+share/afterstep/desktop/icons/common/mini-folder.xpm
+share/afterstep/desktop/icons/common/mini-menu.xpm
+share/afterstep/desktop/icons/common/mini-recycler.xpm
+share/afterstep/desktop/icons/common/os8-title.xpm
+share/afterstep/desktop/icons/common/ostx.xpm
+share/afterstep/desktop/icons/common/ostxs.xpm
+share/afterstep/desktop/icons/common/ostxu.xpm
+share/afterstep/desktop/icons/common/redbar.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/west.xpm
+share/afterstep/desktop/sounds/bong.au
 share/afterstep/desktop/sounds/clink.au
 share/afterstep/desktop/sounds/cowbell.au
 share/afterstep/desktop/sounds/crash.au
 share/afterstep/desktop/sounds/drip.au
 share/afterstep/desktop/sounds/gong.au
 share/afterstep/desktop/sounds/meepmeep.au
-share/afterstep/desktop/sounds/bong.au
-share/afterstep/feels/feel.ICCCM
+share/afterstep/desktop/sounds/train.au
+share/afterstep/doc/afterstep-1.html
+share/afterstep/doc/afterstep-10.html
+share/afterstep/doc/afterstep-2.html
+share/afterstep/doc/afterstep-3.html
+share/afterstep/doc/afterstep-4.html
+share/afterstep/doc/afterstep-5.html
+share/afterstep/doc/afterstep-6.html
+share/afterstep/doc/afterstep-7.html
+share/afterstep/doc/afterstep-8.html
+share/afterstep/doc/afterstep-9.html
+share/afterstep/doc/afterstep.html
+share/afterstep/feels/feel.AutoRaise
 share/afterstep/feels/feel.ClickToFocus
 share/afterstep/feels/feel.DEFAULT
-share/afterstep/feels/feel.AutoRaise
+share/afterstep/feels/feel.GNOME
+share/afterstep/feels/feel.ICCCM
 share/afterstep/feels/feel.MacOS8
 share/afterstep/feels/feel.PureNeXT
 share/afterstep/feels/feel.Windowish
-share/afterstep/scripts/Animate
-share/afterstep/scripts/Quit
-share/afterstep/scripts/ScreenDump
-share/afterstep/scripts/Date
-share/afterstep/scripts/FileBrowser
-share/afterstep/scripts/PointerSetup
-share/afterstep/scripts/KeyboardSetup
-share/afterstep/scripts/ScreenSetup2
-share/afterstep/scripts/ScreenSetup
-share/afterstep/scripts/BellSetup
-share/afterstep/scripts/DeskSetup
-share/afterstep/non-configurable/startmenu
-share/afterstep/non-configurable/Xpm2Jpg
+share/afterstep/feels/feel.cursors
+share/afterstep/forms
+share/afterstep/ident
+share/afterstep/looks/look.AfterStep
+share/afterstep/looks/look.DEFAULT
+share/afterstep/looks/look.Frames
+share/afterstep/looks/look.Guylhem
+share/afterstep/looks/look.Metallic
+share/afterstep/looks/look.NEW
+share/afterstep/looks/look.Nextish
+share/afterstep/looks/look.Ostx
+share/afterstep/looks/look.PureNext
+share/afterstep/looks/look.Transparent.rev
+share/afterstep/looks/look.purple
 share/afterstep/non-configurable/0_background
-share/afterstep/non-configurable/1_background
-share/afterstep/non-configurable/2_background
-share/afterstep/non-configurable/3_background
-share/afterstep/non-configurable/1_look.16bpp
-share/afterstep/non-configurable/1_look.8bpp
-share/afterstep/non-configurable/1_look.24bpp
-share/afterstep/non-configurable/1_look.32bpp
+share/afterstep/non-configurable/0_feel.15bpp
+share/afterstep/non-configurable/0_feel.16bpp
+share/afterstep/non-configurable/0_feel.24bpp
+share/afterstep/non-configurable/0_feel.32bpp
+share/afterstep/non-configurable/0_feel.8bpp
+share/afterstep/non-configurable/0_look.15bpp
 share/afterstep/non-configurable/0_look.16bpp
-share/afterstep/non-configurable/2_look.16bpp
-share/afterstep/non-configurable/3_look.16bpp
-share/afterstep/non-configurable/0_look.8bpp
-share/afterstep/non-configurable/2_look.8bpp
-share/afterstep/non-configurable/3_look.8bpp
-share/afterstep/non-configurable/3_look.24bpp
-share/afterstep/non-configurable/2_look.24bpp
 share/afterstep/non-configurable/0_look.24bpp
 share/afterstep/non-configurable/0_look.32bpp
-share/afterstep/non-configurable/2_look.32bpp
-share/afterstep/non-configurable/3_look.32bpp
-share/afterstep/non-configurable/0_feel.16bpp
+share/afterstep/non-configurable/0_look.8bpp
+share/afterstep/non-configurable/1_background
+share/afterstep/non-configurable/1_feel.15bpp
 share/afterstep/non-configurable/1_feel.16bpp
-share/afterstep/non-configurable/2_feel.16bpp
-share/afterstep/non-configurable/3_feel.16bpp
-share/afterstep/non-configurable/3_feel.8bpp
-share/afterstep/non-configurable/2_feel.8bpp
-share/afterstep/non-configurable/1_feel.8bpp
-share/afterstep/non-configurable/0_feel.8bpp
-share/afterstep/non-configurable/0_feel.24bpp
 share/afterstep/non-configurable/1_feel.24bpp
-share/afterstep/non-configurable/2_feel.24bpp
-share/afterstep/non-configurable/3_feel.24bpp
 share/afterstep/non-configurable/1_feel.32bpp
-share/afterstep/non-configurable/0_feel.32bpp
-share/afterstep/non-configurable/2_feel.32bpp
-share/afterstep/non-configurable/3_feel.32bpp
-share/afterstep/non-configurable/0_feel.15bpp
-share/afterstep/non-configurable/0_look.15bpp
-share/afterstep/non-configurable/1_feel.15bpp
+share/afterstep/non-configurable/1_feel.8bpp
 share/afterstep/non-configurable/1_look.15bpp
+share/afterstep/non-configurable/1_look.16bpp
+share/afterstep/non-configurable/1_look.24bpp
+share/afterstep/non-configurable/1_look.32bpp
+share/afterstep/non-configurable/1_look.8bpp
+share/afterstep/non-configurable/2_background
 share/afterstep/non-configurable/2_feel.15bpp
+share/afterstep/non-configurable/2_feel.16bpp
+share/afterstep/non-configurable/2_feel.24bpp
+share/afterstep/non-configurable/2_feel.32bpp
+share/afterstep/non-configurable/2_feel.8bpp
 share/afterstep/non-configurable/2_look.15bpp
+share/afterstep/non-configurable/2_look.16bpp
+share/afterstep/non-configurable/2_look.24bpp
+share/afterstep/non-configurable/2_look.32bpp
+share/afterstep/non-configurable/2_look.8bpp
+share/afterstep/non-configurable/3_background
 share/afterstep/non-configurable/3_feel.15bpp
+share/afterstep/non-configurable/3_feel.16bpp
+share/afterstep/non-configurable/3_feel.24bpp
+share/afterstep/non-configurable/3_feel.32bpp
+share/afterstep/non-configurable/3_feel.8bpp
 share/afterstep/non-configurable/3_look.15bpp
-share/afterstep/non-configurable/Make8bitXPMs
-share/afterstep/backgrounds/WaveHi.xpm
-share/afterstep/backgrounds/BlueStone.xpm
-share/afterstep/backgrounds/aquamarine.xpm
-share/afterstep/backgrounds/black.xpm
-share/afterstep/backgrounds/darkblue.xpm
-share/afterstep/backgrounds/darkgreen.xpm
-share/afterstep/backgrounds/midnightblue.xpm
-share/afterstep/backgrounds/purple.xpm
-share/afterstep/backgrounds/red.xpm
-share/afterstep/backgrounds/wheat.xpm
-share/afterstep/backgrounds/Rain.xpm
-share/afterstep/backgrounds/Waves.xpm
-share/afterstep/backgrounds/RainHi.xpm
-share/afterstep/backgrounds/Wave.xpm
-share/afterstep/backgrounds/Back.xpm
-share/afterstep/start/Screen_savers/Without_password/9_stars
-share/afterstep/start/Screen_savers/Without_password/1_firework
-share/afterstep/start/Screen_savers/Without_password/2_laser
-share/afterstep/start/Screen_savers/Without_password/3_mount
-share/afterstep/start/Screen_savers/Without_password/4_qix
-share/afterstep/start/Screen_savers/Without_password/5_shape
-share/afterstep/start/Screen_savers/Without_password/6_sperm
-share/afterstep/start/Screen_savers/Without_password/7_spline
-share/afterstep/start/Screen_savers/Without_password/8_startrek
-share/afterstep/start/Screen_savers/Without_password/0_firework
-share/afterstep/start/Screen_savers/With_password/9_stars
-share/afterstep/start/Screen_savers/With_password/1_firework
-share/afterstep/start/Screen_savers/With_password/2_laser
-share/afterstep/start/Screen_savers/With_password/3_mount
-share/afterstep/start/Screen_savers/With_password/4_qix
-share/afterstep/start/Screen_savers/With_password/5_shape
-share/afterstep/start/Screen_savers/With_password/6_sperm
-share/afterstep/start/Screen_savers/With_password/7_spline
-share/afterstep/start/Screen_savers/With_password/8_startrek
-share/afterstep/start/Screen_savers/With_password/0_firework
-share/afterstep/start/Quit/1_exit
-share/afterstep/start/Quit/4_restarttwm
-share/afterstep/start/Quit/5_restartwm
-share/afterstep/start/Quit/2_nop
-share/afterstep/start/Quit/0_close
-share/afterstep/start/Quit/3_restartsession
+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/pager
+share/afterstep/scripts/Animate
+share/afterstep/scripts/BellSetup
+share/afterstep/scripts/Date
+share/afterstep/scripts/DeskSetup
+share/afterstep/scripts/FileBrowser
+share/afterstep/scripts/KeyboardSetup
+share/afterstep/scripts/PointerSetup
+share/afterstep/scripts/Quit
+share/afterstep/scripts/ScreenDump
+share/afterstep/scripts/ScreenSetup
+share/afterstep/scripts/ScreenSetup2
+share/afterstep/scroll
+share/afterstep/start/.include
+share/afterstep/start/Applications/Accessories/1_calc
+share/afterstep/start/Applications/Accessories/2_clock
+share/afterstep/start/Applications/Accessories/3_colors
+share/afterstep/start/Applications/Accessories/4_help
+share/afterstep/start/Applications/Accessories/5_notepad
+share/afterstep/start/Applications/Accessories/6_scrnmag
 share/afterstep/start/Applications/Editors/1_emacs
 share/afterstep/start/Applications/Editors/2_vi
 share/afterstep/start/Applications/Editors/3_nedit
 share/afterstep/start/Applications/Editors/4_xjed
-share/afterstep/start/Applications/System/8_resetcmap
-share/afterstep/start/Applications/System/1_sysload
-share/afterstep/start/Applications/System/2_changedefs
-share/afterstep/start/Applications/System/3_changescrn
-share/afterstep/start/Applications/System/4_console
-share/afterstep/start/Applications/System/5_fontedit
-share/afterstep/start/Applications/System/6_top
-share/afterstep/start/Applications/System/7_keyleds
-share/afterstep/start/Applications/System/0_sysinfo
-share/afterstep/start/Applications/Office/10_tkdesk
-share/afterstep/start/Applications/Office/2_so
-share/afterstep/start/Applications/Office/3_fileman
-share/afterstep/start/Applications/Office/4_plot
-share/afterstep/start/Applications/Office/8_psview
-share/afterstep/start/Applications/Office/9_pdf
-share/afterstep/start/Applications/Office/6_lyx
-share/afterstep/start/Applications/Office/7_dviview
-share/afterstep/start/Applications/Office/1_applix
-share/afterstep/start/Applications/Network/3_lynx
-share/afterstep/start/Applications/Network/5_irc
-share/afterstep/start/Applications/Network/1_ftp
-share/afterstep/start/Applications/Network/2_ncftp
-share/afterstep/start/Applications/Network/6_netscape
-share/afterstep/start/Applications/Network/7_news
-share/afterstep/start/Applications/Network/8_telnet
-share/afterstep/start/Applications/Network/0_minicom
-share/afterstep/start/Applications/Network/4_mail
-share/afterstep/start/Applications/Emulators/5_appleII
+share/afterstep/start/Applications/Emulators/0_dos
 share/afterstep/start/Applications/Emulators/1_mac
-share/afterstep/start/Applications/Emulators/3_amigasnd
 share/afterstep/start/Applications/Emulators/2_amiga
+share/afterstep/start/Applications/Emulators/3_amigasnd
 share/afterstep/start/Applications/Emulators/4_hp48
-share/afterstep/start/Applications/Emulators/0_dos
+share/afterstep/start/Applications/Emulators/5_appleII
 share/afterstep/start/Applications/Emulators/6_x48
-share/afterstep/start/Applications/Accessories/1_calc
-share/afterstep/start/Applications/Accessories/2_clock
-share/afterstep/start/Applications/Accessories/5_notepad
-share/afterstep/start/Applications/Accessories/3_colors
-share/afterstep/start/Applications/Accessories/4_help
-share/afterstep/start/Applications/Accessories/6_scrnmag
 share/afterstep/start/Applications/Multimedia/0_cd
 share/afterstep/start/Applications/Multimedia/1_mp3
 share/afterstep/start/Applications/Multimedia/2_mixer
 share/afterstep/start/Applications/Multimedia/3_pict
 share/afterstep/start/Applications/Multimedia/4_gimp
 share/afterstep/start/Applications/Multimedia/5_imagick
-share/afterstep/start/Applications/3_xterm
-share/afterstep/start/Applications/4_rxvt
-share/afterstep/start/Applications/5_Eterm
-share/afterstep/start/Applications/2_xiterm
-share/afterstep/start/Applications/1_nop
-share/afterstep/start/Modules/Scripts/3_quit
-share/afterstep/start/Modules/Scripts/2_desksetup
-share/afterstep/start/Modules/Scripts/0_animate
-share/afterstep/start/Modules/Scripts/1_bellsetup
-share/afterstep/start/Modules/Scripts/4_screendump
-share/afterstep/start/Modules/Forms/1_ftp
-share/afterstep/start/Modules/Forms/4_quit
-share/afterstep/start/Modules/Forms/2_find
-share/afterstep/start/Modules/Forms/5_run
-share/afterstep/start/Modules/Forms/6_screenshot
-share/afterstep/start/Modules/Forms/7_windowshot
-share/afterstep/start/Modules/Forms/8_xlock
-share/afterstep/start/Modules/Forms/3_help
-share/afterstep/start/Modules/Auto
-share/afterstep/start/Modules/Banner
-share/afterstep/start/Modules/Clean
-share/afterstep/start/Modules/Ident
-share/afterstep/start/Modules/Pager
-share/afterstep/start/Modules/Scroll
-share/afterstep/start/Modules/Wharf
-share/afterstep/start/Modules/WinList
-share/afterstep/start/Modules/Zharf
-share/afterstep/start/Modules/Cascade
-share/afterstep/start/Modules/Tile
-share/afterstep/start/Modules/Auto_Stop
-share/afterstep/start/Modules/Banner_Stop
-share/afterstep/start/Modules/Audio_Stop
-share/afterstep/start/Modules/Cascade_Stop
-share/afterstep/start/Modules/Clean_Stop
-share/afterstep/start/Modules/Ident_Stop
-share/afterstep/start/Modules/Pager_Stop
-share/afterstep/start/Modules/Animate_Stop
-share/afterstep/start/Modules/Scroll_Stop
-share/afterstep/start/Modules/Tile_Stop
-share/afterstep/start/Modules/Wharf_Stop
-share/afterstep/start/Modules/Zharf_Stop
-share/afterstep/start/Modules/Animate
-share/afterstep/start/Modules/Audio
-share/afterstep/start/Modules/WinList_Stop
-share/afterstep/start/Windows/6_winprop
-share/afterstep/start/Windows/1_resize
-share/afterstep/start/Windows/2_raise
-share/afterstep/start/Windows/3_lower
-share/afterstep/start/Windows/4_delete
-share/afterstep/start/Windows/5_destroy
-share/afterstep/start/Windows/1_iconify
-share/afterstep/start/Windows/2_pin
-share/afterstep/start/Windows/0_move
-share/afterstep/start/Desktop/Animations/Animations-1/9_crystal
+share/afterstep/start/Applications/Network/0_minicom
+share/afterstep/start/Applications/Network/1_ftp
+share/afterstep/start/Applications/Network/2_ncftp
+share/afterstep/start/Applications/Network/3_lynx
+share/afterstep/start/Applications/Network/4_mail
+share/afterstep/start/Applications/Network/5_irc
+share/afterstep/start/Applications/Network/6_netscape
+share/afterstep/start/Applications/Network/7_news
+share/afterstep/start/Applications/Network/8_telnet
+share/afterstep/start/Applications/Office/10_tkdesk
+share/afterstep/start/Applications/Office/1_applix
+share/afterstep/start/Applications/Office/2_so
+share/afterstep/start/Applications/Office/3_fileman
+share/afterstep/start/Applications/Office/4_plot
+share/afterstep/start/Applications/Office/6_lyx
+share/afterstep/start/Applications/Office/7_dviview
+share/afterstep/start/Applications/Office/8_psview
+share/afterstep/start/Applications/Office/9_pdf
+share/afterstep/start/Applications/System/0_sysinfo
+share/afterstep/start/Applications/System/1_sysload
+share/afterstep/start/Applications/System/2_changedefs
+share/afterstep/start/Applications/System/3_changescrn
+share/afterstep/start/Applications/System/4_console
+share/afterstep/start/Applications/System/5_fontedit
+share/afterstep/start/Applications/System/6_top
+share/afterstep/start/Applications/System/7_keyleds
+share/afterstep/start/Applications/System/8_resetcmap
+share/afterstep/start/Applications/a_nop
+share/afterstep/start/Applications/b_aterm
+share/afterstep/start/Applications/c_xiterm
+share/afterstep/start/Applications/d_xterm
+share/afterstep/start/Applications/e_rxvt
+share/afterstep/start/Applications/f_Eterm
+share/afterstep/start/Desktop/Animations/Animations-1/0_ant
 share/afterstep/start/Desktop/Animations/Animations-1/10_daisy
 share/afterstep/start/Desktop/Animations/Animations-1/11_dlock
 share/afterstep/start/Desktop/Animations/Animations-1/12_demon
@@ -566,8 +473,8 @@ share/afterstep/start/Desktop/Animations/Animations-1/5_bounce
 share/afterstep/start/Desktop/Animations/Animations-1/6_bug
 share/afterstep/start/Desktop/Animations/Animations-1/7_cartoon
 share/afterstep/start/Desktop/Animations/Animations-1/8_clock
-share/afterstep/start/Desktop/Animations/Animations-1/0_ant
-share/afterstep/start/Desktop/Animations/Animations-2/9_laser
+share/afterstep/start/Desktop/Animations/Animations-1/9_crystal
+share/afterstep/start/Desktop/Animations/Animations-2/0_geometry
 share/afterstep/start/Desktop/Animations/Animations-2/10_life
 share/afterstep/start/Desktop/Animations/Animations-2/11_life1d
 share/afterstep/start/Desktop/Animations/Animations-2/12_life3d
@@ -586,8 +493,8 @@ share/afterstep/start/Desktop/Animations/Animations-2/5_ico
 share/afterstep/start/Desktop/Animations/Animations-2/6_ifs
 share/afterstep/start/Desktop/Animations/Animations-2/7_julia
 share/afterstep/start/Desktop/Animations/Animations-2/8_kaleid
-share/afterstep/start/Desktop/Animations/Animations-2/0_geometry
-share/afterstep/start/Desktop/Animations/Animations-3/9_shape
+share/afterstep/start/Desktop/Animations/Animations-2/9_laser
+share/afterstep/start/Desktop/Animations/Animations-3/0_nose
 share/afterstep/start/Desktop/Animations/Animations-3/10_sier
 share/afterstep/start/Desktop/Animations/Animations-3/11_slip
 share/afterstep/start/Desktop/Animations/Animations-3/12_sphere
@@ -614,13 +521,12 @@ share/afterstep/start/Desktop/Animations/Animations-3/5_pyro
 share/afterstep/start/Desktop/Animations/Animations-3/6_qix
 share/afterstep/start/Desktop/Animations/Animations-3/7_roll
 share/afterstep/start/Desktop/Animations/Animations-3/8_rotor
-share/afterstep/start/Desktop/Animations/Animations-3/0_nose
-share/afterstep/start/Desktop/Animations/0_random
-share/afterstep/start/Desktop/Animations/0_stop
-@exec mkdir -p %D/share/afterstep/start/Desktop/Feel
-@exec mkdir -p %D/share/afterstep/start/Desktop/Look
-@exec mkdir -p %D/share/afterstep/start/Desktop/Pictures
-share/afterstep/start/Desktop/Mouse/9_slow
+share/afterstep/start/Desktop/Animations/Animations-3/9_shape
+share/afterstep/start/Desktop/Animations/a_random
+share/afterstep/start/Desktop/Animations/b_stop
+share/afterstep/start/Desktop/Feel/.include
+share/afterstep/start/Desktop/Look/.include
+share/afterstep/start/Desktop/Mouse/0_fast
 share/afterstep/start/Desktop/Mouse/1_faster
 share/afterstep/start/Desktop/Mouse/2_fastest
 share/afterstep/start/Desktop/Mouse/3_ultrafastest
@@ -630,54 +536,110 @@ share/afterstep/start/Desktop/Mouse/6_right
 share/afterstep/start/Desktop/Mouse/7_nop
 share/afterstep/start/Desktop/Mouse/8_normal
 share/afterstep/start/Desktop/Mouse/9_noaccel
-share/afterstep/start/Desktop/Mouse/0_fast
-share/afterstep/start/Desktop/1_xearth
-share/afterstep/start/Desktop/6_updateall
-share/afterstep/start/Desktop/2_fish
-share/afterstep/start/Desktop/3_snow
-share/afterstep/start/Desktop/4_nop
-share/afterstep/start/Desktop/5_updatestart
-share/afterstep/start/2_afterstepdoc
-share/afterstep/start/1_nop
-share/afterstep/winlist
-share/afterstep/doc/afterstep.html
-share/afterstep/doc/afterstep-1.html
-share/afterstep/doc/afterstep-2.html
-share/afterstep/doc/afterstep-3.html
-share/afterstep/doc/afterstep-4.html
-share/afterstep/doc/afterstep-5.html
-share/afterstep/doc/afterstep-6.html
-share/afterstep/doc/afterstep-7.html
-share/afterstep/doc/afterstep-8.html
-share/afterstep/doc/afterstep-9.html
-share/afterstep/doc/afterstep-10.html
-share/afterstep/base.8bpp
-share/afterstep/base.15bpp
-share/afterstep/base.16bpp
-share/afterstep/asmail
-share/afterstep/base.24bpp
-share/afterstep/base.32bpp
-share/afterstep/audio
-share/afterstep/autoexec
-share/afterstep/compatibility
-share/afterstep/pager
+share/afterstep/start/Desktop/Mouse/9_slow
+share/afterstep/start/Desktop/Pictures/.include
+share/afterstep/start/Desktop/Theme/.include
+share/afterstep/start/Desktop/Theme/0_asthemecreate
+share/afterstep/start/Desktop/Theme/1_nop
+share/afterstep/start/Desktop/a_xearth
+share/afterstep/start/Desktop/b_fish
+share/afterstep/start/Desktop/c_snow
+share/afterstep/start/Desktop/d_nop
+share/afterstep/start/Desktop/e_updatestart
+share/afterstep/start/Desktop/f_updateall
+share/afterstep/start/Modules/Animate
+share/afterstep/start/Modules/Audio
+share/afterstep/start/Modules/Banner
+share/afterstep/start/Modules/Cascade
+share/afterstep/start/Modules/Clean
+share/afterstep/start/Modules/Forms/1_ftp
+share/afterstep/start/Modules/Forms/2_find
+share/afterstep/start/Modules/Forms/3_help
+share/afterstep/start/Modules/Forms/4_quit
+share/afterstep/start/Modules/Forms/5_run
+share/afterstep/start/Modules/Forms/6_screenshot
+share/afterstep/start/Modules/Forms/7_windowshot
+share/afterstep/start/Modules/Forms/8_xlock
+share/afterstep/start/Modules/Gnome
+share/afterstep/start/Modules/Ident
+share/afterstep/start/Modules/Pager
+share/afterstep/start/Modules/Scripts/0_animate
+share/afterstep/start/Modules/Scripts/1_bellsetup
+share/afterstep/start/Modules/Scripts/2_desksetup
+share/afterstep/start/Modules/Scripts/3_quit
+share/afterstep/start/Modules/Scripts/4_screendump
+share/afterstep/start/Modules/Scroll
+share/afterstep/start/Modules/Stop/Animate_Stop
+share/afterstep/start/Modules/Stop/Audio_Stop
+share/afterstep/start/Modules/Stop/Banner_Stop
+share/afterstep/start/Modules/Stop/Cascade_Stop
+share/afterstep/start/Modules/Stop/Clean_Stop
+share/afterstep/start/Modules/Stop/Gnome_Stop
+share/afterstep/start/Modules/Stop/Ident_Stop
+share/afterstep/start/Modules/Stop/Pager_Stop
+share/afterstep/start/Modules/Stop/Scroll_Stop
+share/afterstep/start/Modules/Stop/Tile_Stop
+share/afterstep/start/Modules/Stop/Wharf_Stop
+share/afterstep/start/Modules/Stop/WinList_Stop
+share/afterstep/start/Modules/Stop/Zharf_Stop
+share/afterstep/start/Modules/Stop/asetroot_Stop
+share/afterstep/start/Modules/Tile
+share/afterstep/start/Modules/Wharf
+share/afterstep/start/Modules/WinList
+share/afterstep/start/Modules/Zharf
+share/afterstep/start/Modules/asetroot
+share/afterstep/start/Quit/0_close
+share/afterstep/start/Quit/1_exit
+share/afterstep/start/Quit/2_nop
+share/afterstep/start/Quit/3_restartsession
+share/afterstep/start/Quit/4_restarttwm
+share/afterstep/start/Quit/5_restartwm
+share/afterstep/start/Screen_savers/With_password/0_firework
+share/afterstep/start/Screen_savers/With_password/1_firework
+share/afterstep/start/Screen_savers/With_password/2_laser
+share/afterstep/start/Screen_savers/With_password/3_mount
+share/afterstep/start/Screen_savers/With_password/4_qix
+share/afterstep/start/Screen_savers/With_password/5_shape
+share/afterstep/start/Screen_savers/With_password/6_sperm
+share/afterstep/start/Screen_savers/With_password/7_spline
+share/afterstep/start/Screen_savers/With_password/8_startrek
+share/afterstep/start/Screen_savers/With_password/9_stars
+share/afterstep/start/Screen_savers/Without_password/0_firework
+share/afterstep/start/Screen_savers/Without_password/1_firework
+share/afterstep/start/Screen_savers/Without_password/2_laser
+share/afterstep/start/Screen_savers/Without_password/3_mount
+share/afterstep/start/Screen_savers/Without_password/4_qix
+share/afterstep/start/Screen_savers/Without_password/5_shape
+share/afterstep/start/Screen_savers/Without_password/6_sperm
+share/afterstep/start/Screen_savers/Without_password/7_spline
+share/afterstep/start/Screen_savers/Without_password/8_startrek
+share/afterstep/start/Screen_savers/Without_password/9_stars
+share/afterstep/start/Windows/0_move
+share/afterstep/start/Windows/1_iconify
+share/afterstep/start/Windows/1_resize
+share/afterstep/start/Windows/2_pin
+share/afterstep/start/Windows/2_raise
+share/afterstep/start/Windows/3_lower
+share/afterstep/start/Windows/4_delete
+share/afterstep/start/Windows/5_destroy
+share/afterstep/start/Windows/6_winprop
+share/afterstep/start/a_nop
+share/afterstep/start/b_afterstepdoc
+share/afterstep/themes/DEFAULT.tar.gz
 share/afterstep/wharf
-share/afterstep/.workspace_state
+share/afterstep/winlist
 share/afterstep/zharf
-share/afterstep/animate
-share/afterstep/clean
-share/afterstep/database
-share/afterstep/forms
-share/afterstep/ident
-share/afterstep/scroll
+@dirrm share/afterstep/themes
 @dirrm share/afterstep/start/Windows
 @dirrm share/afterstep/start/Screen_savers/Without_password
 @dirrm share/afterstep/start/Screen_savers/With_password
 @dirrm share/afterstep/start/Screen_savers
 @dirrm share/afterstep/start/Quit
+@dirrm share/afterstep/start/Modules/Stop
 @dirrm share/afterstep/start/Modules/Scripts
 @dirrm share/afterstep/start/Modules/Forms
 @dirrm share/afterstep/start/Modules
+@dirrm share/afterstep/start/Desktop/Theme
 @dirrm share/afterstep/start/Desktop/Pictures
 @dirrm share/afterstep/start/Desktop/Mouse
 @dirrm share/afterstep/start/Desktop/Look
@@ -706,6 +668,7 @@ share/afterstep/scroll
 @dirrm share/afterstep/desktop/icons/8bpp
 @dirrm share/afterstep/desktop/icons/16bpp
 @dirrm share/afterstep/desktop/icons
+@dirrm share/afterstep/desktop/cursors
 @dirrm share/afterstep/desktop/buttons
 @dirrm share/afterstep/desktop
 @dirrm share/afterstep/backgrounds