Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Feb 2012 11:43:23 -0500 (EST)
From:      Michael Scheidell <scheidell@FreeBSD.org>
To:        bug-followup@FreeBSD.org, gabor@freebsd.org, lwhsu@FreeBSD.org,  sunpoet@FreeBSD.org, python@freebsd.org
Cc:        nivit@FreeBSD.org, vivanov@ivanov-nest.com, lars.eggert@nokia.com
Subject:   Re: ports/118301: [patch] devel/py-setuptools easy-install.pth contents lost on upgrade clobbering ports using it
Message-ID:  <20120224164323.B31561D401@scanner.secnap.net>

next in thread | raw e-mail | index | archive | help

--ELM1330101803-86909-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="US-ASCII"

As promissed, attached is a patch to back out portrevision 3, or, most specifically, leave it as an option knob, default 
off.

It packages just fine, with and without:

http://people.freebsd.org/~scheidell/py27-setuptools-0.6c11_4.WITHOUT.log  (the default, just like it did before 
portrevision 3)

and, with: (with option knob set)

by looking at Makefile, and pkg-plist changes, I think I correctly wrapped !defines() around all the changed things.

(note: this sat for 3 years.  python@ got 'open pr' emails, once a week, so, speak up now, or forever hold your peace. or 
nra members, your piece)

I can tell you this packages, both ways, leaves no left overs, but I can't tell you if it solves the original problem with 
the knob, or the problem created with revision 3.  But I can tell you, it looks like this attached patch reverses revision 
3.

Please, if you have any stake in this, test it, or, in when this gets committed, don't complain.
-- 
Michael Scheidell, CTO
SECNAP Network Security Corporation
http://people.freebsd.org/~scheidell

______________________________________________________________________
This email has been scanned and certified safe by SpammerTrap(r). 
For Information please see http://www.spammertrap.com/
______________________________________________________________________  
  
--ELM1330101803-86909-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/x-patch
Content-Disposition: attachment; filename="pr_118301_devel_py-setuptools.patch"

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/py-setuptools/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile	8 Jan 2012 01:51:58 -0000	1.24
+++ Makefile	24 Feb 2012 16:35:57 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	setuptools
 PORTVERSION=	0.6c11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,6 +21,8 @@
 PYDISTUTILS_NOEGGINFO=	yes # XXX convert easy_install support to bsd.python.mk's
 PLIST_SUB=	VERSION=${PORTVERSION} PYVER=${PYTHON_VERSION:S/python//}
 
+OPTIONS=	EASYINSTALL "Use With Python easy-install" off
+
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_SUFFIX} < 25
@@ -31,13 +33,18 @@
 PLIST_SUB+=	PYTHON_OLD="@comment "
 .endif
 
+.if defined(WITH_EASYINSTALL)
 SUB_FILES=	pkg-install
 SUB_LIST=	EASYINSTALL_PTH=${EASYINSTALL_PTH}
+PLIST_SUB+=	EASYINSTALL=""
 
 EASYINSTALL_PTH=	${PYTHON_SITELIBDIR}/easy-install.pth
 
 pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+.else
+PLIST_SUB+=	EASYINSTALL="@comment "
+.endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/site.py ${PYTHON_SITELIBDIR}
@@ -45,8 +52,10 @@
 	${PYTHON_CMD} ${opt} -m compileall -l -x \
 		'^[^s][^i]?[^t]?[^e]?[^.][^p][^y]$$' ${PYTHON_SITELIBDIR}
 .endfor
+.if defined(WITH_EASYINSTALL)
 	${CP} ${EASYINSTALL_PTH} ${EASYINSTALL_PTH}.dist
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/devel/py-setuptools/pkg-plist,v
retrieving revision 1.13
diff -u -r1.13 pkg-plist
--- pkg-plist	8 Jan 2012 01:51:58 -0000	1.13
+++ pkg-plist	24 Feb 2012 16:35:57 -0000
@@ -3,8 +3,9 @@
 bin/easy_install-%%PYVER%%
 %%PYTHON_SITELIBDIR%%/setuptools.pth
 @unexec if cmp -s %B/easy-install.pth %B/easy-install.pth.dist; then rm %B/easy-install.pth; fi
-%%PYTHON_SITELIBDIR%%/easy-install.pth.dist
-@exec if [ ! -f %B/easy-install.pth ]; then cp %B/%f %B/easy-install.pth; fi
+@unexec if [ ! -f %B/easy-install.pth.dist ]; then rm %B/easy-install.pth; fi
+%%EASYINSTALL%%%%PYTHON_SITELIBDIR%%/easy-install.pth.dist
+%%EASYINSTALL%%@exec if [ ! -f %B/easy-install.pth ]; then cp %B/%f %B/easy-install.pth; fi
 %%PYTHON_SITELIBDIR%%/site.py
 %%PYTHON_SITELIBDIR%%/site.pyc
 %%PYTHON_SITELIBDIR%%/site.pyo

--ELM1330101803-86909-0_--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120224164323.B31561D401>