Hi ports@,

Please find below an update diff to the next stable version.

- Build with GCC and Clang
- Runs fine on amd64 but it is a terrible WM.
- Remove Victor Sahlstedt as maintainer (bounce email)

OK? Comments?

Best regards,

Rafael Sadowski

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/evilwm/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile    10 Sep 2016 13:03:44 -0000      1.19
+++ Makefile    15 Jun 2017 07:28:44 -0000
@@ -2,21 +2,20 @@
 
 COMMENT=               minimalist window manager for the X Window System
 
-DISTNAME=              evilwm-1.0.1
+DISTNAME=              evilwm-1.1.1
 CATEGORIES=            x11
-REVISION=              0
 
 HOMEPAGE=              http://www.6809.org.uk/evilwm/
 
-MAINTAINER=            Victor Sahlstedt <sa...@legonet.org>
-
 # 9wm license
 PERMIT_PACKAGE_CDROM=  Yes
 WANTLIB=               X11 Xext Xrandr c
 
 MASTER_SITES=          ${HOMEPAGE}
 
-MAKE_FLAGS=            XROOT='${X11BASE}' CC='${CC}'
+MAKE_FLAGS=            CPPFLAGS="-I${X11BASE}/include" \
+                       CC="${CC}" \
+                       LDFLAGS="-L${X11BASE}/lib"
 
 NO_TEST=               Yes
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/evilwm/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo    18 Jan 2015 03:15:53 -0000      1.12
+++ distinfo    15 Jun 2017 07:28:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (evilwm-1.0.1.tar.gz) = eWQKaPbdfmehdndnq6SG4ZLXZjzLJYgVTSQZtHuexFc=
-SIZE (evilwm-1.0.1.tar.gz) = 31468
+SHA256 (evilwm-1.1.1.tar.gz) = eVicKWpZFe4Lrh0jHokSYB/HlNnwqcrLa2SP+aXyYCo=
+SIZE (evilwm-1.1.1.tar.gz) = 40150
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/evilwm/patches/patch-Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Makefile
--- patches/patch-Makefile      4 Nov 2007 15:42:19 -0000       1.6
+++ patches/patch-Makefile      15 Jun 2017 07:28:44 -0000
@@ -1,11 +1,11 @@
---- Makefile.orig      Mon Jun 18 14:29:22 2007
-+++ Makefile   Sun Nov  4 10:39:02 2007
-@@ -71,7 +71,7 @@ distname = evilwm-$(version)
- #DEFINES += -DXDEBUG  # show some X calls
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -74,7 +74,6 @@ OPT_CPPFLAGS += -DVWM
+ CC = gcc
  
- DEFINES += -DVERSION=\"$(version)\" $(DEBIAN)
--CFLAGS  += $(INCLUDES) $(DEFINES) -Os -Wall
-+CFLAGS  += $(INCLUDES) $(DEFINES)
- #CFLAGS  += $(INCLUDES) $(DEFINES) -g -Wall
- CFLAGS  += -W -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual 
-Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings -Wundef 
-Wsign-compare -Wmissing-prototypes -Wredundant-decls
- LDFLAGS += $(LDPATH) $(LIBS)
+ # Override if desired:
+-CFLAGS = -Os
+ WARN = -Wall -W -Wstrict-prototypes -Wpointer-arith -Wcast-align \
+       -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings \
+       -Wundef -Wsign-compare -Wmissing-prototypes -Wredundant-decls
Index: patches/patch-events_c
===================================================================
RCS file: patches/patch-events_c
diff -N patches/patch-events_c
--- patches/patch-events_c      10 Sep 2016 13:03:44 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-events_c,v 1.1 2016/09/10 13:03:44 ajacoutot Exp $
---- events.c.orig      Sat Sep 10 13:00:37 2016
-+++ events.c   Sat Sep 10 13:00:44 2016
-@@ -4,6 +4,7 @@
- 
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/select.h> /* fd_set */
- #include <errno.h>
- #include "evilwm.h"
- #include "log.h"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/evilwm/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST   27 Sep 2005 08:14:52 -0000      1.4
+++ pkg/PLIST   15 Jun 2017 07:28:44 -0000
@@ -1,5 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.4 2005/09/27 08:14:52 alek Exp $
-bin/evilwm
+@bin bin/evilwm
 @man man/man1/evilwm.1
 share/doc/evilwm/
 share/doc/evilwm/README

Reply via email to