From owner-svn-ports-head@FreeBSD.ORG  Mon Feb 10 00:46:37 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 7525A4CB;
 Mon, 10 Feb 2014 00:46:37 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 45E4318AA;
 Mon, 10 Feb 2014 00:46:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1A0kbrC021971;
 Mon, 10 Feb 2014 00:46:37 GMT (envelope-from danilo@svn.freebsd.org)
Received: (from danilo@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1A0kbUh021970;
 Mon, 10 Feb 2014 00:46:37 GMT (envelope-from danilo@svn.freebsd.org)
Message-Id: <201402100046.s1A0kbUh021970@svn.freebsd.org>
From: Danilo Egea Gondolfo <danilo@FreeBSD.org>
Date: Mon, 10 Feb 2014 00:46:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r343565 - head/x11-wm/windowlab
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Feb 2014 00:46:37 -0000

Author: danilo
Date: Mon Feb 10 00:46:36 2014
New Revision: 343565
URL: http://svnweb.freebsd.org/changeset/ports/343565
QAT: https://qat.redports.org/buildarchive/r343565/

Log:
  - Add stage support
  - Convert USE_GMAKE to USES
  - Use options helpers

Modified:
  head/x11-wm/windowlab/Makefile

Modified: head/x11-wm/windowlab/Makefile
==============================================================================
--- head/x11-wm/windowlab/Makefile	Mon Feb 10 00:27:03 2014	(r343564)
+++ head/x11-wm/windowlab/Makefile	Mon Feb 10 00:46:36 2014	(r343565)
@@ -16,25 +16,20 @@ LICENSE=	GPLv2
 
 OPTIONS_DEFINE=	XFT DOCS
 
+USES=		gmake
 USE_XORG=	x11 xext
-USE_GMAKE=	yes
 MAKE_ENV=	XROOT="${LOCALBASE}" SYSCONFDIR="${ETCDIR}"
 
-MAN1=		windowlab.1x
 PORTDOCS=	CHANGELOG README
-PLIST_FILES=	bin/windowlab %%ETCDIR%%/menurc
+PLIST_FILES=	bin/windowlab %%ETCDIR%%/menurc \
+		man/man1/windowlab.1x.gz
 PLIST_DIRS=	%%ETCDIR%%
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MXFT}
-USE_XORG+=	xft
-USES+=		pkgconfig
-MAKE_ENV+=	EXTRA_INC="$$(pkg-config --cflags xft)" \
+XFT_USE=	XORG=xft
+XFT_USES=	pkgconfig
+XFT_MAKE_ENV=	EXTRA_INC="$$(pkg-config --cflags xft)" \
 		EXTRA_LIBS="$$(pkg-config --libs xft)"
-CFLAGS+=	-DXFT
-.endif
+XFT_CFLAGS=	-DXFT
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -44,15 +39,13 @@ post-patch:
 		 s|^\(CC\) =|\1 ?=|' ${WRKSRC}/Makefile
 
 do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} windowlab ${PREFIX}/bin)
-	(cd ${WRKSRC} && ${INSTALL_MAN} windowlab.1x ${MANPREFIX}/man/man1)
-	@${MKDIR} ${ETCDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} windowlab.menurc ${ETCDIR}/menurc)
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} windowlab ${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_MAN} windowlab.1x ${STAGEDIR}${MANPREFIX}/man/man1)
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} windowlab.menurc ${STAGEDIR}${ETCDIR}/menurc)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
 .endfor
-.endif
 
 .include <bsd.port.mk>