Update to 0.99.17. Respect CC. Enable support for vdesk (which

see) along with the internal pager because the author no longer
warns against doing so.

4 files changed, 39 insertions, 5 deletions

diff --git a/x11-wm/evilwm/Makefile b/x11-wm/evilwm/Makefile
index 073b6e820616..f8a243d0fd97 100644
--- a/x11-wm/evilwm/Makefile
+++ b/x11-wm/evilwm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		evilwm
-PORTVERSION=		0.99.14
+PORTVERSION=		0.99.17
 CATEGORIES=		x11-wm
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +15,6 @@ DISTNAME=		${PORTNAME}_${PORTVERSION}.orig
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Minimalist window manager based on 9wm
 
-FORBIDDEN=	"source code for this version has not been reviewed"
-
 DOCDIR=		share/doc/${PORTNAME}
 DOCS=		ChangeLog README README.vdesk TODO
 MAN1=		evilwm.1
diff --git a/x11-wm/evilwm/distinfo b/x11-wm/evilwm/distinfo
index 238eb4604cc6..b9d63e44a436 100644
--- a/x11-wm/evilwm/distinfo
+++ b/x11-wm/evilwm/distinfo
@@ -1,2 +1 @@
-$FreeBSD$
-MD5 (evilwm_0.99.14.orig.tar.gz) = d8503f30ec92454ba178b211216e7066
+MD5 (evilwm_0.99.17.orig.tar.gz) = 2d9ae76a172240a1ba7e359d9aae41aa
diff --git a/x11-wm/evilwm/files/patch-Makefile b/x11-wm/evilwm/files/patch-Makefile
new file mode 100644
index 000000000000..e5db34f64331
--- /dev/null
+++ b/x11-wm/evilwm/files/patch-Makefile
@@ -0,0 +1,20 @@
+$FreeBSD$
+
+--- Makefile.orig	Wed Oct 15 11:48:23 2003
++++ Makefile	Fri Oct 24 04:51:32 2003
+@@ -1,5 +1,5 @@
+ # 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.
+@@ -26,7 +26,7 @@
+ 
+ # To support virtual desktops, uncomment one or both of the following 2 lines.
+ DEFINES += -DVWM
+-#DEFINES += -DVDESK
++DEFINES += -DVDESK
+ # VWM enables the built-in virtual desktop code and VDESK allows the use
+ # of the extern pager program "vdesk".
+ #
diff --git a/x11-wm/evilwm/files/patch-main.c b/x11-wm/evilwm/files/patch-main.c
new file mode 100644
index 000000000000..bce669cff1ec
--- /dev/null
+++ b/x11-wm/evilwm/files/patch-main.c
@@ -0,0 +1,17 @@
+$FreeBSD$
+
+main.c: In function `main':
+main.c:92: error: `opt_snap' undeclared (first use in this function)
+
+--- main.c.orig	Wed Oct 15 11:48:23 2003
++++ main.c	Fri Oct 24 05:09:42 2003
+@@ -37,9 +37,7 @@ int		opt_bw = DEF_BW;
+ const char	*opt_fc = DEF_FC;
+ int		vdesk = KEY_TO_VDESK(XK_1);
+ #endif
+-#ifdef SNAP
+ int		opt_snap = 0;
+-#endif
+ #ifdef SHAPE
+ int		have_shape, shape_event;
+ #endif