Update to afterstep-1.8.11. The only new feature (from NEWS):

    Added DefaultGeometry option to database. That should allow to place
    window with specifyed geometry when no USPosition was requested,
    instead of dragging it around. Useful for things like Netscape.
    Example:
      Style "*escape*" DefaultGeometry 800x600+10-100

Afterstep-1.8.10 added "Xinerama" support (whatever that is) which we
have to disable in "configure" to build, and multi-head support -- which
is untested on NetBSD.

Follows is the complete ChangeLog since 1.8.9:

1.8.10 patch 1 (sasha+Geoff Burling+Jan Fedak)
 o Numerous man page and usage fixes by Geoff Burling.
 o Fixed bug in DefaultGeometry handling where check for USPosition/Size
   should have been negated.
 o Fixed compilation bug in lib/parse.c
 o Fixed minor typho in afterstep man page.
 o Debugged background setting on multihead config. It apperas that
   asetroot cannot be run with -l if it is named other then asetroot.
   Otherwise background selection from the menu does not work.
 o Updated Clean to use ProcessModuleArgs. Added global var display_name
   that is set to --display argument value or env var $DISPLAY 's value.
   MOst modules must be updated to remove var with the same name from
   main().
 o Applied patch from Jan Fedak to add startup geometry to database
   parameters.
 o Applied patch from Jan Fedak to fix hotkeys in menus.
 o Applied patch to get AfterStep to change Icon when Title is changing.
   New feel option  - FollowTitleChanges in feel has to be used to enable
   this feature.
 o Fixed Tile's -h handling.
 o added support for maximization to not exceed screen size, while
   working with xinerama.
 o man pages fixes.
 o Fixed socket/pipes reading loops to not cause 100% CPU utilization
   under CYGWIN and in some cases even on Unix.
 o Fixed Menus pointer location handling to use coordinates from events
   and not abuse XQueryPointer. Otherwise menus were behaving strange
   whenever events were late due to one reason or others.

1.8.9 patch 1 (sasha)
 o Fix X libraries order, to have Xext preceed X11 - causes problems on
   some Solaris systems.
 o fixed two warnings related to time.h
 o commented out dependency checking to avoid problems for users with old
   compilers. It is not needed in stable series anyways.
 o Added functionality to WindowsDesk function. If second argument is
   10000 then first is relative desk number, instead of exact.
 o Implemented Xinerama support. When window is initially placed - it
   will be appropriately moved to not appear in between monitors, unless
   user requested geometry explicetely.
 o When Xinerama is active, and asetroot is requested to scale or pad
   background image to the screen size it will use size of the first head
   ( the one with origin of 0,0 ).
 o Implemented separate Feel, Look, Background and Init/Restart functions
   for different screens in multihead config with no Xinerama.
 o We now read $TMPDIR in order to locate /tmp directory, and falling back
   to /tmp if envvar is not set.
 o somewhat fixed Align and Pad fields in the Asetroot config parsing.

5 files changed, 32 insertions, 54 deletions

diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index 5f5e64cb7dc..417dac471b4 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2001/10/24 22:11:08 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2002/03/04 19:16:05 fredb Exp $
 
-DISTNAME=	AfterStep-1.8.9
-PKGNAME=	afterstep-1.8.9
+DISTNAME=	AfterStep-1.8.11
+PKGNAME=	afterstep-1.8.11
 CATEGORIES=	x11 wm
 MASTER_SITES=	ftp://ftp.afterstep.org/stable/ \
 		ftp://ftp.digex.net/pub/X11/window-managers/afterstep/AfterStep/stable/
@@ -12,20 +12,19 @@ HOMEPAGE=		http://www.afterstep.org/
 COMMENT=		NeXT-like window manager for X11
 
 BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
-# XXX
-# XXX The following would be "RUN_DEPENDS," if we had such a thing.
-# XXX
 DEPENDS+=		asclock-[0-9]*:../../time/asclock
 DEPENDS+=		xp-[0-9]*:../../x11/xp
 
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_PERL5=		YES
 
 CONFIGURE_ARGS+=	--disable-staticlibs
