Update evilwm to 0.99.18. Changes:

2004-07-10
	Fix Alt+Tab crash when there are no clients.

2004-07-11
	Coalesce move() and resize() into moveresize().
	Refactor window move/resize-by-mouse to eliminate arg to moveresize().

2004-07-12
	Added -app option to specify default vdesk (incl sticky), positions
	and dimensions.

2004-07-13
	Fix so shape information is applied on WM startup.

2005-03-19
	Split geometry and vdesk out of -app option into separate -g and -v
	options (each apply to the last -app defined).

2005-03-20
	Add -mask1 and mask2 switches to override default modifier grabs.

2005-03-29
	Tidy client_update_current using Larry Doolittle's patch.

2005-03-30
	Handle applications reparenting a window to root - manage them unless
	in Withdrawn state.

2005-04-04
	Use strchr,strrchr instead of index,rindex.
	Set border size to frame size when unmanaging window.

2005-04-06
	Return to properly implemented interpretation of win_gravity on
	initial mapping of windows.
	Restore window's original border width on WM exit.

2005-04-20
	Remove deprecated 'vdesk' external pager support.

2005-04-25
	Merging Larry Doolittle's patches: Stricter warning settings for gcc.
	LD: Cast unused paramters to void.

2005-04-26
	Applied LD's patch to declare opt_term statically for now (intent
	is to allow arguments to program specified with -term).
	LD: Try to print ssize_t correctly and within strict standards.
	LD: Add $(EXTRA_DEFINES) to Makefile.
	LD: Improve punctuation in comments.
	LD: Use long instead of CARD32 for argument to XChangeProperty()
	due to odd X Consortium decision.
	LD: Un-shadow variable p in remove_client debugging segment.
	LD: Assign opt_term at compile time instead of malloc.
	LD: Fuss with execvp casting and comments (edited for brevity by CA).

2005-06-02
	Ignore PPosition during window placement (back to old behaviour of
	positioning window under pointer unless user-specified).

4 files changed, 40 insertions, 66 deletions

diff --git a/wm/evilwm/Makefile b/wm/evilwm/Makefile
index f4580c409e0..6a1faafaa9c 100644
--- a/wm/evilwm/Makefile
+++ b/wm/evilwm/Makefile
@@ -1,25 +1,24 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:25 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/07 15:01:09 sketch Exp $
 #
 
-DISTNAME=	evilwm_0.99.17.orig
-PKGNAME=	${DISTNAME:S/.orig//:S/_/-/}
+DISTNAME=	evilwm-0.99.18
 CATEGORIES=	wm x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=evilwm/}
+MASTER_SITES=	http://www.6809.org.uk/evilwm/
 
 MAINTAINER=	sketch@NetBSD.org
-HOMEPAGE=	http://evilwm.sourceforge.net/
+HOMEPAGE=	http://www.6809.org.uk/evilwm/
 COMMENT=	Minimalist Window Manager for X
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
-
-BUILD_TARGET=	allinone
-
 .include "../../mk/x11.buildlink3.mk"
 
