From 069b8e3c3a6abd8c484a897cd899d471b585a3fb Mon Sep 17 00:00:00 2001
From: kevlo <kevlo@openbsd.org>
Date: Sat, 11 Aug 2001 16:00:25 +0000
Subject: [PATCH] upgrade to version 1.8.9

---
 x11/afterstep/Makefile                        |  6 ++---
 x11/afterstep/files/md5                       |  6 ++---
 .../patches/patch-afterstep_wharf_in          |  8 +++---
 .../patches/patch-afterstep_zharf_in          |  6 ++---
 .../patches/patch-src_afterstep_configure_c   | 26 -------------------
 5 files changed, 13 insertions(+), 39 deletions(-)
 delete mode 100644 x11/afterstep/patches/patch-src_afterstep_configure_c

diff --git a/x11/afterstep/Makefile b/x11/afterstep/Makefile
index a5782b5dd38..e7cb35c0d42 100644
--- a/x11/afterstep/Makefile
+++ b/x11/afterstep/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2001/06/06 10:12:31 kevlo Exp $
+# $OpenBSD: Makefile,v 1.18 2001/08/11 16:00:25 kevlo Exp $
 
 COMMENT=	"Window manager, continuation of the Bowman NeXTSTEP clone"
 
-DISTNAME=	AfterStep-1.8.8
-PKGNAME=	afterstep-1.8.8
+DISTNAME=	AfterStep-1.8.9
+PKGNAME=	afterstep-1.8.9
 CATEGORIES=     x11
 NEED_VERSION=	1.402
 MASTER_SITES=   ftp://ftp.afterstep.org/stable/
diff --git a/x11/afterstep/files/md5 b/x11/afterstep/files/md5
index 133575dc750..06486ca69e7 100644
--- a/x11/afterstep/files/md5
+++ b/x11/afterstep/files/md5
@@ -1,3 +1,3 @@
-MD5 (AfterStep-1.8.8.tar.gz) = 657ec4cdbb24559b40e292c6e4302dc9
-RMD160 (AfterStep-1.8.8.tar.gz) = 4dccff95a6fcf83633a6dc9c261a25d4de580c09
-SHA1 (AfterStep-1.8.8.tar.gz) = c50381c8bacb8fea5b72bf3c07268d85c943b188
+MD5 (AfterStep-1.8.9.tar.gz) = 4af710e4f21a68d398c850470b1e6420
+RMD160 (AfterStep-1.8.9.tar.gz) = d0d31fabd24cae5873cb38cf7e1f641af1dffb33
+SHA1 (AfterStep-1.8.9.tar.gz) = c90174c3f0283b77066931a5b764f1ba5d7655d3
diff --git a/x11/afterstep/patches/patch-afterstep_wharf_in b/x11/afterstep/patches/patch-afterstep_wharf_in
index 8be72d28735..dcd788c61a0 100644
--- a/x11/afterstep/patches/patch-afterstep_wharf_in
+++ b/x11/afterstep/patches/patch-afterstep_wharf_in
@@ -1,11 +1,11 @@
---- afterstep/wharf.in.orig	Fri Oct 20 03:27:58 2000
-+++ afterstep/wharf.in	Wed Jun  6 12:05:58 2001
+--- afterstep/wharf.in.orig	Sat Aug 11 18:49:34 2001
++++ afterstep/wharf.in	Sat Aug 11 18:50:04 2001
 @@ -99,7 +99,7 @@
  #
  *Wharf Applications FileFolders.xpm,3_dots.xpm Folders
   #*Wharf Files Computer.xpm Exec "-" Files &
-- *Wharf xiterm linux-penguin.xpm Exec "-" xiterm -sl 500 -vb -fn 10x20 &
-+ *Wharf xterm monitor_bsd.xpm Exec "-" xterm -sl 500 -vb -fn 10x20 &
+- *Wharf xterm linux-penguin.xpm Exec "-" (exec aterm) || (exec xterm) &
++ *Wharf xterm monitor_bsd.xpm Exec "-" (exec aterm) || (exec xterm) &
  
   *Wharf Helpme Info.xpm,3_dots.xpm Folders
          *Wharf xman Bookshelf.xpm Exec "-" xman &
diff --git a/x11/afterstep/patches/patch-afterstep_zharf_in b/x11/afterstep/patches/patch-afterstep_zharf_in
index 1b286ce8305..4dd22181a6b 100644
--- a/x11/afterstep/patches/patch-afterstep_zharf_in
+++ b/x11/afterstep/patches/patch-afterstep_zharf_in
@@ -1,11 +1,11 @@
---- afterstep/zharf.in.orig	Fri Oct 20 03:27:58 2000
-+++ afterstep/zharf.in	Tue Jun  5 13:30:16 2001
+--- afterstep/zharf.in.orig	Sat Aug 11 18:51:12 2001
++++ afterstep/zharf.in	Sat Aug 11 18:59:33 2001
 @@ -26,7 +26,7 @@
  *Zharf Disk	-		Swallow "asfsm" asfsm_lite -bg Grey30 -fg Grey70 -bp None -pbg Grey30 -pfg Grey70 -pbp None
  *Zharf Start 	Start.xpm	Popup "0"
  *Zharf Swap	Install.xpm	WindowList
 -*Zharf Xiterm	linux-penguin.xpm Exec "xiterm" xterm -fg wheat -bg black &
-+*Zharf Xterm	monitor_bsd.xpm Exec "xterm" xterm -fg wheat -bg black &
++*Zharf Xterm	monitor_bsd.xpm Exec "xiterm" xterm -fg wheat -bg black &
  *Zharf Netscape netscape.xpm    Exec "netscape" netscape &
  *Zharf(3x1) -	whatever	SwallowModule "Pager" Pager 0 @with_desktops_1@
  *Zharf Quit?	RedFire.xpm	Module "QuitForm" Form QuitForm
diff --git a/x11/afterstep/patches/patch-src_afterstep_configure_c b/x11/afterstep/patches/patch-src_afterstep_configure_c
deleted file mode 100644
index 883a9ad10c1..00000000000
--- a/x11/afterstep/patches/patch-src_afterstep_configure_c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/afterstep/configure.c.orig	Wed Jun  6 10:42:52 2001
-+++ src/afterstep/configure.c	Wed Jun  6 11:33:45 2001
-@@ -2192,7 +2192,7 @@
- {
-   FILE *pipeFileIn;		/* input channel from the popen'ed process */
-   FILE *fileOut;		/* tmp file storing the popen results */
--  char errMsg[128], tmpFileName[PATH_MAX];
-+  char errMsg[128], tmpFileName[PATH_MAX] = "as.xxxxxxxx";
-   int readChar;
-   static int semaCounter = 0;
- 
-@@ -2201,13 +2201,7 @@
- 
-   sprintf (errMsg, "ReadPipeConfig (%d)", semaCounter);
- 
--  if (tmpnam (tmpFileName) == NULL)
--    {
--      afterstep_err (errMsg, "cannot tmpnam", NULL, NULL);
--      semaCounter--;
--      return;
--    }
--  if ((fileOut = fopen (tmpFileName, "w")) == NULL)
-+  if ((fileOut = fdopen (mkstemp (tmpFileName), "w")) == NULL)
-     {
-       afterstep_err (errMsg, "cannot open the temp file", tmpFileName, NULL);
-       semaCounter--;