-CONFIGURE_ARGS+=	--with-helpcommand="xpman"
-CFLAGS+=		-I${BUILDLINK_DIR}/include/X11		# xpm.h
+CONFIGURE_ARGS+=	--disable-xinerama
+CONFIGURE_ARGS+=	--with-helpcommand=xpman
+CONFIGURE_ARGS+=	--with-xpm-includes='${BUILDLINK_DIR}/include/X11'
+CONFIGURE_ENV+=		PERL='${LOCALBASE}/bin/perl'
+CONFIGURE_ENV+=		ac_cv_prog_sgmltools='no'
 
 post-patch:
 	for i in `${FIND} ${WRKSRC} -name "*.man" -print` \
diff --git a/wm/afterstep/distinfo b/wm/afterstep/distinfo
index b1ade9f3214..57e3aa93077 100644
--- a/wm/afterstep/distinfo
+++ b/wm/afterstep/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.4 2001/07/16 15:21:21 wiz Exp $
+$NetBSD: distinfo,v 1.5 2002/03/04 19:16:05 fredb Exp $
 
-SHA1 (AfterStep-1.8.9.tar.bz2) = d181a71036c85f13f541e3058f21f50b03d2dc7d
-Size (AfterStep-1.8.9.tar.bz2) = 1122290 bytes
+SHA1 (AfterStep-1.8.11.tar.bz2) = 841655ff19df9c5361852a33950183ca6d67b6f0
+Size (AfterStep-1.8.11.tar.bz2) = 1162212 bytes
 SHA1 (patch-aa) = 79d732f26da21d069a53443e3799730733bc050b
 SHA1 (patch-ab) = 24c9f8569c88ea661cc6eb79390b5ecc825500b4
 SHA1 (patch-ad) = e0e5cd8182bdf7b3b6ada61e58a2a2c0dd4e243c
-SHA1 (patch-ae) = 995ec52cbdc08d55277dc3c8dbaee0355d48e1aa
+SHA1 (patch-ae) = 911c083e3bb941de6f384c0035978a576e17179c
 SHA1 (patch-af) = 7e1cd2b8e184fca8ee38cae2c02dc1520b899d37
-SHA1 (patch-ag) = 8e018c8ca7c46d60b14513ad091f2dd87030a3ef
-SHA1 (patch-ah) = e64aac1b3902405c5733bc6a7e136344e610a222
+SHA1 (patch-ag) = 3fc5611c74b3f54f27ddb13ce2e9bfd86207b837
+SHA1 (patch-ah) = fa25e141548fff77ea1790a7e5ca22e39008f257
 SHA1 (patch-ai) = e543bfb27d16b49d1844a4fc29dd0cca5e262bfc
 SHA1 (patch-aj) = ceca49e410ec22e5b5fdf8132ab80fa920514eb3
diff --git a/wm/afterstep/patches/patch-ae b/wm/afterstep/patches/patch-ae
index ab1dc74c713..1245d8baac2 100644
--- a/wm/afterstep/patches/patch-ae
+++ b/wm/afterstep/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2001/03/11 19:58:59 fredb Exp $
+$NetBSD: patch-ae,v 1.3 2002/03/04 19:16:06 fredb Exp $
 
---- 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 @@
+--- autoconf/configure.in.orig	Fri Mar  1 00:33:37 2002
++++ autoconf/configure.in
+@@ -84,6 +84,7 @@
  AC_PATH_PROG(CP, cp, cp)
  AC_PATH_PROG(MKDIR, mkdir, mkdir)
  AC_PATH_PROG(PERL, perl, perl)
@@ -10,38 +10,32 @@ $NetBSD: patch-ae,v 1.2 2001/03/11 19:58:59 fredb Exp $
  
  dnl# let's check for endiannes of our box
  AC_C_BIGENDIAN
