From owner-svn-ports-all@FreeBSD.ORG  Tue Apr  1 19:41:31 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9A0CCFAC;
 Tue,  1 Apr 2014 19:41:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 86F661EC;
 Tue,  1 Apr 2014 19:41:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s31JfVKj048365;
 Tue, 1 Apr 2014 19:41:31 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s31JfV7H048364;
 Tue, 1 Apr 2014 19:41:31 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201404011941.s31JfV7H048364@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Tue, 1 Apr 2014 19:41:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349882 - head/x11-wm/evilwm
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Apr 2014 19:41:31 -0000

Author: antoine
Date: Tue Apr  1 19:41:31 2014
New Revision: 349882
URL: http://svnweb.freebsd.org/changeset/ports/349882
QAT: https://qat.redports.org/buildarchive/r349882/

Log:
  - Stage support
  - Do not remove a directory belonging to BSD.local.dist mtree on uninstall
  
  Reported by:	poudriere
  With hat:	portmgr

Modified:
  head/x11-wm/evilwm/Makefile

Modified: head/x11-wm/evilwm/Makefile
==============================================================================
--- head/x11-wm/evilwm/Makefile	Tue Apr  1 19:37:51 2014	(r349881)
+++ head/x11-wm/evilwm/Makefile	Tue Apr  1 19:41:31 2014	(r349882)
@@ -3,6 +3,7 @@
 
 PORTNAME=	evilwm
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.6809.org.uk/evilwm/
 
@@ -13,27 +14,22 @@ USES=		gmake
 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 \
+		man/man1/evilwm.1.gz \
 		${DESKTOPDIR:S,^${PREFIX}/,,}/${PORTNAME}.desktop
-PLIST_DIRSTRY=	${DESKTOPDIR:S,^${PREFIX}/,,}
 
 # X11's include and library path
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 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}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
+	${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}
 
 .include <bsd.port.mk>