CVS commit: pkgsrc/sysutils/gam

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Mar  8 13:20:15 UTC 2025

Modified Files:
        pkgsrc/sysutils/gam: Makefile PLIST

Log Message:
gam: simplify package by using more of the Python infrastructure

adapt wheel name for latest setuptools and depend on it

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/gam/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/gam/PLIST

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

Modified files:

Index: pkgsrc/sysutils/gam/Makefile
diff -u pkgsrc/sysutils/gam/Makefile:1.10 pkgsrc/sysutils/gam/Makefile:1.11
--- pkgsrc/sysutils/gam/Makefile:1.10   Fri Dec 13 13:33:44 2024
+++ pkgsrc/sysutils/gam/Makefile        Sat Mar  8 13:20:15 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2024/12/13 13:33:44 sborrill Exp $
+# $NetBSD: Makefile,v 1.11 2025/03/08 13:20:15 wiz Exp $
 
 DISTNAME=      gam-7.02.00
+PKGREVISION=   1
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=GAM-team/}
 GITHUB_PROJECT=        GAM
@@ -14,7 +15,6 @@ COMMENT=      Command line tool for Google Wo
 LICENSE=       apache-2.0
 
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=66.1.0:../../devel/py-setuptools
-
 DEPENDS+=      ${PYPKGPREFIX}-google-api-python-client>=2.0:../../www/py-google-api-python-client
 DEPENDS+=      ${PYPKGPREFIX}-google-auth>=1.11.2:../../security/py-google-auth
 DEPENDS+=      ${PYPKGPREFIX}-google-auth-httplib2-[0-9]*:../../security/py-google-auth-httplib2
@@ -25,9 +25,6 @@ DEPENDS+=     ${PYPKGPREFIX}-filelock-[0-9]*
 DEPENDS+=      ${PYPKGPREFIX}-passlib>=1.7.2:../../security/py-passlib
 DEPENDS+=      ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
 
-PLIST_SUBST+=  PYSITELIB=${PYSITELIB}
-PLIST_SUBST+=  INFODIR=GAM_for_Google_Workspace-${VERSION_TRIM}.dist-info
-
 REPLACE_PYTHON=        gam.py
 WRKSRC=                ${WRKDIR}/GAM-${PKGVERSION_NOREV}/src
 
@@ -36,7 +33,7 @@ SUBST_STAGE.version=  pre-configure
 SUBST_FILES.version=   setup.cfg
 SUBST_VARS.version=    PKGVERSION_NOREV
 
-INSTALLATION_DIRS=     bin ${PYSITELIB}
+WHEEL_NAME=    gam_for_google_workspace-${VERSION_TRIM}
 
 .include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/gam/PLIST
diff -u pkgsrc/sysutils/gam/PLIST:1.4 pkgsrc/sysutils/gam/PLIST:1.5
--- pkgsrc/sysutils/gam/PLIST:1.4       Tue Nov 19 15:35:39 2024
+++ pkgsrc/sysutils/gam/PLIST   Sat Mar  8 13:20:15 2025
@@ -1,11 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2024/11/19 15:35:39 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.5 2025/03/08 13:20:15 wiz Exp $
 bin/gam
-${PYSITELIB}/${INFODIR}/LICENSE
-${PYSITELIB}/${INFODIR}/METADATA
-${PYSITELIB}/${INFODIR}/RECORD
-${PYSITELIB}/${INFODIR}/WHEEL
-${PYSITELIB}/${INFODIR}/entry_points.txt
-${PYSITELIB}/${INFODIR}/top_level.txt
 ${PYSITELIB}/gam/__init__.py
 ${PYSITELIB}/gam/__init__.pyc
 ${PYSITELIB}/gam/__init__.pyo
@@ -196,3 +190,9 @@ ${PYSITELIB}/gam/iso8601/iso8601.pyo
 ${PYSITELIB}/gam/six.py
 ${PYSITELIB}/gam/six.pyc
 ${PYSITELIB}/gam/six.pyo
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt