CVS commit: pkgsrc/chat/gajim

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Dec 25 10:54:20 UTC 2023

Modified Files:
        pkgsrc/chat/gajim: Makefile PLIST

Log Message:
gajim: convert to wheel.mk

While here, add missing file to PLIST.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/chat/gajim/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/chat/gajim/PLIST

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

Modified files:

Index: pkgsrc/chat/gajim/Makefile
diff -u pkgsrc/chat/gajim/Makefile:1.73 pkgsrc/chat/gajim/Makefile:1.74
--- pkgsrc/chat/gajim/Makefile:1.73     Tue Nov 14 14:01:29 2023
+++ pkgsrc/chat/gajim/Makefile  Mon Dec 25 10:54:20 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2023/11/14 14:01:29 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2023/12/25 10:54:20 wiz Exp $
 
 DISTNAME=      gajim-1.3.3
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    chat
 MASTER_SITES=  https://www.gajim.org/downloads/${PKGVERSION_NOREV:R}/
 
@@ -10,24 +10,24 @@ HOMEPAGE=   http://www.gajim.org/
 COMMENT=       XMPP/Jabber chat client written in Python/GTK3
 LICENSE=       gnu-gpl-v3
 
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=0:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
+DEPENDS+=      ${PYPKGPREFIX}-cairo>=1.16.0:../../graphics/py-cairo
+DEPENDS+=      ${PYPKGPREFIX}-css-parser-[0-9]*:../../textproc/py-css-parser
+DEPENDS+=      ${PYPKGPREFIX}-keyring-[0-9]*:../../security/py-keyring
+DEPENDS+=      ${PYPKGPREFIX}-nbxmpp>=2.0.1:../../chat/py-nbxmpp
+DEPENDS+=      ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
+DEPENDS+=      ${PYPKGPREFIX}-precis-i18n-[0-9]*:../../textproc/py-precis-i18n
+
 WRKSRC=                ${WRKDIR}/gajim-gajim-${PKGVERSION_NOREV}
 
 USE_TOOLS+=    gettext
 
-USE_PKG_RESOURCES=     yes
-
 MANCOMPRESSED= yes
 MAKE_ENV+=     PKGMANDIR=${PKGMANDIR}
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-DEPENDS+=      ${PYPKGPREFIX}-cairo>=1.16.0:../../graphics/py-cairo
-DEPENDS+=      ${PYPKGPREFIX}-css-parser-[0-9]*:../../textproc/py-css-parser
-DEPENDS+=      ${PYPKGPREFIX}-keyring-[0-9]*:../../security/py-keyring
-DEPENDS+=      ${PYPKGPREFIX}-nbxmpp>=2.0.1:../../chat/py-nbxmpp
-DEPENDS+=      ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
-DEPENDS+=      ${PYPKGPREFIX}-precis-i18n-[0-9]*:../../textproc/py-precis-i18n
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin"
@@ -38,7 +38,7 @@ DEPENDS+=     ${PYPKGPREFIX}-pyobjc-framewor
 .include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/batteries-included.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 PYTHON_VERSIONED_DEPENDENCIES+=        OpenSSL
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../x11/gtk3/buildlink3.mk"

Index: pkgsrc/chat/gajim/PLIST
diff -u pkgsrc/chat/gajim/PLIST:1.7 pkgsrc/chat/gajim/PLIST:1.8
--- pkgsrc/chat/gajim/PLIST:1.7 Fri Mar  4 09:34:29 2022
+++ pkgsrc/chat/gajim/PLIST     Mon Dec 25 10:54:20 2023
@@ -1,13 +1,14 @@
-@comment $NetBSD: PLIST,v 1.7 2022/03/04 09:34:29 nia Exp $
+@comment $NetBSD: PLIST,v 1.8 2023/12/25 10:54:20 wiz Exp $
 bin/gajim
 bin/gajim-history-manager
 bin/gajim-remote
-${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}/AUTHORS
+${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}/gajim/__init__.py
 ${PYSITELIB}/gajim/__init__.pyc
 ${PYSITELIB}/gajim/__init__.pyo
@@ -1197,6 +1198,7 @@ ${PYSITELIB}/gajim/gtk/emoji_chooser.pyc
 ${PYSITELIB}/gajim/gtk/emoji_chooser.pyo
 ${PYSITELIB}/gajim/gtk/emoji_data.py
 ${PYSITELIB}/gajim/gtk/emoji_data.pyc
+${PYSITELIB}/gajim/gtk/emoji_data.pyi
 ${PYSITELIB}/gajim/gtk/emoji_data.pyo
 ${PYSITELIB}/gajim/gtk/exception.py
 ${PYSITELIB}/gajim/gtk/exception.pyc