From owner-svn-ports-head@FreeBSD.ORG  Sat Nov 16 02:51:45 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ECA01BB7;
 Sat, 16 Nov 2013 02:51:45 +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 DC31325E1;
 Sat, 16 Nov 2013 02:51:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAG2pjTF000328;
 Sat, 16 Nov 2013 02:51:45 GMT (envelope-from danilo@svn.freebsd.org)
Received: (from danilo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAG2pj05000327;
 Sat, 16 Nov 2013 02:51:45 GMT (envelope-from danilo@svn.freebsd.org)
Message-Id: <201311160251.rAG2pj05000327@svn.freebsd.org>
From: Danilo Egea Gondolfo <danilo@FreeBSD.org>
Date: Sat, 16 Nov 2013 02:51:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333971 - head/games/doom-hr
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.16
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: Sat, 16 Nov 2013 02:51:46 -0000

Author: danilo
Date: Sat Nov 16 02:51:45 2013
New Revision: 333971
URL: http://svnweb.freebsd.org/changeset/ports/333971

Log:
  - Use options helpers
  - Add stage support

Modified:
  head/games/doom-hr/Makefile

Modified: head/games/doom-hr/Makefile
==============================================================================
--- head/games/doom-hr/Makefile	Sat Nov 16 02:43:26 2013	(r333970)
+++ head/games/doom-hr/Makefile	Sat Nov 16 02:51:45 2013	(r333971)
@@ -27,9 +27,13 @@ OPTIONS_DEFAULT=	DEMO_NM DEMO_UV
 DEMO_NM_DESC=	Install demos with -nomonsters
 DEMO_UV_DESC=	Install Ultra-Violence demos
 
+OPTIONS_SUB=	yes
+
 DATADIR=	${DMDIR}/${PORTNAME}
 
-NO_STAGE=	yes
+DEMO_NM_DISTFILES=	hrhelp${EXTRACT_SUFX}
+DEMO_UV_DISTFILES=	hruvlmp2${EXTRACT_SUFX}
+
 post-extract:
 	@(cd ${WRKDIR} && ${SH} ${SCRIPTDIR}/lowercase.sh)
 
@@ -37,29 +41,13 @@ post-extract:
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDEMO_NM}
-DISTFILES+=	hrhelp${EXTRACT_SUFX}
-PLIST_SUB+=	DEMO_NM=""
-.else
-PLIST_SUB+=	DEMO_NM="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDEMO_UV}
-DISTFILES+=	hruvlmp2${EXTRACT_SUFX}
-PLIST_SUB+=	DEMO_UV=""
-.else
-PLIST_SUB+=	DEMO_UV="@comment "
-.endif
-
 do-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.wad ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.wad ${STAGEDIR}${DATADIR}
 .if ${PORT_OPTIONS:MDEMO_NM} || !empty(PORT_OPTIONS:MDEMO_UV)
-	${INSTALL_DATA} ${WRKSRC}/*.lmp ${DATADIR}
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.lmp ${STAGEDIR}${DATADIR}
 .endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>