From owner-freebsd-python@FreeBSD.ORG  Fri Jul 20 20:20:13 2012
Return-Path: <owner-freebsd-python@FreeBSD.ORG>
Delivered-To: freebsd-python@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ED638106566B
	for <freebsd-python@hub.freebsd.org>;
	Fri, 20 Jul 2012 20:20:12 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id BD8308FC16
	for <freebsd-python@hub.freebsd.org>;
	Fri, 20 Jul 2012 20:20:12 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q6KKKCOv016787
	for <freebsd-python@freefall.freebsd.org>; Fri, 20 Jul 2012 20:20:12 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q6KKKCUR016786;
	Fri, 20 Jul 2012 20:20:12 GMT (envelope-from gnats)
Date: Fri, 20 Jul 2012 20:20:12 GMT
Message-Id: <201207202020.q6KKKCUR016786@freefall.freebsd.org>
To: freebsd-python@FreeBSD.org
From: Marcus von Appen <mva@FreeBSD.org>
Cc: 
Subject: Re: ports/168640: [PATCH]: prevent checksum mismatches for compiled
 python files on installing python ports via the ports tree
X-BeenThere: freebsd-python@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Marcus von Appen <mva@FreeBSD.org>
List-Id: FreeBSD-specific Python issues <freebsd-python.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-python>, 
	<mailto:freebsd-python-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-python>
List-Post: <mailto:freebsd-python@freebsd.org>
List-Help: <mailto:freebsd-python-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-python>,
	<mailto:freebsd-python-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Jul 2012 20:20:13 -0000

The following reply was made to PR ports/168640; it has been noted by GNATS.

From: Marcus von Appen <mva@FreeBSD.org>
To: bug-followup@FreeBSD.org, portmgr@FreeBSD.org, python@FreeBSD.org
Cc:  
Subject: Re: ports/168640: [PATCH]: prevent checksum mismatches for compiled
 python files on installing python ports via the ports tree
Date: Fri, 20 Jul 2012 22:14:48 +0200

 --E13BgyNx05feLLmH
 Content-Type: multipart/mixed; boundary="MW5yreqqjyrRcusr"
 Content-Disposition: inline
 
 
 --MW5yreqqjyrRcusr
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Find below an updated patch for an exp-run and integration, once
 acknowledged by portmgr@.
 
 Regards
 Marcus
 
 --MW5yreqqjyrRcusr
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="cleanup_contents.diff"
 Content-Transfer-Encoding: quoted-printable
 
 Index: Mk/bsd.python.mk
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- Mk/bsd.python.mk	(revision 301239)
 +++ Mk/bsd.python.mk	(working copy)
 @@ -497,6 +497,9 @@
  PYDISTUTILS_EGGINFO?=3D	${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDI=
 STUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}.egg-info
  PYDISTUTILS_EGGINFODIR?=3D${PYTHONPREFIX_SITELIBDIR}
 =20
 +# Override bsd.port.mk's setting
 +_CLEANUP_CONTENTS+=3D	${SED} -i -e '/\.py[co]$$/{n;d;}' ${PKG_DBDIR}/${PKG=
 NAME}/+CONTENTS;
 +
  .if !defined(PYDISTUTILS_NOEGGINFO) && \
  	(defined(INSTALLS_EGGINFO) ||	\
  		(defined(USE_PYDISTUTILS) && \
 Index: Mk/bsd.port.mk
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- Mk/bsd.port.mk	(revision 301239)
 +++ Mk/bsd.port.mk	(working copy)
 @@ -5842,6 +5842,9 @@
  .endif
  .endif
 =20
 +_CLEANUP_CONTENTS?=3D	${DO_NADA};
 +
 +
  # Fake installation of package so that user can pkg_delete it later.
  # Also, make sure that an installed port is recognized correctly in
  # accordance to the @pkgdep directive in the packing lists
 @@ -5861,6 +5864,7 @@
  		${ECHO_MSG} "=3D=3D=3D>   Registering installation for ${PKGNAME}"; \
  		${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \
  		${PKG_CMD} ${PKG_ARGS} -O ${PKGFILE} > ${PKG_DBDIR}/${PKGNAME}/+CONTENTS=
 ; \
 +		${_CLEANUP_CONTENTS} \
  		${CP} ${DESCR} ${PKG_DBDIR}/${PKGNAME}/+DESC; \
  		${ECHO_CMD} ${COMMENT:Q} > ${PKG_DBDIR}/${PKGNAME}/+COMMENT; \
  		if [ -f ${PKGINSTALL} ]; then \
 
 --MW5yreqqjyrRcusr--
 
 --E13BgyNx05feLLmH
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (FreeBSD)
 
 iEYEARECAAYFAlAJvDgACgkQi68/ErJnpkeyiQCdFVM7nJCZ7vZzo1RnvfWlaBYX
 DpMAn3iBezNaMSBLGVt6bBp5MbVH+9sr
 =j4bW
 -----END PGP SIGNATURE-----
 
 --E13BgyNx05feLLmH--