>Number:         15766
>Category:       pkg
>Synopsis:       [PATCH] Upgrade wm/evilwm to 0.99.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Feb 28 10:05:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Perkin
>Release:        1.5ZA
>Organization:
British Broadcasting Corporation
>Environment:
NetBSD batfink.intra.nut 1.5ZA NetBSD 1.5ZA (BATFINK) #0: Wed Feb 20 21:10:17 GMT 2002     sketch@batfink.intra.nut:/usr/src/sys/arch/i386/compile/BATFINK i386
>Description:
Upgrade of evilwm latest version, 0.99.4, as released today.  Take
advantage and tidy up Makefile a bit and remove unneeded cruft in
patch-aa.

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).
>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/pkgsrc/wm/evilwm/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile    2001/12/21 23:14:36     1.1.1.1
+++ Makefile    2002/02/28 17:45:31
@@ -1,8 +1,8 @@
 # $NetBSD$
 #
 
-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,12 +10,16 @@
 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
 
-post-install:
+ALL_TARGET=            allinone
+
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/evilwm ${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/evilwm.1 ${PREFIX}/man/man1
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/evilwm
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/evilwm
        ${INSTALL_DATA} ${WRKSRC}/README.multihead ${PREFIX}/share/doc/evilwm
Index: distinfo
===================================================================
RCS file: /home/ncvs/pkgsrc/wm/evilwm/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo    2001/12/21 23:14:36     1.1.1.1
+++ distinfo    2002/02/28 17:47:39
@@ -1,5 +1,5 @@
 $NetBSD$
 
-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) = 04e71dedc777957edd53f2dbb498d03a98d2045a
cvs diff: Diffing patches
Index: patches/patch-aa
===================================================================
RCS file: /home/ncvs/pkgsrc/wm/evilwm/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patches/patch-aa    2001/12/21 23:14:36     1.1.1.1
+++ patches/patch-aa    2002/02/28 17:47:36
@@ -1,35 +1,18 @@
 $NetBSD$
 
---- 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 17:28:44 2002
++++ Makefile   Thu Feb 28 17:28:05 2002
+@@ -1,11 +1,11 @@
 -prefix = $(DESTDIR)/usr/X11R6
 +prefix = ${PREFIX}
  version = 0
- revision = 3
- subrev = 11
+ revision = 99
+ subrev = 4
  
  XROOT    = /usr/X11R6
- INCLPATH = -I$(XROOT)/include
+ INCLUDES = -I$(XROOT)/include
 -LDPATH   = -L$(XROOT)/lib
 +LDPATH   = -L$(XROOT)/lib -Wl,-R${X11BASE}/lib
- LIBS     = -lX11 #-lXext
+ LIBS     = -lX11
  
  CC       = gcc
--CFLAGS   = -Os -Wall $(DEBIAN)
-+CFLAGS   += -O -Wall
- 
- #
- # See the file INSTALL for descriptions of these
-@@ -42,9 +42,8 @@
-       $(CC) -c $(CFLAGS) $(DEFINES) $(INCLPATH) $<
- 
- 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
- 
- clean:
-       rm -f evilwm $(OBJS)
>Release-Note:
>Audit-Trail:
>Unformatted: