ports/168640: [PATCH]: prevent checksum mismatches for compiled python files on installing python ports via the ports tree

[Marcus von Appen]

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

From: Marcus von Appen <mva at FreeBSD.org>
To: bug-followup at FreeBSD.org, portmgr at FreeBSD.org, python at 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 at .
 
 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--