From owner-svn-ports-all@FreeBSD.ORG  Sun Apr 13 09:54:02 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 BF9C35CF;
 Sun, 13 Apr 2014 09:54:02 +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 9263D1BF4;
 Sun, 13 Apr 2014 09:54:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3D9s2Wj063338;
 Sun, 13 Apr 2014 09:54:02 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3D9s2nC063337;
 Sun, 13 Apr 2014 09:54:02 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201404130954.s3D9s2nC063337@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Sun, 13 Apr 2014 09:54:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351195 - head/games/doom
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: Sun, 13 Apr 2014 09:54:02 -0000

Author: pawel
Date: Sun Apr 13 09:54:02 2014
New Revision: 351195
URL: http://svnweb.freebsd.org/changeset/ports/351195
QAT: https://qat.redports.org/buildarchive/r351195/

Log:
  - Add staging support
  - When executing gmake set it's enviroment first, use MAKE_CMD
  - Respect CFLAGS

Modified:
  head/games/doom/Makefile

Modified: head/games/doom/Makefile
==============================================================================
--- head/games/doom/Makefile	Sun Apr 13 09:51:20 2014	(r351194)
+++ head/games/doom/Makefile	Sun Apr 13 09:54:02 2014	(r351195)
@@ -23,7 +23,6 @@ NO_WRKSUBDIR=	yes
 
 DATADIR=	${DMDIR}
 
-NO_STAGE=	yes
 post-extract:
 	@cd ${WRKDIR} && ${TAR} xzf linuxdoom-1.10.src.tgz && ${TAR} xzf sndserv.tgz
 
@@ -50,16 +49,20 @@ post-patch:
 		-E -e 's|#include +<malloc.h>|#include <stdlib.h>|g'
 
 do-build:
-	@cd ${WRKDIR}/linuxdoom-1.10 && ${GMAKE} X11BASE=${LOCALBASE}
-	@cd ${WRKDIR}/sndserv && ${GMAKE}
+	@cd ${WRKDIR}/linuxdoom-1.10 && ${SETENV} ${MAKE_ENV} \
+		${MAKE_CMD} X11BASE=${LOCALBASE}
+	@cd ${WRKDIR}/sndserv && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
 
 do-install:
-	@${MKDIR} ${PREFIX}/libexec/doom
-	@${INSTALL_PROGRAM} ${WRKDIR}/linuxdoom-1.10/linux/linuxxdoom ${PREFIX}/libexec/doom/xdoom
-	@${INSTALL_PROGRAM} ${WRKDIR}/sndserv/linux/sndserver ${PREFIX}/libexec/doom/sndserver
+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/doom
+	${INSTALL_PROGRAM} ${WRKDIR}/linuxdoom-1.10/linux/linuxxdoom \
+		${STAGEDIR}${PREFIX}/libexec/doom/xdoom
+	${INSTALL_PROGRAM} ${WRKDIR}/sndserv/linux/sndserver \
+		${STAGEDIR}${PREFIX}/libexec/doom/sndserver
 	@(${ECHO_CMD} "#!${SH}"; ${ECHO_CMD} "cd ${PREFIX}/libexec/doom"; \
-	  ${ECHO_CMD} 'export PATH=.:$$PATH';${ECHO_CMD} "export DOOMWADDIR=${DATADIR}"; ${ECHO_CMD} "./xdoom $$*") > ${PREFIX}/bin/doom
-	@${CHMOD} ugo+x ${PREFIX}/bin/doom
+	  ${ECHO_CMD} 'export PATH=.:$$PATH';${ECHO_CMD} "export DOOMWADDIR=${DATADIR}"; \
+	  ${ECHO_CMD} "./xdoom $$*") > ${STAGEDIR}${PREFIX}/bin/doom
+	@${CHMOD} ugo+x ${STAGEDIR}${PREFIX}/bin/doom
 
 .include "${.CURDIR}/../doom-data/Makefile.include"