From owner-svn-ports-all@FreeBSD.ORG  Thu Jul  3 22:45:53 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 B68DBEE0;
 Thu,  3 Jul 2014 22:45:53 +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 8A1AD2D36;
 Thu,  3 Jul 2014 22:45:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s63MjrVU031322;
 Thu, 3 Jul 2014 22:45:53 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s63Mjrqw031321;
 Thu, 3 Jul 2014 22:45:53 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201407032245.s63Mjrqw031321@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Thu, 3 Jul 2014 22:45:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r360480 - head/games/quake2-zaero
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.18
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: Thu, 03 Jul 2014 22:45:53 -0000

Author: wg
Date: Thu Jul  3 22:45:53 2014
New Revision: 360480
URL: http://svnweb.freebsd.org/changeset/ports/360480
QAT: https://qat.redports.org/buildarchive/r360480/

Log:
  games/quake2-zaero: support stage

Modified:
  head/games/quake2-zaero/Makefile

Modified: head/games/quake2-zaero/Makefile
==============================================================================
--- head/games/quake2-zaero/Makefile	Thu Jul  3 22:43:38 2014	(r360479)
+++ head/games/quake2-zaero/Makefile	Thu Jul  3 22:45:53 2014	(r360480)
@@ -17,30 +17,26 @@ USES=		dos2unix zip
 DOS2UNIX_FILES=	*.[ch]
 NO_WRKSUBDIR=	yes
 
-OPTIONS_DEFINE=	DEMO DM
+OPTIONS_DEFINE=	DEMO DM DOCS
 DEMO_DESC=	Demo version of the game data
 DM_DESC=	Deathmatch maps
 
+OPTIONS_SUB=	yes
+
 DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../quake2-data/Makefile.include"
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEMO}
 DISTFILES+=	zaerodemo${EXTRACT_SUFX}
-PLIST_SUB+=	DEMO=""
 .else
-PLIST_SUB+=	DEMO="@comment "
 SUB_FILES+=	pkg-message
 .endif
 
 .if ${PORT_OPTIONS:MDM}
 DISTFILES+=	zaerodm${EXTRACT_SUFX}
-PLIST_SUB+=	DM=""
-.else
-PLIST_SUB+=	DM="@comment "
 .endif
 
 post-extract:
@@ -50,27 +46,20 @@ post-patch:
 	@${REINPLACE_CMD} -e 's/__linux__/__unix__/' ${WRKSRC}/q_shared.[ch]
 
 do-install:
-	${MKDIR} ${Q2DIR}/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/game.so ${Q2DIR}/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${Q2DIR}/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/game.so ${STAGEDIR}${Q2DIR}/${PORTNAME}
 .if ${PORT_OPTIONS:MDEMO}
-	${INSTALL_DATA} ${WRKSRC}/zaero/pak0.pak ${Q2DIR}/${PORTNAME}
-	${MKDIR} ${Q2DIR}/${PORTNAME}/sprites
-	${INSTALL_DATA} ${WRKSRC}/zaero/sprites/* ${Q2DIR}/${PORTNAME}/sprites
+	${INSTALL_DATA} ${WRKSRC}/zaero/pak0.pak ${STAGEDIR}${Q2DIR}/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${Q2DIR}/${PORTNAME}/sprites
+	${INSTALL_DATA} ${WRKSRC}/zaero/sprites/* ${STAGEDIR}${Q2DIR}/${PORTNAME}/sprites
 .endif
-	${INSTALL_DATA} ${WRKSRC}/pak1.pak ${Q2DIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/pak1.pak ${STAGEDIR}${Q2DIR}/${PORTNAME}
 .if ${PORT_OPTIONS:MDM}
-	${INSTALL_DATA} ${WRKSRC}/zaero/pak2.pak ${Q2DIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/zaero/pak2.pak ${STAGEDIR}${Q2DIR}/${PORTNAME}
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/changelog.txt ${DOCSDIR}
-.endif
-
-.if ! ${PORT_OPTIONS:MDEMO}
-post-install:
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/changelog.txt ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>