Date: Sat, 23 Feb 2013 20:40:01 GMT From: Geoff Garside <freebsd@geoffgarside.co.uk> To: freebsd-python@FreeBSD.org Subject: Re: ports/176375: [PATCH] sysutils/py-salt-api: fix build and removal Message-ID: <201302232040.r1NKe1lf089221@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/176375; it has been noted by GNATS.
From: Geoff Garside <freebsd@geoffgarside.co.uk>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/176375: [PATCH] sysutils/py-salt-api: fix build and removal
Date: Sat, 23 Feb 2013 20:23:57 +0000
--Apple-Mail=_F75D6C8C-7F69-486A-906A-8EF14E135815
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
charset=windows-1252
On 23 Feb 2013, at 19:55, Ruslan Makhmatkhanov <cvs-src@yandex.ru> =
wrote:
> Hi Geoff,
>=20
> Geoff Garside wrote on 23.02.2013 21:14:
>>=20
>>> Number: 176375
>>> Category: ports
>>> Synopsis: [PATCH] sysutils/py-salt-api: fix build and removal
>=20
>> =85snipped...
>=20
> it's ok to leave ${PYTHON_PKGNAMEPREFIX}, but it should be used like =
this (note the version specification):
>=20
> BUILD_DEPENDS+=3D =
${PYTHON_PKGNAMEPREFIX}salt>0:${PORTSDIR}/sysutils/py-salt
>=20
> --=20
> Regards,
> Ruslan
>=20
> Tinderboxing kills... the drives.
Thanks for the tip Ruslan, I wasn't aware a version specification would =
fix it resolving the dependency like that.
I've made the recommended change and have run it through redports =
successfully. Updated patch is attached.
--
Geoff
--Apple-Mail=_F75D6C8C-7F69-486A-906A-8EF14E135815
Content-Disposition: attachment;
filename=sysutils_py-salt-api.txt
Content-Type: text/plain;
name="sysutils_py-salt-api.txt"
Content-Transfer-Encoding: quoted-printable
diff -ruN /usr/ports/sysutils/py-salt-api/Makefile =
sysutils/py-salt-api/Makefile
--- /usr/ports/sysutils/py-salt-api/Makefile 2013-01-27 =
21:48:48.000000000 +0000
+++ sysutils/py-salt-api/Makefile 2013-02-23 20:14:37.934474194 =
+0000
@@ -20,7 +20,7 @@
MAN1=3D salt-api.1
MAN7=3D salt-api.7
=20
-BUILD_DEPENDS+=3D =
${PYTHON_PKGNAMEPREFIX}salt:${PORTSDIR}/sysutils/py-salt
+BUILD_DEPENDS+=3D =
${PYTHON_PKGNAMEPREFIX}salt>0:${PORTSDIR}/sysutils/py-salt
=20
RUN_DEPENDS:=3D ${BUILD_DEPENDS}
=20
diff -ruN /usr/ports/sysutils/py-salt-api/pkg-plist =
sysutils/py-salt-api/pkg-plist
--- /usr/ports/sysutils/py-salt-api/pkg-plist 2013-01-27 =
21:48:48.000000000 +0000
+++ sysutils/py-salt-api/pkg-plist 2013-02-23 16:27:52.603677473 =
+0000
@@ -26,6 +26,6 @@
%%PYTHON_SITELIBDIR%%/saltapi/version.py
%%PYTHON_SITELIBDIR%%/saltapi/version.pyc
%%PYTHON_SITELIBDIR%%/saltapi/version.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/saltapi/netapi
@dirrm %%PYTHON_SITELIBDIR%%/saltapi/netapi/rest_cherrypy
+@dirrm %%PYTHON_SITELIBDIR%%/saltapi/netapi
@dirrm %%PYTHON_SITELIBDIR%%/saltapi
--Apple-Mail=_F75D6C8C-7F69-486A-906A-8EF14E135815--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302232040.r1NKe1lf089221>