Date: Sat, 7 Jan 2012 18:23:54 -0800 From: Garrett Cooper <yanegomi@gmail.com> To: Michael Scheidell <scheidell@freebsd.org> Cc: cvs-ports@freebsd.org, douglas@douglasthrift.net, cvs-all@freebsd.org, ports-committers@freebsd.org Subject: Re: cvs commit: ports/devel/py-setuptools Makefile pkg-plist ports/devel/py-setuptools/files pkg-install.in Message-ID: <CAGH67wS19BV=000RAgm=t=_Z0FhB%2Bgsqo2z=h2onKUHB9DUmvA@mail.gmail.com> In-Reply-To: <201201061636.q06Ga3BI017302@repoman.freebsd.org> References: <201201061636.q06Ga3BI017302@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Jan 6, 2012 at 8:36 AM, Michael Scheidell <scheidell@freebsd.org> w=
rote:
> scheidell =A0 =A02012-01-06 16:36:03 UTC
>
> =A0FreeBSD ports repository
>
> =A0Modified files:
> =A0 =A0devel/py-setuptools =A0Makefile pkg-plist
> =A0Added files:
> =A0 =A0devel/py-setuptools/files pkg-install.in
> =A0Log:
> =A0- Fixes: easy-install.pth contents lost on upgrade clobbering ports us=
ing it
>
> =A0PR: =A0 =A0 =A0 =A0 =A0 =A0 ports/118301
> =A0Submitted by: =A0 Douglas William Thrift <douglas@douglasthrift.net>
> =A0Approved by: =A0 =A0lars.eggert@nokia.com (maintainer, timeout 3 years=
), gabor (mentor)
>
> =A0Revision =A0Changes =A0 =A0Path
> =A01.23 =A0 =A0 =A0+11 -1 =A0 =A0 ports/devel/py-setuptools/Makefile
> =A01.1 =A0 =A0 =A0 +24 -0 =A0 =A0 ports/devel/py-setuptools/files/pkg-ins=
tall.in (new)
> =A01.12 =A0 =A0 =A0+4 -2 =A0 =A0 =A0ports/devel/py-setuptools/pkg-plist
Some other issues with the patch:
1.
+ PKG_PREFIX=3D${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
This should be:
+ env PKG_PREFIX=3D${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
2. This line in the pkg_install.in disguises bugs with mv:
+exit 0
The overall script should be something like this:
ec=3D0
case $2 in
PRE-INSTALL)
if [ -f ${EASYINSTALL_PTH} ]; then
mv ${EASYINSTALL_PTH} ${EASYINSTALL_PTH}.tmp
ec=3D$?
fi
;;
POST-INSTALL)
if [ -f ${EASYINSTALL_PTH}.tmp ]; then
mv ${EASYINSTALL_PTH}.tmp ${EASYINSTALL_PTH}
ec=3D$?
fi
;;
esac
exit $ec
3. This doesn't fix parallel installation issue with easy-install
(see: http://mail.python.org/pipermail/distutils-sig/2009-March/011127.html
).
Thanks!
-Garrett
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGH67wS19BV=000RAgm=t=_Z0FhB%2Bgsqo2z=h2onKUHB9DUmvA>