CVS commit: pkgsrc/www/ap2-python

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug 14 07:40:41 UTC 2023

Modified Files:
        pkgsrc/www/ap2-python: Makefile PLIST

Log Message:
ap2-python: hack around issue when setuptools is installed

Just depend on it.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/www/ap2-python/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/ap2-python/PLIST

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

Modified files:

Index: pkgsrc/www/ap2-python/Makefile
diff -u pkgsrc/www/ap2-python/Makefile:1.40 pkgsrc/www/ap2-python/Makefile:1.41
--- pkgsrc/www/ap2-python/Makefile:1.40 Mon Aug 14 05:25:28 2023
+++ pkgsrc/www/ap2-python/Makefile      Mon Aug 14 07:40:41 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2023/08/14 05:25:28 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2023/08/14 07:40:41 wiz Exp $
 
 DISTNAME=      mod_python-3.5.0
 PKGNAME=       ${APACHE_PKG_PREFIX}-${PYPKGPREFIX}-${DISTNAME:S/mod_//}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    www python
 MASTER_SITES=  http://dist.modpython.org/dist/
 EXTRACT_SUFX=  .tgz
@@ -12,6 +12,10 @@ HOMEPAGE=    http://www.modpython.org/
 COMMENT=       Apache module that embeds the Python interpreter
 LICENSE=       apache-2.0
 
+# HACK: This is not needed, but if it's installed, the PLIST differs
+# so just depend on it to make it consistently install the same files.
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+
 MAKE_JOBS_SAFE=                no
 
 APACHE_MODULE=         yes

Index: pkgsrc/www/ap2-python/PLIST
diff -u pkgsrc/www/ap2-python/PLIST:1.7 pkgsrc/www/ap2-python/PLIST:1.8
--- pkgsrc/www/ap2-python/PLIST:1.7     Sun Apr  3 08:58:46 2022
+++ pkgsrc/www/ap2-python/PLIST Mon Aug 14 07:40:41 2023
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.7 2022/04/03 08:58:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2023/08/14 07:40:41 wiz Exp $
 bin/mod_python
 lib/httpd/mod_python.so
-${PYSITELIB}/mod_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info
+${PYSITELIB}/mod_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/PKG-INFO
+${PYSITELIB}/mod_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
+${PYSITELIB}/mod_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
+${PYSITELIB}/mod_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/top_level.txt
 ${PYSITELIB}/mod_python/Cookie.py
 ${PYSITELIB}/mod_python/Cookie.pyc
 ${PYSITELIB}/mod_python/Cookie.pyo