- Update to version 1.1.1

- Employ USES+=localbase:ldflags instead of manually setting CFLAGS
  and LDFLAGS
- Propagate our standard `prefix' and `mandir' to inner Makefile and
  thus get rid of hand-rolled `do-install' target
- Install `doc/standards.html' and convert to options helper target
- Simplify PLIST_FILES and sanitize port description text while here

TIMESTAMP (evilwm-1.1.1.tar.gz) = 1436791316

3 files changed, 20 insertions, 29 deletions

diff --git a/x11-wm/evilwm/Makefile b/x11-wm/evilwm/Makefile
index 9ce13954d631..5e090823f005 100644
--- a/x11-wm/evilwm/Makefile
+++ b/x11-wm/evilwm/Makefile
@@ -2,34 +2,29 @@
 # $FreeBSD$
 
 PORTNAME=	evilwm
-PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTVERSION=	1.1.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.6809.org.uk/evilwm/
 
 MAINTAINER=	lasg@lasg.dk
 COMMENT=	Minimalist window manager based on 9wm
 
-USES=		gmake
+USES=		gmake localbase:ldflags
 USE_XORG=	x11 xpm xext xrandr xrender
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" prefix="${PREFIX}" \
+		mandir="${MANPREFIX}/man"
 
-PORTDOCS=	ChangeLog README TODO
 PLIST_FILES=	bin/evilwm \
 		man/man1/evilwm.1.gz \
-		${DESKTOPDIR:S,^${PREFIX}/,,}/${PORTNAME}.desktop
-
-# X11's include and library path
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+		share/applications/evilwm.desktop
+PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/evilwm ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/evilwm.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/evilwm.desktop ${STAGEDIR}${DESKTOPDIR}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in ChangeLog README TODO doc/standards.html
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11-wm/evilwm/distinfo b/x11-wm/evilwm/distinfo
index 68a878c968f2..e3bc3f62d6e2 100644
--- a/x11-wm/evilwm/distinfo
+++ b/x11-wm/evilwm/distinfo
@@ -1,2 +1,3 @@
-SHA256 (evilwm-1.1.0.tar.gz) = cdc763c875b64ee3734f3cb764249e91ec659f550177ec1bb564304260ef0c75
-SIZE (evilwm-1.1.0.tar.gz) = 40309
+TIMESTAMP = 1436791316
+SHA256 (evilwm-1.1.1.tar.gz) = 79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+SIZE (evilwm-1.1.1.tar.gz) = 40150
diff --git a/x11-wm/evilwm/pkg-descr b/x11-wm/evilwm/pkg-descr
index aacffc679c6a..2b0f2e398072 100644
--- a/x11-wm/evilwm/pkg-descr
+++ b/x11-wm/evilwm/pkg-descr
@@ -1,13 +1,8 @@
-from the Web page:
+evilwm is a minimalist window manager for X11.  The name evil came from
+Stuart "Stuii" Ford, who reckons any window manager I use has to be evil
+and masochistic.  This is not the case at all, but I liked the name.
 
-	evilwm is a minimalist window manager for X. The name evil
-	came from Stuart 'Stuii' Ford, who reckons any window
-	manager I use has to be evil and masochistic.  This is not
-	the case at all, but I liked the name.
+It features movement, killing, lowering, raising, and moving windows by
+keyboard control.  It supports virtual desktops.
 
-It features movement, killing, lowering, raising, and moving windows
-by keyboard control.  It supports virtual desktops.
-
-WWW:   http://www.6809.org.uk/evilwm/
-
-Trevor Johnson
+WWW: http://www.6809.org.uk/evilwm/