From owner-cvs-all@FreeBSD.ORG Sun Jan 8 02:23:56 2012 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAB9C1065700; Sun, 8 Jan 2012 02:23:56 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-tul01m020-f182.google.com (mail-tul01m020-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 6B3858FC1A; Sun, 8 Jan 2012 02:23:56 +0000 (UTC) Received: by obbwd18 with SMTP id wd18so4322703obb.13 for ; Sat, 07 Jan 2012 18:23:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=RHk+Jm4r7jjBTlHap/Z1O55P2rIBnaSfiJq4sfIqDz0=; b=OPQDXLUklFHjs4Ck9TyNunHzIpA4z0cQNqvmra5zTj8UI5j8/+58BBcBhqih4D+w8w uTljkZMWpZVrWn2zvVlot1IWPgQwBhAXlX66m10TGw08HNQhCDrs5ZCvIcAad6DnYcbe P+U22TLuVKkGB1LH6wuao0W5cnfSSknUKaCrM= MIME-Version: 1.0 Received: by 10.182.39.70 with SMTP id n6mr2818831obk.41.1325989434724; Sat, 07 Jan 2012 18:23:54 -0800 (PST) Received: by 10.182.152.6 with HTTP; Sat, 7 Jan 2012 18:23:54 -0800 (PST) In-Reply-To: <201201061636.q06Ga3BI017302@repoman.freebsd.org> References: <201201061636.q06Ga3BI017302@repoman.freebsd.org> Date: Sat, 7 Jan 2012 18:23:54 -0800 Message-ID: From: Garrett Cooper To: Michael Scheidell Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable 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 X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jan 2012 02:23:56 -0000 On Fri, Jan 6, 2012 at 8:36 AM, Michael Scheidell 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 > =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