Upgrade evilwm from 0.3.11 to 0.99.4, provided in PR 15766 by Jonathan

Perkin (sketch@rd.bbc.co.uk), modified slightly by me.

Excerpt from ChangeLog since last version (0.3.11):

2001-07-13
        Added -V option.

        Start the run up to 1.0.  Hopefully this will involve solving the
        IE bug, but right now I'm not very concerned about it.

2001-08-24
        Grab everything with Mod3Mask as well - this should circumvent the
        NumLock problem.

2002-01-03
        If an app maps itself (EVIL!  EVIL!  EVIL!), switch to the virtual
        desktop it's on before raising it.

2002-01-22 (vatten@users.sourceforge.net)
        Added support for vdesk - an external virtual desktop manager
        that works by iconifying windows and mapping them back again.

2002-01-24 (vatten@users.souceforge.net)
        Added support for the combination of vdesk and the internal
        virtual desktop manager.

2002-01-25
        Move all the key bindings out into a separate include file and
        add a line in Makefile to override KILL key (for cygwin).

3 files changed, 36 insertions, 30 deletions

diff --git a/wm/evilwm/Makefile b/wm/evilwm/Makefile
index 179c43a3c5c..68172fdfc58 100644
--- a/wm/evilwm/Makefile
+++ b/wm/evilwm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/12/21 23:14:36 zuntum Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/04 15:56:37 agc Exp $
 #
 
-DISTNAME=	evilwm_0.3.11-1
-PKGNAME=	evilwm-0.3.11
+DISTNAME=	evilwm_0.99.4-1
+PKGNAME=	evilwm-0.99.4
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=evilwm/}
 
@@ -10,11 +10,13 @@ MAINTAINER=	sketch@rd.bbc.co.uk
 HOMEPAGE=	http://evilwm.sourceforge.net/
 COMMENT=	Minimalist Window Manager for X
 
-WRKSRC=		${WRKDIR}/evilwm-0.3.11
+WRKSRC=		${WRKDIR}/${PKGNAME}
 
 USE_GMAKE=		YES
 USE_X11BASE=		YES
 
+ALL_TARGET=		allinone
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/evilwm
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/evilwm
diff --git a/wm/evilwm/distinfo b/wm/evilwm/distinfo
index 8b0519dc40d..24d1ebe2549 100644
--- a/wm/evilwm/distinfo
+++ b/wm/evilwm/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/12/21 23:14:36 zuntum Exp $
+$NetBSD: distinfo,v 1.2 2002/03/04 15:56:37 agc Exp $
 
-SHA1 (evilwm_0.3.11-1.tar.gz) = ee7d7b4676b188ee3f77bcbd63af814c7d9b7a1c
-Size (evilwm_0.3.11-1.tar.gz) = 16780 bytes
-SHA1 (patch-aa) = 3dac1d0b7ed3762c374e353160b88e3059f0e05a
+SHA1 (evilwm_0.99.4-1.tar.gz) = c127c4e19b98e4302073c35555c2f88ee2dad88c
+Size (evilwm_0.99.4-1.tar.gz) = 19505 bytes
+SHA1 (patch-aa) = 6acf48003ec2ffac9505a50e25928b9624b5f775
diff --git a/wm/evilwm/patches/patch-aa b/wm/evilwm/patches/patch-aa
index cb2ac9c9e9d..250f2cfb3af 100644
--- a/wm/evilwm/patches/patch-aa
+++ b/wm/evilwm/patches/patch-aa
@@ -1,35 +1,39 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/12/21 23:14:36 zuntum Exp $
+$NetBSD: patch-aa,v 1.2 2002/03/04 15:56:38 agc Exp $
 
---- Makefile.orig	Sat Jun  2 17:30:39 2001
-+++ Makefile	Mon Dec  3 11:06:26 2001
-@@ -1,15 +1,15 @@
+--- 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 = ${PREFIX}
++prefix = $(DESTDIR)/${PREFIX}
  version = 0
- revision = 3
- subrev = 11
+ revision = 99
+ subrev = 4
  
- XROOT    = /usr/X11R6
- INCLPATH = -I$(XROOT)/include
+-XROOT    = /usr/X11R6
+-INCLUDES = -I$(XROOT)/include
 -LDPATH   = -L$(XROOT)/lib
-+LDPATH   = -L$(XROOT)/lib -Wl,-R${X11BASE}/lib
- LIBS     = -lX11 #-lXext
++INCLUDES = -I$(X11BASE)/include
++LDPATH   = -L$(X11BASE)/lib -Wl,-R${X11BASE}
+ LIBS     = -lX11
  
  CC       = gcc
--CFLAGS   = -Os -Wall $(DEBIAN)
-+CFLAGS   += -O -Wall
+@@ -33,7 +32,7 @@
+ #DEFINES  += -DDEBUG	# miscellaneous debugging
+ #DEFINES  += -DXDEBUG	# show some X calls
  
- #
- # See the file INSTALL for descriptions of these
-@@ -42,9 +42,8 @@
- 	$(CC) -c $(CFLAGS) $(DEFINES) $(INCLPATH) $<
+-CFLAGS   = $(INCLUDES) -DVERSION=\"$(version).$(revision).$(subrev)\" -Os -Wall $(DEBIAN)
++CFLAGS   = $(INCLUDES) -DVERSION=\"$(version).$(revision).$(subrev)\" -Os -Wall
+ LDFLAGS  = $(LDPATH) $(LIBS)
+ 
+ HEADERS  = evilwm.h
+@@ -54,8 +53,8 @@
+ 	$(CC) -c $(CFLAGS) $(DEFINES) $<
  
  install:
 -	install -s evilwm $(prefix)/bin
 -	install evilwm.1 $(prefix)/man/man1
--	#gzip -9 $(prefix)/man/man1/evilwm.1
-+	install -c -o root -g wheel -m 555 -s evilwm $(prefix)/bin
-+	install -c -o root -g wheel -m 444 evilwm.1 $(prefix)/man/man1
++	${BSD_INSTALL_PROGRAM} evilwm $(prefix)/bin
++	${BSD_INSTALL_MAN} evilwm.1 $(prefix)/man/man1
+ 	#gzip -9 $(prefix)/man/man1/evilwm.1
  
- clean:
- 	rm -f evilwm $(OBJS)
+ cyginstall: