cvs commit: ports/devel/py-setuptools Makefile pkg-plist ports/devel/py-setuptools/files pkg-install.in

[Garrett Cooper]

On Fri, Jan 6, 2012 at 8:36 AM, Michael Scheidell <scheidell at freebsd.org> wrote:
> scheidell    2012-01-06 16:36:03 UTC
>
>  FreeBSD ports repository
>
>  Modified files:
>    devel/py-setuptools  Makefile pkg-plist
>  Added files:
>    devel/py-setuptools/files pkg-install.in
>  Log:
>  - Fixes: easy-install.pth contents lost on upgrade clobbering ports using it
>
>  PR:             ports/118301
>  Submitted by:   Douglas William Thrift <douglas at douglasthrift.net>
>  Approved by:    lars.eggert at nokia.com (maintainer, timeout 3 years), gabor (mentor)
>
>  Revision  Changes    Path
>  1.23      +11 -1     ports/devel/py-setuptools/Makefile
>  1.1       +24 -0     ports/devel/py-setuptools/files/pkg-install.in (new)
>  1.12      +4 -2      ports/devel/py-setuptools/pkg-plist

Some other issues with the patch:

1.

+	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL

This should be:

+	env PKG_PREFIX=${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=0
case $2 in
     PRE-INSTALL)
		if [ -f ${EASYINSTALL_PTH} ]; then
		    mv ${EASYINSTALL_PTH} ${EASYINSTALL_PTH}.tmp
		    ec=$?
		fi
		;;
     POST-INSTALL)
		if [ -f ${EASYINSTALL_PTH}.tmp ]; then
		    mv ${EASYINSTALL_PTH}.tmp ${EASYINSTALL_PTH}
		    ec=$?
		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