From e8117743e0d1bf29919b97124072ebb617924107 Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Mon, 19 Sep 2011 21:18:50 +0000
Subject: [PATCH] - Update to 1.1.0. - Depend on xrandr. - Depend on gmake so
 that EVILWM_CPPFLAGS and EVILWM_LDLIBS are handled   properly (so that we do
 not need to pass all defined manually). - Install .desktop file.

Approved by:	avilla (mentor), maintainer timeout (15 days)
---
 x11-wm/evilwm/Makefile | 19 +++++++++++--------
 x11-wm/evilwm/distinfo |  4 ++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/x11-wm/evilwm/Makefile b/x11-wm/evilwm/Makefile
index 677b0c62539f..029c0738d957 100644
--- a/x11-wm/evilwm/Makefile
+++ b/x11-wm/evilwm/Makefile
@@ -6,29 +6,32 @@
 #
 
 PORTNAME=	evilwm
-PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTVERSION=	1.1.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.6809.org.uk/evilwm/
 
 MAINTAINER=	lasg@lasg.dk
 COMMENT=	Minimalist window manager based on 9wm
 
-USE_XORG=	x11 xpm xext xrender
+USE_GMAKE=	yes
+USE_XORG=	x11 xpm xext xrandr xrender
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		evilwm.1
 PORTDOCS=	ChangeLog README TODO
-PLIST_FILES=	bin/evilwm
+PLIST_FILES=	bin/evilwm \
+		${DESKTOPDIR:S,^${PREFIX}/,,}/${PORTNAME}.desktop
+PLIST_DIRSTRY=	${DESKTOPDIR:S,^${PREFIX}/,,}
 
-CFLAGS+=	-DSOLIDDRAG -DINFOBANNER -DVWM -DSHAPE -DMOUSE -DSNAP \
-		-DSTDIO -DCOLOURMAP -DVERSION=\\\"${PORTVERSION}\\\" \
-		-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -lX11 -lXext
+# X11's include and library path
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1
+	${MKDIR} ${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${DESKTOPDIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
diff --git a/x11-wm/evilwm/distinfo b/x11-wm/evilwm/distinfo
index 17db656d4b66..68a878c968f2 100644
--- a/x11-wm/evilwm/distinfo
+++ b/x11-wm/evilwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (evilwm-1.0.0.tar.gz) = 79d227f3af36eb621d6aa9b76d6270cd0bd31aeb5f9c1014723b2bb54fd37dc8
-SIZE (evilwm-1.0.0.tar.gz) = 30048
+SHA256 (evilwm-1.1.0.tar.gz) = cdc763c875b64ee3734f3cb764249e91ec659f550177ec1bb564304260ef0c75
+SIZE (evilwm-1.1.0.tar.gz) = 40309