From owner-svn-ports-all@freebsd.org Wed Jul 1 02:47:35 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 06F769913F9; Wed, 1 Jul 2015 02:47:35 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) 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 EBD7F1C4F; Wed, 1 Jul 2015 02:47:34 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t612lYgh001459; Wed, 1 Jul 2015 02:47:34 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t612lYJp001458; Wed, 1 Jul 2015 02:47:34 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201507010247.t612lYJp001458@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 1 Jul 2015 02:47:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391027 - head/x11-fm/doublecmd 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.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jul 2015 02:47:35 -0000 Author: amdmi3 Date: Wed Jul 1 02:47:34 2015 New Revision: 391027 URL: https://svnweb.freebsd.org/changeset/ports/391027 Log: - Pass MAKE_ENV to build commands, fixing built with ccache as a result PR: 201219 Submitted by: andrey@bsdnir.info Approved by: bbtruk@users.sourceforge.net (maintainer) Modified: head/x11-fm/doublecmd/Makefile Modified: head/x11-fm/doublecmd/Makefile ============================================================================== --- head/x11-fm/doublecmd/Makefile Wed Jul 1 02:46:20 2015 (r391026) +++ head/x11-fm/doublecmd/Makefile Wed Jul 1 02:47:34 2015 (r391027) @@ -3,6 +3,7 @@ PORTNAME= doublecmd PORTVERSION= 0.6.3 +PORTREVISION= 1 CATEGORIES= x11-fm MASTER_SITES= SF/${PORTNAME}/Double%20Commander%20Source DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -135,72 +136,72 @@ do-build: doublecmd/doublecmd_common.lpk KASToolBar/kascomp.lpk \ viewer/viewerpackage.lpk gifanim/pkg_gifanim.lpk \ ZVDateTimeCtrls/zvdatetimectrls.lpk - @cd ${WRKSRC}/components && \ + @cd ${WRKSRC}/components && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "${FILE}" .endfor .if ${PORT_OPTIONS:MWCX_CPIO} - @cd ${WRKSRC}/plugins && \ + @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/cpio/src/cpio.lpi" .endif .if ${PORT_OPTIONS:MWCX_DEB} - @cd ${WRKSRC}/plugins && \ + @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/deb/src/deb.lpi" .endif .if ${PORT_OPTIONS:MWCX_UNBZ2} - @cd ${WRKSRC}/plugins && \ + @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/unbz2/src/unbz2.lpi" .endif .if ${PORT_OPTIONS:MWCX_RPM} - @cd ${WRKSRC}/plugins && \ + @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/rpm/src/rpm.lpi" .endif .if ${PORT_OPTIONS:MWCX_UNRAR} - @cd ${WRKSRC}/plugins && \ + @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/unrar/src/unrar.lpi" .endif .if ${PORT_OPTIONS:MWCX_ZIP} - @cd ${WRKSRC}/plugins && \ + @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/zip/src/Zip.lpi" .endif .if ${PORT_OPTIONS:MWDX_RPM} - @cd ${WRKSRC}/plugins && \ + @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/rpm_wdx/src/rpm_wdx.lpi" .endif .if ${PORT_OPTIONS:MWDX_DEB} - @cd ${WRKSRC}/plugins && \ + @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/deb_wdx/src/deb_wdx.lpi" .endif .if ${PORT_OPTIONS:MWDX_SVN} - @cd ${WRKSRC}/plugins && \ + @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/svn_wdx/src/svn_wdx.lpi" .endif .if ${PORT_OPTIONS:MWDX_XPI} - @cd ${WRKSRC}/plugins && \ + @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/xpi_wdx/src/xpi_wdx.lpi" .endif .if ${PORT_OPTIONS:MWFX_FTP} - @cd ${WRKSRC}/plugins && \ + @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wfx/ftp/src/ftp.lpi" .endif .if ${PORT_OPTIONS:MWFX_SAMBA} - @cd ${WRKSRC}/plugins && \ + @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wfx/samba/src/samba.lpi" .endif .if ${PORT_OPTIONS:MWLX_MPLAYER} - @cd ${WRKSRC}/plugins && \ + @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wlx/WlxMplayer/src/wlxMplayer.lpi" .endif .if ${PORT_OPTIONS:MDSX_LOCATE} - @cd ${WRKSRC}/plugins && \ + @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "dsx/DSXLocate/src/DSXLocate.lpi" .endif - @cd ${WRKSRC} && \ + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --bm="${BUILD_MODE}" --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE} post-build: