CVS commit: [pkgsrc-2024Q4] pkgsrc/net/Radicale2

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Feb 10 19:23:25 UTC 2025

Modified Files:
        pkgsrc/net/Radicale2 [pkgsrc-2024Q4]: Makefile PLIST

Log Message:
Pullup ticket #6944 - requested by jakllsch
net/Radicale2: Runtime fix

Revisions pulled up:
- net/Radicale2/Makefile                                        1.16
- net/Radicale2/PLIST                                           1.4

---
   Module Name: pkgsrc
   Committed By:        jakllsch
   Date:                Wed Jan 22 15:57:26 UTC 2025

   Modified Files:
        pkgsrc/net/Radicale2: Makefile PLIST

   Log Message:
   Radicale2 doesn't work with python 3.12 or greater, due to

   An exception occurred during server startup: module 'ssl' has no attribute 'wrap_socket'

   While here, switch to wheel.mk, and add missing dependency.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.6.1 pkgsrc/net/Radicale2/Makefile
cvs rdiff -u -r1.3 -r1.3.6.1 pkgsrc/net/Radicale2/PLIST

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

Modified files:

Index: pkgsrc/net/Radicale2/Makefile
diff -u pkgsrc/net/Radicale2/Makefile:1.15 pkgsrc/net/Radicale2/Makefile:1.15.6.1
--- pkgsrc/net/Radicale2/Makefile:1.15  Fri May 17 15:49:08 2024
+++ pkgsrc/net/Radicale2/Makefile       Mon Feb 10 19:23:25 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2024/05/17 15:49:08 sborrill Exp $
+# $NetBSD: Makefile,v 1.15.6.1 2025/02/10 19:23:25 maya Exp $
 
 DISTNAME=      Radicale-2.1.12
+PKGREVISION=   1
 CATEGORIES=    net time www
 MASTER_SITES=  ${MASTER_SITE_PYPI:=R/Radicale/}
 
@@ -15,7 +16,7 @@ RADICALE_USER?=                       www
 RADICALE_GROUP?=               www
 PKG_GROUPS=                    ${RADICALE_GROUP}
 PKG_USERS=                     ${RADICALE_USER}:${RADICALE_GROUP}
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+PYTHON_VERSIONS_INCOMPATIBLE=  27 312 313
 
 INSTALLATION_DIRS=     ${EGDIR}
 OWN_DIRS=              ${PKG_SYSCONFDIR}/radicale
@@ -39,6 +40,7 @@ SUBST_FILES.server+=  config
 SUBST_STAGE.server=    pre-configure
 SUBST_MESSAGE.server=  Configure as a daemon by default, and override default collection location
 
+DEPENDS+=              ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=              ${PYPKGPREFIX}-vobject-[0-9]*:../../textproc/py-vobject
 
 # for md5 htpasswd_encryption method
@@ -48,5 +50,5 @@ DEPENDS+=             ${PYPKGPREFIX}-passlib-[0-9]*
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/config ${DESTDIR}${PREFIX}/${EGDIR}/config
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/Radicale2/PLIST
diff -u pkgsrc/net/Radicale2/PLIST:1.3 pkgsrc/net/Radicale2/PLIST:1.3.6.1
--- pkgsrc/net/Radicale2/PLIST:1.3      Fri May 17 15:49:08 2024
+++ pkgsrc/net/Radicale2/PLIST  Mon Feb 10 19:23:25 2025
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2024/05/17 15:49:08 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.3.6.1 2025/02/10 19:23:25 maya Exp $
 bin/radicale
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/COPYING
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/radicale/__init__.py
 ${PYSITELIB}/radicale/__init__.pyc
 ${PYSITELIB}/radicale/__init__.pyo