-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/evilwm ${PREFIX}/bin/evilwm
+	${INSTALL_MAN} ${WRKSRC}/evilwm.1 ${PREFIX}/man/man1/evilwm.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/evilwm
-	cd ${WRKSRC} && \
-	${INSTALL_DATA} ChangeLog README README.vdesk TODO	\
-		${PREFIX}/share/doc/evilwm
+	for file in ChangeLog README TODO; \
+	do \
+	    ${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/share/doc/evilwm/; \
+	done
+	
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/evilwm/PLIST b/wm/evilwm/PLIST
index 44184a99e8a..da69d52f1a7 100644
--- a/wm/evilwm/PLIST
+++ b/wm/evilwm/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/19 06:07:19 salo Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/06/07 15:01:09 sketch Exp $
 bin/evilwm
 man/man1/evilwm.1
 share/doc/evilwm/ChangeLog
 share/doc/evilwm/README
-share/doc/evilwm/README.vdesk
 share/doc/evilwm/TODO
 @dirrm share/doc/evilwm
diff --git a/wm/evilwm/distinfo b/wm/evilwm/distinfo
index f4a7e09c80d..07e3b5c85e3 100644
--- a/wm/evilwm/distinfo
+++ b/wm/evilwm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2005/02/23 18:43:54 wiz Exp $
+$NetBSD: distinfo,v 1.12 2005/06/07 15:01:09 sketch Exp $
 
-SHA1 (evilwm_0.99.17.orig.tar.gz) = 3e5d4f8cf24cad800e8670f6c65c177c89304585
-RMD160 (evilwm_0.99.17.orig.tar.gz) = b001d44860bd043bc2244d2bd641d3a712ffd4de
-Size (evilwm_0.99.17.orig.tar.gz) = 24147 bytes
-SHA1 (patch-aa) = eabb06669db57da960820af94459ef2a9b8ce792
+SHA1 (evilwm-0.99.18.tar.gz) = a7f9f2acac87c182752050024bffc52e35aa9614
+RMD160 (evilwm-0.99.18.tar.gz) = 16cb77abf6422b64ea3edee3781fc7623ed4f5d7
+Size (evilwm-0.99.18.tar.gz) = 25688 bytes
+SHA1 (patch-aa) = 400defe9475a1e611073d7fc2e4a91e89ddcebd4
diff --git a/wm/evilwm/patches/patch-aa b/wm/evilwm/patches/patch-aa
index d16ce7784db..812666c2cfc 100644
--- a/wm/evilwm/patches/patch-aa
+++ b/wm/evilwm/patches/patch-aa
@@ -1,55 +1,31 @@
-$NetBSD: patch-aa,v 1.10 2003/12/03 17:40:25 sketch Exp $
+$NetBSD: patch-aa,v 1.11 2005/06/07 15:01:09 sketch Exp $
 
---- Makefile.orig	Wed Oct 15 12:48:23 2003
-+++ Makefile	Wed Oct 15 13:35:35 2003
-@@ -1,11 +1,11 @@
- # If you don't use CC 
--CC       = gcc
-+#CC       = gcc
- 
- # Edit this line if you don't want evilwm to install under /usr.
- # Note that $(DESTDIR) is used by the Debian build process.
--prefix = $(DESTDIR)/usr
-+prefix = ${PREFIX}
- 
--XROOT    = /usr/X11R6
-+XROOT    = ${X11BASE}
- INCLUDES = -I$(XROOT)/include
- LDPATH   = -L$(XROOT)/lib
- LIBS     = -lX11
-@@ -22,7 +22,7 @@
+--- Makefile.orig	2005-06-02 18:22:49.000000000 +0100
++++ Makefile	2005-06-07 08:54:32.000000000 +0100
+@@ -25,7 +25,7 @@
  
  # Use Motif hints to find if a window should be borderless.
  # To use this option, you need to have the Motif development files installed.
 -DEFINES += -DMWM_HINTS
 +#DEFINES += -DMWM_HINTS
  
- # To support virtual desktops, uncomment one or both of the following 2 lines.
+ # To support virtual desktops, uncomment the following line.
  DEFINES += -DVWM
-@@ -70,10 +70,10 @@
- #DEFINES += -DXDEBUG	# show some X calls
- 
- DEFINES += -DVERSION=\"$(version).$(revision).$(subrev)\" $(DEBIAN)
--CFLAGS  += $(INCLUDES) $(DEFINES) -Os -Wall
-+CFLAGS  += $(INCLUDES) $(DEFINES)
- #CFLAGS  += $(INCLUDES) $(DEFINES) -g -Wall
--CFLAGS  += -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings -Wundef
--LDFLAGS += $(LDPATH) $(LIBS)
-+#CFLAGS  += -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings -Wundef
-+LDFLAGS += $(LIBS)
- 
- HEADERS  = evilwm.h
- SRCS     = client.c events.c main.c misc.c new.c screen.c
-@@ -94,10 +94,8 @@
- 
- doinstall:
- 	if [ -f evilwm.exe ]; then mv evilwm.exe evilwm; fi
--	mkdir -p $(prefix)/bin $(prefix)/share/man/man1
--	install -s evilwm $(prefix)/bin
--	install evilwm.1 $(prefix)/share/man/man1
--	#gzip -9 $(prefix)/share/man/man1/evilwm.1
-+	${BSD_INSTALL_PROGRAM} evilwm $(prefix)/bin
-+	${BSD_INSTALL_MAN} evilwm.1 $(prefix)/man/man1
- 
- install: doinstall
+@@ -56,7 +56,7 @@
+ #DEFINES += -DKEY_KILL=XK_q
  
+ # Print whatever debugging messages I've left in this release.
+-DEFINES += -DDEBUG	# miscellaneous debugging
++#DEFINES += -DDEBUG	# miscellaneous debugging
+ 
+ # ----- You shouldn't need to change anything under this line ------ #
+ 
+@@ -64,7 +64,7 @@
+ 
+ distname = evilwm-$(version)
+ 
+-DEFINES += -DXDEBUG	# show some X calls
++#DEFINES += -DXDEBUG	# show some X calls
+ 
+ DEFINES += -DVERSION=\"$(version)\" $(DEBIAN)
+ CFLAGS  += $(INCLUDES) $(DEFINES) -Os -Wall