Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Nov 2013 02:51:45 +0000 (UTC)
From:      Danilo Egea Gondolfo <danilo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r333971 - head/games/doom-hr
Message-ID:  <201311160251.rAG2pj05000327@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311160251.rAG2pj05000327>