Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 Feb 2015 11:36:31 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r379901 - head/multimedia/mkvtoolnix
Message-ID:  <201502251136.t1PBaV5T053481@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Wed Feb 25 11:36:31 2015
New Revision: 379901
URL: https://svnweb.freebsd.org/changeset/ports/379901
QAT: https://qat.redports.org/buildarchive/r379901/

Log:
  multimedia/mkvtoolnix: set environment during build/install and unsuppress
  
  This port was strange in that it not only failed to set the environment,
  it was unsetting PREFIX to whatever environment it had.  This change sets
  the environment in both build and install targets with the exception of
  PREFIX.  I don't know why that is done, but I maintained that part.
  
  While here, unsuppress the commands so that the build can be logged and
  change ";" to "&&" conjunctions which is preferred.
  
  Approved by:	blanket

Modified:
  head/multimedia/mkvtoolnix/Makefile

Modified: head/multimedia/mkvtoolnix/Makefile
==============================================================================
--- head/multimedia/mkvtoolnix/Makefile	Wed Feb 25 11:35:14 2015	(r379900)
+++ head/multimedia/mkvtoolnix/Makefile	Wed Feb 25 11:36:31 2015	(r379901)
@@ -59,9 +59,10 @@ INSTALLS_ICONS=	yes
 .endif
 
 do-build:
-	@(cd ${WRKSRC}/; unset PREFIX; ./drake ${_MAKE_JOBS})
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV:NPREFIX=*} ./drake ${_MAKE_JOBS})
 
 do-install:
-	@(cd ${WRKSRC}/; unset PREFIX;  ./drake ${_MAKE_JOBS} ${MAKE_ARGS} install)
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV:NPREFIX=*} \
+		./drake ${_MAKE_JOBS} ${MAKE_ARGS} install)
 
 .include <bsd.port.mk>



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