Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Apr 2014 09:54:02 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r351195 - head/games/doom
Message-ID:  <201404130954.s3D9s2nC063337@svn.freebsd.org>

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



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