Date: Sun, 23 Mar 2014 10:11:18 -0500 From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r348859 - head/Mk Message-ID: <532EF996.2070606@FreeBSD.org> In-Reply-To: <201403231509.s2NF9oIn048206@svn.freebsd.org> References: <201403231509.s2NF9oIn048206@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0KsviL92p2T7t85l12IjPeFOieERBvfKF Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 3/23/2014 10:09 AM, Bryan Drewery wrote: > Author: bdrewery > Date: Sun Mar 23 15:09:50 2014 > New Revision: 348859 > URL: http://svnweb.freebsd.org/changeset/ports/348859 > QAT: https://qat.redports.org/buildarchive/r348859/ >=20 > Log: > install-package: Use WRKDIR/PKGNAME.PKG_SUFX if available Got my msg backwards, this supports installing from PKGFILE if available as a fallback. > =20 > With hat: portmgr >=20 > Modified: > head/Mk/bsd.port.mk >=20 > Modified: head/Mk/bsd.port.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/Mk/bsd.port.mk Sun Mar 23 14:50:25 2014 (r348858) > +++ head/Mk/bsd.port.mk Sun Mar 23 15:09:50 2014 (r348859) > @@ -3835,13 +3835,17 @@ delete-package-list: delete-package-link > @${ECHO_CMD} "[ -f ${PKGFILE} ] && (${ECHO_CMD} deleting ${PKGFILE}; = ${RM} -f ${PKGFILE})" > .endif > =20 > -# Only used if !defined(NO_STAGE) > +# Used if !defined(NO_STAGE) during install, or manually to install pa= ckage > +# from local repository. > .if !target(install-package) > -install-package: > .if defined(FORCE_PKG_REGISTER) > - @${PKG_ADD} -f ${WRKDIR}/${PKGNAME}${PKG_SUFX} > +_INSTALL_PKG_ARGS=3D -f > +.endif > +install-package: > +.if exists(${WRKDIR}/${PKGNAME}${PKG_SUFX}) > + @${PKG_ADD} ${_INSTALL_PKG_ARGS} ${WRKDIR}/${PKGNAME}${PKG_SUFX} > .else > - @${PKG_ADD} ${WRKDIR}/${PKGNAME}${PKG_SUFX} > + @${PKG_ADD} ${_INSTALL_PKG_ARGS} ${PKGFILE} > .endif > .endif > =20 >=20 --=20 Regards, Bryan Drewery --0KsviL92p2T7t85l12IjPeFOieERBvfKF Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEbBAEBAgAGBQJTLvmWAAoJEDXXcbtuRpfPiNkH+L++gcyl9BgJkMP6vq/BH9cB za+XqizbhkjuReL5IwaHfW6oa+hIpmqZDu+i7TW02eXQQQkiaNhGPTNZ05TZM8xg lhIfpEbf32+Uw4XgVhMYLVNYbNHnoFNv6L3ztEtgi04zHqUS9J8VWiNuOkXnYW4b K554yBPv33ZJFS2ZeUHR33YACb8AA3AnfSl4h7w8ugzm14xYMw53O8KPwqh3g0o9 hPacjdxSNKuxGumbVFJOBiYu7VI5Yn8IYn81GIddHP7dAh6j4DLxFtMNRaUPrYev gGuKQJ+4VIXQzToAiFl/zC4TofHTg+4m4JlBwjL7FrjzdJiU9tn4qVgG0xy4EA== =zMkZ -----END PGP SIGNATURE----- --0KsviL92p2T7t85l12IjPeFOieERBvfKF--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?532EF996.2070606>