Update to version 0.99.14.

Patches provided by Jonathan Perkin <sketch at rd dot bbc dot co dot uk>
and Toru TAKAMIZU <ttaka at earth dot email dot ne dot jp> in PR pkg/19257
with minor tweaks by me.

Changes:

2002-11-18
	Fixed Alt-Tab-into-nowhere bug that I think would cause an infinite
	loop if you tried Alt-Tab on an empty virtual desktop.
	Extended the NumLock keyboard fixes to the mouse button grabs.

2002-11-19
	Ripped out most of the VDESK_BOTH code (which didn't work) and
	replaced it with code that just calls the 'vdesk' application (which
	does).

2002-11-20
	Abstract a couple more grabs out into macros - code tidy.

2002-11-23
	Fix small problem with border colours in new code.
	Documentation updates.  Re-fix multihead "support".

2002-11-24
	Better multihead support - entering managed screen will grab keyboard
	events, leaving will deselect "current" window.
	Documentation updates.
	Released 0.99.12.

	Argh!  Only set focus to PointerRoot on entering root window if we
	don't have a current window (I'd killed sloppy focus...)

2002-11-26
	Released 0.99.13.

	First draft proper multihead support - looks like it's working,
	needs a bit of testing.

2003-01-15
	No complaints so...
	Released 0.99.14.

4 files changed, 58 insertions, 42 deletions

diff --git a/wm/evilwm/Makefile b/wm/evilwm/Makefile
index 68172fdfc58..6c55d5f8050 100644
--- a/wm/evilwm/Makefile
+++ b/wm/evilwm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/03/04 15:56:37 agc Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/19 06:07:19 salo Exp $
 #
 
-DISTNAME=	evilwm_0.99.4-1
-PKGNAME=	evilwm-0.99.4
+DISTNAME=	evilwm_0.99.14.orig
+PKGNAME=	evilwm-0.99.14
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=evilwm/}
 
@@ -10,17 +10,17 @@ MAINTAINER=	sketch@rd.bbc.co.uk
 HOMEPAGE=	http://evilwm.sourceforge.net/
 COMMENT=	Minimalist Window Manager for X
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 
-USE_GMAKE=		YES
-USE_X11BASE=		YES
+USE_GMAKE=	YES
+USE_X11BASE=	YES
 
-ALL_TARGET=		allinone
+ALL_TARGET=	allinone
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/evilwm
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/evilwm
-	${INSTALL_DATA} ${WRKSRC}/README.multihead ${PREFIX}/share/doc/evilwm
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/evilwm
+	cd ${WRKSRC} && \
+	${INSTALL_DATA} ChangeLog README README.vdesk TODO	\
+		${PREFIX}/share/doc/evilwm
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/evilwm/PLIST b/wm/evilwm/PLIST
index fb776e2d4e7..44184a99e8a 100644
--- a/wm/evilwm/PLIST
+++ b/wm/evilwm/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/12/21 23:14:36 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/19 06:07:19 salo Exp $
 bin/evilwm
 man/man1/evilwm.1
 share/doc/evilwm/ChangeLog
 share/doc/evilwm/README
-share/doc/evilwm/README.multihead
+share/doc/evilwm/README.vdesk
+share/doc/evilwm/TODO
 @dirrm share/doc/evilwm
diff --git a/wm/evilwm/distinfo b/wm/evilwm/distinfo
index 8707041ffcb..8c8029f0c3b 100644
--- a/wm/evilwm/distinfo
+++ b/wm/evilwm/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/03/10 10:58:17 jmc Exp $
+$NetBSD: distinfo,v 1.4 2003/01/19 06:07:19 salo Exp $
 
-SHA1 (evilwm_0.99.4-1.tar.gz) = c127c4e19b98e4302073c35555c2f88ee2dad88c
-Size (evilwm_0.99.4-1.tar.gz) = 19505 bytes
-SHA1 (patch-aa) = b568f43952c3dd1a9f4fa6c70d1e538f7808a4b8
+SHA1 (evilwm_0.99.14.orig.tar.gz) = 79f1fedab90615e3ae39dba321c87512cfc35ec6
+Size (evilwm_0.99.14.orig.tar.gz) = 22887 bytes
+SHA1 (patch-aa) = e84cf4c26293efd4f8c726cb4d85eac5acf18269
diff --git a/wm/evilwm/patches/patch-aa b/wm/evilwm/patches/patch-aa
index 85c4a7ba29b..9a46bafc253 100644
--- a/wm/evilwm/patches/patch-aa
+++ b/wm/evilwm/patches/patch-aa
@@ -1,39 +1,54 @@
-$NetBSD: patch-aa,v 1.3 2002/03/10 10:58:17 jmc Exp $
+$NetBSD: patch-aa,v 1.4 2003/01/19 06:07:19 salo Exp $
 
---- Makefile.orig	Thu Feb 28 09:46:09 2002
-+++ Makefile	Mon Mar  4 15:34:24 2002
-@@ -1,11 +1,10 @@
--prefix = $(DESTDIR)/usr/X11R6
-+prefix = $(DESTDIR)/${PREFIX}
- version = 0
- revision = 99
- subrev = 4
+--- Makefile.orig	Thu Dec  5 21:35:00 2002
++++ Makefile	Sun Jan 19 06:58:29 2003
+@@ -1,13 +1,13 @@
+ # 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 = ${X11PREFIX}
  
 -XROOT    = /usr/X11R6
--INCLUDES = -I$(XROOT)/include
++XROOT    = ${X11PREFIX}
+ INCLUDES = -I$(XROOT)/include
 -LDPATH   = -L$(XROOT)/lib
-+INCLUDES = -I$(X11BASE)/include
-+LDPATH   = -L$(X11BASE)/lib -Wl,-R${X11BASE}/lib
++LDPATH   = -L$(XROOT)/lib -Wl,-R$(XROOT)/lib
  LIBS     = -lX11
  
- CC       = gcc
-@@ -33,7 +32,7 @@
- #DEFINES  += -DDEBUG	# miscellaneous debugging
- #DEFINES  += -DXDEBUG	# show some X calls
+ # Configure evilwm by editing the following DEFINES lines.
+@@ -22,7 +22,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
  
--CFLAGS   = $(INCLUDES) -DVERSION=\"$(version).$(revision).$(subrev)\" -Os -Wall $(DEBIAN)
-+CFLAGS   = $(INCLUDES) -DVERSION=\"$(version).$(revision).$(subrev)\" -Os -Wall
- LDFLAGS  = $(LDPATH) $(LIBS)
+ # To support virtual desktops, uncomment one or both of the following 2 lines.
+ DEFINES += -DVWM
+@@ -66,7 +66,8 @@
+ #DEFINES += -DXDEBUG	# show some X calls
  
- HEADERS  = evilwm.h
-@@ -54,8 +53,8 @@
- 	$(CC) -c $(CFLAGS) $(DEFINES) $<
+ DEFINES += -DVERSION=\"$(version).$(revision).$(subrev)\" $(DEBIAN)
+-CFLAGS  += $(INCLUDES) $(DEFINES) -Os -Wall
++CFLAGS  += $(INCLUDES) $(DEFINES) -Wall
++#CFLAGS  += $(INCLUDES) $(DEFINES) -Os -Wall
+ #CFLAGS  += $(INCLUDES) $(DEFINES) -g -Wall
+ LDFLAGS += $(LDPATH) $(LIBS)
  
- install:
+@@ -89,10 +90,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)/man/man1
+-	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
- 	#gzip -9 $(prefix)/man/man1/evilwm.1
  
- cyginstall:
+ install: doinstall
+