-@@ -246,19 +247,16 @@
- dnl# AFTERSTEP_LIB="-lafterstep" 
+@@ -263,20 +264,16 @@
+ dnl# AFTERSTEP_LIB="-lafterstep"
  dnl# ASIMAGE_LIB="-lasimage"
  dnl# WIDGETS_LIB="-lWidgets"
-+AFTERSTEP_LIB="../../lib/libafterstep.la" 
++AFTERSTEP_LIB="../../lib/libafterstep.la"
 +ASIMAGE_LIB="../../asimagelib/libasimage.la"
 +WIDGETS_LIB="../Script/Widgets/libWidgets.la"
 +CONFIG_LIB="../Config/libasConfig.la"
 +LIBPROG='$(PROG)'
++LIBINSTALL="install.dyn"
  if test "x$enable_staticlibs" = "xyes"; then
--   AFTERSTEP_LIB="../../lib/libafterstep.a" 
+-   AFTERSTEP_LIB="../../lib/libafterstep.a"
 -   ASIMAGE_LIB="../../asimagelib/libasimage.a"
 -   WIDGETS_LIB="../Script/Widgets/libWidgets.a"
 -   CONFIG_LIB="../Config/libasConfig.a"
 -   LIBPROG='$(PROG)'
+-   LIBINSTALL=""
 +   LDSTATIC="-static"
-    LIBINSTALL=""
  else
--   AFTERSTEP_LIB="../../lib/libafterstep.so" 
+-   AFTERSTEP_LIB="../../lib/libafterstep.so"
 -   ASIMAGE_LIB="../../asimagelib/libasimage.so"
 -   WIDGETS_LIB="../Script/Widgets/libWidgets.so"
 -   CONFIG_LIB="../Config/libasConfig.so"
 -   LIBPROG='$(DYNPROG)'
+-   LIBINSTALL="install.dyn"
 +   LDSTATIC=""
-    LIBINSTALL="install.dyn"
  fi
  
-@@ -342,6 +340,7 @@
- AC_SUBST(enable_audit)
- AC_SUBST(SCRIPT_DIR)
- AC_SUBST(PERL)
-+AC_SUBST(LDSTATIC)
- 
- dnl# Write results
- 
+ ASIMAGE_LIB="$ASIMAGE_LIB $LIB_MATH"
diff --git a/wm/afterstep/patches/patch-ag b/wm/afterstep/patches/patch-ag
index 0f6669f76a6..c7e2589f577 100644
--- a/wm/afterstep/patches/patch-ag
+++ b/wm/afterstep/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.2 2001/03/11 19:59:00 fredb Exp $
+$NetBSD: patch-ag,v 1.3 2002/03/04 19:16:07 fredb Exp $
 
---- autoconf/Makefile.common.in.orig	Fri Oct 20 06:27:57 2000
-+++ autoconf/Makefile.common.in	Sun Mar 11 15:15:53 2001
+--- autoconf/Makefile.common.in.orig	Wed Oct  3 00:58:40 2001
++++ autoconf/Makefile.common.in
 @@ -7,7 +7,7 @@
  all:            $(PROG)
  
@@ -25,7 +25,7 @@ $NetBSD: patch-ag,v 1.2 2001/03/11 19:59:00 fredb Exp $
  #
  # include dependency files if they exist
 @@ -106,23 +106,17 @@
- include .depend
+ #include .depend
  #endif
  
 -../../lib/libafterstep.a:
diff --git a/wm/afterstep/patches/patch-ah b/wm/afterstep/patches/patch-ah
index f60b1aec89f..5bcd301d1cc 100644
--- a/wm/afterstep/patches/patch-ah
+++ b/wm/afterstep/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2001/03/11 19:59:00 fredb Exp $
+$NetBSD: patch-ah,v 1.3 2002/03/04 19:16:07 fredb Exp $
 
 --- 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
@@ -52,18 +52,3 @@ $NetBSD: patch-ah,v 1.2 2001/03/11 19:59:00 fredb Exp $
  
  #
  # include dependency files if they exist
-@@ -95,14 +76,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)
-