CVS commit: pkgsrc/devel/py-mercurial

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Dec 31 07:09:22 UTC 2021

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile PLIST

Log Message:
py-mercurial: Fix packaging with recent Python change

* Use egg.mk explicitly.
* Bump PKGREVISION to install egg files.

Fix PR pkg/56593.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/devel/py-mercurial/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-mercurial/Makefile
diff -u pkgsrc/devel/py-mercurial/Makefile:1.62 pkgsrc/devel/py-mercurial/Makefile:1.63
--- pkgsrc/devel/py-mercurial/Makefile:1.62     Sun Nov 28 10:36:14 2021
+++ pkgsrc/devel/py-mercurial/Makefile  Fri Dec 31 07:09:22 2021
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.62 2021/11/28 10:36:14 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2021/12/31 07:09:22 ryoon Exp $
 #
 # Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
 
 DISTNAME=      mercurial-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel scm
 MASTER_SITES=  https://www.mercurial-scm.org/release/
 
@@ -44,5 +45,5 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/README.rst  \
                ${DESTDIR}${PREFIX}/share/doc/mercurial
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-mercurial/PLIST
diff -u pkgsrc/devel/py-mercurial/PLIST:1.36 pkgsrc/devel/py-mercurial/PLIST:1.37
--- pkgsrc/devel/py-mercurial/PLIST:1.36        Sun Nov 28 10:36:14 2021
+++ pkgsrc/devel/py-mercurial/PLIST     Fri Dec 31 07:09:22 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2021/11/28 10:36:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.37 2021/12/31 07:09:22 ryoon Exp $
 bin/hg
 ${PYSITELIB}/hgdemandimport/__init__.py
 ${PYSITELIB}/hgdemandimport/__init__.pyc
@@ -463,7 +463,10 @@ ${PYSITELIB}/hgext/zeroconf/__init__.pyo
 ${PYSITELIB}/hgext3rd/__init__.py
 ${PYSITELIB}/hgext3rd/__init__.pyc
 ${PYSITELIB}/hgext3rd/__init__.pyo
-${PYSITELIB}/${EGG_FILE}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/mercurial/__init__.py
 ${PYSITELIB}/mercurial/__init__.pyc
 ${PYSITELIB}/mercurial/__init__.pyo