Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7A9C884F98 for ; Mon, 23 Oct 2023 06:38:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id PmCFKdw9Pt3y for ; Mon, 23 Oct 2023 06:38:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 62E6D84CD8 for ; Mon, 23 Oct 2023 06:38:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 55FA9FADC; Mon, 23 Oct 2023 06:38:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_16980430812450" MIME-Version: 1.0 Date: Mon, 23 Oct 2023 06:38:01 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20231023063801.55FA9FADC@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_16980430812450 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Mon Oct 23 06:37:59 UTC 2023 Modified Files: pkgsrc/archivers/zziplib: Makefile pkgsrc/audio/cplay: Makefile pkgsrc/audio/py-beets: Makefile pkgsrc/audio/py-musicbrainz-ngs: Makefile pkgsrc/audio/solfege: Makefile pkgsrc/chat/bitlbee: Makefile pkgsrc/chat/gajim: Makefile pkgsrc/chat/matrix-synapse: Makefile pkgsrc/chat/py-xmpppy: Makefile pkgsrc/chat/spectrum: Makefile pkgsrc/chat/telepathy-gabble: Makefile pkgsrc/chat/telepathy-glib: Makefile pkgsrc/chat/telepathy-haze: Makefile pkgsrc/chat/telepathy-idle: Makefile pkgsrc/chat/telepathy-logger: Makefile pkgsrc/chat/telepathy-mission-control5: Makefile pkgsrc/chat/telepathy-qt: Makefile pkgsrc/chat/tootstream: Makefile pkgsrc/converters/py-zfec: Makefile pkgsrc/databases: Makefile pkgsrc/databases/gramps5: Makefile options.mk pkgsrc/databases/py-aiosqlite: Makefile pkgsrc/databases/py-kb: Makefile pkgsrc/databases/py-peewee: MESSAGE Makefile pkgsrc/devel: Makefile pkgsrc/devel/apenwarr-redo: Makefile pkgsrc/devel/bpython: Makefile pkgsrc/devel/breezy: MESSAGE pkgsrc/devel/doxygen: Makefile pkgsrc/devel/gdbus-codegen: Makefile pkgsrc/devel/glib2: Makefile pkgsrc/devel/gobject-introspection: Makefile pkgsrc/devel/libdbusmenu-tools: Makefile pkgsrc/devel/py-blessed: Makefile pkgsrc/devel/py-blessings: Makefile pkgsrc/devel/py-buildbot: Makefile pkgsrc/devel/py-coverage: Makefile pkgsrc/devel/py-extension-helpers: Makefile pkgsrc/devel/py-freezegun: Makefile pkgsrc/devel/py-hg-evolve: Makefile pkgsrc/devel/py-hg-fastimport: Makefile pkgsrc/devel/py-ipython: Makefile pkgsrc/devel/py-lockfile: Makefile pkgsrc/devel/py-mercurial: Makefile pkgsrc/devel/py-pysvn: Makefile pkgsrc/devel/py-rope: Makefile pkgsrc/devel/py-setuptools44: Makefile pkgsrc/devel/py-stem: Makefile pkgsrc/devel/py-test: Makefile pkgsrc/devel/py-test4: Makefile pkgsrc/devel/py-trytond: Makefile pkgsrc/devel/py-urwid: Makefile pkgsrc/devel/py-virtualenv: Makefile pkgsrc/devel/py-visitor: Makefile pkgsrc/devel/py27-coverage: Makefile pkgsrc/devel/ropper: Makefile pkgsrc/devel/rox-lib: Makefile pkgsrc/doc: CHANGES-2023 pkgsrc/editors/fileobj: Makefile pkgsrc/editors/medit: Makefile pkgsrc/editors/py-jedi: Makefile pkgsrc/editors/tp-note: Makefile pkgsrc/editors/zim: Makefile pkgsrc/emulators/fs-uae-arcade: Makefile pkgsrc/emulators/fs-uae-launcher: Makefile pkgsrc/emulators/mame: Makefile pkgsrc/filesystems/tahoe-lafs: Makefile pkgsrc/finance/gnucash: options.mk pkgsrc/fonts/py-fonttools: Makefile pkgsrc/games/supertuxkart: Makefile pkgsrc/games/unknown-horizons: Makefile pkgsrc/games/wordsearch: Makefile pkgsrc/graphics/MesaLib: Makefile pkgsrc/graphics/comix: Makefile pkgsrc/graphics/glad: Makefile pkgsrc/graphics/inkscape: Makefile pkgsrc/graphics/libepoxy: Makefile pkgsrc/graphics/py-mcomix: Makefile pkgsrc/inputmethod/ibus-table: Makefile pkgsrc/inputmethod/tegaki-python: Makefile pkgsrc/lang/mozjs78: Makefile pkgsrc/lang/nodejs: Makefile pkgsrc/lang/nodejs16: Makefile pkgsrc/lang/nodejs18: Makefile pkgsrc/mail/feed2exec: Makefile pkgsrc/mail/gyb: Makefile pkgsrc/mail/meli: Makefile pkgsrc/mail/newspipe: Makefile pkgsrc/mail/offlineimap: Makefile pkgsrc/mail/rss2email: Makefile pkgsrc/mail/thunderbird: mozilla-common.mk pkgsrc/mail/thunderbird102: mozilla-common.mk pkgsrc/mail/thunderbird78: mozilla-common.mk pkgsrc/math/py-pandas: Makefile pkgsrc/math/py-rpy: Makefile pkgsrc/meta-pkgs/bulk-medium: Makefile pkgsrc/meta-pkgs/bulk-small: Makefile pkgsrc/misc/calibre: Makefile pkgsrc/misc/libreoffice: Makefile pkgsrc/multimedia/pitivi: Makefile pkgsrc/multimedia/sickgear: Makefile pkgsrc/net/gallery-dl: Makefile pkgsrc/net/mitmproxy: Makefile pkgsrc/net/nyx: Makefile pkgsrc/net/py-botocore: Makefile pkgsrc/net/py-google-cloud-sdk: Makefile pkgsrc/net/py-hatop: Makefile pkgsrc/net/py-kenosis: Makefile pkgsrc/net/py-magic-wormhole-transit-relay: Makefile pkgsrc/net/py-s3cmd: Makefile pkgsrc/net/rabbitmq: Makefile pkgsrc/net/samba4: Makefile pkgsrc/net/speedtest-cli: Makefile pkgsrc/net/zenmap: Makefile pkgsrc/print/py-reportlab: Makefile pkgsrc/security/fail2ban: Makefile pkgsrc/security/gpg-tui: Makefile pkgsrc/security/py-certbot: Makefile pkgsrc/security/py-denyhosts: Makefile pkgsrc/security/py-lasso: Makefile pkgsrc/security/sqlmap: Makefile pkgsrc/security/volatility3: Makefile pkgsrc/shells/lshell: Makefile pkgsrc/sysutils/bracket: Makefile pkgsrc/sysutils/broot: Makefile pkgsrc/sysutils/ovmf: Makefile pkgsrc/sysutils/py-Glances: Makefile pkgsrc/sysutils/py-appnope: Makefile pkgsrc/sysutils/py-dbus: Makefile pkgsrc/sysutils/py-diffoscope: Makefile pkgsrc/sysutils/py27-dbus: Makefile pkgsrc/sysutils/salt-docs: Makefile pkgsrc/sysutils/vxargs: Makefile pkgsrc/sysutils/xentools415: Makefile pkgsrc/textproc: Makefile pkgsrc/textproc/iso-codes: Makefile pkgsrc/textproc/jless: Makefile pkgsrc/textproc/py-docutils: Makefile pkgsrc/textproc/py-elementpath: Makefile pkgsrc/textproc/py-epr-reader: Makefile pkgsrc/textproc/py-gnosis-utils: Makefile pkgsrc/textproc/py-libxml2: Makefile pkgsrc/textproc/py-libxslt: Makefile pkgsrc/textproc/py-lxml: Makefile pkgsrc/textproc/py-nltk: Makefile pkgsrc/textproc/py-xmlschema: Makefile pkgsrc/textproc/py-xmltodict: Makefile pkgsrc/time/khal: Makefile pkgsrc/time/ntpsec: Makefile pkgsrc/time/py-jrnl: Makefile pkgsrc/time/py-vdirsyncer: Makefile pkgsrc/www/arcticfox: Makefile pkgsrc/www/firefox: mozilla-common.mk pkgsrc/www/firefox102: mozilla-common.mk pkgsrc/www/firefox115: mozilla-common.mk pkgsrc/www/firefox52: mozilla-common.mk pkgsrc/www/ikiwiki: options.mk pkgsrc/www/py-django: MESSAGE pkgsrc/www/py-django3: MESSAGE pkgsrc/www/py-genshi: Makefile pkgsrc/www/py-httpie: Makefile pkgsrc/www/py-sydent: Makefile pkgsrc/www/py-uwsgitop: Makefile pkgsrc/www/seamonkey: mozilla-common.mk pkgsrc/www/trac: options.mk pkgsrc/www/tuir: Makefile pkgsrc/www/webkit-gtk: Makefile pkgsrc/x11/alacritty: Makefile pkgsrc/x11/driconf: Makefile pkgsrc/x11/gtk2: Makefile pkgsrc/x11/py-xcbgen: Makefile pkgsrc/x11/qt5-qtwebengine: Makefile pkgsrc/x11/qt5-qtwebkit: Makefile pkgsrc/x11/xcb-util-errors: Makefile pkgsrc/x11/xcolor: Makefile Removed Files: pkgsrc/databases/py-sqlite3: DESCR Makefile PLIST pkgsrc/databases/py-sqlite3/files: setup.py pkgsrc/devel/py-curses: DESCR Makefile PLIST pkgsrc/devel/py-curses/files: Setup.in setup.py pkgsrc/devel/py-cursespanel: DESCR Makefile PLIST pkgsrc/devel/py-cursespanel/files: setup.py pkgsrc/devel/py-readline: DESCR Makefile PLIST pkgsrc/devel/py-readline/files: Setup.in setup.py pkgsrc/textproc/py-cElementTree: DESCR Makefile PLIST pkgsrc/textproc/py-cElementTree/files: setup.py pkgsrc/textproc/py-expat: DESCR Makefile PLIST pkgsrc/textproc/py-expat/files: setup.py Log Message: *: update for Python base package change Instead of depending on one of the removed packages (that are now included in the base Python packages), include batteries-included.mk to require a Python version that supplies them. Remove now included packages. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 pkgsrc/archivers/zziplib/Makefile cvs rdiff -u -r1.24 -r1.25 pkgsrc/audio/cplay/Makefile cvs rdiff -u -r1.31 -r1.32 pkgsrc/audio/py-beets/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/py-musicbrainz-ngs/Makefile cvs rdiff -u -r1.91 -r1.92 pkgsrc/audio/solfege/Makefile cvs rdiff -u -r1.92 -r1.93 pkgsrc/chat/bitlbee/Makefile cvs rdiff -u -r1.70 -r1.71 pkgsrc/chat/gajim/Makefile cvs rdiff -u -r1.81 -r1.82 pkgsrc/chat/matrix-synapse/Makefile cvs rdiff -u -r1.27 -r1.28 pkgsrc/chat/py-xmpppy/Makefile cvs rdiff -u -r1.119 -r1.120 pkgsrc/chat/spectrum/Makefile cvs rdiff -u -r1.89 -r1.90 pkgsrc/chat/telepathy-gabble/Makefile cvs rdiff -u -r1.81 -r1.82 pkgsrc/chat/telepathy-glib/Makefile cvs rdiff -u -r1.27 -r1.28 pkgsrc/chat/telepathy-haze/Makefile cvs rdiff -u -r1.53 -r1.54 pkgsrc/chat/telepathy-idle/Makefile cvs rdiff -u -r1.63 -r1.64 pkgsrc/chat/telepathy-logger/Makefile cvs rdiff -u -r1.37 -r1.38 pkgsrc/chat/telepathy-mission-control5/Makefile cvs rdiff -u -r1.23 -r1.24 pkgsrc/chat/telepathy-qt/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/chat/tootstream/Makefile cvs rdiff -u -r1.34 -r1.35 pkgsrc/converters/py-zfec/Makefile cvs rdiff -u -r1.691 -r1.692 pkgsrc/databases/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/gramps5/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/gramps5/options.mk cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/py-aiosqlite/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/py-kb/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/py-peewee/MESSAGE cvs rdiff -u -r1.97 -r1.98 pkgsrc/databases/py-peewee/Makefile cvs rdiff -u -r1.2 -r0 pkgsrc/databases/py-sqlite3/DESCR \ pkgsrc/databases/py-sqlite3/PLIST cvs rdiff -u -r1.48 -r0 pkgsrc/databases/py-sqlite3/Makefile cvs rdiff -u -r1.2 -r0 pkgsrc/databases/py-sqlite3/files/setup.py cvs rdiff -u -r1.4074 -r1.4075 pkgsrc/devel/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/apenwarr-redo/Makefile cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/bpython/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/breezy/MESSAGE cvs rdiff -u -r1.176 -r1.177 pkgsrc/devel/doxygen/Makefile cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/gdbus-codegen/Makefile cvs rdiff -u -r1.295 -r1.296 pkgsrc/devel/glib2/Makefile cvs rdiff -u -r1.87 -r1.88 pkgsrc/devel/gobject-introspection/Makefile cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/libdbusmenu-tools/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-blessed/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-blessings/Makefile cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/py-buildbot/Makefile cvs rdiff -u -r1.41 -r1.42 pkgsrc/devel/py-coverage/Makefile cvs rdiff -u -r1.2 -r0 pkgsrc/devel/py-curses/DESCR cvs rdiff -u -r1.54 -r0 pkgsrc/devel/py-curses/Makefile cvs rdiff -u -r1.3 -r0 pkgsrc/devel/py-curses/PLIST cvs rdiff -u -r1.2 -r0 pkgsrc/devel/py-curses/files/Setup.in \ pkgsrc/devel/py-curses/files/setup.py cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/devel/py-cursespanel/DESCR cvs rdiff -u -r1.34 -r0 pkgsrc/devel/py-cursespanel/Makefile cvs rdiff -u -r1.2 -r0 pkgsrc/devel/py-cursespanel/PLIST cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/devel/py-cursespanel/files/setup.py cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-extension-helpers/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/py-freezegun/Makefile cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/py-hg-evolve/Makefile cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/py-hg-fastimport/Makefile cvs rdiff -u -r1.95 -r1.96 pkgsrc/devel/py-ipython/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-lockfile/Makefile cvs rdiff -u -r1.88 -r1.89 pkgsrc/devel/py-mercurial/Makefile cvs rdiff -u -r1.54 -r1.55 pkgsrc/devel/py-pysvn/Makefile cvs rdiff -u -r1.1 -r0 pkgsrc/devel/py-readline/DESCR cvs rdiff -u -r1.35 -r0 pkgsrc/devel/py-readline/Makefile cvs rdiff -u -r1.2 -r0 pkgsrc/devel/py-readline/PLIST cvs rdiff -u -r1.1 -r0 pkgsrc/devel/py-readline/files/Setup.in \ pkgsrc/devel/py-readline/files/setup.py cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/py-rope/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-setuptools44/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/py-stem/Makefile cvs rdiff -u -r1.118 -r1.119 pkgsrc/devel/py-test/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/py-test4/Makefile cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/py-trytond/Makefile cvs rdiff -u -r1.32 -r1.33 pkgsrc/devel/py-urwid/Makefile cvs rdiff -u -r1.75 -r1.76 pkgsrc/devel/py-virtualenv/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-visitor/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py27-coverage/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/ropper/Makefile cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/rox-lib/Makefile cvs rdiff -u -r1.6052 -r1.6053 pkgsrc/doc/CHANGES-2023 cvs rdiff -u -r1.19 -r1.20 pkgsrc/editors/fileobj/Makefile cvs rdiff -u -r1.57 -r1.58 pkgsrc/editors/medit/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/editors/py-jedi/Makefile cvs rdiff -u -r1.58 -r1.59 pkgsrc/editors/tp-note/Makefile cvs rdiff -u -r1.54 -r1.55 pkgsrc/editors/zim/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/fs-uae-arcade/Makefile cvs rdiff -u -r1.23 -r1.24 pkgsrc/emulators/fs-uae-launcher/Makefile cvs rdiff -u -r1.180 -r1.181 pkgsrc/emulators/mame/Makefile cvs rdiff -u -r1.60 -r1.61 pkgsrc/filesystems/tahoe-lafs/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/finance/gnucash/options.mk cvs rdiff -u -r1.94 -r1.95 pkgsrc/fonts/py-fonttools/Makefile cvs rdiff -u -r1.48 -r1.49 pkgsrc/games/supertuxkart/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/games/unknown-horizons/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/wordsearch/Makefile cvs rdiff -u -r1.209 -r1.210 pkgsrc/graphics/MesaLib/Makefile cvs rdiff -u -r1.86 -r1.87 pkgsrc/graphics/comix/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/glad/Makefile cvs rdiff -u -r1.273 -r1.274 pkgsrc/graphics/inkscape/Makefile cvs rdiff -u -r1.34 -r1.35 pkgsrc/graphics/libepoxy/Makefile cvs rdiff -u -r1.26 -r1.27 pkgsrc/graphics/py-mcomix/Makefile cvs rdiff -u -r1.29 -r1.30 pkgsrc/inputmethod/ibus-table/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/inputmethod/tegaki-python/Makefile cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/mozjs78/Makefile cvs rdiff -u -r1.275 -r1.276 pkgsrc/lang/nodejs/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/nodejs16/Makefile cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/nodejs18/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/mail/feed2exec/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/gyb/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/meli/Makefile cvs rdiff -u -r1.25 -r1.26 pkgsrc/mail/newspipe/Makefile cvs rdiff -u -r1.40 -r1.41 pkgsrc/mail/offlineimap/Makefile cvs rdiff -u -r1.59 -r1.60 pkgsrc/mail/rss2email/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/thunderbird/mozilla-common.mk cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/thunderbird102/mozilla-common.mk cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/thunderbird78/mozilla-common.mk cvs rdiff -u -r1.51 -r1.52 pkgsrc/math/py-pandas/Makefile cvs rdiff -u -r1.53 -r1.54 pkgsrc/math/py-rpy/Makefile cvs rdiff -u -r1.99 -r1.100 pkgsrc/meta-pkgs/bulk-medium/Makefile cvs rdiff -u -r1.50 -r1.51 pkgsrc/meta-pkgs/bulk-small/Makefile cvs rdiff -u -r1.288 -r1.289 pkgsrc/misc/calibre/Makefile cvs rdiff -u -r1.315 -r1.316 pkgsrc/misc/libreoffice/Makefile cvs rdiff -u -r1.76 -r1.77 pkgsrc/multimedia/pitivi/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/multimedia/sickgear/Makefile cvs rdiff -u -r1.91 -r1.92 pkgsrc/net/gallery-dl/Makefile cvs rdiff -u -r1.44 -r1.45 pkgsrc/net/mitmproxy/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/nyx/Makefile cvs rdiff -u -r1.62 -r1.63 pkgsrc/net/py-botocore/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/py-google-cloud-sdk/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/py-hatop/Makefile cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/py-kenosis/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/py-magic-wormhole-transit-relay/Makefile cvs rdiff -u -r1.24 -r1.25 pkgsrc/net/py-s3cmd/Makefile cvs rdiff -u -r1.87 -r1.88 pkgsrc/net/rabbitmq/Makefile cvs rdiff -u -r1.172 -r1.173 pkgsrc/net/samba4/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/speedtest-cli/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/zenmap/Makefile cvs rdiff -u -r1.88 -r1.89 pkgsrc/print/py-reportlab/Makefile cvs rdiff -u -r1.25 -r1.26 pkgsrc/security/fail2ban/Makefile cvs rdiff -u -r1.31 -r1.32 pkgsrc/security/gpg-tui/Makefile cvs rdiff -u -r1.38 -r1.39 pkgsrc/security/py-certbot/Makefile cvs rdiff -u -r1.25 -r1.26 pkgsrc/security/py-denyhosts/Makefile cvs rdiff -u -r1.49 -r1.50 pkgsrc/security/py-lasso/Makefile cvs rdiff -u -r1.37 -r1.38 pkgsrc/security/sqlmap/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/volatility3/Makefile cvs rdiff -u -r1.27 -r1.28 pkgsrc/shells/lshell/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/bracket/Makefile cvs rdiff -u -r1.82 -r1.83 pkgsrc/sysutils/broot/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/ovmf/Makefile cvs rdiff -u -r1.23 -r1.24 pkgsrc/sysutils/py-Glances/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/py-appnope/Makefile cvs rdiff -u -r1.43 -r1.44 pkgsrc/sysutils/py-dbus/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/sysutils/py-diffoscope/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/py27-dbus/Makefile cvs rdiff -u -r1.32 -r1.33 pkgsrc/sysutils/salt-docs/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/vxargs/Makefile cvs rdiff -u -r1.26 -r1.27 pkgsrc/sysutils/xentools415/Makefile cvs rdiff -u -r1.1427 -r1.1428 pkgsrc/textproc/Makefile cvs rdiff -u -r1.66 -r1.67 pkgsrc/textproc/iso-codes/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/jless/Makefile cvs rdiff -u -r1.3 -r0 pkgsrc/textproc/py-cElementTree/DESCR cvs rdiff -u -r1.20 -r0 pkgsrc/textproc/py-cElementTree/Makefile cvs rdiff -u -r1.2 -r0 pkgsrc/textproc/py-cElementTree/PLIST cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/textproc/py-cElementTree/files/setup.py cvs rdiff -u -r1.62 -r1.63 pkgsrc/textproc/py-docutils/Makefile cvs rdiff -u -r1.34 -r1.35 pkgsrc/textproc/py-elementpath/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/py-epr-reader/Makefile cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/textproc/py-expat/DESCR cvs rdiff -u -r1.33 -r0 pkgsrc/textproc/py-expat/Makefile cvs rdiff -u -r1.3 -r0 pkgsrc/textproc/py-expat/PLIST cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/textproc/py-expat/files/setup.py cvs rdiff -u -r1.23 -r1.24 pkgsrc/textproc/py-gnosis-utils/Makefile cvs rdiff -u -r1.88 -r1.89 pkgsrc/textproc/py-libxml2/Makefile cvs rdiff -u -r1.67 -r1.68 pkgsrc/textproc/py-libxslt/Makefile cvs rdiff -u -r1.90 -r1.91 pkgsrc/textproc/py-lxml/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/py-nltk/Makefile cvs rdiff -u -r1.47 -r1.48 pkgsrc/textproc/py-xmlschema/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/py-xmltodict/Makefile cvs rdiff -u -r1.41 -r1.42 pkgsrc/time/khal/Makefile cvs rdiff -u -r1.25 -r1.26 pkgsrc/time/ntpsec/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/time/py-jrnl/Makefile cvs rdiff -u -r1.66 -r1.67 pkgsrc/time/py-vdirsyncer/Makefile cvs rdiff -u -r1.34 -r1.35 pkgsrc/www/arcticfox/Makefile cvs rdiff -u -r1.264 -r1.265 pkgsrc/www/firefox/mozilla-common.mk cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/firefox102/mozilla-common.mk cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/firefox115/mozilla-common.mk cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/firefox52/mozilla-common.mk cvs rdiff -u -r1.24 -r1.25 pkgsrc/www/ikiwiki/options.mk cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/py-django/MESSAGE cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/py-django3/MESSAGE cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/py-genshi/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/py-httpie/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/py-sydent/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/py-uwsgitop/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/seamonkey/mozilla-common.mk cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/trac/options.mk cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/tuir/Makefile cvs rdiff -u -r1.250 -r1.251 pkgsrc/www/webkit-gtk/Makefile cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/alacritty/Makefile cvs rdiff -u -r1.35 -r1.36 pkgsrc/x11/driconf/Makefile cvs rdiff -u -r1.333 -r1.334 pkgsrc/x11/gtk2/Makefile cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/py-xcbgen/Makefile cvs rdiff -u -r1.50 -r1.51 pkgsrc/x11/qt5-qtwebengine/Makefile cvs rdiff -u -r1.115 -r1.116 pkgsrc/x11/qt5-qtwebkit/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/xcb-util-errors/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/xcolor/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_16980430812450 Content-Disposition: inline Content-Length: 200486 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/archivers/zziplib/Makefile diff -u pkgsrc/archivers/zziplib/Makefile:1.33 pkgsrc/archivers/zziplib/Makefile:1.34 --- pkgsrc/archivers/zziplib/Makefile:1.33 Mon Aug 14 05:23:46 2023 +++ pkgsrc/archivers/zziplib/Makefile Mon Oct 23 06:37:32 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2023/08/14 05:23:46 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2023/10/23 06:37:32 wiz Exp $ DISTNAME= zziplib-0.13.72 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_GITHUB:=gdraheim/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -12,7 +12,6 @@ COMMENT= Library for ZIP archive handlin LICENSE= gnu-lgpl-v2 OR mpl-1.1 TOOL_DEPENDS+= zip-[0-9]*:../../archivers/zip -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat USE_TOOLS+= bash:build @@ -34,5 +33,6 @@ PYTHON_FOR_BUILD_ONLY= tool .include "../../devel/cmake/build.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/audio/cplay/Makefile diff -u pkgsrc/audio/cplay/Makefile:1.24 pkgsrc/audio/cplay/Makefile:1.25 --- pkgsrc/audio/cplay/Makefile:1.24 Mon Aug 14 05:23:46 2023 +++ pkgsrc/audio/cplay/Makefile Mon Oct 23 06:37:32 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2023/08/14 05:23:46 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2023/10/23 06:37:32 wiz Exp $ DISTNAME= cplay-1.49 PKGREVISION= 9 @@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Curses front-end for various audio players LICENSE= gnu-gpl-v2 -DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses - PYTHON_VERSIONS_ACCEPTED= 27 REPLACE_PYTHON= cplay @@ -49,4 +47,5 @@ do-install: .endfor .include "../../lang/python/application.mk" +.include "../../lang/python/batteries-included.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/audio/py-beets/Makefile diff -u pkgsrc/audio/py-beets/Makefile:1.31 pkgsrc/audio/py-beets/Makefile:1.32 --- pkgsrc/audio/py-beets/Makefile:1.31 Tue Mar 7 20:19:17 2023 +++ pkgsrc/audio/py-beets/Makefile Mon Oct 23 06:37:33 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.31 2023/03/07 20:19:17 adam Exp $ +# $NetBSD: Makefile,v 1.32 2023/10/23 06:37:33 wiz Exp $ DISTNAME= beets-1.6.0 +PKGREVISION= 1 CATEGORIES= audio python MASTER_SITES= ${MASTER_SITE_PYPI:=b/beets/} @@ -18,7 +19,6 @@ DEPENDS+= ${PYPKGPREFIX}-munkres>=1.0.0: DEPENDS+= ${PYPKGPREFIX}-musicbrainz-ngs>=0.4:../../audio/py-musicbrainz-ngs DEPENDS+= ${PYPKGPREFIX}-mutagen>=1.33:../../audio/py-mutagen DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml USE_LANGUAGES= # none @@ -30,5 +30,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 post-install: cd ${DESTDIR}${PREFIX}/bin && ${MV} beet beet-${PYVERSSUFFIX} || ${TRUE} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/audio/py-musicbrainz-ngs/Makefile diff -u pkgsrc/audio/py-musicbrainz-ngs/Makefile:1.5 pkgsrc/audio/py-musicbrainz-ngs/Makefile:1.6 --- pkgsrc/audio/py-musicbrainz-ngs/Makefile:1.5 Mon Jan 10 20:39:43 2022 +++ pkgsrc/audio/py-musicbrainz-ngs/Makefile Mon Oct 23 06:37:33 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2022/01/10 20:39:43 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2023/10/23 06:37:33 wiz Exp $ DISTNAME= python-musicbrainzngs-0.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-//:S/ngs/-ngs/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio net MASTER_SITES= ${MASTER_SITE_GITHUB:=alastair/} @@ -14,12 +14,11 @@ LICENSE= 2-clause-bsd GITHUB_PROJECT= python-musicbrainzngs GITHUB_TAG= v${PKGVERSION_NOREV} -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - EGG_NAME= ${DISTNAME:S/python-//} do-test: cd ${WRKSRC} && ${PYTHONBIN} setup.py test +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/audio/solfege/Makefile diff -u pkgsrc/audio/solfege/Makefile:1.91 pkgsrc/audio/solfege/Makefile:1.92 --- pkgsrc/audio/solfege/Makefile:1.91 Sat Oct 21 17:09:47 2023 +++ pkgsrc/audio/solfege/Makefile Mon Oct 23 06:37:33 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.91 2023/10/21 17:09:47 gdt Exp $ +# $NetBSD: Makefile,v 1.92 2023/10/23 06:37:33 wiz Exp $ DISTNAME= solfege-3.23.4 PKGREVISION= 3 @@ -10,7 +10,6 @@ HOMEPAGE= https://www.gnu.org/software/ COMMENT= Practice several musical ear training exercises LICENSE= gnu-gpl-v3 -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl @@ -74,6 +73,7 @@ OGGPLAYER= ${PREFIX}/bin/ogg123 post-install: find ${DESTDIR}${PREFIX} -type d -name __pycache__ | xargs rm -rf +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" Index: pkgsrc/chat/bitlbee/Makefile diff -u pkgsrc/chat/bitlbee/Makefile:1.92 pkgsrc/chat/bitlbee/Makefile:1.93 --- pkgsrc/chat/bitlbee/Makefile:1.92 Mon Aug 14 05:23:53 2023 +++ pkgsrc/chat/bitlbee/Makefile Mon Oct 23 06:37:33 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.92 2023/08/14 05:23:53 wiz Exp $ +# $NetBSD: Makefile,v 1.93 2023/10/23 06:37:33 wiz Exp $ DISTNAME= bitlbee-3.6 -PKGREVISION= 11 +PKGREVISION= 12 CATEGORIES= chat MASTER_SITES= http://get.bitlbee.org/src/ @@ -12,7 +12,6 @@ LICENSE= gnu-gpl-v2 TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto TOOL_DEPENDS+= w3m-[0-9]*:../../www/w3m -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat HAS_CONFIGURE= yes USE_TOOLS+= gmake pkg-config @@ -92,6 +91,7 @@ RCD_SCRIPT_SRC.bitlbee= ${FILESDIR}/bitl .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" PYTHON_FOR_BUILD_ONLY= yes +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../security/gnutls/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" Index: pkgsrc/chat/gajim/Makefile diff -u pkgsrc/chat/gajim/Makefile:1.70 pkgsrc/chat/gajim/Makefile:1.71 --- pkgsrc/chat/gajim/Makefile:1.70 Sat Oct 21 17:09:51 2023 +++ pkgsrc/chat/gajim/Makefile Mon Oct 23 06:37:33 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2023/10/21 17:09:51 gdt Exp $ +# $NetBSD: Makefile,v 1.71 2023/10/23 06:37:33 wiz Exp $ DISTNAME= gajim-1.3.3 PKGREVISION= 6 @@ -27,7 +27,6 @@ DEPENDS+= ${PYPKGPREFIX}-keyring-[0-9]*: 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 -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 .include "../../mk/bsd.prefs.mk" @@ -38,6 +37,7 @@ DEPENDS+= ${PYPKGPREFIX}-pyobjc-framewor .include "options.mk" .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" PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL .include "../../lang/python/versioned_dependencies.mk" Index: pkgsrc/chat/matrix-synapse/Makefile diff -u pkgsrc/chat/matrix-synapse/Makefile:1.81 pkgsrc/chat/matrix-synapse/Makefile:1.82 --- pkgsrc/chat/matrix-synapse/Makefile:1.81 Fri Sep 8 20:32:00 2023 +++ pkgsrc/chat/matrix-synapse/Makefile Mon Oct 23 06:37:34 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.81 2023/09/08 20:32:00 js Exp $ +# $NetBSD: Makefile,v 1.82 2023/10/23 06:37:34 wiz Exp $ DISTNAME= matrix-synapse-1.91.2 +PKGREVISION= 1 CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_GITHUB:=matrix-org/} GITHUB_PROJECT= synapse @@ -25,7 +26,6 @@ DEPENDS+= ${PYPKGPREFIX}-attrs>=19.2.0:. DEPENDS+= ${PYPKGPREFIX}-bcrypt>=3.1.0:../../security/py-bcrypt DEPENDS+= ${PYPKGPREFIX}-bleach>=1.4.3:../../www/py-bleach DEPENDS+= ${PYPKGPREFIX}-canonicaljson>=2.0.0:../../devel/py-canonicaljson -DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses DEPENDS+= ${PYPKGPREFIX}-immutabledict>=2.0:../../devel/py-immutabledict DEPENDS+= ${PYPKGPREFIX}-idna>=2.5:../../www/py-idna DEPENDS+= ${PYPKGPREFIX}-ijson>=3.0:../../devel/py-ijson @@ -46,7 +46,6 @@ DEPENDS+= ${PYPKGPREFIX}-signedjson>=1.1 DEPENDS+= ${PYPKGPREFIX}-sortedcontainers>=1.4.4:../../devel/py-sortedcontainers # NB: synapse needs features missing in NetBSD base system sqlite, and probably # missing in other builds. -DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-treq>=15.1:../../devel/py-treq DEPENDS+= ${PYPKGPREFIX}-twisted>=18.9.0:../../net/py-twisted DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=3.10.0:../../devel/py-typing-extensions @@ -132,6 +131,7 @@ do-test: # make; make print-cargo-depends > cargo-depends.mk && make distinfo .include "cargo-depends.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/wheel.mk" RUST_REQ= 1.51.0 Index: pkgsrc/chat/py-xmpppy/Makefile diff -u pkgsrc/chat/py-xmpppy/Makefile:1.27 pkgsrc/chat/py-xmpppy/Makefile:1.28 --- pkgsrc/chat/py-xmpppy/Makefile:1.27 Tue Aug 23 21:49:55 2022 +++ pkgsrc/chat/py-xmpppy/Makefile Mon Oct 23 06:37:34 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.27 2022/08/23 21:49:55 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2023/10/23 06:37:34 wiz Exp $ DISTNAME= xmpppy-0.7.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= chat python MASTER_SITES= ${MASTER_SITE_GITHUB:=xmpppy/} GITHUB_PROJECT= xmpppy @@ -11,8 +12,6 @@ HOMEPAGE= http://xmpppy.sourceforge.net/ COMMENT= XMPP (Jabber) library for Python LICENSE= gnu-gpl-v2 -DEPENDS+= ${PYPKGPREFIX}-expat>=0nb4:../../textproc/py-expat - USE_LANGUAGES= # none PYTHON_VERSIONED_DEPENDENCIES= dns @@ -36,6 +35,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/docs/*.css \ ${DESTDIR}${DOCDIR} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/versioned_dependencies.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/chat/spectrum/Makefile diff -u pkgsrc/chat/spectrum/Makefile:1.119 pkgsrc/chat/spectrum/Makefile:1.120 --- pkgsrc/chat/spectrum/Makefile:1.119 Thu Oct 19 15:08:30 2023 +++ pkgsrc/chat/spectrum/Makefile Mon Oct 23 06:37:34 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.119 2023/10/19 15:08:30 wiz Exp $ +# $NetBSD: Makefile,v 1.120 2023/10/23 06:37:34 wiz Exp $ DISTNAME= spectrum-1.4.8 -PKGREVISION= 88 +PKGREVISION= 89 CATEGORIES= chat MASTER_SITES= https://cloud.github.com/downloads/hanzz/libtransport/ @@ -11,8 +11,6 @@ COMMENT= XMPP transport/gateway based o LICENSE= gnu-gpl-v3 DEPENDS+= ${PYPKGPREFIX}-xmpppy>=0.4.1:../../chat/py-xmpppy -DEPENDS+= ${PYPKGPREFIX}-expat>=0nb4:../../textproc/py-expat -DEPENDS+= ${PYPKGPREFIX}-readline>=0nb2:../../devel/py-readline USE_TOOLS+= pkg-config msgfmt xgettext USE_CMAKE= yes @@ -120,6 +118,7 @@ post-install: # .include "../../devel/libev/buildlink3.mk" .include "../../devel/poco/buildlink3.mk" .include "../../graphics/ImageMagick/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" Index: pkgsrc/chat/telepathy-gabble/Makefile diff -u pkgsrc/chat/telepathy-gabble/Makefile:1.89 pkgsrc/chat/telepathy-gabble/Makefile:1.90 --- pkgsrc/chat/telepathy-gabble/Makefile:1.89 Mon Aug 14 05:23:55 2023 +++ pkgsrc/chat/telepathy-gabble/Makefile Mon Oct 23 06:37:34 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.89 2023/08/14 05:23:55 wiz Exp $ +# $NetBSD: Makefile,v 1.90 2023/10/23 06:37:34 wiz Exp $ DISTNAME= telepathy-gabble-0.18.3 -PKGREVISION= 34 +PKGREVISION= 35 CATEGORIES= chat MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-gabble/ @@ -10,8 +10,6 @@ HOMEPAGE= https://telepathy.freedesktop. COMMENT= Jabber/XMPP connection manager for Telepathy LICENSE= gnu-lgpl-v2.1 AND mit -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - GNU_CONFIGURE= yes OVERRIDE_DIRDEPTH= 3 USE_LIBTOOL= yes @@ -43,6 +41,7 @@ BUILDLINK_API_DEPENDS.telepathy-glib+= t .include "../../chat/telepathy-glib/buildlink3.mk" BUILDLINK_API_DEPENDS.glib2+= glib2>=2.21.0 .include "../../devel/glib2/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../net/libsoup/buildlink3.mk" .include "../../net/libnice/buildlink3.mk" Index: pkgsrc/chat/telepathy-glib/Makefile diff -u pkgsrc/chat/telepathy-glib/Makefile:1.81 pkgsrc/chat/telepathy-glib/Makefile:1.82 --- pkgsrc/chat/telepathy-glib/Makefile:1.81 Mon Aug 14 05:23:55 2023 +++ pkgsrc/chat/telepathy-glib/Makefile Mon Oct 23 06:37:34 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.81 2023/08/14 05:23:55 wiz Exp $ +# $NetBSD: Makefile,v 1.82 2023/10/23 06:37:34 wiz Exp $ DISTNAME= telepathy-glib-0.24.1 -PKGREVISION= 30 +PKGREVISION= 31 CATEGORIES= chat MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-glib/ @@ -10,8 +10,6 @@ HOMEPAGE= https://telepathy.freedesktop. COMMENT= GObject-based C binding for the Telepathy D-Bus API LICENSE= gnu-gpl-v2 AND modified-bsd -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-vala-bindings USE_LIBTOOL= yes @@ -29,6 +27,7 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2. .include "../../devel/glib2/buildlink3.mk" BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=1.30.0 .include "../../devel/gobject-introspection/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/vala/buildlink3.mk" BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.90 Index: pkgsrc/chat/telepathy-haze/Makefile diff -u pkgsrc/chat/telepathy-haze/Makefile:1.27 pkgsrc/chat/telepathy-haze/Makefile:1.28 --- pkgsrc/chat/telepathy-haze/Makefile:1.27 Mon Aug 14 05:23:55 2023 +++ pkgsrc/chat/telepathy-haze/Makefile Mon Oct 23 06:37:34 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2023/08/14 05:23:55 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2023/10/23 06:37:34 wiz Exp $ DISTNAME= telepathy-haze-0.8.0 -PKGREVISION= 14 +PKGREVISION= 15 CATEGORIES= chat MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-haze/ @@ -10,12 +10,11 @@ MAINTAINER= jaapb@NetBSD.org COMMENT= Libpurple connection manager for Telepathy LICENSE= gnu-gpl-v2 -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - GNU_CONFIGURE= yes USE_TOOLS= gmake pkg-config PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.8.0 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../chat/libpurple/buildlink3.mk" .include "../../chat/telepathy-glib/buildlink3.mk" Index: pkgsrc/chat/telepathy-idle/Makefile diff -u pkgsrc/chat/telepathy-idle/Makefile:1.53 pkgsrc/chat/telepathy-idle/Makefile:1.54 --- pkgsrc/chat/telepathy-idle/Makefile:1.53 Mon Aug 14 05:23:55 2023 +++ pkgsrc/chat/telepathy-idle/Makefile Mon Oct 23 06:37:35 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.53 2023/08/14 05:23:55 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2023/10/23 06:37:35 wiz Exp $ DISTNAME= telepathy-idle-0.1.8 -PKGREVISION= 23 +PKGREVISION= 24 CATEGORIES= chat MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-idle/ @@ -10,8 +10,6 @@ HOMEPAGE= https://telepathy.freedesktop. COMMENT= Full-featured IRC connection manager for Telepathy LICENSE= gnu-lgpl-v2.1 -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.1.8 GNU_CONFIGURE= yes @@ -28,6 +26,7 @@ CONFIGURE_ENV+= ac_cv_prog_PYTHON=${PYT # needs py-twisted # TEST_TARGET= check +.include "../../lang/python/batteries-included.mk" .include "../../chat/telepathy-glib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../lang/python/application.mk" Index: pkgsrc/chat/telepathy-logger/Makefile diff -u pkgsrc/chat/telepathy-logger/Makefile:1.63 pkgsrc/chat/telepathy-logger/Makefile:1.64 --- pkgsrc/chat/telepathy-logger/Makefile:1.63 Mon Aug 14 05:23:55 2023 +++ pkgsrc/chat/telepathy-logger/Makefile Mon Oct 23 06:37:35 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.63 2023/08/14 05:23:55 wiz Exp $ +# $NetBSD: Makefile,v 1.64 2023/10/23 06:37:35 wiz Exp $ DISTNAME= telepathy-logger-0.2.7 -PKGREVISION= 36 +PKGREVISION= 37 CATEGORIES= chat MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-logger/ EXTRACT_SUFX= .tar.bz2 @@ -20,14 +20,13 @@ CFLAGS.SunOS+= -std=c99 -D_XOPEN_SOURCE= PKGCONFIG_OVERRIDE+= extensions/tpl-extensions.pc.in PKGCONFIG_OVERRIDE+= telepathy-logger/telepathy-logger-0.1.pc.in -TOOL_DEPENDS= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - PYTHON_FOR_BUILD_ONLY= yes PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.2.7 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/schemas.mk" .include "../../devel/GConf/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../mk/curses.buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" Index: pkgsrc/chat/telepathy-mission-control5/Makefile diff -u pkgsrc/chat/telepathy-mission-control5/Makefile:1.37 pkgsrc/chat/telepathy-mission-control5/Makefile:1.38 --- pkgsrc/chat/telepathy-mission-control5/Makefile:1.37 Mon Aug 14 05:23:56 2023 +++ pkgsrc/chat/telepathy-mission-control5/Makefile Mon Oct 23 06:37:35 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.37 2023/08/14 05:23:56 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2023/10/23 06:37:35 wiz Exp $ DISTNAME= telepathy-mission-control-5.7.9 PKGNAME= telepathy-mission-control5-5.7.9 -PKGREVISION= 19 +PKGREVISION= 20 CATEGORIES= chat #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mission-control/} MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-mission-control/ @@ -30,10 +30,9 @@ CONFIGURE_ARGS+= --enable-gnome-keyring # needs py-twisted # TEST_TARGET= check -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - .include "../../chat/telepathy-glib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" Index: pkgsrc/chat/telepathy-qt/Makefile diff -u pkgsrc/chat/telepathy-qt/Makefile:1.23 pkgsrc/chat/telepathy-qt/Makefile:1.24 --- pkgsrc/chat/telepathy-qt/Makefile:1.23 Mon Aug 14 05:23:56 2023 +++ pkgsrc/chat/telepathy-qt/Makefile Mon Oct 23 06:37:35 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2023/08/14 05:23:56 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2023/10/23 06:37:35 wiz Exp $ DISTNAME= telepathy-qt-0.9.6.1 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= chat MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-qt/ @@ -22,7 +22,6 @@ PKGCONFIG_OVERRIDE+= TelepathyQt/Farstre PYTHON_FOR_BUILD_ONLY= yes PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.24.1 -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--no-add-needed @@ -30,6 +29,7 @@ BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--no- BUILDLINK_API_DEPENDS.telepathy-glib+= telepathy-glib>=0.18.0 .include "../../chat/telepathy-glib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../multimedia/gstreamer1/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" Index: pkgsrc/chat/tootstream/Makefile diff -u pkgsrc/chat/tootstream/Makefile:1.19 pkgsrc/chat/tootstream/Makefile:1.20 --- pkgsrc/chat/tootstream/Makefile:1.19 Mon Aug 14 05:23:56 2023 +++ pkgsrc/chat/tootstream/Makefile Mon Oct 23 06:37:35 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2023/08/14 05:23:56 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2023/10/23 06:37:35 wiz Exp $ DISTNAME= tootstream-0.3.8.1 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= chat www MASTER_SITES= ${MASTER_SITE_GITHUB:=magicalraccoon/} @@ -15,7 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-colored>=1.3.93 DEPENDS+= ${PYPKGPREFIX}-emoji>=0.4.5:../../converters/py-emoji DEPENDS+= ${PYPKGPREFIX}-humanize>=0.5.1:../../textproc/py-humanize DEPENDS+= ${PYPKGPREFIX}-mastodon>=1.5.0:../../chat/py-mastodon -DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline EXTRACT_USING= bsdtar USE_LANGUAGES= # none @@ -26,5 +25,6 @@ USE_PKG_RESOURCES= yes # to py-click. PYTHON_VERSIONS_INCOMPATIBLE= 27 38 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/converters/py-zfec/Makefile diff -u pkgsrc/converters/py-zfec/Makefile:1.34 pkgsrc/converters/py-zfec/Makefile:1.35 --- pkgsrc/converters/py-zfec/Makefile:1.34 Sat Oct 7 13:25:06 2023 +++ pkgsrc/converters/py-zfec/Makefile Mon Oct 23 06:37:36 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.34 2023/10/07 13:25:06 gdt Exp $ +# $NetBSD: Makefile,v 1.35 2023/10/23 06:37:36 wiz Exp $ DISTNAME= zfec-1.5.7.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= converters python MASTER_SITES= ${MASTER_SITE_PYPI:=z/zfec/} @@ -10,7 +11,6 @@ HOMEPAGE= https://github.com/tahoe-lafs/ COMMENT= Efficient, portable erasure coding tool LICENSE= gnu-gpl-v2 -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-pyutil>=3.0.0:../../devel/py-pyutil TEST_DEPENDS+= ${PYPKGPREFIX}-setuptools_trial-[0-9]*:../../devel/py-setuptools_trial TEST_DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted @@ -29,6 +29,7 @@ post-install: ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE} .endfor +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/databases/Makefile diff -u pkgsrc/databases/Makefile:1.691 pkgsrc/databases/Makefile:1.692 --- pkgsrc/databases/Makefile:1.691 Fri Oct 20 16:44:06 2023 +++ pkgsrc/databases/Makefile Mon Oct 23 06:37:36 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.691 2023/10/20 16:44:06 tnn Exp $ +# $NetBSD: Makefile,v 1.692 2023/10/23 06:37:36 wiz Exp $ COMMENT= Databases @@ -407,7 +407,6 @@ SUBDIR+= py-sqlalchemy-i18n SUBDIR+= py-sqlalchemy-migrate SUBDIR+= py-sqlalchemy-utils SUBDIR+= py-sqlite2 -SUBDIR+= py-sqlite3 SUBDIR+= py-sqlparse SUBDIR+= py-sqlrelay SUBDIR+= py-sqlsoup Index: pkgsrc/databases/gramps5/Makefile diff -u pkgsrc/databases/gramps5/Makefile:1.11 pkgsrc/databases/gramps5/Makefile:1.12 --- pkgsrc/databases/gramps5/Makefile:1.11 Mon Aug 14 05:23:59 2023 +++ pkgsrc/databases/gramps5/Makefile Mon Oct 23 06:37:36 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2023/08/14 05:23:59 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2023/10/23 06:37:36 wiz Exp $ DISTNAME= gramps-5.1.6 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gramps/} @@ -41,6 +41,7 @@ post-install: .include "../../databases/py-bsddb3/buildlink3.mk" .include "../../graphics/gnome-icon-theme/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../databases/shared-mime-info/mimedb.mk" Index: pkgsrc/databases/gramps5/options.mk diff -u pkgsrc/databases/gramps5/options.mk:1.1 pkgsrc/databases/gramps5/options.mk:1.2 --- pkgsrc/databases/gramps5/options.mk:1.1 Sun Feb 9 21:43:07 2020 +++ pkgsrc/databases/gramps5/options.mk Mon Oct 23 06:37:36 2023 @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2020/02/09 21:43:07 jdolecek Exp $ +# $NetBSD: options.mk,v 1.2 2023/10/23 06:37:36 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gramps5 -PKG_SUPPORTED_OPTIONS= graphviz freefont sqlite3 -PKG_SUGGESTED_OPTIONS= sqlite3 +PKG_SUPPORTED_OPTIONS= graphviz freefont +PKG_SUGGESTED_OPTIONS= # .include "../../mk/bsd.options.mk" @@ -13,7 +13,3 @@ DEPENDS+= freefont-ttf-[0-9]*:../../font .if !empty(PKG_OPTIONS:Mgraphviz) DEPENDS+= graphviz-[0-9]*:../../graphics/graphviz .endif - -.if !empty(PKG_OPTIONS:Msqlite3) -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 -.endif Index: pkgsrc/databases/py-aiosqlite/Makefile diff -u pkgsrc/databases/py-aiosqlite/Makefile:1.13 pkgsrc/databases/py-aiosqlite/Makefile:1.14 --- pkgsrc/databases/py-aiosqlite/Makefile:1.13 Sun Apr 30 10:45:23 2023 +++ pkgsrc/databases/py-aiosqlite/Makefile Mon Oct 23 06:37:36 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2023/04/30 10:45:23 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2023/10/23 06:37:36 wiz Exp $ DISTNAME= aiosqlite-0.19.0 +PKGREVISION= 1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= databases python MASTER_SITES= ${MASTER_SITE_PYPI:=a/aiosqlite/} @@ -11,7 +12,6 @@ COMMENT= Async bridge to the standard sq LICENSE= mit TOOL_DEPENDS+= ${PYPKGPREFIX}-flit_core>=2:../../devel/py-flit_core -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 USE_LANGUAGES= # none @@ -20,5 +20,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} -m aiosqlite.tests +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/wheel.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/databases/py-kb/Makefile diff -u pkgsrc/databases/py-kb/Makefile:1.7 pkgsrc/databases/py-kb/Makefile:1.8 --- pkgsrc/databases/py-kb/Makefile:1.7 Sun Aug 6 07:33:40 2023 +++ pkgsrc/databases/py-kb/Makefile Mon Oct 23 06:37:36 2023 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2023/08/06 07:33:40 adam Exp $ +# $NetBSD: Makefile,v 1.8 2023/10/23 06:37:36 wiz Exp $ DISTNAME= kb-manager-0.1.7 EGGNAME= ${DISTNAME:S/-manager//} PKGNAME= ${PYPKGPREFIX}-${EGGNAME} +PKGREVISION= 1 CATEGORIES= databases python MASTER_SITES= ${MASTER_SITE_PYPI:=k/kb-manager/} @@ -14,7 +15,6 @@ LICENSE= gnu-gpl-v3 DEPENDS+= ${PYPKGPREFIX}-attrs-[0-9]*:../../devel/py-attrs DEPENDS+= ${PYPKGPREFIX}-colored-[0-9]*:../../textproc/py-colored DEPENDS+= ${PYPKGPREFIX}-gitpython-[0-9]*:../../devel/py-gitpython -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-toml-[0-9]*:../../textproc/py-toml USE_LANGUAGES= # none @@ -23,6 +23,7 @@ USE_PKG_RESOURCES= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 38 # py-colored +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/databases/py-peewee/MESSAGE diff -u pkgsrc/databases/py-peewee/MESSAGE:1.2 pkgsrc/databases/py-peewee/MESSAGE:1.3 --- pkgsrc/databases/py-peewee/MESSAGE:1.2 Wed Apr 4 12:31:19 2018 +++ pkgsrc/databases/py-peewee/MESSAGE Mon Oct 23 06:37:37 2023 @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.2 2018/04/04 12:31:19 fhajny Exp $ +$NetBSD: MESSAGE,v 1.3 2023/10/23 06:37:37 wiz Exp $ The ${PKGNAME} package doesn't have any fixed dependencies. In order to use it, install a supported backend package as needed. @@ -12,7 +12,6 @@ it, install a supported backend package - ${PYPKGPREFIX}-psycopg2 (databases/py-psycopg2) SQLite: - - ${PYPKGPREFIX}-sqlite3 (databases/py-sqlite3) - ${PYPKGPREFIX}-apsw (databases/py-apsw) - ${PYPKGPREFIX}-sqlite2 (databases/py-sqlite2) Index: pkgsrc/databases/py-peewee/Makefile diff -u pkgsrc/databases/py-peewee/Makefile:1.97 pkgsrc/databases/py-peewee/Makefile:1.98 --- pkgsrc/databases/py-peewee/Makefile:1.97 Mon Oct 16 13:05:30 2023 +++ pkgsrc/databases/py-peewee/Makefile Mon Oct 23 06:37:37 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.97 2023/10/16 13:05:30 adam Exp $ +# $NetBSD: Makefile,v 1.98 2023/10/23 06:37:37 wiz Exp $ DISTNAME= peewee-3.17.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= databases python MASTER_SITES= ${MASTER_SITE_PYPI:=p/peewee/} @@ -10,7 +11,6 @@ HOMEPAGE= http://docs.peewee-orm.com/ COMMENT= Small, expressive ORM for PostgreSQL, MySQL and SQLite LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-rtd-theme-[0-9]*:../../textproc/py-sphinx-rtd-theme @@ -44,6 +44,7 @@ post-install: .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/py-cython/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/Makefile diff -u pkgsrc/devel/Makefile:1.4074 pkgsrc/devel/Makefile:1.4075 --- pkgsrc/devel/Makefile:1.4074 Thu Oct 19 18:07:28 2023 +++ pkgsrc/devel/Makefile Mon Oct 23 06:37:37 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4074 2023/10/19 18:07:28 bsiegert Exp $ +# $NetBSD: Makefile,v 1.4075 2023/10/23 06:37:37 wiz Exp $ # COMMENT= Development utilities @@ -2478,8 +2478,6 @@ SUBDIR+= py-cparser SUBDIR+= py-cpplint SUBDIR+= py-cppy SUBDIR+= py-crayons -SUBDIR+= py-curses -SUBDIR+= py-cursespanel SUBDIR+= py-curtsies SUBDIR+= py-cwcwidth SUBDIR+= py-cyordereddict @@ -2932,7 +2930,6 @@ SUBDIR+= py-radon SUBDIR+= py-random2 SUBDIR+= py-rauth SUBDIR+= py-readlike -SUBDIR+= py-readline SUBDIR+= py-rednose SUBDIR+= py-reparser SUBDIR+= py-repoze.lru Index: pkgsrc/devel/apenwarr-redo/Makefile diff -u pkgsrc/devel/apenwarr-redo/Makefile:1.12 pkgsrc/devel/apenwarr-redo/Makefile:1.13 --- pkgsrc/devel/apenwarr-redo/Makefile:1.12 Mon Aug 14 05:24:03 2023 +++ pkgsrc/devel/apenwarr-redo/Makefile Mon Oct 23 06:37:37 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2023/08/14 05:24:03 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2023/10/23 06:37:37 wiz Exp $ DISTNAME= redo-0.42d PKGNAME= apenwarr-${DISTNAME} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=apenwarr/} GITHUB_PROJECT= redo @@ -17,7 +17,6 @@ TOOL_DEPENDS+= ${PYPKGPREFIX}-beautifuls TOOL_DEPENDS+= ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown DEPENDS+= dash-[0-9]*:../../shells/dash DEPENDS+= ${PYPKGPREFIX}-setproctitle-[0-9]*:../../sysutils/py-setproctitle -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 WRKSRC= ${WRKDIR}/redo-${DISTNAME} @@ -36,6 +35,7 @@ post-install: cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \ for i in *; do mv -f $${i} apenwarr-$${i}; done +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/bpython/Makefile diff -u pkgsrc/devel/bpython/Makefile:1.39 pkgsrc/devel/bpython/Makefile:1.40 --- pkgsrc/devel/bpython/Makefile:1.39 Mon Aug 14 05:24:04 2023 +++ pkgsrc/devel/bpython/Makefile Mon Oct 23 06:37:38 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2023/08/14 05:24:04 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2023/10/23 06:37:38 wiz Exp $ DISTNAME= bpython-0.24 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel python MASTER_SITES= https://bpython-interpreter.org/releases/ @@ -12,12 +12,10 @@ LICENSE= mit TOOL_DEPENDS+= ${PYPKGPREFIX}-babel-[0-9]*:../../devel/py-babel TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx -DEPENDS+= ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses DEPENDS+= ${PYPKGPREFIX}-curtsies>=0.4.0:../../devel/py-curtsies DEPENDS+= ${PYPKGPREFIX}-cwcwidth-[0-9]*:../../devel/py-cwcwidth DEPENDS+= ${PYPKGPREFIX}-greenlet-[0-9]*:../../devel/py-greenlet DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments -DEPENDS+= ${PYPKGPREFIX}-readline>=0nb2:../../devel/py-readline DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests DEPENDS+= ${PYPKGPREFIX}-urwid-[0-9]*:../../devel/py-urwid DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg @@ -28,6 +26,7 @@ USE_PKG_RESOURCES= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/breezy/MESSAGE diff -u pkgsrc/devel/breezy/MESSAGE:1.1 pkgsrc/devel/breezy/MESSAGE:1.2 --- pkgsrc/devel/breezy/MESSAGE:1.1 Sun Oct 27 13:05:46 2019 +++ pkgsrc/devel/breezy/MESSAGE Mon Oct 23 06:37:38 2023 @@ -1,7 +1,7 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2019/10/27 13:05:46 rhialto Exp $ +$NetBSD: MESSAGE,v 1.2 2023/10/23 06:37:38 wiz Exp $ bzr requires security/py-paramiko in order to push branches over sftp -and www/py-curl to verify https certificates. For the "shelve" command -devel/py-curses is required. +and www/py-curl to verify https certificates. + =========================================================================== Index: pkgsrc/devel/doxygen/Makefile diff -u pkgsrc/devel/doxygen/Makefile:1.176 pkgsrc/devel/doxygen/Makefile:1.177 --- pkgsrc/devel/doxygen/Makefile:1.176 Wed Aug 30 12:35:58 2023 +++ pkgsrc/devel/doxygen/Makefile Mon Oct 23 06:37:38 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.176 2023/08/30 12:35:58 adam Exp $ +# $NetBSD: Makefile,v 1.177 2023/10/23 06:37:38 wiz Exp $ DISTNAME= doxygen-1.9.8.src +PKGREVISION= 1 PKGNAME= ${DISTNAME:S/.src//} CATEGORIES= devel MASTER_SITES= http://doxygen.nl/files/ @@ -12,8 +13,6 @@ LICENSE= gnu-gpl-v2 EXTRACT_USING= gtar # Cannot restore extended attributes -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} UNLIMIT_RESOURCES+= datasize # doxygen changelog says at least this version of flex is required @@ -74,5 +73,6 @@ post-install: .include "../../devel/cmake/build.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../graphics/graphviz/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/pyversion.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/gdbus-codegen/Makefile diff -u pkgsrc/devel/gdbus-codegen/Makefile:1.29 pkgsrc/devel/gdbus-codegen/Makefile:1.30 --- pkgsrc/devel/gdbus-codegen/Makefile:1.29 Sat Sep 16 03:09:02 2023 +++ pkgsrc/devel/gdbus-codegen/Makefile Mon Oct 23 06:37:38 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2023/09/16 03:09:02 adam Exp $ +# $NetBSD: Makefile,v 1.30 2023/10/23 06:37:38 wiz Exp $ .include "../../devel/glib2/Makefile.common" @@ -22,8 +22,7 @@ SUBST_SED.autovars+= -e 's,@DATADIR@,${P REPLACE_PYTHON+= gdbus-codegen.in -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - .include "../../devel/meson/build.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/glib2/Makefile diff -u pkgsrc/devel/glib2/Makefile:1.295 pkgsrc/devel/glib2/Makefile:1.296 --- pkgsrc/devel/glib2/Makefile:1.295 Sat Sep 16 03:09:01 2023 +++ pkgsrc/devel/glib2/Makefile Mon Oct 23 06:37:38 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.295 2023/09/16 03:09:01 adam Exp $ +# $NetBSD: Makefile,v 1.296 2023/10/23 06:37:38 wiz Exp $ .include "Makefile.common" @@ -77,7 +77,6 @@ PKGCONFIG_OVERRIDE+= output/meson-privat PKGCONFIG_OVERRIDE_STAGE= post-configure # to run gdbus-codegen to generate gdbus-daemon-generated.{h,c} -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat PYTHON_FOR_BUILD_ONLY= yes post-extract: @@ -89,6 +88,7 @@ post-extract: .include "../../devel/meson/build.mk" .include "../../devel/pcre2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/tool.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/gobject-introspection/Makefile diff -u pkgsrc/devel/gobject-introspection/Makefile:1.87 pkgsrc/devel/gobject-introspection/Makefile:1.88 --- pkgsrc/devel/gobject-introspection/Makefile:1.87 Mon Aug 14 05:24:09 2023 +++ pkgsrc/devel/gobject-introspection/Makefile Mon Oct 23 06:37:39 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.87 2023/08/14 05:24:09 wiz Exp $ +# $NetBSD: Makefile,v 1.88 2023/10/23 06:37:39 wiz Exp $ DISTNAME= gobject-introspection-1.76.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gobject-introspection/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz @@ -11,9 +11,6 @@ HOMEPAGE= https://wiki.gnome.org/Project COMMENT= GObject Introspection LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 -DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - PYTHON_VERSIONS_INCOMPATIBLE= 27 USE_TOOLS+= pkg-config flex bison @@ -61,6 +58,7 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.7 BUILDLINK_API_DEPENDS.libffi+= libffi>=3.0.0 .include "../../devel/libffi/buildlink3.mk" .include "../../devel/meson/build.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/libdbusmenu-tools/Makefile diff -u pkgsrc/devel/libdbusmenu-tools/Makefile:1.34 pkgsrc/devel/libdbusmenu-tools/Makefile:1.35 --- pkgsrc/devel/libdbusmenu-tools/Makefile:1.34 Sat Oct 21 17:09:58 2023 +++ pkgsrc/devel/libdbusmenu-tools/Makefile Mon Oct 23 06:37:39 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2023/10/21 17:09:58 gdt Exp $ +# $NetBSD: Makefile,v 1.35 2023/10/23 06:37:39 wiz Exp $ PKGREVISION= 32 .include "../../meta-pkgs/libdbusmenu/Makefile.common" @@ -6,8 +6,6 @@ PKGREVISION= 32 PKGNAME= ${DISTNAME:S/-/-tools-/} COMMENT= Tools for development with libdbusemenu -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - CONFIGURE_ARGS+= --disable-gtk CONFIGURE_ARGS+= --enable-dumper CONFIGURE_ARGS+= --disable-introspection @@ -29,6 +27,7 @@ BUILD_DIRS= tools REPLACE_PYTHON+= tools/dbusmenu-bench .include "../../devel/libdbusmenu-glib/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../lang/vala/buildlink3.mk" Index: pkgsrc/devel/py-blessed/Makefile diff -u pkgsrc/devel/py-blessed/Makefile:1.3 pkgsrc/devel/py-blessed/Makefile:1.4 --- pkgsrc/devel/py-blessed/Makefile:1.3 Sat May 13 08:26:01 2023 +++ pkgsrc/devel/py-blessed/Makefile Mon Oct 23 06:37:39 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2023/05/13 08:26:01 adam Exp $ +# $NetBSD: Makefile,v 1.4 2023/10/23 06:37:39 wiz Exp $ DISTNAME= blessed-1.20.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=b/blessed/} @@ -10,7 +11,6 @@ HOMEPAGE= https://github.com/jquast/bles COMMENT= Wrapper around terminal styling, screen positioning, and input LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses DEPENDS+= ${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six DEPENDS+= ${PYPKGPREFIX}-wcwidth>=0.1.4:../../devel/py-wcwidth @@ -21,5 +21,6 @@ USE_LANGUAGES= # none DEPENDS+= ${PYPKGPREFIX}-backports.functools_lru_cache>=1.2.1:../../devel/py-backports.functools_lru_cache .endif +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-blessings/Makefile diff -u pkgsrc/devel/py-blessings/Makefile:1.4 pkgsrc/devel/py-blessings/Makefile:1.5 --- pkgsrc/devel/py-blessings/Makefile:1.4 Tue Jan 4 20:52:53 2022 +++ pkgsrc/devel/py-blessings/Makefile Mon Oct 23 06:37:39 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2022/01/04 20:52:53 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2023/10/23 06:37:39 wiz Exp $ DISTNAME= blessings-1.7 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=b/blessings/} @@ -11,11 +11,11 @@ HOMEPAGE= https://github.com/erikrose/bl COMMENT= Thin, practical wrapper around terminal LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose USE_LANGUAGES= # none +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-buildbot/Makefile diff -u pkgsrc/devel/py-buildbot/Makefile:1.29 pkgsrc/devel/py-buildbot/Makefile:1.30 --- pkgsrc/devel/py-buildbot/Makefile:1.29 Sun Jun 18 05:39:37 2023 +++ pkgsrc/devel/py-buildbot/Makefile Mon Oct 23 06:37:39 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2023/06/18 05:39:37 adam Exp $ +# $NetBSD: Makefile,v 1.30 2023/10/23 06:37:39 wiz Exp $ DISTNAME= buildbot-2.6.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= devel net python MASTER_SITES= ${MASTER_SITE_PYPI:=b/buildbot/} @@ -15,7 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-JWT-[0-9]*:../. DEPENDS+= ${PYPKGPREFIX}-autobahn>=0.16.0:../../www/py-autobahn DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.5:../../time/py-dateutil DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.1:../../textproc/py-jinja2 -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-sqlalchemy>=1.1.0:../../databases/py-sqlalchemy DEPENDS+= ${PYPKGPREFIX}-sqlalchemy-migrate>=0.9:../../databases/py-sqlalchemy-migrate DEPENDS+= ${PYPKGPREFIX}-twisted>=17.9.0:../../net/py-twisted @@ -43,6 +42,7 @@ post-install: ${MV} buildbot buildbot-${PYVERSSUFFIX} && \ ${MV} buildbot_windows_service buildbot_windows_service-${PYVERSSUFFIX} || ${TRUE} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-coverage/Makefile diff -u pkgsrc/devel/py-coverage/Makefile:1.41 pkgsrc/devel/py-coverage/Makefile:1.42 --- pkgsrc/devel/py-coverage/Makefile:1.41 Mon Oct 2 19:03:13 2023 +++ pkgsrc/devel/py-coverage/Makefile Mon Oct 23 06:37:39 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.41 2023/10/02 19:03:13 adam Exp $ +# $NetBSD: Makefile,v 1.42 2023/10/23 06:37:39 wiz Exp $ DISTNAME= coverage-7.3.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=c/coverage/} @@ -11,7 +12,6 @@ COMMENT= Python module that measures cod LICENSE= apache-2.0 TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-tomli-[0-9]*:../../textproc/py-tomli TEST_DEPENDS+= ${PYPKGPREFIX}-flaky>=3.7.0:../../devel/py-flaky TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=4.57.1:../../devel/py-hypothesis @@ -28,5 +28,6 @@ post-install: do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/wheel.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-extension-helpers/Makefile diff -u pkgsrc/devel/py-extension-helpers/Makefile:1.7 pkgsrc/devel/py-extension-helpers/Makefile:1.8 --- pkgsrc/devel/py-extension-helpers/Makefile:1.7 Sat Sep 16 04:23:06 2023 +++ pkgsrc/devel/py-extension-helpers/Makefile Mon Oct 23 06:37:40 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2023/09/16 04:23:06 adam Exp $ +# $NetBSD: Makefile,v 1.8 2023/10/23 06:37:40 wiz Exp $ DISTNAME= extension-helpers-1.1.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=e/extension-helpers/} @@ -12,7 +13,6 @@ LICENSE= modified-bsd TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=6.2:../../devel/py-setuptools_scm TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-setuptools>=43.0.0:../../devel/py-setuptools DEPENDS+= ${PYPKGPREFIX}-tomli>=1.0.0:../../textproc/py-tomli TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test @@ -25,5 +25,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} extension_helpers +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/wheel.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-freezegun/Makefile diff -u pkgsrc/devel/py-freezegun/Makefile:1.13 pkgsrc/devel/py-freezegun/Makefile:1.14 --- pkgsrc/devel/py-freezegun/Makefile:1.13 Wed Aug 24 08:48:51 2022 +++ pkgsrc/devel/py-freezegun/Makefile Mon Oct 23 06:37:40 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2022/08/24 08:48:51 adam Exp $ +# $NetBSD: Makefile,v 1.14 2023/10/23 06:37:40 wiz Exp $ DISTNAME= freezegun-1.2.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=f/freezegun/} @@ -11,7 +12,6 @@ COMMENT= Let your Python tests travel th LICENSE= apache-2.0 DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.0:../../time/py-dateutil -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test @@ -20,5 +20,6 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-hg-evolve/Makefile diff -u pkgsrc/devel/py-hg-evolve/Makefile:1.37 pkgsrc/devel/py-hg-evolve/Makefile:1.38 --- pkgsrc/devel/py-hg-evolve/Makefile:1.37 Wed Jul 19 14:57:42 2023 +++ pkgsrc/devel/py-hg-evolve/Makefile Mon Oct 23 06:37:41 2023 @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.37 2023/07/19 14:57:42 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2023/10/23 06:37:41 wiz Exp $ # # Release notes: # https://lists.mercurial-scm.org/pipermail/mercurial/ DISTNAME= hg-evolve-11.0.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/post//} +PKGREVISION= 1 CATEGORIES= devel scm MASTER_SITES= ${MASTER_SITE_PYPI:=h/hg-evolve/} @@ -14,7 +15,6 @@ COMMENT= Experimental Mercurial extensio LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-mercurial>=5.4nb1:../../devel/py-mercurial -DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3 TEST_DEPENDS+= curl-[0-9]*:../../www/curl USE_TOOLS+= bash:test @@ -39,5 +39,6 @@ do-test: HGROOT=${HG_WRKSRC:sh}; cd ${WRKSRC}/tests && ${PYTHONBIN} $${HGROOT}/tests/run-tests.py ${_MAKE_JOBS:Q} .endif +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-hg-fastimport/Makefile diff -u pkgsrc/devel/py-hg-fastimport/Makefile:1.20 pkgsrc/devel/py-hg-fastimport/Makefile:1.21 --- pkgsrc/devel/py-hg-fastimport/Makefile:1.20 Wed Jul 12 19:09:22 2023 +++ pkgsrc/devel/py-hg-fastimport/Makefile Mon Oct 23 06:37:41 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2023/07/12 19:09:22 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2023/10/23 06:37:41 wiz Exp $ DISTNAME= hg-fastimport-0.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= devel MASTER_SITES= https://roy.marples.name/downloads/hg-fastimport/ EXTRACT_SUFX= .tar.xz @@ -12,10 +12,10 @@ HOMEPAGE= https://wiki.mercurial-scm.org COMMENT= Mercurial extension for importing from a git fast-import stream LICENSE= gnu-gpl-v2 -DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-mercurial>=5.1:../../devel/py-mercurial PYTHON_VERSIONS_INCOMPATIBLE= 27 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-ipython/Makefile diff -u pkgsrc/devel/py-ipython/Makefile:1.95 pkgsrc/devel/py-ipython/Makefile:1.96 --- pkgsrc/devel/py-ipython/Makefile:1.95 Mon Oct 2 18:58:24 2023 +++ pkgsrc/devel/py-ipython/Makefile Mon Oct 23 06:37:41 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.95 2023/10/02 18:58:24 adam Exp $ +# $NetBSD: Makefile,v 1.96 2023/10/23 06:37:41 wiz Exp $ DISTNAME= ipython-8.16.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=i/ipython/} @@ -18,7 +19,6 @@ DEPENDS+= ${PYPKGPREFIX}-pexpect>=4.4:.. DEPENDS+= ${PYPKGPREFIX}-pickleshare-[0-9]*:../../databases/py-pickleshare DEPENDS+= ${PYPKGPREFIX}-prompt_toolkit>=3.0.38:../../devel/py-prompt_toolkit DEPENDS+= ${PYPKGPREFIX}-pygments>=2.4.0:../../textproc/py-pygments -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-stack-data-[0-9]*:../../sysutils/py-stack-data DEPENDS+= ${PYPKGPREFIX}-traitlets>=5:../../devel/py-traitlets .include "../../mk/bsd.prefs.mk" @@ -46,5 +46,6 @@ post-install: ${MV} bin/ipython3 bin/ipython3-${PYVERSSUFFIX} && \ ${MV} ${PKGMANDIR}/man1/ipython.1 ${PKGMANDIR}/man1/ipython-${PYVERSSUFFIX}.1 || ${TRUE} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-lockfile/Makefile diff -u pkgsrc/devel/py-lockfile/Makefile:1.8 pkgsrc/devel/py-lockfile/Makefile:1.9 --- pkgsrc/devel/py-lockfile/Makefile:1.8 Tue Jun 6 12:41:14 2023 +++ pkgsrc/devel/py-lockfile/Makefile Mon Oct 23 06:37:41 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2023/06/06 12:41:14 riastradh Exp $ +# $NetBSD: Makefile,v 1.9 2023/10/23 06:37:41 wiz Exp $ DISTNAME= lockfile-0.12.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=l/lockfile/} @@ -11,12 +11,12 @@ HOMEPAGE= https://github.com/smontanaro/ COMMENT= Platform-independent file locking module LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3 TOOL_DEPENDS+= ${PYPKGPREFIX}-pbr>=1.8:../../devel/py-pbr USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-mercurial/Makefile diff -u pkgsrc/devel/py-mercurial/Makefile:1.88 pkgsrc/devel/py-mercurial/Makefile:1.89 --- pkgsrc/devel/py-mercurial/Makefile:1.88 Mon Oct 9 19:01:03 2023 +++ pkgsrc/devel/py-mercurial/Makefile Mon Oct 23 06:37:41 2023 @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.88 2023/10/09 19:01:03 wiz Exp $ +# $NetBSD: Makefile,v 1.89 2023/10/23 06:37:41 wiz 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/ @@ -12,12 +13,6 @@ HOMEPAGE= https://www.mercurial-scm.org/ COMMENT= Fast, lightweight source control management system LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # OR newer -DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses -# via xmlrpc from python itself, used in mercurial/pycompat.py -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - -TEST_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 - USE_TOOLS+= gmake msgfmt INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 @@ -44,5 +39,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README.rst \ ${DESTDIR}${PREFIX}/share/doc/mercurial +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-pysvn/Makefile diff -u pkgsrc/devel/py-pysvn/Makefile:1.54 pkgsrc/devel/py-pysvn/Makefile:1.55 --- pkgsrc/devel/py-pysvn/Makefile:1.54 Wed Apr 19 08:09:46 2023 +++ pkgsrc/devel/py-pysvn/Makefile Mon Oct 23 06:37:42 2023 @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.54 2023/04/19 08:09:46 adam Exp $ -# +# $NetBSD: Makefile,v 1.55 2023/10/23 06:37:42 wiz Exp $ VERS= 1.9.15 DISTNAME= pysvn-${VERS} PKGNAME= ${PYPKGPREFIX}-pysvn-${VERS} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pysvn/} @@ -13,8 +12,6 @@ HOMEPAGE= https://pysvn.sourceforge.io/ COMMENT= Python interface to Subversion LICENSE= apache-1.1 -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - USE_LANGUAGES= c c++ WRKSRC= ${WRKDIR}/${DISTNAME}/Source @@ -51,6 +48,7 @@ do-install: .include "../../devel/subversion-base/buildlink3.mk" .include "../../www/neon/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/extension.mk" .include "../../mk/krb5.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-rope/Makefile diff -u pkgsrc/devel/py-rope/Makefile:1.35 pkgsrc/devel/py-rope/Makefile:1.36 --- pkgsrc/devel/py-rope/Makefile:1.35 Wed Oct 4 20:21:18 2023 +++ pkgsrc/devel/py-rope/Makefile Mon Oct 23 06:37:42 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.35 2023/10/04 20:21:18 adam Exp $ +# $NetBSD: Makefile,v 1.36 2023/10/23 06:37:42 wiz Exp $ DISTNAME= rope-1.10.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=r/rope/} @@ -10,7 +11,6 @@ HOMEPAGE= https://github.com/python-rope COMMENT= Python refactoring library LICENSE= gnu-lgpl-v3 -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-toolconfig>=1.2.2:../../devel/py-toolconfig TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test @@ -18,5 +18,6 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-setuptools44/Makefile diff -u pkgsrc/devel/py-setuptools44/Makefile:1.6 pkgsrc/devel/py-setuptools44/Makefile:1.7 --- pkgsrc/devel/py-setuptools44/Makefile:1.6 Sun Apr 30 18:42:52 2023 +++ pkgsrc/devel/py-setuptools44/Makefile Mon Oct 23 06:37:42 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2023/04/30 18:42:52 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2023/10/23 06:37:42 wiz Exp $ DISTNAME= setuptools-44.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=s/setuptools/} EXTRACT_SUFX= .zip @@ -11,7 +12,6 @@ HOMEPAGE= https://github.com/pypa/setupt COMMENT= New Python packaging system (python 2.x version) LICENSE= python-software-foundation OR zpl-2.0 -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat #TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock #TEST_DEPENDS+= ${PYPKGPREFIX}-pathlib2-[0-9]*:../../devel/py-pathlib2 #TEST_DEPENDS+= ${PYPKGPREFIX}-test-fixture-config-[0-9]*:../../devel/py-test-fixture-config @@ -27,6 +27,7 @@ PYSETUPTESTTARGET= pytest BOOTSTRAP_SETUPTOOLS= yes +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-stem/Makefile diff -u pkgsrc/devel/py-stem/Makefile:1.9 pkgsrc/devel/py-stem/Makefile:1.10 --- pkgsrc/devel/py-stem/Makefile:1.9 Wed Jun 14 15:35:31 2023 +++ pkgsrc/devel/py-stem/Makefile Mon Oct 23 06:37:42 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2023/06/14 15:35:31 adam Exp $ +# $NetBSD: Makefile,v 1.10 2023/10/23 06:37:42 wiz Exp $ DISTNAME= stem-1.8.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel net python MASTER_SITES= ${MASTER_SITE_PYPI:=s/stem/} @@ -12,7 +13,6 @@ LICENSE= gnu-gpl-v3 USE_LANGUAGES= # none -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 TEST_DEPENDS+= ${PYPKGPREFIX}-codestyle-[0-9]*:../../devel/py-codestyle TEST_DEPENDS+= ${PYPKGPREFIX}-flakes-[0-9]*:../../devel/py-flakes TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock @@ -31,6 +31,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 do-test: cd ${WRKSRC} && ${PYTHONBIN} run_tests.py --unit +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../lang/python/versioned_dependencies.mk" Index: pkgsrc/devel/py-test/Makefile diff -u pkgsrc/devel/py-test/Makefile:1.118 pkgsrc/devel/py-test/Makefile:1.119 --- pkgsrc/devel/py-test/Makefile:1.118 Fri Sep 8 06:26:04 2023 +++ pkgsrc/devel/py-test/Makefile Mon Oct 23 06:37:43 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.118 2023/09/08 06:26:04 adam Exp $ +# $NetBSD: Makefile,v 1.119 2023/10/23 06:37:43 wiz Exp $ DISTNAME= pytest-7.4.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=p/pytest/} @@ -13,7 +14,6 @@ LICENSE= mit TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-iniconfig-[0-9]*:../../devel/py-iniconfig DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging DEPENDS+= ${PYPKGPREFIX}-pluggy>=0.12:../../devel/py-pluggy @@ -50,5 +50,6 @@ post-install: do-test: cd ${WRKSRC}/testing && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-test4/Makefile diff -u pkgsrc/devel/py-test4/Makefile:1.14 pkgsrc/devel/py-test4/Makefile:1.15 --- pkgsrc/devel/py-test4/Makefile:1.14 Tue Jun 6 12:41:15 2023 +++ pkgsrc/devel/py-test4/Makefile Mon Oct 23 06:37:43 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2023/06/06 12:41:15 riastradh Exp $ +# $NetBSD: Makefile,v 1.15 2023/10/23 06:37:43 wiz Exp $ DISTNAME= pytest-4.6.11 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=p/pytest/} @@ -13,7 +14,6 @@ LICENSE= mit TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm5 DEPENDS+= ${PYPKGPREFIX}-atomicwrites>=1.0:../../devel/py-atomicwrites DEPENDS+= ${PYPKGPREFIX}-attrs>=17.4.0:../../devel/py27-attrs -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-funcsigs>=1.0:../../devel/py-funcsigs DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata2 DEPENDS+= ${PYPKGPREFIX}-more-itertools-[0-9]*:../../devel/py-more-itertools2 @@ -45,5 +45,6 @@ post-install: do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} testing +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-trytond/Makefile diff -u pkgsrc/devel/py-trytond/Makefile:1.27 pkgsrc/devel/py-trytond/Makefile:1.28 --- pkgsrc/devel/py-trytond/Makefile:1.27 Wed Jan 5 15:41:08 2022 +++ pkgsrc/devel/py-trytond/Makefile Mon Oct 23 06:37:43 2023 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.27 2022/01/05 15:41:08 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2023/10/23 06:37:43 wiz Exp $ TRYTON_MODULE_NAME= trytond -PKGREVISION= 2 +PKGREVISION= 3 .include "../../devel/py-trytond/Makefile.common" CATEGORIES= devel python @@ -17,7 +17,6 @@ DEPENDS+= ${PYPKGPREFIX}-polib-[0-9]*:.. DEPENDS+= ${PYPKGPREFIX}-python-sql>=0.5:../../databases/py-python-sql DEPENDS+= ${PYPKGPREFIX}-werkzeug-[0-9]*:../../www/py-werkzeug DEPENDS+= ${PYPKGPREFIX}-wrapt-[0-9]*:../../devel/py-wrapt -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-passlib>=1.7.0:../../security/py-passlib DEPENDS+= ${PYPKGPREFIX}-magic-[0-9]*:../../sysutils/py-magic TEST_DEPENDS+= ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow @@ -35,6 +34,7 @@ post-install: .include "options.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-urwid/Makefile diff -u pkgsrc/devel/py-urwid/Makefile:1.32 pkgsrc/devel/py-urwid/Makefile:1.33 --- pkgsrc/devel/py-urwid/Makefile:1.32 Fri Oct 20 11:33:03 2023 +++ pkgsrc/devel/py-urwid/Makefile Mon Oct 23 06:37:43 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.32 2023/10/20 11:33:03 adam Exp $ +# $NetBSD: Makefile,v 1.33 2023/10/23 06:37:43 wiz Exp $ DISTNAME= urwid-2.2.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=u/urwid/} @@ -11,9 +12,9 @@ COMMENT= Curses-based Python user interf LICENSE= gnu-lgpl-v2.1 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm -DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses PYTHON_VERSIONS_INCOMPATIBLE= 27 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-virtualenv/Makefile diff -u pkgsrc/devel/py-virtualenv/Makefile:1.75 pkgsrc/devel/py-virtualenv/Makefile:1.76 --- pkgsrc/devel/py-virtualenv/Makefile:1.75 Wed Sep 13 19:27:34 2023 +++ pkgsrc/devel/py-virtualenv/Makefile Mon Oct 23 06:37:43 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.75 2023/09/13 19:27:34 adam Exp $ +# $NetBSD: Makefile,v 1.76 2023/10/23 06:37:43 wiz Exp $ DISTNAME= virtualenv-20.24.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=v/virtualenv/} @@ -15,7 +16,6 @@ TOOL_DEPENDS+= ${PYPKGPREFIX}-hatchling> DEPENDS+= ${PYPKGPREFIX}-distlib>=0.3.6:../../devel/py-distlib DEPENDS+= ${PYPKGPREFIX}-filelock>=3.11:../../devel/py-filelock DEPENDS+= ${PYPKGPREFIX}-platformdirs>=3.2:../../misc/py-platformdirs -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat TEST_DEPENDS+= ${PYPKGPREFIX}-coverage>=6.2:../../devel/py-coverage TEST_DEPENDS+= ${PYPKGPREFIX}-coverage-enable-subprocess>=1:../../devel/py-coverage-enable-subprocess TEST_DEPENDS+= ${PYPKGPREFIX}-flaky>=3.7:../../devel/py-flaky @@ -44,6 +44,7 @@ post-install: do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/wheel.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-visitor/Makefile diff -u pkgsrc/devel/py-visitor/Makefile:1.4 pkgsrc/devel/py-visitor/Makefile:1.5 --- pkgsrc/devel/py-visitor/Makefile:1.4 Thu Jan 13 19:31:22 2022 +++ pkgsrc/devel/py-visitor/Makefile Mon Oct 23 06:37:43 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2022/01/13 19:31:22 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2023/10/23 06:37:43 wiz Exp $ DISTNAME= visitor-0.1.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=v/visitor/} @@ -11,9 +11,8 @@ HOMEPAGE= https://github.com/mbr/visitor COMMENT= Tiny pythonic visitor implementation LICENSE= mit -#DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - USE_LANGUAGES= # none +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py27-coverage/Makefile diff -u pkgsrc/devel/py27-coverage/Makefile:1.5 pkgsrc/devel/py27-coverage/Makefile:1.6 --- pkgsrc/devel/py27-coverage/Makefile:1.5 Mon Aug 14 05:24:14 2023 +++ pkgsrc/devel/py27-coverage/Makefile Mon Oct 23 06:37:43 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2023/08/14 05:24:14 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2023/10/23 06:37:43 wiz Exp $ DISTNAME= coverage-5.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=c/coverage/} @@ -12,7 +12,6 @@ COMMENT= Python module that measures cod LICENSE= modified-bsd #TOOL_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 #TEST_DEPENDS+= ${PYPKGPREFIX}-flaky>=3.7.0:../../devel/py-flaky #TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=4.57.1:../../devel/py-hypothesis4 #TEST_DEPENDS+= ${PYPKGPREFIX}-mock>=3.0.5:../../devel/py-mock @@ -28,5 +27,6 @@ PYSETUPTESTTARGET= pytest post-install: ${RM} -f ${DESTDIR}${PREFIX}/bin/coverage ${DESTDIR}${PREFIX}/bin/coverage[23] +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/ropper/Makefile diff -u pkgsrc/devel/ropper/Makefile:1.9 pkgsrc/devel/ropper/Makefile:1.10 --- pkgsrc/devel/ropper/Makefile:1.9 Mon Aug 14 05:24:15 2023 +++ pkgsrc/devel/ropper/Makefile Mon Oct 23 06:37:43 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2023/08/14 05:24:15 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2023/10/23 06:37:43 wiz Exp $ DISTNAME= Ropper-1.11.6 PKGNAME= ${DISTNAME:tl} -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=sashs/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -14,12 +14,12 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-capstone-[0-9]*:../../devel/py-capstone DEPENDS+= ${PYPKGPREFIX}-filebytes-[0-9]*:../../devel/py-filebytes -DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline DEPENDS+= ${PYPKGPREFIX}-keystone-[0-9]*:../../emulators/py-keystone USE_LANGUAGES= # none WRKSRC= ${WRKDIR}/${DISTNAME} EGG_NAME= ${DISTNAME:tl} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/rox-lib/Makefile diff -u pkgsrc/devel/rox-lib/Makefile:1.35 pkgsrc/devel/rox-lib/Makefile:1.36 --- pkgsrc/devel/rox-lib/Makefile:1.35 Mon Aug 14 05:24:15 2023 +++ pkgsrc/devel/rox-lib/Makefile Mon Oct 23 06:37:44 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2023/08/14 05:24:15 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2023/10/23 06:37:44 wiz Exp $ DISTNAME= rox-lib-2.0.2 -PKGREVISION= 18 +PKGREVISION= 19 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/} EXTRACT_SUFX= .tgz @@ -11,7 +11,6 @@ HOMEPAGE= http://rox.sourceforge.net/des COMMENT= Shared code for ROX applications DEPENDS+= rox>=2.2.0:../../sysutils/rox -DEPENDS+= ${PYPKGPREFIX}-expat>=0nb2:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-gtk2>=1.99.13:../../x11/py-gtk2 WRKSRC= ${WRKDIR}/${DISTNAME}/ROX-Lib2 @@ -46,5 +45,6 @@ SUBST_SED.lib= -e 's,/usr/local/lib,${P do-install: cd ${WRKSRC} && pax -rw . ${DESTDIR}${PREFIX}/share/rox/ROX-Lib2 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/doc/CHANGES-2023 diff -u pkgsrc/doc/CHANGES-2023:1.6052 pkgsrc/doc/CHANGES-2023:1.6053 --- pkgsrc/doc/CHANGES-2023:1.6052 Sun Oct 22 19:42:28 2023 +++ pkgsrc/doc/CHANGES-2023 Mon Oct 23 06:37:44 2023 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2023,v 1.6052 2023/10/22 19:42:28 pin Exp $ +$NetBSD: CHANGES-2023,v 1.6053 2023/10/23 06:37:44 wiz Exp $ Changes to the packages collection and infrastructure in 2023: @@ -8889,3 +8889,15 @@ Changes to the packages collection and i Updated net/tlrc to 1.6.0 [pin 2023-10-22] Updated www/xh to 0.19.3 [pin 2023-10-22] Updated sysutils/yazi to 0.1.5 [pin 2023-10-22] + Updated lang/python27 to 2.7.18nb12 [wiz 2023-10-23] + Updated lang/python38 to 3.8.18nb1 [wiz 2023-10-23] + Updated lang/python39 to 3.9.18nb1 [wiz 2023-10-23] + Updated lang/python310 to 3.10.13nb1 [wiz 2023-10-23] + Updated lang/python311 to 3.11.6nb1 [wiz 2023-10-23] + Updated lang/python312 to 3.12.0nb1 [wiz 2023-10-23] + Removed devel/py-curses [wiz 2023-10-23] + Removed devel/py-cursespanel [wiz 2023-10-23] + Removed databases/py-sqlite3 [wiz 2023-10-23] + Removed textproc/py-cElementTree [wiz 2023-10-23] + Removed textproc/py-expat [wiz 2023-10-23] + Removed devel/py-readline [wiz 2023-10-23] Index: pkgsrc/editors/fileobj/Makefile diff -u pkgsrc/editors/fileobj/Makefile:1.19 pkgsrc/editors/fileobj/Makefile:1.20 --- pkgsrc/editors/fileobj/Makefile:1.19 Mon Aug 14 05:24:18 2023 +++ pkgsrc/editors/fileobj/Makefile Mon Oct 23 06:37:44 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2023/08/14 05:24:18 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2023/10/23 06:37:44 wiz Exp $ DISTNAME= fileobj-0.8.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= editors python MASTER_SITES= ${MASTER_SITE_GITHUB:=kusumi/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -11,13 +11,12 @@ HOMEPAGE= https://sourceforge.net/projec COMMENT= Curses based hex editor with vi interface LICENSE= 2-clause-bsd -DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses - PYTHON_VERSIONS_INCOMPATIBLE= 27 post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} fileobj fileobj-${PYVERSSUFFIX} || ${TRUE} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/editors/medit/Makefile diff -u pkgsrc/editors/medit/Makefile:1.57 pkgsrc/editors/medit/Makefile:1.58 --- pkgsrc/editors/medit/Makefile:1.57 Sat Oct 21 17:10:05 2023 +++ pkgsrc/editors/medit/Makefile Mon Oct 23 06:37:44 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2023/10/21 17:10:05 gdt Exp $ +# $NetBSD: Makefile,v 1.58 2023/10/23 06:37:44 wiz Exp $ DISTNAME= medit-1.2.0 PKGREVISION= 26 @@ -11,8 +11,6 @@ HOMEPAGE= http://mooedit.sourceforge.net COMMENT= Programming and around-programming text editor LICENSE= gnu-lgpl-v2.1 -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_LANGUAGES= c c++ @@ -26,6 +24,7 @@ CONFIGURE_ENV+= MOO_PYTHON=${PYTHONBIN .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../textproc/libxml2/buildlink3.mk" Index: pkgsrc/editors/py-jedi/Makefile diff -u pkgsrc/editors/py-jedi/Makefile:1.13 pkgsrc/editors/py-jedi/Makefile:1.14 --- pkgsrc/editors/py-jedi/Makefile:1.13 Thu Oct 19 15:42:37 2023 +++ pkgsrc/editors/py-jedi/Makefile Mon Oct 23 06:37:44 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2023/10/19 15:42:37 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2023/10/23 06:37:44 wiz Exp $ DISTNAME= jedi-0.19.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= editors python MASTER_SITES= ${MASTER_SITE_PYPI:=j/jedi/} @@ -13,7 +14,6 @@ LICENSE= mit EXTRACT_USING= bsdtar DEPENDS+= ${PYPKGPREFIX}-parso>=0.8.3:../../lang/py-parso -DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline TEST_DEPENDS+= ${PYPKGPREFIX}-attrs-[0-9]*:../../devel/py-attrs TEST_DEPENDS+= ${PYPKGPREFIX}-colorama-[0-9]*:../../comms/py-colorama TEST_DEPENDS+= ${PYPKGPREFIX}-docopt-[0-9]*:../../devel/py-docopt @@ -26,5 +26,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 do-test: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} pytest-${PYVERSSUFFIX} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/editors/tp-note/Makefile diff -u pkgsrc/editors/tp-note/Makefile:1.58 pkgsrc/editors/tp-note/Makefile:1.59 --- pkgsrc/editors/tp-note/Makefile:1.58 Fri Oct 20 07:00:07 2023 +++ pkgsrc/editors/tp-note/Makefile Mon Oct 23 06:37:45 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.58 2023/10/20 07:00:07 pin Exp $ +# $NetBSD: Makefile,v 1.59 2023/10/23 06:37:45 wiz Exp $ DISTNAME= tp-note-1.22.9 +PKGREVISION= 1 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GITLAB:=getreu/} GITLAB_RELEASE= v${PKGVERSION_NOREV} @@ -10,8 +11,6 @@ HOMEPAGE= https://blog.getreu.net/projec COMMENT= Minimalistic note taking and template system LICENSE= mit OR apache-2.0 -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - .include "cargo-depends.mk" WRKSRC= ${WRKDIR}/tp-note-v1.22.9-d1e6d0032d5c8d76872373595978958b2a2628f8 @@ -36,6 +35,7 @@ do-install: ${DESTDIR}${PREFIX}/share/pixmaps .include "../../lang/rust/cargo.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" .include "../../x11/gtk3/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" Index: pkgsrc/editors/zim/Makefile diff -u pkgsrc/editors/zim/Makefile:1.54 pkgsrc/editors/zim/Makefile:1.55 --- pkgsrc/editors/zim/Makefile:1.54 Sat Oct 21 17:10:07 2023 +++ pkgsrc/editors/zim/Makefile Mon Oct 23 06:37:45 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2023/10/21 17:10:07 gdt Exp $ +# $NetBSD: Makefile,v 1.55 2023/10/23 06:37:45 wiz Exp $ DISTNAME= zim-0.74.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,8 +13,6 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 -DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils USE_LANGUAGES= # none @@ -36,6 +34,7 @@ SUBST_STAGE.man-path= pre-configure SUBST_FILES.man-path+= setup.py SUBST_SED.man-path= -e s,share/man/man1,${PKGMANDIR}/man1, +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../x11/gtk3/buildlink3.mk" Index: pkgsrc/emulators/fs-uae-arcade/Makefile diff -u pkgsrc/emulators/fs-uae-arcade/Makefile:1.16 pkgsrc/emulators/fs-uae-arcade/Makefile:1.17 --- pkgsrc/emulators/fs-uae-arcade/Makefile:1.16 Mon Aug 14 05:24:20 2023 +++ pkgsrc/emulators/fs-uae-arcade/Makefile Mon Oct 23 06:37:45 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2023/08/14 05:24:20 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2023/10/23 06:37:45 wiz Exp $ DISTNAME= fs-uae-arcade-3.1.63 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= emulators MASTER_SITES= https://fs-uae.net/files/FS-UAE-Arcade/Stable/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.xz @@ -13,7 +13,6 @@ LICENSE= gnu-gpl-v2 DEPENDS+= fs-uae>=3.1.66:../../emulators/fs-uae DEPENDS+= ${PYPKGPREFIX}-lhafile-[0-9]*:../../archivers/py-lhafile -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-qt5>=5.4:../../x11/py-qt5 .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "Darwin" @@ -49,6 +48,7 @@ post-install: ${LN} -s ../share/fs-uae-arcade/fs-uae-arcade fs-uae-arcade .include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" Index: pkgsrc/emulators/fs-uae-launcher/Makefile diff -u pkgsrc/emulators/fs-uae-launcher/Makefile:1.23 pkgsrc/emulators/fs-uae-launcher/Makefile:1.24 --- pkgsrc/emulators/fs-uae-launcher/Makefile:1.23 Mon Aug 14 05:24:20 2023 +++ pkgsrc/emulators/fs-uae-launcher/Makefile Mon Oct 23 06:37:45 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2023/08/14 05:24:20 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2023/10/23 06:37:45 wiz Exp $ DISTNAME= fs-uae-launcher-3.1.68 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= emulators MASTER_SITES= https://fs-uae.net/files/FS-UAE-Launcher/Stable/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.xz @@ -14,7 +14,6 @@ LICENSE= gnu-gpl-v2 DEPENDS+= fs-uae>=3.1.66:../../emulators/fs-uae DEPENDS+= ${PYPKGPREFIX}-lhafile-[0-9]*:../../archivers/py-lhafile DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-qt5>=5.4:../../x11/py-qt5 .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "Darwin" @@ -50,6 +49,7 @@ post-install: ${LN} -s ../share/fs-uae-launcher/fs-uae-launcher fs-uae-launcher .include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" Index: pkgsrc/emulators/mame/Makefile diff -u pkgsrc/emulators/mame/Makefile:1.180 pkgsrc/emulators/mame/Makefile:1.181 --- pkgsrc/emulators/mame/Makefile:1.180 Sat Sep 9 20:04:57 2023 +++ pkgsrc/emulators/mame/Makefile Mon Oct 23 06:37:45 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.180 2023/09/09 20:04:57 wiz Exp $ +# $NetBSD: Makefile,v 1.181 2023/10/23 06:37:45 wiz Exp $ DISTNAME= mame-0.258 +PKGREVISION= 1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_GITHUB:=mamedev/} GITHUB_TAG= ${DISTNAME:S/-//S/.//} @@ -17,7 +18,6 @@ INSTALLATION_DIRS+= ${SHAREDIR}/artwork/ INSTALLATION_DIRS+= ${SHAREDIR}/artwork/bgfx/chains/crt-geom ${SHAREDIR}/hash DEPENDS+= liberation-ttf-[0-9]*:../../fonts/liberation-ttf -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat USE_LANGUAGES= c99 c++ USE_CXX_FEATURES+= c++17 @@ -128,6 +128,7 @@ do-install: .include "../../graphics/glm/buildlink3.mk" .include "../../fonts/SDL2_ttf/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/pyversion.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../textproc/pugixml/buildlink3.mk" Index: pkgsrc/filesystems/tahoe-lafs/Makefile diff -u pkgsrc/filesystems/tahoe-lafs/Makefile:1.60 pkgsrc/filesystems/tahoe-lafs/Makefile:1.61 --- pkgsrc/filesystems/tahoe-lafs/Makefile:1.60 Mon Aug 14 05:24:23 2023 +++ pkgsrc/filesystems/tahoe-lafs/Makefile Mon Oct 23 06:37:45 2023 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.60 2023/08/14 05:24:23 wiz Exp $ +# $NetBSD: Makefile,v 1.61 2023/10/23 06:37:45 wiz Exp $ VERSION_BASE= 1.18.0 VERSION_RC= DISTNAME= tahoe-lafs-${VERSION_BASE}${VERSION_RC} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= filesystems MASTER_SITES= https://tahoe-lafs.org/downloads/ @@ -18,9 +18,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 USE_PKG_RESOURCES= yes -# The world sees this as part of base python. -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 - ## Dependencies are from tahoe's setup.py, in order, and try to follow ## setup.py's version requirements. # install_requires @@ -87,6 +84,7 @@ PKG_GECOS.tahoes= tahoe server #do-test: # cd ${WRKSRC} && py.test-3.8 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../lang/python/versioned_dependencies.mk" Index: pkgsrc/finance/gnucash/options.mk diff -u pkgsrc/finance/gnucash/options.mk:1.7 pkgsrc/finance/gnucash/options.mk:1.8 --- pkgsrc/finance/gnucash/options.mk:1.7 Tue Jun 6 12:41:22 2023 +++ pkgsrc/finance/gnucash/options.mk Mon Oct 23 06:37:45 2023 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2023/06/06 12:41:22 riastradh Exp $ +# $NetBSD: options.mk,v 1.8 2023/10/23 06:37:45 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gnucash PKG_SUPPORTED_OPTIONS= libdbi libofx gnucash-finance-quote python @@ -37,8 +37,8 @@ REPLACE_PYTHON+= gnucash/python/pycons/ PY_PATCHPLIST= yes PLIST_SRC+= PLIST.python -# /usr/pkg/share/gnucash/python/pycons/console.py imports readline -DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline +.include "../../lang/python/batteries-included.mk" + # /usr/pkg/share/gnucash/python/init.py imports gi DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 Index: pkgsrc/fonts/py-fonttools/Makefile diff -u pkgsrc/fonts/py-fonttools/Makefile:1.94 pkgsrc/fonts/py-fonttools/Makefile:1.95 --- pkgsrc/fonts/py-fonttools/Makefile:1.94 Wed Oct 11 09:02:17 2023 +++ pkgsrc/fonts/py-fonttools/Makefile Mon Oct 23 06:37:45 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.94 2023/10/11 09:02:17 adam Exp $ +# $NetBSD: Makefile,v 1.95 2023/10/23 06:37:45 wiz Exp $ DISTNAME= fonttools-4.43.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= fonts python MASTER_SITES= ${MASTER_SITE_PYPI:=F/FontTools/} @@ -11,8 +12,6 @@ COMMENT= Library for manipulating fonts LICENSE= mit TOOL_DEPENDS+= ${PYPKGPREFIX}-cython-[0-9]*:../../devel/py-cython -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat -# lxml DEPENDS+= ${PYPKGPREFIX}-lxml>=4.0:../../textproc/py-lxml # ufo DEPENDS+= ${PYPKGPREFIX}-fs>=2.2.0:../../filesystems/py-fs @@ -44,5 +43,6 @@ post-install: cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && \ ${MV} ttx.1 ttx-${PYVERSSUFFIX}.1 || ${TRUE} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/games/supertuxkart/Makefile diff -u pkgsrc/games/supertuxkart/Makefile:1.48 pkgsrc/games/supertuxkart/Makefile:1.49 --- pkgsrc/games/supertuxkart/Makefile:1.48 Mon Aug 14 05:24:28 2023 +++ pkgsrc/games/supertuxkart/Makefile Mon Oct 23 06:37:45 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.48 2023/08/14 05:24:28 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2023/10/23 06:37:45 wiz Exp $ DISTNAME= SuperTuxKart-1.4-src PKGNAME= ${DISTNAME:tl:S/-src//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GITHUB:=supertuxkart/} GITHUB_PROJECT= stk-code @@ -18,8 +18,6 @@ USE_CMAKE= yes USE_LANGUAGES= c c++ USE_TOOLS+= cmake pkg-config -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - CMAKE_ARGS+= -DUSE_WIIUSE=OFF CMAKE_ARGS+= -DBUILD_RECORDER=OFF @@ -43,6 +41,7 @@ CMAKE_ARGS+= -DENABLE_WAYLAND_DEVICE=OFF .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" .include "../../net/enet/buildlink3.mk" .include "../../security/nettle/buildlink3.mk" Index: pkgsrc/games/unknown-horizons/Makefile diff -u pkgsrc/games/unknown-horizons/Makefile:1.10 pkgsrc/games/unknown-horizons/Makefile:1.11 --- pkgsrc/games/unknown-horizons/Makefile:1.10 Mon Aug 14 05:24:28 2023 +++ pkgsrc/games/unknown-horizons/Makefile Mon Oct 23 06:37:46 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2023/08/14 05:24:28 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2023/10/23 06:37:46 wiz Exp $ DISTNAME= unknown-horizons-2019.1 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GITHUB:=unknown-horizons/} @@ -14,7 +14,6 @@ USE_TOOLS+= intltool msgfmt DEPENDS+= ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow DEPENDS+= ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml DEPENDS+= fifengine-[0-9]*:../../devel/fifengine @@ -35,6 +34,7 @@ SUBST_VARS.paths+= PREFIX PKGMANDIR post-build: cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${PYTHONBIN} horizons/engine/generate_atlases.py 2048 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/games/wordsearch/Makefile diff -u pkgsrc/games/wordsearch/Makefile:1.4 pkgsrc/games/wordsearch/Makefile:1.5 --- pkgsrc/games/wordsearch/Makefile:1.4 Mon Aug 14 05:24:29 2023 +++ pkgsrc/games/wordsearch/Makefile Mon Oct 23 06:37:46 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2023/08/14 05:24:29 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2023/10/23 06:37:46 wiz Exp $ DISTNAME= wordsearch-2.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= games GITHUB_PROJECT= wordsearch MASTER_SITES= ${MASTER_SITE_GITHUB:=jensenpat/} @@ -12,8 +12,6 @@ HOMEPAGE= https://github.com/jensenpat/w COMMENT= Classic word search game that you can play in your terminal LICENSE= 2-clause-bsd -DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses - NO_BUILD= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 @@ -32,5 +30,6 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/man/wordsearch.6 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/ ${INSTALL_DATA} ${WRKSRC}/puzzles/*.txt ${DESTDIR}${PREFIX}/share/wordsearch/ +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/graphics/MesaLib/Makefile diff -u pkgsrc/graphics/MesaLib/Makefile:1.209 pkgsrc/graphics/MesaLib/Makefile:1.210 --- pkgsrc/graphics/MesaLib/Makefile:1.209 Mon Aug 14 05:24:30 2023 +++ pkgsrc/graphics/MesaLib/Makefile Mon Oct 23 06:37:46 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.209 2023/08/14 05:24:30 wiz Exp $ +# $NetBSD: Makefile,v 1.210 2023/10/23 06:37:46 wiz Exp $ DISTNAME= mesa-21.3.9 PKGNAME= ${DISTNAME:S/mesa/MesaLib/} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics MASTER_SITES= https://mesa.freedesktop.org/archive/ EXTRACT_SUFX= .tar.xz @@ -141,9 +141,6 @@ CPPFLAGS+= -DSYSCONFDIR=${PKG_SYSCONFDIR TOOL_DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako -# needed to build vulkan support -TOOL_DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree - BUILDLINK_TRANSFORM+= rm:-Werror=incompatible-pointer-types # https://gitlab.freedesktop.org/mesa/mesa/merge_requests/1854 @@ -188,6 +185,7 @@ post-install: .include "../../devel/meson/build.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/atomic64.mk" Index: pkgsrc/graphics/comix/Makefile diff -u pkgsrc/graphics/comix/Makefile:1.86 pkgsrc/graphics/comix/Makefile:1.87 --- pkgsrc/graphics/comix/Makefile:1.86 Sat Oct 21 17:10:23 2023 +++ pkgsrc/graphics/comix/Makefile Mon Oct 23 06:37:46 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2023/10/21 17:10:23 gdt Exp $ +# $NetBSD: Makefile,v 1.87 2023/10/23 06:37:46 wiz Exp $ DISTNAME= comix-4.0.4 PKGREVISION= 52 @@ -11,7 +11,6 @@ COMMENT= Image viewer specifically desi LICENSE= gnu-gpl-v2 DEPENDS+= unrar-[0-9]*:../../archivers/unrar -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 MANCOMPRESSED= yes @@ -35,6 +34,7 @@ do-install: .include "../../graphics/hicolor-icon-theme/buildlink3.mk" BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.5 .include "../../graphics/py-imaging/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" Index: pkgsrc/graphics/glad/Makefile diff -u pkgsrc/graphics/glad/Makefile:1.4 pkgsrc/graphics/glad/Makefile:1.5 --- pkgsrc/graphics/glad/Makefile:1.4 Mon Aug 14 05:24:33 2023 +++ pkgsrc/graphics/glad/Makefile Mon Oct 23 06:37:46 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2023/08/14 05:24:33 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2023/10/23 06:37:46 wiz Exp $ DISTNAME= glad-0.1.34 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GITHUB:=Dav1dde/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -18,7 +18,7 @@ CMAKE_ARGS+= -DGLAD_REPRODUCIBLE=ON CMAKE_ARGS+= -DGLAD_INSTALL=ON PYTHON_FOR_BUILD_ONLY= tool -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/graphics/inkscape/Makefile diff -u pkgsrc/graphics/inkscape/Makefile:1.273 pkgsrc/graphics/inkscape/Makefile:1.274 --- pkgsrc/graphics/inkscape/Makefile:1.273 Sat Oct 21 17:10:32 2023 +++ pkgsrc/graphics/inkscape/Makefile Mon Oct 23 06:37:46 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.273 2023/10/21 17:10:32 gdt Exp $ +# $NetBSD: Makefile,v 1.274 2023/10/23 06:37:46 wiz Exp $ DISTNAME= inkscape-1.3 PKGREVISION= 2 @@ -15,7 +15,6 @@ LICENSE= gnu-gpl-v2 TOOL_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv .endif DEPENDS+= adwaita-icon-theme>0:../../graphics/adwaita-icon-theme -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat # for inkex.py, needed by most python extension scripts DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml DEPENDS+= ${PYPKGPREFIX}-serial-[0-9]*:../../comms/py-serial @@ -137,6 +136,7 @@ BUILDLINK_API_DEPENDS.gtkmm3+= gtkmm3>=3 .include "../../x11/gtk-mac-integration/buildlink3.mk" .endif .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../mk/atomic64.mk" .include "../../mk/jpeg.buildlink3.mk" Index: pkgsrc/graphics/libepoxy/Makefile diff -u pkgsrc/graphics/libepoxy/Makefile:1.34 pkgsrc/graphics/libepoxy/Makefile:1.35 --- pkgsrc/graphics/libepoxy/Makefile:1.34 Mon Aug 14 05:24:35 2023 +++ pkgsrc/graphics/libepoxy/Makefile Mon Oct 23 06:37:46 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.34 2023/08/14 05:24:35 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2023/10/23 06:37:46 wiz Exp $ DISTNAME= libepoxy-1.5.10 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GITHUB:=anholt/} GITHUB_TAG= ${PKGVERSION_NOREV} @@ -11,8 +11,6 @@ HOMEPAGE= https://github.com/anholt/libe COMMENT= Library for OpenGL function pointer management LICENSE= mit -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat - PYTHON_VERSIONS_INCOMPATIBLE= 27 USE_TOOLS+= pkg-config @@ -43,5 +41,6 @@ TEST_ENV+= LD_LIBRARY_PATH=${WRKSRC}/out .include "../../devel/meson/build.mk" .include "../../devel/xorg-util-macros/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/graphics/py-mcomix/Makefile diff -u pkgsrc/graphics/py-mcomix/Makefile:1.26 pkgsrc/graphics/py-mcomix/Makefile:1.27 --- pkgsrc/graphics/py-mcomix/Makefile:1.26 Mon Jul 3 13:06:02 2023 +++ pkgsrc/graphics/py-mcomix/Makefile Mon Oct 23 06:37:46 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2023/07/03 13:06:02 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2023/10/23 06:37:46 wiz Exp $ DISTNAME= mcomix-2.1.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mcomix/} @@ -13,7 +13,6 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-Pillow>=6.0.0:../../graphics/py-Pillow DEPENDS+= ${PYPKGPREFIX}-gobject3>=3.36.0:../../devel/py-gobject3 -DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3 USE_LANGUAGES= # none @@ -34,5 +33,6 @@ SUBST_SED.path= -e s,share/man,${PKGMAN .include "../../graphics/py-cairo/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/inputmethod/ibus-table/Makefile diff -u pkgsrc/inputmethod/ibus-table/Makefile:1.29 pkgsrc/inputmethod/ibus-table/Makefile:1.30 --- pkgsrc/inputmethod/ibus-table/Makefile:1.29 Mon Aug 14 05:24:40 2023 +++ pkgsrc/inputmethod/ibus-table/Makefile Mon Oct 23 06:37:46 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2023/08/14 05:24:40 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2023/10/23 06:37:46 wiz Exp $ DISTNAME= ibus-table-1.9.2 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= inputmethod MASTER_SITES= https://github.com/kaio/ibus-table/releases/download/${PKGVERSION_NOREV}/ @@ -11,7 +11,6 @@ COMMENT= Table engine for IBus platform LICENSE= gnu-lgpl-v2.1 DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 GNU_CONFIGURE= yes USE_TOOLS+= gmake pkg-config msgfmt @@ -27,6 +26,7 @@ SUBST_SED.prefix= -e 's|/usr/share|${PRE REPLACE_PYTHON+= engine/tabcreatedb.py PYTHON_VERSIONS_INCOMPATIBLE= 27 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../inputmethod/ibus/buildlink3.mk" Index: pkgsrc/inputmethod/tegaki-python/Makefile diff -u pkgsrc/inputmethod/tegaki-python/Makefile:1.19 pkgsrc/inputmethod/tegaki-python/Makefile:1.20 --- pkgsrc/inputmethod/tegaki-python/Makefile:1.19 Mon Aug 14 05:24:41 2023 +++ pkgsrc/inputmethod/tegaki-python/Makefile Mon Oct 23 06:37:47 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2023/08/14 05:24:41 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2023/10/23 06:37:47 wiz Exp $ DISTNAME= tegaki-python-0.3.1 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= inputmethod MASTER_SITES= http://www.tegaki.org/releases/${PKGVERSION_NOREV}/ @@ -10,8 +10,6 @@ HOMEPAGE= http://www.tegaki.org/ COMMENT= Base Python library for the Tegaki project LICENSE= gnu-gpl-v2 -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat # optional for desktop applications, see tegaki/character.py #DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml DEPENDS+= ${PYPKGPREFIX}-zinnia>=0.05:../../inputmethod/py-zinnia @@ -25,5 +23,6 @@ SUBST_SED.prefix= -e 's|/usr/local/share PYTHON_VERSIONS_ACCEPTED= 27 # py-zinnia +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/lang/mozjs78/Makefile diff -u pkgsrc/lang/mozjs78/Makefile:1.31 pkgsrc/lang/mozjs78/Makefile:1.32 --- pkgsrc/lang/mozjs78/Makefile:1.31 Mon Aug 14 05:24:45 2023 +++ pkgsrc/lang/mozjs78/Makefile Mon Oct 23 06:37:47 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.31 2023/08/14 05:24:45 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2023/10/23 06:37:47 wiz Exp $ DISTNAME= mozjs78_78.15.0.orig PKGNAME= ${DISTNAME:S/_/-/:S/.orig//} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= lang MASTER_SITES= http://deb.debian.org/debian/pool/main/m/mozjs78/ EXTRACT_SUFX= .tar.xz @@ -62,7 +62,6 @@ PKGCONFIG_OVERRIDE+= js/src/ctypes/libff PYTHON_VERSIONS_ACCEPTED= 39 38 PYTHON_FOR_BUILD_ONLY= tool -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat TEST_DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six @@ -88,6 +87,7 @@ BUILDLINK_DEPMETHOD.clang= build RUST_REQ= 1.41.0 .include "../../lang/rust/rust.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" .include "../../textproc/icu/buildlink3.mk" .include "../../mk/readline.buildlink3.mk" Index: pkgsrc/lang/nodejs/Makefile diff -u pkgsrc/lang/nodejs/Makefile:1.275 pkgsrc/lang/nodejs/Makefile:1.276 --- pkgsrc/lang/nodejs/Makefile:1.275 Mon Oct 16 19:15:17 2023 +++ pkgsrc/lang/nodejs/Makefile Mon Oct 23 06:37:47 2023 @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.275 2023/10/16 19:15:17 adam Exp $ +# $NetBSD: Makefile,v 1.276 2023/10/23 06:37:47 wiz Exp $ DISTNAME= node-v20.8.1 +PKGREVISION= 1 EXTRACT_SUFX= .tar.xz USE_LANGUAGES= c gnu++17 USE_CXX_FEATURES+= c++17 charconv -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat - .include "../../mk/bsd.prefs.mk" # XXX: figure out a way to add rpaths to torque @@ -47,5 +46,7 @@ minusx: .include "../../lang/nodejs/Makefile.common" .include "../../net/ngtcp2/buildlink3.mk" .include "../../www/nghttp3/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" +.include "../../lang/python/tool.mk" .include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/lang/nodejs16/Makefile diff -u pkgsrc/lang/nodejs16/Makefile:1.19 pkgsrc/lang/nodejs16/Makefile:1.20 --- pkgsrc/lang/nodejs16/Makefile:1.19 Mon Aug 14 05:24:45 2023 +++ pkgsrc/lang/nodejs16/Makefile Mon Oct 23 06:37:47 2023 @@ -1,13 +1,11 @@ -# $NetBSD: Makefile,v 1.19 2023/08/14 05:24:45 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2023/10/23 06:37:47 wiz Exp $ DISTNAME= node-v16.20.2 EXTRACT_SUFX= .tar.xz USE_LANGUAGES= c gnu++14 -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat - -PKGREVISION= 1 +PKGREVISION= 2 .include "../../mk/bsd.prefs.mk" # XXX: figure out a way to add rpaths to torque @@ -43,6 +41,8 @@ minusx: .include "../../devel/libatomic/buildlink3.mk" .endif +.include "../../lang/python/batteries-included.mk" +.include "../../lang/python/tool.mk" .include "../../lang/nodejs/Makefile.common" .include "../../net/ngtcp2/buildlink3.mk" .include "../../www/nghttp3/buildlink3.mk" Index: pkgsrc/lang/nodejs18/Makefile diff -u pkgsrc/lang/nodejs18/Makefile:1.21 pkgsrc/lang/nodejs18/Makefile:1.22 --- pkgsrc/lang/nodejs18/Makefile:1.21 Mon Oct 16 19:16:58 2023 +++ pkgsrc/lang/nodejs18/Makefile Mon Oct 23 06:37:47 2023 @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.21 2023/10/16 19:16:58 adam Exp $ +# $NetBSD: Makefile,v 1.22 2023/10/23 06:37:47 wiz Exp $ DISTNAME= node-v18.18.2 +PKGREVISION= 1 EXTRACT_SUFX= .tar.xz USE_LANGUAGES= c gnu++17 USE_CXX_FEATURES+= c++17 charconv -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat - .include "../../mk/bsd.prefs.mk" # XXX: figure out a way to add rpaths to torque @@ -45,6 +44,8 @@ minusx: .include "../../devel/libatomic/buildlink3.mk" .endif +.include "../../lang/python/batteries-included.mk" +.include "../../lang/python/tool.mk" .include "../../lang/nodejs/Makefile.common" .include "../../net/ngtcp2/buildlink3.mk" .include "../../www/nghttp3/buildlink3.mk" Index: pkgsrc/mail/feed2exec/Makefile diff -u pkgsrc/mail/feed2exec/Makefile:1.22 pkgsrc/mail/feed2exec/Makefile:1.23 --- pkgsrc/mail/feed2exec/Makefile:1.22 Mon Aug 14 05:24:46 2023 +++ pkgsrc/mail/feed2exec/Makefile Mon Oct 23 06:37:47 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2023/08/14 05:24:46 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2023/10/23 06:37:47 wiz Exp $ DISTNAME= feed2exec-0.19.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 3 CATEGORIES= mail python MASTER_SITES= ${MASTER_SITE_GITLAB:=anarcat/feed2exec/-/archive/${PKGVERSION_NOREV}/} @@ -25,7 +25,6 @@ DEPENDS+= ${PYPKGPREFIX}-html2text-[0-9 DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests DEPENDS+= ${PYPKGPREFIX}-requests-file-[0-9]*:../../devel/py-requests-file -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-wcwidth-[0-9]*:../../devel/py-wcwidth DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml @@ -51,9 +50,7 @@ post-extract: do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} -#post-install: -# ${RM} -rf ${DESTDIR}${PREFIX}/${PYSITELIB}/feed2exec/__pycache__/ - +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/mail/gyb/Makefile diff -u pkgsrc/mail/gyb/Makefile:1.4 pkgsrc/mail/gyb/Makefile:1.5 --- pkgsrc/mail/gyb/Makefile:1.4 Mon Aug 14 05:24:46 2023 +++ pkgsrc/mail/gyb/Makefile Mon Oct 23 06:37:47 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2023/08/14 05:24:46 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2023/10/23 06:37:47 wiz Exp $ DISTNAME= gyb-1.71 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail python MASTER_SITES= ${MASTER_SITE_GITHUB:=GAM-team/} GITHUB_PROJECT= got-your-back @@ -16,7 +16,6 @@ DEPENDS+= ${PYPKGPREFIX}-google-api-pyth DEPENDS+= ${PYPKGPREFIX}-google-auth>=1.11.2:../../security/py-google-auth DEPENDS+= ${PYPKGPREFIX}-google-auth-httplib2-[0-9]*:../../security/py-google-auth-httplib2 DEPENDS+= ${PYPKGPREFIX}-google-auth-oauthlib>=0.4.1:../../security/py-google-auth-oauthlib -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 NO_BUILD= yes PLIST_SUBST+= PYSITELIB=${PYSITELIB} @@ -39,5 +38,6 @@ do-install: ${INSTALL_SCRIPT} $${f} ${DESTDIR}${PREFIX}/${PYSITELIB}/$${f}; \ done +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/mail/meli/Makefile diff -u pkgsrc/mail/meli/Makefile:1.12 pkgsrc/mail/meli/Makefile:1.13 --- pkgsrc/mail/meli/Makefile:1.12 Wed Sep 27 16:49:37 2023 +++ pkgsrc/mail/meli/Makefile Mon Oct 23 06:37:47 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2023/09/27 16:49:37 vins Exp $ +# $NetBSD: Makefile,v 1.13 2023/10/23 06:37:47 wiz Exp $ DISTNAME= v0.8.2 PKGNAME= ${DISTNAME:S|^v|meli-|} +PKGREVISION= 1 CATEGORIES= mail news DIST_SUBDIR= ${PKGNAME_NOREV} MASTER_SITES= https://git.meli.delivery/meli/meli/archive/ @@ -18,7 +19,6 @@ ONLY_FOR_PLATFORM= ${LP64PLATFORMS} USE_TOOLS+= pax pkg-config -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat PYTHON_VERSIONS_INCOMPATIBLE= 27 PYTHON_FOR_BUILD_ONLY= tool @@ -71,6 +71,7 @@ post-install: .include "../../devel/pcre2/buildlink3.mk" .include "../../x11/libxcb/buildlink3.mk" .include "../../www/curl/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" .include "../../lang/rust/cargo.mk" Index: pkgsrc/mail/newspipe/Makefile diff -u pkgsrc/mail/newspipe/Makefile:1.25 pkgsrc/mail/newspipe/Makefile:1.26 --- pkgsrc/mail/newspipe/Makefile:1.25 Mon Aug 14 05:24:47 2023 +++ pkgsrc/mail/newspipe/Makefile Mon Oct 23 06:37:48 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2023/08/14 05:24:47 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2023/10/23 06:37:48 wiz Exp $ DISTNAME= newspipe.1.1.9 PKGNAME= ${DISTNAME:S/./-/} -PKGREVISION= 12 +PKGREVISION= 13 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=newspipe/} EXTRACT_SUFX= .zip @@ -11,7 +11,6 @@ MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://newspipe.sourceforge.net/ COMMENT= Read RSS/Atom feeds as email messages -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-feedparser<6.0.0:../../textproc/py-feedparser5 DEPENDS+= ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text-2019.8.11 @@ -45,5 +44,6 @@ do-install: ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/share/examples/newspipe; \ done +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/mail/offlineimap/Makefile diff -u pkgsrc/mail/offlineimap/Makefile:1.40 pkgsrc/mail/offlineimap/Makefile:1.41 --- pkgsrc/mail/offlineimap/Makefile:1.40 Mon Aug 14 05:24:47 2023 +++ pkgsrc/mail/offlineimap/Makefile Mon Oct 23 06:37:48 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.40 2023/08/14 05:24:47 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2023/10/23 06:37:48 wiz Exp $ DISTNAME= offlineimap-7.3.4 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_GITHUB:=OfflineIMAP/} @@ -14,9 +14,6 @@ GITHUB_TAG= v${PKGVERSION_NOREV} PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported -DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses -DEPENDS+= ${PYPKGPREFIX}-cursespanel-[0-9]*:../../devel/py-cursespanel -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six INSTALLATION_DIRS= share/examples/offlineimap @@ -28,6 +25,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/examples/offlineimap/${f} .endfor +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/mail/rss2email/Makefile diff -u pkgsrc/mail/rss2email/Makefile:1.59 pkgsrc/mail/rss2email/Makefile:1.60 --- pkgsrc/mail/rss2email/Makefile:1.59 Mon Aug 14 05:24:48 2023 +++ pkgsrc/mail/rss2email/Makefile Mon Oct 23 06:37:48 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.59 2023/08/14 05:24:48 wiz Exp $ +# $NetBSD: Makefile,v 1.60 2023/10/23 06:37:48 wiz Exp $ DISTNAME= ${GITHUB_PROJECT}-3.14 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail python MASTER_SITES= ${MASTER_SITE_GITHUB:=rss2email/} GITHUB_PROJECT= rss2email @@ -12,7 +12,6 @@ HOMEPAGE= https://github.com/rss2email/ COMMENT= Get RSS feeds emailed to you LICENSE= gnu-gpl-v2 -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-feedparser>=6.0.0:../../textproc/py-feedparser DEPENDS+= ${PYPKGPREFIX}-html2text>=2014.4.5:../../textproc/py-html2text @@ -29,6 +28,7 @@ post-install: set -e; cd ${WRKSRC}; \ ${INSTALL_MAN} r2e.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/mail/thunderbird/mozilla-common.mk diff -u pkgsrc/mail/thunderbird/mozilla-common.mk:1.9 pkgsrc/mail/thunderbird/mozilla-common.mk:1.10 --- pkgsrc/mail/thunderbird/mozilla-common.mk:1.9 Mon Sep 4 11:42:38 2023 +++ pkgsrc/mail/thunderbird/mozilla-common.mk Mon Oct 23 06:37:48 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.9 2023/09/04 11:42:38 prlw1 Exp $ +# $NetBSD: mozilla-common.mk,v 1.10 2023/10/23 06:37:48 wiz Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -28,10 +28,6 @@ CONFIGURE_ARGS+= --disable-nodejs TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs .endif -TOOL_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 -TOOL_DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - # malloc_usable_size() LDFLAGS.NetBSD+= -ljemalloc @@ -229,4 +225,5 @@ PLIST_VARS+= wayland .if ${PKG_BUILD_OPTIONS.gtk3:Mwayland} PLIST.wayland= yes .endif +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" Index: pkgsrc/mail/thunderbird102/mozilla-common.mk diff -u pkgsrc/mail/thunderbird102/mozilla-common.mk:1.1 pkgsrc/mail/thunderbird102/mozilla-common.mk:1.2 --- pkgsrc/mail/thunderbird102/mozilla-common.mk:1.1 Wed Sep 6 10:40:30 2023 +++ pkgsrc/mail/thunderbird102/mozilla-common.mk Mon Oct 23 06:37:48 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.1 2023/09/06 10:40:30 hauke Exp $ +# $NetBSD: mozilla-common.mk,v 1.2 2023/10/23 06:37:48 wiz Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -28,9 +28,6 @@ CONFIGURE_ARGS+= --disable-nodejs TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs .endif -TOOL_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" TOOL_DEPENDS+= nasm>=2.14:../../devel/nasm TOOL_DEPENDS+= yasm>=1.1:../../devel/yasm @@ -225,4 +222,5 @@ PLIST_VARS+= wayland .if ${PKG_BUILD_OPTIONS.gtk3:Mwayland} PLIST.wayland= yes .endif +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" Index: pkgsrc/mail/thunderbird78/mozilla-common.mk diff -u pkgsrc/mail/thunderbird78/mozilla-common.mk:1.1 pkgsrc/mail/thunderbird78/mozilla-common.mk:1.2 --- pkgsrc/mail/thunderbird78/mozilla-common.mk:1.1 Sun Feb 5 08:32:24 2023 +++ pkgsrc/mail/thunderbird78/mozilla-common.mk Mon Oct 23 06:37:48 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.1 2023/02/05 08:32:24 he Exp $ +# $NetBSD: mozilla-common.mk,v 1.2 2023/10/23 06:37:48 wiz Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -29,9 +29,6 @@ CONFIGURE_ARGS+= --disable-nodejs TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs .endif -TOOL_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" TOOL_DEPENDS+= nasm>=2.14:../../devel/nasm TOOL_DEPENDS+= yasm>=1.1:../../devel/yasm @@ -210,4 +207,5 @@ PLIST_VARS+= wayland .if ${PKG_BUILD_OPTIONS.gtk3:Mwayland} PLIST.wayland= yes .endif +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" Index: pkgsrc/math/py-pandas/Makefile diff -u pkgsrc/math/py-pandas/Makefile:1.51 pkgsrc/math/py-pandas/Makefile:1.52 --- pkgsrc/math/py-pandas/Makefile:1.51 Sun Oct 15 00:05:44 2023 +++ pkgsrc/math/py-pandas/Makefile Mon Oct 23 06:37:48 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.51 2023/10/15 00:05:44 gutteridge Exp $ +# $NetBSD: Makefile,v 1.52 2023/10/23 06:37:48 wiz Exp $ DISTNAME= pandas-2.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= math graphics python MASTER_SITES= ${MASTER_SITE_PYPI:=p/pandas/} @@ -18,7 +19,6 @@ TOOL_DEPENDS+= ${PYPKGPREFIX}-meson_pyth TOOL_DEPENDS+= ${PYPKGPREFIX}-versioneer-[0-9]*:../../devel/py-versioneer DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.8.2:../../time/py-dateutil DEPENDS+= ${PYPKGPREFIX}-pytz>=2020.1:../../time/py-pytz -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-tzdata>=2022.1:../../time/py-tzdata TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=6.34.2:../../devel/py-hypothesis TEST_DEPENDS+= ${PYPKGPREFIX}-test>=7.3.2:../../devel/py-test @@ -45,6 +45,7 @@ post-patch: do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} pandas +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/wheel.mk" BUILDLINK_API_DEPENDS.py-numpy+= ${PYPKGPREFIX}-numpy>=1.23.2 .include "../../math/py-numpy/buildlink3.mk" Index: pkgsrc/math/py-rpy/Makefile diff -u pkgsrc/math/py-rpy/Makefile:1.53 pkgsrc/math/py-rpy/Makefile:1.54 --- pkgsrc/math/py-rpy/Makefile:1.53 Tue Aug 1 23:20:49 2023 +++ pkgsrc/math/py-rpy/Makefile Mon Oct 23 06:37:48 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.53 2023/08/01 23:20:49 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2023/10/23 06:37:48 wiz Exp $ DISTNAME= rpy2-3.4.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/rpy2/rpy/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=r/rpy2/} @@ -15,7 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:. DEPENDS+= ${PYPKGPREFIX}-tzlocal-[0-9]*:../../time/py-tzlocal DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz DEPENDS+= ${PYPKGPREFIX}-cffi-[0-9]*:../../devel/py-cffi -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= R-dbplyr-[0-9]*:../../databases/R-dbplyr DEPENDS+= R-ggplot2-[0-9]*:../../graphics/R-ggplot2 DEPENDS+= R-lazyeval-[0-9]*:../../devel/R-lazyeval @@ -34,6 +33,7 @@ REPLACE_PYTHON= rpy/tests.py PYTHON_VERSIONS_INCOMPATIBLE= 27 38 .include "../../devel/pcre2/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" BUILDLINK_API_DEPENDS.R+= R>=3.3.0 Index: pkgsrc/meta-pkgs/bulk-medium/Makefile diff -u pkgsrc/meta-pkgs/bulk-medium/Makefile:1.99 pkgsrc/meta-pkgs/bulk-medium/Makefile:1.100 --- pkgsrc/meta-pkgs/bulk-medium/Makefile:1.99 Fri Oct 20 07:41:34 2023 +++ pkgsrc/meta-pkgs/bulk-medium/Makefile Mon Oct 23 06:37:49 2023 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.99 2023/10/20 07:41:34 wiz Exp $ +# $NetBSD: Makefile,v 1.100 2023/10/23 06:37:49 wiz Exp $ -DISTNAME= bulk-medium-20231020 +DISTNAME= bulk-medium-20231022 CATEGORIES= meta-pkgs MASTER_SITES= # empty DISTFILES= # empty @@ -151,7 +151,6 @@ DEPENDS+= p5-DBI-[0-9]*:../../databases/ DEPENDS+= ${PYPKGPREFIX}-bsddb3-[0-9]*:../../databases/py-bsddb3 DEPENDS+= ${PYPKGPREFIX}-postgresql-[0-9]*:../../databases/py-postgresql DEPENDS+= ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2 -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= SDL2-[0-9]*:../../devel/SDL2 DEPENDS+= atk-[0-9]*:../../devel/atk DEPENDS+= boehm-gc-[0-9]*:../../devel/boehm-gc Index: pkgsrc/meta-pkgs/bulk-small/Makefile diff -u pkgsrc/meta-pkgs/bulk-small/Makefile:1.50 pkgsrc/meta-pkgs/bulk-small/Makefile:1.51 --- pkgsrc/meta-pkgs/bulk-small/Makefile:1.50 Sun Oct 1 13:22:19 2023 +++ pkgsrc/meta-pkgs/bulk-small/Makefile Mon Oct 23 06:37:49 2023 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.50 2023/10/01 13:22:19 riastradh Exp $ +# $NetBSD: Makefile,v 1.51 2023/10/23 06:37:49 wiz Exp $ -DISTNAME= bulk-small-20230915 +DISTNAME= bulk-small-20231022 CATEGORIES= meta-pkgs MASTER_SITES= # empty DISTFILES= # empty @@ -241,7 +241,6 @@ TRANSITIVE+= p5-gettext-[0-9]*:../../dev # required by devel/meson TRANSITIVE+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools -TRANSITIVE+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat # required by devel/ninja-build TRANSITIVE+= re2c-[0-9]*:../../devel/re2c Index: pkgsrc/misc/calibre/Makefile diff -u pkgsrc/misc/calibre/Makefile:1.288 pkgsrc/misc/calibre/Makefile:1.289 --- pkgsrc/misc/calibre/Makefile:1.288 Sat Oct 21 17:11:02 2023 +++ pkgsrc/misc/calibre/Makefile Mon Oct 23 06:37:49 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.288 2023/10/21 17:11:02 gdt Exp $ +# $NetBSD: Makefile,v 1.289 2023/10/23 06:37:49 wiz Exp $ # Needs update to 6.9.0 DISTNAME= calibre-5.44.0 @@ -36,7 +36,6 @@ DEPENDS+= ${PYPKGPREFIX}-qt5-webengine-[ DEPENDS+= ${PYPKGPREFIX}-regex-[0-9]*:../../textproc/py-regex DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six DEPENDS+= ${PYPKGPREFIX}-soupsieve-[0-9]*:../../www/py-soupsieve -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-zeroconf-[0-9]*:../../net/py-zeroconf # for installation @@ -127,6 +126,7 @@ do-test: .include "options.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../archivers//bzip2/buildlink3.mk" .include "../../databases/sqlite3/buildlink3.mk" Index: pkgsrc/misc/libreoffice/Makefile diff -u pkgsrc/misc/libreoffice/Makefile:1.315 pkgsrc/misc/libreoffice/Makefile:1.316 --- pkgsrc/misc/libreoffice/Makefile:1.315 Sun Oct 15 07:26:23 2023 +++ pkgsrc/misc/libreoffice/Makefile Mon Oct 23 06:37:49 2023 @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.315 2023/10/15 07:26:23 ryoon Exp $ +# $NetBSD: Makefile,v 1.316 2023/10/23 06:37:49 wiz Exp $ VERREL= 7.6.2 VERRC= 1 VER= ${VERREL}.${VERRC} DISTNAME= libreoffice-${VER} +PKGREVISION= 1 CATEGORIES= misc MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/ EXTRACT_SUFX= .tar.xz @@ -157,7 +158,6 @@ EXTRACT_USING= bsdtar WRKSRC= ${WRKDIR}/${LO_BOOTSTRAP} TOOL_DEPENDS+= p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils LDFLAGS+= -lboost_system @@ -375,6 +375,7 @@ BUILDLINK_API_DEPENDS.libetonyek+= libet .include "../../graphics/zxing-cpp/buildlink3.mk" #.include "../../graphics/sane-backends/buildlink3.mk" #.include "../../graphics/vigra/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" # workaround for dtoa.h conflict with python and dtoa: # Do not pass -I${PREFIX}/include/python?.? to CPPFLAGS/CFLAGS/CXXFLAGS always. Index: pkgsrc/multimedia/pitivi/Makefile diff -u pkgsrc/multimedia/pitivi/Makefile:1.76 pkgsrc/multimedia/pitivi/Makefile:1.77 --- pkgsrc/multimedia/pitivi/Makefile:1.76 Sat Oct 21 17:11:08 2023 +++ pkgsrc/multimedia/pitivi/Makefile Mon Oct 23 06:37:49 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2023/10/21 17:11:08 gdt Exp $ +# $NetBSD: Makefile,v 1.77 2023/10/23 06:37:49 wiz Exp $ DISTNAME= pitivi-0.999 PKGREVISION= 14 @@ -16,7 +16,6 @@ USE_TOOLS+= pkg-config intltool msgfmt x DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 DEPENDS+= ${PYPKGPREFIX}-gstreamer1-[0-9]*:../../multimedia/py-gstreamer1 DEPENDS+= ${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 # For some reason creating projects fails without these. DEPENDS+= gst-plugins1-ogg-[0-9]*:../../multimedia/gst-plugins1-ogg @@ -41,6 +40,7 @@ LDFLAGS+= -lpython${PYVERSSUFFIX} .include "../../graphics/gst-plugins1-gdk_pixbuf/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/py-cairo/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk" .include "../../multimedia/frei0r/buildlink3.mk" Index: pkgsrc/multimedia/sickgear/Makefile diff -u pkgsrc/multimedia/sickgear/Makefile:1.14 pkgsrc/multimedia/sickgear/Makefile:1.15 --- pkgsrc/multimedia/sickgear/Makefile:1.14 Wed Aug 30 21:46:34 2023 +++ pkgsrc/multimedia/sickgear/Makefile Mon Oct 23 06:37:49 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2023/08/30 21:46:34 js Exp $ +# $NetBSD: Makefile,v 1.15 2023/10/23 06:37:49 wiz Exp $ DISTNAME= release_${PKGVERSION_NOREV} PKGNAME= sickgear-0.23.14 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GITHUB:=SickGear/} GITHUB_PROJECT= SickGear @@ -15,7 +15,6 @@ COMMENT= Management of TV shows and/or A LICENSE= gnu-gpl-v3 DEPENDS+= ${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah3 -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 USE_TOOLS+= pax PYTHON_VERSIONS_INCOMPATIBLE= 27 @@ -44,5 +43,6 @@ do-install: cd ${WRKSRC} && ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/sickgear ${INSTALL_SCRIPT} ${WRKDIR}/sickgear ${DESTDIR}${PREFIX}/bin/sickgear +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/gallery-dl/Makefile diff -u pkgsrc/net/gallery-dl/Makefile:1.91 pkgsrc/net/gallery-dl/Makefile:1.92 --- pkgsrc/net/gallery-dl/Makefile:1.91 Thu Aug 17 21:41:45 2023 +++ pkgsrc/net/gallery-dl/Makefile Mon Oct 23 06:37:49 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.91 2023/08/17 21:41:45 leot Exp $ +# $NetBSD: Makefile,v 1.92 2023/10/23 06:37:49 wiz Exp $ DISTNAME= gallery_dl-1.25.8 PKGNAME= ${DISTNAME:S/_/-/} +PKGREVISION= 1 CATEGORIES= net python MASTER_SITES= ${MASTER_SITE_PYPI:=g/gallery-dl/} @@ -10,7 +11,6 @@ HOMEPAGE= https://github.com/mikf/galler COMMENT= Command-line program to download image galleries and collections LICENSE= gnu-gpl-v2 -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-requests>=2.11.0:../../devel/py-requests SUBST_CLASSES+= paths @@ -27,5 +27,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 USE_PKG_RESOURCES= yes +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/mitmproxy/Makefile diff -u pkgsrc/net/mitmproxy/Makefile:1.44 pkgsrc/net/mitmproxy/Makefile:1.45 --- pkgsrc/net/mitmproxy/Makefile:1.44 Mon Aug 14 05:25:02 2023 +++ pkgsrc/net/mitmproxy/Makefile Mon Oct 23 06:37:49 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2023/08/14 05:25:02 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2023/10/23 06:37:49 wiz Exp $ DISTNAME= mitmproxy-8.1.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=mitmproxy/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -30,7 +30,6 @@ DEPENDS+= ${PYPKGPREFIX}-publicsuffix2>= DEPENDS+= ${PYPKGPREFIX}-pyparsing>=2.4.2:../../devel/py-pyparsing DEPENDS+= ${PYPKGPREFIX}-pyperclip>=1.6.0:../../x11/py-pyperclip DEPENDS+= ${PYPKGPREFIX}-ruamel-yaml>=0.16:../../devel/py-ruamel-yaml -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-sortedcontainers>=2.3:../../devel/py-sortedcontainers DEPENDS+= ${PYPKGPREFIX}-tornado>=6.1:../../www/py-tornado DEPENDS+= ${PYPKGPREFIX}-urwid>=2.1.1:../../devel/py-urwid @@ -51,6 +50,7 @@ USE_LANGUAGES= # none # Only for Python >=3.9 PYTHON_VERSIONS_INCOMPATIBLE= 27 38 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL Index: pkgsrc/net/nyx/Makefile diff -u pkgsrc/net/nyx/Makefile:1.5 pkgsrc/net/nyx/Makefile:1.6 --- pkgsrc/net/nyx/Makefile:1.5 Mon Aug 14 05:25:02 2023 +++ pkgsrc/net/nyx/Makefile Mon Oct 23 06:37:49 2023 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2023/08/14 05:25:02 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2023/10/23 06:37:49 wiz Exp $ -PKGREVISION= 4 +PKGREVISION= 5 .include "../../net/py-nyx/Makefile.common" PKGNAME= nyx-${VERSION} @@ -13,10 +13,10 @@ HOMEPAGE= https://nyx.torproject.org/ COMMENT= Command-line monitor for the tor daemon LICENSE= gnu-gpl-v3 -DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses DEPENDS+= ${PYPKGPREFIX}-nyx>=${VERSION}:../../net/py-nyx META_PACKAGE= yes +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/pyversion.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/py-botocore/Makefile diff -u pkgsrc/net/py-botocore/Makefile:1.62 pkgsrc/net/py-botocore/Makefile:1.63 --- pkgsrc/net/py-botocore/Makefile:1.62 Fri Sep 15 14:34:47 2023 +++ pkgsrc/net/py-botocore/Makefile Mon Oct 23 06:37:50 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.62 2023/09/15 14:34:47 leot Exp $ +# $NetBSD: Makefile,v 1.63 2023/10/23 06:37:50 wiz Exp $ DISTNAME= botocore-1.31.47 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net python MASTER_SITES= ${MASTER_SITE_PYPI:=b/botocore/} @@ -11,7 +11,6 @@ HOMEPAGE= https://github.com/boto/botoco COMMENT= Low-level interface to a growing number of Amazon Web Services LICENSE= apache-2.0 -DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.5.3:../../time/py-dateutil DEPENDS+= ${PYPKGPREFIX}-jmespath>=0.7.1:../../textproc/py-jmespath DEPENDS+= ${PYPKGPREFIX}-urllib3>=1.25.4:../../www/py-urllib3 @@ -20,5 +19,6 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/py-google-cloud-sdk/Makefile diff -u pkgsrc/net/py-google-cloud-sdk/Makefile:1.8 pkgsrc/net/py-google-cloud-sdk/Makefile:1.9 --- pkgsrc/net/py-google-cloud-sdk/Makefile:1.8 Tue Aug 24 10:11:54 2021 +++ pkgsrc/net/py-google-cloud-sdk/Makefile Mon Oct 23 06:37:50 2023 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2021/08/24 10:11:54 nia Exp $ +# $NetBSD: Makefile,v 1.9 2023/10/23 06:37:50 wiz Exp $ GCLOUDVER= 319.0.0 DISTNAME= google-cloud-sdk-${GCLOUDVER}-linux-x86 PKGNAME= ${PYPKGPREFIX}-google-cloud-sdk-${GCLOUDVER} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/ @@ -18,8 +18,6 @@ NO_BUILD= yes USE_TOOLS+= pax -DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3 - REPLACE_PYTHON+= bin/* REPLACE_PYTHON+= bin/bootstrapping/* @@ -45,5 +43,6 @@ do-install: ${FIND} . -type f \! -name '*.orig' -print | \ pax -rw -pmp ${DESTDIR}${PREFIX}/${PKGBASE} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/py-hatop/Makefile diff -u pkgsrc/net/py-hatop/Makefile:1.4 pkgsrc/net/py-hatop/Makefile:1.5 --- pkgsrc/net/py-hatop/Makefile:1.4 Sat Sep 16 19:27:05 2017 +++ pkgsrc/net/py-hatop/Makefile Mon Oct 23 06:37:50 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:05 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2023/10/23 06:37:50 wiz Exp $ DISTNAME= hatop-0.7.7 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://hatop.googlecode.com/files/ @@ -11,7 +12,6 @@ COMMENT= Interactive client and monitori LICENSE= gnu-gpl-v3 DEPENDS+= haproxy>=1.4:../../net/haproxy -DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses USE_LANGUAGES= # none NO_BUILD= yes @@ -30,6 +30,7 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/man/hatop.1 \ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/hatop${PYVERSSUFFIX}.1 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/py-kenosis/Makefile diff -u pkgsrc/net/py-kenosis/Makefile:1.26 pkgsrc/net/py-kenosis/Makefile:1.27 --- pkgsrc/net/py-kenosis/Makefile:1.26 Mon Jan 10 18:34:53 2022 +++ pkgsrc/net/py-kenosis/Makefile Mon Oct 23 06:37:50 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2022/01/10 18:34:53 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2023/10/23 06:37:50 wiz Exp $ DISTNAME= kenosis-0.96 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kenosis/} @@ -11,12 +11,11 @@ HOMEPAGE= http://kenosis.sourceforge.ne COMMENT= P2P RPC system LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - USE_LANGUAGES= # empty PYSETUP= kenosis_setup.py PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.96 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/py-magic-wormhole-transit-relay/Makefile diff -u pkgsrc/net/py-magic-wormhole-transit-relay/Makefile:1.2 pkgsrc/net/py-magic-wormhole-transit-relay/Makefile:1.3 --- pkgsrc/net/py-magic-wormhole-transit-relay/Makefile:1.2 Tue Jan 4 20:54:29 2022 +++ pkgsrc/net/py-magic-wormhole-transit-relay/Makefile Mon Oct 23 06:37:50 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2022/01/04 20:54:29 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2023/10/23 06:37:50 wiz Exp $ DISTNAME= magic-wormhole-transit-relay-0.2.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net python MASTER_SITES= ${MASTER_SITE_PYPI:=m/magic-wormhole-transit-relay/} @@ -13,11 +13,11 @@ LICENSE= mit PYTHON_VERSIONS_INCOMPATIBLE= 27 -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-twisted>=17.5.0:../../net/py-twisted TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock USE_LANGUAGES= # none +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/py-s3cmd/Makefile diff -u pkgsrc/net/py-s3cmd/Makefile:1.24 pkgsrc/net/py-s3cmd/Makefile:1.25 --- pkgsrc/net/py-s3cmd/Makefile:1.24 Sat Aug 5 06:06:07 2023 +++ pkgsrc/net/py-s3cmd/Makefile Mon Oct 23 06:37:50 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2023/08/05 06:06:07 adam Exp $ +# $NetBSD: Makefile,v 1.25 2023/10/23 06:37:50 wiz Exp $ DISTNAME= s3cmd-2.3.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= net python MASTER_SITES= ${MASTER_SITE_PYPI:=s/s3cmd/} @@ -11,7 +12,6 @@ COMMENT= Command line tool for managing LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-magic-[0-9]*:../../sysutils/py-magic MAKE_ENV+= S3CMD_INSTPATH_MAN=${PKGMANDIR} @@ -19,5 +19,6 @@ MAKE_ENV+= S3CMD_INSTPATH_MAN=${PKGMANDI PYTHON_SELF_CONFLICT= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/rabbitmq/Makefile diff -u pkgsrc/net/rabbitmq/Makefile:1.87 pkgsrc/net/rabbitmq/Makefile:1.88 --- pkgsrc/net/rabbitmq/Makefile:1.87 Mon Aug 14 05:25:03 2023 +++ pkgsrc/net/rabbitmq/Makefile Mon Oct 23 06:37:50 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.87 2023/08/14 05:25:03 wiz Exp $ +# $NetBSD: Makefile,v 1.88 2023/10/23 06:37:50 wiz Exp $ DISTNAME= rabbitmq-server-3.12.2 PKGNAME= ${DISTNAME:S/-server//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=rabbitmq/} EXTRACT_SUFX= .tar.xz @@ -18,7 +18,6 @@ USE_TOOLS+= bash:run gmake unzip zip TOOL_DEPENDS+= elixir-[0-9]*:../../lang/elixir TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat TOOL_DEPENDS+= rsync-[0-9]*:../../net/rsync TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto DEPENDS+= ${PYPKGPREFIX}-simplejson>=2:../../converters/py-simplejson @@ -119,5 +118,6 @@ post-install: ${DESTDIR}${PREFIX}/share/examples/rabbitmq .include "../../lang/erlang/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/samba4/Makefile diff -u pkgsrc/net/samba4/Makefile:1.172 pkgsrc/net/samba4/Makefile:1.173 --- pkgsrc/net/samba4/Makefile:1.172 Sat Oct 21 17:11:13 2023 +++ pkgsrc/net/samba4/Makefile Mon Oct 23 06:37:50 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.172 2023/10/21 17:11:13 gdt Exp $ +# $NetBSD: Makefile,v 1.173 2023/10/23 06:37:50 wiz Exp $ DISTNAME= samba-4.18.8 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= https://download.samba.org/pub/samba/stable/ @@ -21,7 +21,6 @@ TOOL_DEPENDS+= docbook-xsl>=1.79.2:../.. DEPENDS+= p5-JSON>=4.05:../../converters/p5-JSON DEPENDS+= p5-Parse-Yapp>=1.05:../../devel/p5-Parse-Yapp DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-iso8601-[0-9]*:../../time/py-iso8601 DEPENDS+= ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown @@ -219,6 +218,7 @@ BUILDLINK_API_DEPENDS.talloc+= talloc>=2 .include "../../devel/talloc/buildlink3.mk" .include "../../devel/tevent/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../security/gnutls/buildlink3.mk" Index: pkgsrc/net/speedtest-cli/Makefile diff -u pkgsrc/net/speedtest-cli/Makefile:1.14 pkgsrc/net/speedtest-cli/Makefile:1.15 --- pkgsrc/net/speedtest-cli/Makefile:1.14 Mon Aug 14 05:25:03 2023 +++ pkgsrc/net/speedtest-cli/Makefile Mon Oct 23 06:37:51 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2023/08/14 05:25:03 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2023/10/23 06:37:51 wiz Exp $ DISTNAME= speedtest-cli-2.1.3 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=sivel/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -11,8 +11,6 @@ HOMEPAGE= https://github.com/sivel/speed COMMENT= Command line client for use with speedtest.net LICENSE= apache-2.0 -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - REPLACE_PYTHON= *.py PYTHON_VERSIONED_DEPENDENCIES+= setuptools @@ -25,6 +23,7 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/speedtest-cli.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_MAN} ${WRKSRC}/speedtest-cli.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/speedtest.1 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../lang/python/application.mk" .include "../../lang/python/versioned_dependencies.mk" Index: pkgsrc/net/zenmap/Makefile diff -u pkgsrc/net/zenmap/Makefile:1.12 pkgsrc/net/zenmap/Makefile:1.13 --- pkgsrc/net/zenmap/Makefile:1.12 Mon Aug 14 05:25:04 2023 +++ pkgsrc/net/zenmap/Makefile Mon Oct 23 06:37:51 2023 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2023/08/14 05:25:04 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2023/10/23 06:37:51 wiz Exp $ -PKGREVISION= 1 +PKGREVISION= 2 .include "../../net/nmap/Makefile.common" PKGNAME= ${DISTNAME:S/nmap/zenmap/} @@ -17,9 +17,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 DEPENDS+= gtk3+-[0-9]*:../../x11/gtk3 DEPENDS+= nmap-[0-9]*:../../net/nmap -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 PYSETUPARGS+= vanilla @@ -29,5 +27,6 @@ SUBST_MESSAGE.setup= Fixing setup. SUBST_FILES.setup= setup.py SUBST_SED.setup= -e 's,\(self.create_uninstaller\),\#\1,g' +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/print/py-reportlab/Makefile diff -u pkgsrc/print/py-reportlab/Makefile:1.88 pkgsrc/print/py-reportlab/Makefile:1.89 --- pkgsrc/print/py-reportlab/Makefile:1.88 Sun Jan 29 21:17:37 2023 +++ pkgsrc/print/py-reportlab/Makefile Mon Oct 23 06:37:51 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.88 2023/01/29 21:17:37 ryoon Exp $ +# $NetBSD: Makefile,v 1.89 2023/10/23 06:37:51 wiz Exp $ DISTNAME= reportlab-3.6.12 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= print python MASTER_SITES= ${MASTER_SITE_PYPI:=r/reportlab/} @@ -11,7 +11,6 @@ HOMEPAGE= https://www.reportlab.com/ COMMENT= Powerful PDF-generating toolkit for Python LICENSE= modified-bsd -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow DEPENDS+= ${PYPKGPREFIX}-pyphen-[0-9]*:../../textproc/py-pyphen @@ -22,5 +21,6 @@ PYSETUPARGS+= --use-system-libart .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/security/fail2ban/Makefile diff -u pkgsrc/security/fail2ban/Makefile:1.25 pkgsrc/security/fail2ban/Makefile:1.26 --- pkgsrc/security/fail2ban/Makefile:1.25 Mon Aug 14 05:25:09 2023 +++ pkgsrc/security/fail2ban/Makefile Mon Oct 23 06:37:51 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2023/08/14 05:25:09 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2023/10/23 06:37:51 wiz Exp $ DISTNAME= fail2ban-1.0.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GITHUB:=fail2ban/} @@ -10,8 +10,6 @@ HOMEPAGE= http://www.fail2ban.org/ COMMENT= Scans log files and bans IP that makes too many password failures LICENSE= gnu-gpl-v2 -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 - TOOL_DEPENDS+= ${PYPKGPREFIX}-numpydoc-[0-9]*:../../textproc/py-numpydoc TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx @@ -120,5 +118,6 @@ post-install: .include "options.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/security/gpg-tui/Makefile diff -u pkgsrc/security/gpg-tui/Makefile:1.31 pkgsrc/security/gpg-tui/Makefile:1.32 --- pkgsrc/security/gpg-tui/Makefile:1.31 Sun Sep 10 18:32:22 2023 +++ pkgsrc/security/gpg-tui/Makefile Mon Oct 23 06:37:51 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.31 2023/09/10 18:32:22 pin Exp $ +# $NetBSD: Makefile,v 1.32 2023/10/23 06:37:51 wiz Exp $ DISTNAME= gpg-tui-0.10.0 +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GITHUB:=orhun/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -15,7 +16,6 @@ LICENSE= mit USE_TOOLS+= pkg-config PYTHON_VERSIONS_INCOMPATIBLE= 27 PYTHON_FOR_BUILD_ONLY= tool -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libxcb}/lib RUSTFLAGS+= -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libgpg-error}/lib @@ -29,6 +29,7 @@ post-install: ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 .include "../../lang/rust/cargo.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" .include "../../x11/libxcb/buildlink3.mk" .include "../../security/libgpg-error/buildlink3.mk" Index: pkgsrc/security/py-certbot/Makefile diff -u pkgsrc/security/py-certbot/Makefile:1.38 pkgsrc/security/py-certbot/Makefile:1.39 --- pkgsrc/security/py-certbot/Makefile:1.38 Wed Oct 11 18:27:03 2023 +++ pkgsrc/security/py-certbot/Makefile Mon Oct 23 06:37:51 2023 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.38 2023/10/11 18:27:03 adam Exp $ +# $NetBSD: Makefile,v 1.39 2023/10/23 06:37:51 wiz Exp $ .include "../../security/py-certbot/Makefile.common" DISTNAME= certbot-${CERTBOT_VERSION} +PKGREVISION= 1 MASTER_SITES= ${MASTER_SITE_PYPI:=c/certbot/} COMMENT= Client for the Let's Encrypt CA @@ -17,7 +18,6 @@ DEPENDS+= ${PYPKGPREFIX}-pytz>=2019.3:.. DEPENDS+= ${PYPKGPREFIX}-rfc3339-[0-9]*:../../time/py-rfc3339 # Needed for the test target # https://github.com/certbot/certbot/issues/2956 -TEST_DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist @@ -48,6 +48,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/examples/cli.ini \ ${DESTDIR}${PREFIX}/share/examples/certbot-${PYVERSSUFFIX} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" PYTHON_VERSIONED_DEPENDENCIES+= cryptography .include "../../lang/python/versioned_dependencies.mk" Index: pkgsrc/security/py-denyhosts/Makefile diff -u pkgsrc/security/py-denyhosts/Makefile:1.25 pkgsrc/security/py-denyhosts/Makefile:1.26 --- pkgsrc/security/py-denyhosts/Makefile:1.25 Sat Oct 15 20:29:48 2022 +++ pkgsrc/security/py-denyhosts/Makefile Mon Oct 23 06:37:51 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2022/10/15 20:29:48 he Exp $ +# $NetBSD: Makefile,v 1.26 2023/10/23 06:37:51 wiz Exp $ DISTNAME= denyhosts-3.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=denyhosts/} LICENSE= gnu-gpl-v2 @@ -33,14 +33,13 @@ PYTHON_SELF_CONFLICT= yes RCD_SCRIPTS+= denyhosts SMF_NAME= denyhost -DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat - post-install: mv ${DESTDIR}/${PKG_SYSCONFDIR}/denyhosts.conf \ ${DESTDIR}/${PREFIX}/${EGDIR}/denyhosts.conf EGG_NAME= DenyHosts-${PKGVERSION_NOREV} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/security/py-lasso/Makefile diff -u pkgsrc/security/py-lasso/Makefile:1.49 pkgsrc/security/py-lasso/Makefile:1.50 --- pkgsrc/security/py-lasso/Makefile:1.49 Tue Jun 6 12:42:16 2023 +++ pkgsrc/security/py-lasso/Makefile Mon Oct 23 06:37:51 2023 @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.49 2023/06/06 12:42:16 riastradh Exp $ +# $NetBSD: Makefile,v 1.50 2023/10/23 06:37:51 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 17 +PKGREVISION= 18 COMMENT= Liberty Alliance Single Sign On binding for Python -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - CONFIGURE_ARGS+= --disable-php4 CONFIGURE_ARGS+= --disable-perl @@ -14,6 +12,7 @@ INSTALL_DIRS= bindings/python PY_PATCHPLIST= yes PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 2.4.1 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/extension.mk" .include "../../security/lasso/buildlink3.mk" Index: pkgsrc/security/sqlmap/Makefile diff -u pkgsrc/security/sqlmap/Makefile:1.37 pkgsrc/security/sqlmap/Makefile:1.38 --- pkgsrc/security/sqlmap/Makefile:1.37 Mon Oct 9 10:34:28 2023 +++ pkgsrc/security/sqlmap/Makefile Mon Oct 23 06:37:51 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.37 2023/10/09 10:34:28 adam Exp $ +# $NetBSD: Makefile,v 1.38 2023/10/23 06:37:51 wiz Exp $ DISTNAME= sqlmap-1.7.10 +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_PYPI:=s/sqlmap/} @@ -11,8 +12,6 @@ LICENSE= gnu-gpl-v2 USE_TOOLS+= bash:run perl:run -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 - REPLACE_BASH+= sqlmap/extra/shutils/autocompletion.sh REPLACE_BASH+= sqlmap/extra/shutils/blanks.sh REPLACE_BASH+= sqlmap/extra/shutils/drei.sh @@ -37,6 +36,7 @@ USE_PKG_RESOURCES= yes USE_LANGUAGES= # none .include "../../converters/libiconv/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/security/volatility3/Makefile diff -u pkgsrc/security/volatility3/Makefile:1.2 pkgsrc/security/volatility3/Makefile:1.3 --- pkgsrc/security/volatility3/Makefile:1.2 Mon Aug 14 05:25:12 2023 +++ pkgsrc/security/volatility3/Makefile Mon Oct 23 06:37:52 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2023/08/14 05:25:12 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2023/10/23 06:37:52 wiz Exp $ DISTNAME= volatility3-2.0.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GITHUB:=volatilityfoundation/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -12,7 +12,6 @@ COMMENT= Advanced memory forensics frame LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-pefile>=2017.8.1:../../sysutils/py-pefile -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 # Optional; see requirements.txt DEPENDS+= ${PYPKGPREFIX}-capstone>=3.0.5:../../devel/py-capstone DEPENDS+= ${PYPKGPREFIX}-cryptodome-[0-9]*:../../security/py-cryptodome @@ -24,5 +23,6 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/shells/lshell/Makefile diff -u pkgsrc/shells/lshell/Makefile:1.27 pkgsrc/shells/lshell/Makefile:1.28 --- pkgsrc/shells/lshell/Makefile:1.27 Mon Aug 14 05:25:12 2023 +++ pkgsrc/shells/lshell/Makefile Mon Oct 23 06:37:52 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2023/08/14 05:25:12 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2023/10/23 06:37:52 wiz Exp $ DISTNAME= lshell-0.9.16 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= shells python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lshell/} @@ -10,8 +10,6 @@ HOMEPAGE= http://ghantoos.org/limited-sh COMMENT= Restrict user environment to specified commands LICENSE= gnu-gpl-v3 -DEPENDS+= ${PYPKGPREFIX}-readline>=0nb2:../../devel/py-readline - PKG_GROUPS= lshellg PKG_SHELL= bin/lshell @@ -32,6 +30,7 @@ INSTALLATION_DIRS+= ${EGDIR} ${EGDIR}/lo CONF_FILES= ${PREFIX}/${EGDIR}/lshell.conf \ ${PKG_SYSCONFDIR}/lshell.conf +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/bracket/Makefile diff -u pkgsrc/sysutils/bracket/Makefile:1.3 pkgsrc/sysutils/bracket/Makefile:1.4 --- pkgsrc/sysutils/bracket/Makefile:1.3 Mon Aug 14 05:25:13 2023 +++ pkgsrc/sysutils/bracket/Makefile Mon Oct 23 06:37:52 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2023/08/14 05:25:13 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2023/10/23 06:37:52 wiz Exp $ DISTNAME= bracket-2.18 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= https://www.gson.org/netbsd/bracket/download/ @@ -15,7 +15,6 @@ DEPENDS+= qemu-[0-9]*:../../emulators/qe DEPENDS+= rsync-[0-9]*:../../net/rsync DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt DEPENDS+= ${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-sysctl-[0-9]*:../../devel/py-sysctl DEPENDS+= ${PYPKGPREFIX}-gitpython-[0-9]*:../../devel/py-gitpython DEPENDS+= ${PYPKGPREFIX}-mercurial-[0-9]*:../../devel/py-mercurial @@ -30,5 +29,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "options.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/pyversion.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/broot/Makefile diff -u pkgsrc/sysutils/broot/Makefile:1.82 pkgsrc/sysutils/broot/Makefile:1.83 --- pkgsrc/sysutils/broot/Makefile:1.82 Sun Oct 1 09:57:55 2023 +++ pkgsrc/sysutils/broot/Makefile Mon Oct 23 06:37:52 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.82 2023/10/01 09:57:55 pin Exp $ +# $NetBSD: Makefile,v 1.83 2023/10/23 06:37:52 wiz Exp $ DISTNAME= broot-1.26.1 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GITHUB:=Canop/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -15,7 +16,6 @@ LICENSE= mit USE_TOOLS+= pkg-config PYTHON_VERSIONS_INCOMPATIBLE= 27 PYTHON_FOR_BUILD_ONLY= tool -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat INSTALLATION_DIRS= ${PKGMANDIR}/man1 @@ -27,6 +27,7 @@ post-install: ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/broot.1 .include "../../lang/rust/cargo.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" .include "../../x11/libxcb/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/ovmf/Makefile diff -u pkgsrc/sysutils/ovmf/Makefile:1.11 pkgsrc/sysutils/ovmf/Makefile:1.12 --- pkgsrc/sysutils/ovmf/Makefile:1.11 Mon Aug 14 05:25:18 2023 +++ pkgsrc/sysutils/ovmf/Makefile Mon Oct 23 06:37:52 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2023/08/14 05:25:18 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2023/10/23 06:37:52 wiz Exp $ PKGNAME= OVMF-0.0.20181116 -PKGREVISION= 4 +PKGREVISION= 5 DISTNAME= edk2-20181116 MASTER_SITES= ${MASTER_SITE_LOCAL} CATEGORIES= sysutils @@ -57,8 +57,8 @@ do-install: TOOL_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils TOOL_DEPENDS+= nasm-[0-9]*:../../devel/nasm -TOOL_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../devel/libuuid/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/py-Glances/Makefile diff -u pkgsrc/sysutils/py-Glances/Makefile:1.23 pkgsrc/sysutils/py-Glances/Makefile:1.24 --- pkgsrc/sysutils/py-Glances/Makefile:1.23 Sun May 21 17:41:04 2023 +++ pkgsrc/sysutils/py-Glances/Makefile Mon Oct 23 06:37:52 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2023/05/21 17:41:04 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2023/10/23 06:37:52 wiz Exp $ DISTNAME= Glances-3.4.0.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= ${MASTER_SITE_PYPI:=G/Glances/} @@ -12,8 +13,6 @@ LICENSE= gnu-lgpl-v3 DEPENDS+= ${PYPKGPREFIX}-psutil>=5.3.0:../../sysutils/py-psutil DEPENDS+= ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future -DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses -DEPENDS+= ${PYPKGPREFIX}-cursespanel-[0-9]*:../../devel/py-cursespanel DEPENDS+= ${PYPKGPREFIX}-defusedxml-[0-9]*:../../textproc/py-defusedxml DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging DEPENDS+= ${PYPKGPREFIX}-ujson-[0-9]*:../../textproc/py-ujson @@ -41,5 +40,6 @@ post-install: ${MV} share/doc/glances share/doc/glances-${PYVERSSUFFIX} && \ ${MV} share/examples/glances share/examples/glances-${PYVERSSUFFIX} || ${TRUE} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/py-appnope/Makefile diff -u pkgsrc/sysutils/py-appnope/Makefile:1.7 pkgsrc/sysutils/py-appnope/Makefile:1.8 --- pkgsrc/sysutils/py-appnope/Makefile:1.7 Tue Jun 6 12:42:22 2023 +++ pkgsrc/sysutils/py-appnope/Makefile Mon Oct 23 06:37:52 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2023/06/06 12:42:22 riastradh Exp $ +# $NetBSD: Makefile,v 1.8 2023/10/23 06:37:52 wiz Exp $ DISTNAME= appnope-0.1.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= ${MASTER_SITE_PYPI:=a/appnope/} @@ -12,11 +13,8 @@ LICENSE= modified-bsd ONLY_FOR_PLATFORM= Darwin-*-* -# setup.py uses platform, which in turn uses pyexpat in parsing -# SystemVersion.plist on Darwin. -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - USE_LANGUAGES= # none +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/py-dbus/Makefile diff -u pkgsrc/sysutils/py-dbus/Makefile:1.43 pkgsrc/sysutils/py-dbus/Makefile:1.44 --- pkgsrc/sysutils/py-dbus/Makefile:1.43 Sat Aug 5 06:14:04 2023 +++ pkgsrc/sysutils/py-dbus/Makefile Mon Oct 23 06:37:52 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.43 2023/08/05 06:14:04 adam Exp $ +# $NetBSD: Makefile,v 1.44 2023/10/23 06:37:52 wiz Exp $ DISTNAME= dbus-python-1.3.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python//} +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-python/ @@ -17,12 +18,10 @@ CONFIGURE_ARGS+= PYTHON=${PYTHONBIN} PY_PATCHPLIST= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 -# py-expat is only needed at runtime -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - BUILDLINK_TRANSFORM.SunOS+= rm:-std=c9x .include "../../devel/glib2/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/extension.mk" BUILDLINK_API_DEPENDS.dbus+= dbus>=1.6 .include "../../sysutils/dbus/buildlink3.mk" Index: pkgsrc/sysutils/py-diffoscope/Makefile diff -u pkgsrc/sysutils/py-diffoscope/Makefile:1.19 pkgsrc/sysutils/py-diffoscope/Makefile:1.20 --- pkgsrc/sysutils/py-diffoscope/Makefile:1.19 Sat Jan 28 00:50:28 2023 +++ pkgsrc/sysutils/py-diffoscope/Makefile Mon Oct 23 06:37:52 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2023/01/28 00:50:28 khorben Exp $ +# $NetBSD: Makefile,v 1.20 2023/10/23 06:37:52 wiz Exp $ DISTNAME= diffoscope-233 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= ${MASTER_SITE_PYPI:=d/diffoscope/} @@ -12,7 +13,6 @@ LICENSE= gnu-gpl-v3 DEPENDS+= ${PYPKGPREFIX}-libarchive-c-[0-9]*:../../archivers/py-libarchive-c DEPENDS+= ${PYPKGPREFIX}-magic-[0-9]*:../../sysutils/py-magic -DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses DEPENDS+= ${PYPKGPREFIX}-tlsh-[0-9]*:../../devel/py-tlsh DEPENDS+= colordiff-[0-9]*:../../devel/colordiff # for xxd @@ -30,5 +30,6 @@ post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} diffoscope diffoscope-${PYVERSSUFFIX} || ${TRUE} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/py27-dbus/Makefile diff -u pkgsrc/sysutils/py27-dbus/Makefile:1.2 pkgsrc/sysutils/py27-dbus/Makefile:1.3 --- pkgsrc/sysutils/py27-dbus/Makefile:1.2 Mon Aug 14 05:25:18 2023 +++ pkgsrc/sysutils/py27-dbus/Makefile Mon Oct 23 06:37:53 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2023/08/14 05:25:18 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2023/10/23 06:37:53 wiz Exp $ DISTNAME= dbus-python-1.2.18 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-python/ @@ -21,12 +21,10 @@ CONFIGURE_ARGS+= PYTHON=${PYTHONBIN} PY_PATCHPLIST= yes PYTHON_VERSIONS_ACCEPTED= 27 -# py-expat is only needed at runtime -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - BUILDLINK_TRANSFORM.SunOS+= rm:-std=c9x .include "../../devel/glib2/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/extension.mk" BUILDLINK_API_DEPENDS.dbus+= dbus>=1.6 .include "../../sysutils/dbus/buildlink3.mk" Index: pkgsrc/sysutils/salt-docs/Makefile diff -u pkgsrc/sysutils/salt-docs/Makefile:1.32 pkgsrc/sysutils/salt-docs/Makefile:1.33 --- pkgsrc/sysutils/salt-docs/Makefile:1.32 Mon Aug 14 05:25:18 2023 +++ pkgsrc/sysutils/salt-docs/Makefile Mon Oct 23 06:37:53 2023 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.32 2023/08/14 05:25:18 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2023/10/23 06:37:53 wiz Exp $ -PKGREVISION= 1 +PKGREVISION= 2 .include "../../sysutils/salt/Makefile.common" PKGNAME= ${DISTNAME:S/-/-docs-/} @@ -11,7 +11,6 @@ USE_TOOLS+= gmake pax TOOL_DEPENDS+= salt-[0-9]*:../../sysutils/salt TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.2.3nb1:../../textproc/py-sphinx -TOOL_DEPENDS+= ${PYPKGPREFIX}-sqlite3>=1.2.3nb1:../../databases/py-sqlite3 NO_CONFIGURE= yes BUILD_DIRS= doc @@ -34,5 +33,6 @@ do-install: cd ${WRKSRC}/doc/_build/html && ${PAX} -rw -pp . ${DESTDIR}${PREFIX}/${HTMLDIR} cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/pyversion.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/vxargs/Makefile diff -u pkgsrc/sysutils/vxargs/Makefile:1.14 pkgsrc/sysutils/vxargs/Makefile:1.15 --- pkgsrc/sysutils/vxargs/Makefile:1.14 Mon Aug 14 05:25:20 2023 +++ pkgsrc/sysutils/vxargs/Makefile Mon Oct 23 06:37:53 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2023/08/14 05:25:20 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2023/10/23 06:37:53 wiz Exp $ DISTNAME= vxargs-0.3.3 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= sysutils #MASTER_SITES= http://dharma.cis.upenn.edu/planetlab/vxargs/ EXTRACT_SUFX= .py @@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org #HOMEPAGE= http://dharma.cis.upenn.edu/planetlab/vxargs/ COMMENT= Runs parallel jobs with visualization and redirection -DEPENDS+= ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses - EXTRACT_CMD= ${CP} $${extract_file} ${WRKSRC}/vxargs.py NO_BUILD= yes WRKSRC= ${WRKDIR} @@ -20,9 +18,9 @@ INSTALLATION_DIRS= bin REPLACE_PYTHON= vxargs.py -.include "../../lang/python/application.mk" - do-install: ${INSTALL_SCRIPT} ${WRKSRC}/vxargs.py ${DESTDIR}${PREFIX}/bin/vxargs +.include "../../lang/python/batteries-included.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/sysutils/xentools415/Makefile diff -u pkgsrc/sysutils/xentools415/Makefile:1.26 pkgsrc/sysutils/xentools415/Makefile:1.27 --- pkgsrc/sysutils/xentools415/Makefile:1.26 Thu Aug 24 10:27:09 2023 +++ pkgsrc/sysutils/xentools415/Makefile Mon Oct 23 06:37:53 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2023/08/24 10:27:09 bouyer Exp $ +# $NetBSD: Makefile,v 1.27 2023/10/23 06:37:53 wiz Exp $ # # VERSION is set in version.mk as it is shared with other packages -#PKGREVISION= 1 +PKGREVISION= 1 .include "version.mk" PKGNAME= xentools415-${VERSION} @@ -17,7 +17,6 @@ TOOL_DEPENDS+= dev86-[0-9]*:../../devel/ .if !exists(/usr/bin/iasl) TOOL_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils .endif -DEPENDS+= ${PYPKGPREFIX}-curses>=0:../../devel/py-curses TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools PYTHON_VERSIONS_INCOMPATIBLE= 27 @@ -225,6 +224,7 @@ BUILDLINK_TRANSFORM+= rm:-falign-jumps=1 MAKE_ENV+= EXTRA_HOSTCFLAGS=${EXTRA_HOSTCFLAGS:Q} EXTRA_CFLAGS=${EXTRA_CFLAGS:M*:Q} TARGET_CC=${TARGET_CC} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" #.include "../../devel/SDL/buildlink3.mk" Index: pkgsrc/textproc/Makefile diff -u pkgsrc/textproc/Makefile:1.1427 pkgsrc/textproc/Makefile:1.1428 --- pkgsrc/textproc/Makefile:1.1427 Sun Oct 15 07:50:41 2023 +++ pkgsrc/textproc/Makefile Mon Oct 23 06:37:53 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1427 2023/10/15 07:50:41 wiz Exp $ +# $NetBSD: Makefile,v 1.1428 2023/10/23 06:37:53 wiz Exp $ # COMMENT= Text processing utilities (does not include desktop publishing) @@ -1007,7 +1007,6 @@ SUBDIR+= py-biplist SUBDIR+= py-black SUBDIR+= py-bracex SUBDIR+= py-breathe -SUBDIR+= py-cElementTree SUBDIR+= py-cabocha SUBDIR+= py-cmTemplate SUBDIR+= py-cmarkgfm @@ -1036,7 +1035,6 @@ SUBDIR+= py-empy SUBDIR+= py-enchant SUBDIR+= py-epr-reader SUBDIR+= py-eradicate -SUBDIR+= py-expat SUBDIR+= py-fastjsonschema SUBDIR+= py-feedparser SUBDIR+= py-feedparser5 Index: pkgsrc/textproc/iso-codes/Makefile diff -u pkgsrc/textproc/iso-codes/Makefile:1.66 pkgsrc/textproc/iso-codes/Makefile:1.67 --- pkgsrc/textproc/iso-codes/Makefile:1.66 Mon Aug 14 05:25:22 2023 +++ pkgsrc/textproc/iso-codes/Makefile Mon Oct 23 06:37:53 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.66 2023/08/14 05:25:22 wiz Exp $ +# $NetBSD: Makefile,v 1.67 2023/10/23 06:37:53 wiz Exp $ DISTNAME= iso-codes-v4.11.0 PKGNAME= ${DISTNAME:S/v//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= textproc MASTER_SITES= https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.bz2 @@ -12,8 +12,6 @@ HOMEPAGE= https://salsa.debian.org/iso-c COMMENT= List of country, language and currency names LICENSE= gnu-lgpl-v2.1 -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat - USE_LANGUAGES= # empty USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake msgfmt @@ -41,5 +39,6 @@ SUBST_MESSAGE.python3= Fixing path to py PYTHON_FOR_BUILD_ONLY= yes +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/jless/Makefile diff -u pkgsrc/textproc/jless/Makefile:1.9 pkgsrc/textproc/jless/Makefile:1.10 --- pkgsrc/textproc/jless/Makefile:1.9 Mon Aug 14 05:25:23 2023 +++ pkgsrc/textproc/jless/Makefile Mon Oct 23 06:37:53 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2023/08/14 05:25:23 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2023/10/23 06:37:53 wiz Exp $ DISTNAME= jless-0.9.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GITHUB:=PaulJuliusMartinez/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -11,8 +11,6 @@ HOMEPAGE= https://github.com/PaulJuliusM COMMENT= Command-line pager for JSON data LICENSE= mit -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - .include "cargo-depends.mk" USE_LANGUAGES+= c c++ @@ -33,6 +31,7 @@ do-install: ${DESTDIR}${PREFIX}/bin/j_less .include "../../lang/rust/cargo.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" .include "../../x11/libxcb/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/py-docutils/Makefile diff -u pkgsrc/textproc/py-docutils/Makefile:1.62 pkgsrc/textproc/py-docutils/Makefile:1.63 --- pkgsrc/textproc/py-docutils/Makefile:1.62 Sun May 21 17:45:36 2023 +++ pkgsrc/textproc/py-docutils/Makefile Mon Oct 23 06:37:54 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.62 2023/05/21 17:45:36 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2023/10/23 06:37:54 wiz Exp $ DISTNAME= docutils-0.20.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= textproc python MASTER_SITES= ${MASTER_SITE_PYPI:=d/docutils/} @@ -10,7 +11,6 @@ HOMEPAGE= https://docutils.sourceforge.i COMMENT= Python tool to generate documents LICENSE= public-domain AND 2-clause-bsd -DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-roman>=1.4:../../math/py-roman DEPENDS+= ${PYPKGPREFIX}-pygments>=0:../../textproc/py-pygments @@ -38,6 +38,7 @@ post-install: do-test: cd ${WRKSRC} && ${PYTHONBIN} test/alltests.py +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/py-elementpath/Makefile diff -u pkgsrc/textproc/py-elementpath/Makefile:1.34 pkgsrc/textproc/py-elementpath/Makefile:1.35 --- pkgsrc/textproc/py-elementpath/Makefile:1.34 Mon Jul 31 16:27:07 2023 +++ pkgsrc/textproc/py-elementpath/Makefile Mon Oct 23 06:37:54 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.34 2023/07/31 16:27:07 adam Exp $ +# $NetBSD: Makefile,v 1.35 2023/10/23 06:37:54 wiz Exp $ DISTNAME= elementpath-4.1.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= textproc python MASTER_SITES= ${MASTER_SITE_PYPI:=e/elementpath/} @@ -10,11 +11,10 @@ HOMEPAGE= https://github.com/sissaschool COMMENT= XPath 1.0/2.0 parsers and selectors for ElementTree and lxml LICENSE= mit -TEST_DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree - USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/py-epr-reader/Makefile diff -u pkgsrc/textproc/py-epr-reader/Makefile:1.6 pkgsrc/textproc/py-epr-reader/Makefile:1.7 --- pkgsrc/textproc/py-epr-reader/Makefile:1.6 Tue May 30 04:22:05 2023 +++ pkgsrc/textproc/py-epr-reader/Makefile Mon Oct 23 06:37:54 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2023/05/30 04:22:05 adam Exp $ +# $NetBSD: Makefile,v 1.7 2023/10/23 06:37:54 wiz Exp $ DISTNAME= epr-reader-2.4.15 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= textproc python MASTER_SITES= ${MASTER_SITE_PYPI:=e/epr-reader/} @@ -11,7 +12,6 @@ COMMENT= Terminal/CLI Epub Reader LICENSE= mit TOOL_DEPENDS+= ${PYPKGPREFIX}-poetry-core>=1.0.0:../../devel/py-poetry-core -DEPENDS+= ${PYPKGPREFIX}-curses>0:../../devel/py-curses USE_LANGUAGES= # none @@ -23,6 +23,7 @@ post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} epr epr-${PYVERSSUFFIX} || ${TRUE} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/wheel.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/py-gnosis-utils/Makefile diff -u pkgsrc/textproc/py-gnosis-utils/Makefile:1.23 pkgsrc/textproc/py-gnosis-utils/Makefile:1.24 --- pkgsrc/textproc/py-gnosis-utils/Makefile:1.23 Mon Jan 10 09:10:43 2022 +++ pkgsrc/textproc/py-gnosis-utils/Makefile Mon Oct 23 06:37:54 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2022/01/10 09:10:43 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2023/10/23 06:37:54 wiz Exp $ DISTNAME= Gnosis_Utils-1.2.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Gnosis_Utils/gnosis-utils/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= textproc python MASTER_SITES= http://gnosis.cx/download/ @@ -11,13 +11,12 @@ HOMEPAGE= http://gnosis.cx/download/ COMMENT= Classes for working with XML LICENSE= public-domain -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - USE_LANGUAGES= #none PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.2.2 CONFLICTS+= ${PYPKGPREFIX}-Gnosis-Utils-[0-9]* +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/py-libxml2/Makefile diff -u pkgsrc/textproc/py-libxml2/Makefile:1.88 pkgsrc/textproc/py-libxml2/Makefile:1.89 --- pkgsrc/textproc/py-libxml2/Makefile:1.88 Mon Sep 18 13:21:40 2023 +++ pkgsrc/textproc/py-libxml2/Makefile Mon Oct 23 06:37:54 2023 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.88 2023/09/18 13:21:40 gdt Exp $ +# $NetBSD: Makefile,v 1.89 2023/10/23 06:37:54 wiz Exp $ -PKGREVISION= 1 +PKGREVISION= 2 .include "../../textproc/libxml2/Makefile.common" PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -53,8 +53,7 @@ fix-darwin-install-name: EGG_NAME= ${DISTNAME:S/-/_python-/} -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat - +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../converters/libiconv/buildlink3.mk" BUILDLINK_API_DEPENDS.libxml2+= libxml2>=${PKGVERSION_NOREV} Index: pkgsrc/textproc/py-libxslt/Makefile diff -u pkgsrc/textproc/py-libxslt/Makefile:1.67 pkgsrc/textproc/py-libxslt/Makefile:1.68 --- pkgsrc/textproc/py-libxslt/Makefile:1.67 Wed May 17 23:35:45 2023 +++ pkgsrc/textproc/py-libxslt/Makefile Mon Oct 23 06:37:54 2023 @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.67 2023/05/17 23:35:45 gutteridge Exp $ +# $NetBSD: Makefile,v 1.68 2023/10/23 06:37:54 wiz Exp $ .include "../../textproc/libxslt/Makefile.common" PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= textproc python MAINTAINER= minskim@NetBSD.org COMMENT= Python wrapper for libxslt -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-libxml2>=2.6.8:../../textproc/py-libxml2 EGG_NAME= libxslt_python-${PKGVERSION_NOREV} @@ -34,6 +34,7 @@ post-extract: setuppy setuppy: ${CP} ${FILESDIR}/setup.py ${WRKSRC}/python +.include "../../lang/python/batteries-included.mk" # this must come before py-libxml2's bl3 or the direct dependence is lost .include "../../lang/python/pyversion.mk" Index: pkgsrc/textproc/py-lxml/Makefile diff -u pkgsrc/textproc/py-lxml/Makefile:1.90 pkgsrc/textproc/py-lxml/Makefile:1.91 --- pkgsrc/textproc/py-lxml/Makefile:1.90 Wed Jul 5 12:33:02 2023 +++ pkgsrc/textproc/py-lxml/Makefile Mon Oct 23 06:37:55 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.90 2023/07/05 12:33:02 adam Exp $ +# $NetBSD: Makefile,v 1.91 2023/10/23 06:37:55 wiz Exp $ DISTNAME= lxml-4.9.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= textproc python MASTER_SITES= ${MASTER_SITE_PYPI:=l/lxml/} @@ -14,12 +15,12 @@ LICENSE= modified-bsd # See pkg/56688: nbtar (archivers/pax) silently drops files EXTRACT_USING= gtar -TEST_DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree TEST_DEPENDS+= ${PYPKGPREFIX}-cssselect>=0.7:../../textproc/py-cssselect PYSETUPTESTARGS= --run-tests .include "../../devel/zlib/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.9.12 .include "../../textproc/libxml2/buildlink3.mk" Index: pkgsrc/textproc/py-nltk/Makefile diff -u pkgsrc/textproc/py-nltk/Makefile:1.13 pkgsrc/textproc/py-nltk/Makefile:1.14 --- pkgsrc/textproc/py-nltk/Makefile:1.13 Tue Aug 1 23:20:53 2023 +++ pkgsrc/textproc/py-nltk/Makefile Mon Oct 23 06:37:55 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2023/08/01 23:20:53 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2023/10/23 06:37:55 wiz Exp $ DISTNAME= nltk-3.8.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= textproc python MASTER_SITES= ${MASTER_SITE_PYPI:=n/nltk/} EXTRACT_SUFX= .zip @@ -15,7 +16,6 @@ DEPENDS+= ${PYPKGPREFIX}-click-[0-9]*:.. DEPENDS+= ${PYPKGPREFIX}-joblib-[0-9]*:../../devel/py-joblib DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing DEPENDS+= ${PYPKGPREFIX}-regex>=2021.8.3:../../textproc/py-regex -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-tqdm-[0-9]*:../../misc/py-tqdm TEST_DEPENDS+= ${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy TEST_DEPENDS+= ${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib @@ -67,6 +67,7 @@ post-install: do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/py-xmlschema/Makefile diff -u pkgsrc/textproc/py-xmlschema/Makefile:1.47 pkgsrc/textproc/py-xmlschema/Makefile:1.48 --- pkgsrc/textproc/py-xmlschema/Makefile:1.47 Sun Oct 1 16:15:55 2023 +++ pkgsrc/textproc/py-xmlschema/Makefile Mon Oct 23 06:37:55 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.47 2023/10/01 16:15:55 adam Exp $ +# $NetBSD: Makefile,v 1.48 2023/10/23 06:37:55 wiz Exp $ DISTNAME= xmlschema-2.5.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= textproc python MASTER_SITES= ${MASTER_SITE_PYPI:=x/xmlschema/} @@ -11,7 +12,6 @@ COMMENT= XML Schema validator and decode LICENSE= mit DEPENDS+= ${PYPKGPREFIX}-elementpath>=4.1.5:../../textproc/py-elementpath -TEST_DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree USE_LANGUAGES= # none @@ -28,5 +28,6 @@ post-install: do-test: cd ${WRKSRC} && ${PYTHONBIN} -m unittest discover -v +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/py-xmltodict/Makefile diff -u pkgsrc/textproc/py-xmltodict/Makefile:1.4 pkgsrc/textproc/py-xmltodict/Makefile:1.5 --- pkgsrc/textproc/py-xmltodict/Makefile:1.4 Mon May 9 08:13:02 2022 +++ pkgsrc/textproc/py-xmltodict/Makefile Mon Oct 23 06:37:55 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2022/05/09 08:13:02 adam Exp $ +# $NetBSD: Makefile,v 1.5 2023/10/23 06:37:55 wiz Exp $ DISTNAME= xmltodict-0.13.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= textproc python MASTER_SITES= ${MASTER_SITE_PYPI:=x/xmltodict/} @@ -10,7 +11,6 @@ HOMEPAGE= https://github.com/martinblech COMMENT= Simplified XML parser library LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat TEST_DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose @@ -21,5 +21,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 do-test: cd ${WRKSRC} && ${PYTHONBIN} -m unittest discover -s tests -v +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/time/khal/Makefile diff -u pkgsrc/time/khal/Makefile:1.41 pkgsrc/time/khal/Makefile:1.42 --- pkgsrc/time/khal/Makefile:1.41 Mon Aug 14 05:25:26 2023 +++ pkgsrc/time/khal/Makefile Mon Oct 23 06:37:55 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.41 2023/08/14 05:25:26 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2023/10/23 06:37:55 wiz Exp $ DISTNAME= khal-0.11.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= time net python MASTER_SITES= ${MASTER_SITE_PYPI:=k/khal/} @@ -18,7 +18,6 @@ DEPENDS+= ${PYPKGPREFIX}-configobj-[0-9] DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil DEPENDS+= ${PYPKGPREFIX}-icalendar>=4.0.3:../../time/py-icalendar DEPENDS+= ${PYPKGPREFIX}-pytz>=2018.7:../../time/py-pytz -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-tzlocal>=1.0:../../time/py-tzlocal DEPENDS+= ${PYPKGPREFIX}-urwid>=1.3.0:../../devel/py-urwid DEPENDS+= ${PYPKGPREFIX}-xdg>=0.17:../../devel/py-xdg @@ -54,6 +53,7 @@ post-install: do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/time/ntpsec/Makefile diff -u pkgsrc/time/ntpsec/Makefile:1.25 pkgsrc/time/ntpsec/Makefile:1.26 --- pkgsrc/time/ntpsec/Makefile:1.25 Mon Aug 14 05:25:26 2023 +++ pkgsrc/time/ntpsec/Makefile Mon Oct 23 06:37:55 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2023/08/14 05:25:26 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2023/10/23 06:37:55 wiz Exp $ DISTNAME= ntpsec-1.2.1 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= time MASTER_SITES= https://ftp.ntpsec.org/pub/releases/ @@ -10,8 +10,6 @@ HOMEPAGE= https://www.ntpsec.org/ COMMENT= Hardened & improved NTP implementation derived from NTP Classic LICENSE= cc-by-v4.0 AND 2-clause-bsd AND modified-bsd AND mit -DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses - TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc TOOL_DEPENDS+= waf-[0-9]*:../../devel/waf @@ -34,6 +32,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 38 .include "../../devel/waf/waf.mk" .include "../../geography/gpsd/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../security/openssl/buildlink3.mk" Index: pkgsrc/time/py-jrnl/Makefile diff -u pkgsrc/time/py-jrnl/Makefile:1.6 pkgsrc/time/py-jrnl/Makefile:1.7 --- pkgsrc/time/py-jrnl/Makefile:1.6 Wed Jan 5 15:41:28 2022 +++ pkgsrc/time/py-jrnl/Makefile Mon Oct 23 06:37:55 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:28 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2023/10/23 06:37:55 wiz Exp $ DISTNAME= jrnl-1.9.8 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= time python GITHUB_PROJECT= jrnl MASTER_SITES= ${MASTER_SITE_GITHUB:=maebert/} @@ -18,7 +18,6 @@ DEPENDS+= ${PYPKGPREFIX}-keyring>=3.3:.. DEPENDS+= ${PYPKGPREFIX}-keyrings.alt>=1.3:../../security/py-keyrings.alt DEPENDS+= ${PYPKGPREFIX}-parsedatetime>=1.2:../../time/py-parsedatetime DEPENDS+= ${PYPKGPREFIX}-pytz>=2013b:../../time/py-pytz -DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline DEPENDS+= ${PYPKGPREFIX}-six>=1.6.1:../../lang/py-six DEPENDS+= ${PYPKGPREFIX}-tzlocal>=1.1:../../time/py-tzlocal @@ -31,5 +30,6 @@ USE_PKG_RESOURCES= yes post-install: ${MV} ${DESTDIR}${PREFIX}/bin/jrnl ${DESTDIR}${PREFIX}/bin/jrnl-${PYVERSSUFFIX} || ${TRUE} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/time/py-vdirsyncer/Makefile diff -u pkgsrc/time/py-vdirsyncer/Makefile:1.66 pkgsrc/time/py-vdirsyncer/Makefile:1.67 --- pkgsrc/time/py-vdirsyncer/Makefile:1.66 Mon Aug 7 18:16:15 2023 +++ pkgsrc/time/py-vdirsyncer/Makefile Mon Oct 23 06:37:55 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2023/08/07 18:16:15 adam Exp $ +# $NetBSD: Makefile,v 1.67 2023/10/23 06:37:55 wiz Exp $ DISTNAME= vdirsyncer-0.18.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -22,7 +22,6 @@ DEPENDS+= ${PYPKGPREFIX}-click-threading DEPENDS+= ${PYPKGPREFIX}-requests>=2.20.0:../../devel/py-requests DEPENDS+= ${PYPKGPREFIX}-requests-oauthlib-[0-9]*:../../security/py-requests-oauthlib DEPENDS+= ${PYPKGPREFIX}-requests-toolbelt>=0.4.0:../../devel/py-requests-toolbelt -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=5.0.0:../../devel/py-hypothesis TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov @@ -47,6 +46,7 @@ post-build: post-install: ${INSTALL_MAN} ${WRKSRC}/docs/_build/man/vdirsyncer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" # needed due to py-click Index: pkgsrc/www/arcticfox/Makefile diff -u pkgsrc/www/arcticfox/Makefile:1.34 pkgsrc/www/arcticfox/Makefile:1.35 --- pkgsrc/www/arcticfox/Makefile:1.34 Sat Oct 21 17:11:37 2023 +++ pkgsrc/www/arcticfox/Makefile Mon Oct 23 06:37:56 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2023/10/21 17:11:37 gdt Exp $ +# $NetBSD: Makefile,v 1.35 2023/10/23 06:37:56 wiz Exp $ DISTNAME= arcticfox-42.1 PKGREVISION= 2 @@ -92,7 +92,6 @@ REPLACE_PYTHON+= xpcom/typelib/xpt/tool PYTHON_VERSIONS_ACCEPTED= 27 PYTHON_FOR_BUILD_ONLY= tool -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat NOT_PAX_MPROTECT_SAFE+= lib/${PKGNAME_NOREV}/arcticfox NOT_PAX_MPROTECT_SAFE+= lib/${PKGNAME_NOREV}/arcticfox-bin @@ -133,6 +132,7 @@ BUILDLINK_API_DEPENDS.libevent+= libeven .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/libwebp/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/tool.mk" .include "../../multimedia/libvpx/buildlink3.mk" Index: pkgsrc/www/firefox/mozilla-common.mk diff -u pkgsrc/www/firefox/mozilla-common.mk:1.264 pkgsrc/www/firefox/mozilla-common.mk:1.265 --- pkgsrc/www/firefox/mozilla-common.mk:1.264 Wed Oct 18 23:49:16 2023 +++ pkgsrc/www/firefox/mozilla-common.mk Mon Oct 23 06:37:56 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.264 2023/10/18 23:49:16 gutteridge Exp $ +# $NetBSD: mozilla-common.mk,v 1.265 2023/10/23 06:37:56 wiz Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -32,10 +32,6 @@ USE_TOOLS+= diff CONFIGURE_ENV+= NODEJS="${FILESDIR}/node-wrapper.sh" .endif -TOOL_DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses -TOOL_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - # malloc_usable_size() LDFLAGS.NetBSD+= -ljemalloc @@ -267,4 +263,5 @@ PLIST.wayland= yes .else CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 .endif +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" Index: pkgsrc/www/firefox102/mozilla-common.mk diff -u pkgsrc/www/firefox102/mozilla-common.mk:1.5 pkgsrc/www/firefox102/mozilla-common.mk:1.6 --- pkgsrc/www/firefox102/mozilla-common.mk:1.5 Sun Sep 10 14:42:28 2023 +++ pkgsrc/www/firefox102/mozilla-common.mk Mon Oct 23 06:37:56 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.5 2023/09/10 14:42:28 nia Exp $ +# $NetBSD: mozilla-common.mk,v 1.6 2023/10/23 06:37:56 wiz Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -29,9 +29,6 @@ USE_TOOLS+= diff CONFIGURE_ENV+= NODEJS="${FILESDIR}/node-wrapper.sh" .endif -TOOL_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" TOOL_DEPENDS+= nasm>=2.14:../../devel/nasm TOOL_DEPENDS+= yasm>=1.1:../../devel/yasm @@ -230,4 +227,5 @@ PLIST_VARS+= wayland .if ${PKG_BUILD_OPTIONS.gtk3:Mwayland} PLIST.wayland= yes .endif +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/pyversion.mk" Index: pkgsrc/www/firefox115/mozilla-common.mk diff -u pkgsrc/www/firefox115/mozilla-common.mk:1.1 pkgsrc/www/firefox115/mozilla-common.mk:1.2 --- pkgsrc/www/firefox115/mozilla-common.mk:1.1 Mon Sep 11 12:33:25 2023 +++ pkgsrc/www/firefox115/mozilla-common.mk Mon Oct 23 06:37:56 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.1 2023/09/11 12:33:25 ryoon Exp $ +# $NetBSD: mozilla-common.mk,v 1.2 2023/10/23 06:37:56 wiz Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -32,10 +32,6 @@ USE_TOOLS+= diff CONFIGURE_ENV+= NODEJS="${FILESDIR}/node-wrapper.sh" .endif -TOOL_DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses -TOOL_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - # malloc_usable_size() LDFLAGS.NetBSD+= -ljemalloc @@ -260,4 +256,5 @@ PLIST.wayland= yes .else CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 .endif +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" Index: pkgsrc/www/firefox52/mozilla-common.mk diff -u pkgsrc/www/firefox52/mozilla-common.mk:1.16 pkgsrc/www/firefox52/mozilla-common.mk:1.17 --- pkgsrc/www/firefox52/mozilla-common.mk:1.16 Tue Jun 6 12:42:39 2023 +++ pkgsrc/www/firefox52/mozilla-common.mk Mon Oct 23 06:37:56 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.16 2023/06/06 12:42:39 riastradh Exp $ +# $NetBSD: mozilla-common.mk,v 1.17 2023/10/23 06:37:56 wiz Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -135,7 +135,6 @@ PREFER.bzip2?= pkgsrc PYTHON_VERSIONS_ACCEPTED= 27 PYTHON_FOR_BUILD_ONLY= tool -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat .include "../../mk/atomic64.mk" .include "../../archivers/bzip2/buildlink3.mk" @@ -151,6 +150,7 @@ BUILDLINK_API_DEPENDS.nspr+= nspr>=4.12 .include "../../graphics/MesaLib/buildlink3.mk" BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 .include "../../graphics/cairo/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" .include "../../multimedia/libvpx/buildlink3.mk" .include "../../net/libIDL/buildlink3.mk" Index: pkgsrc/www/ikiwiki/options.mk diff -u pkgsrc/www/ikiwiki/options.mk:1.24 pkgsrc/www/ikiwiki/options.mk:1.25 --- pkgsrc/www/ikiwiki/options.mk:1.24 Tue May 2 00:43:54 2023 +++ pkgsrc/www/ikiwiki/options.mk Mon Oct 23 06:37:56 2023 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.24 2023/05/02 00:43:54 schmonz Exp $ +# $NetBSD: options.mk,v 1.25 2023/10/23 06:37:56 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ikiwiki PKG_SUPPORTED_OPTIONS= cgi imagemagick l10n python w3m @@ -71,7 +71,7 @@ SUBST_SED.l10n+= -e 's|\(Locale::Po4a::C .if !empty(PKG_OPTIONS:Mpython) DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat +.include "../../lang/python/batteries-included.mk" .else PYTHON_FOR_BUILD_ONLY= yes .endif Index: pkgsrc/www/py-django/MESSAGE diff -u pkgsrc/www/py-django/MESSAGE:1.3 pkgsrc/www/py-django/MESSAGE:1.4 --- pkgsrc/www/py-django/MESSAGE:1.3 Wed Oct 4 21:37:14 2023 +++ pkgsrc/www/py-django/MESSAGE Mon Oct 23 06:37:56 2023 @@ -1,11 +1,10 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2023/10/04 21:37:14 adam Exp $ +$NetBSD: MESSAGE,v 1.4 2023/10/23 06:37:56 wiz Exp $ Django also requires a database backend. For PostgreSQL, install databases/py-psycopg2 package. For MySQL/MariaDB, install databases/py-mysqldb or databases/py-mysql-connector package. -For SQLite, install databases/py-sqlite3 package. For Oracle, install databases/py-cx_Oracle package. =========================================================================== Index: pkgsrc/www/py-django3/MESSAGE diff -u pkgsrc/www/py-django3/MESSAGE:1.1 pkgsrc/www/py-django3/MESSAGE:1.2 --- pkgsrc/www/py-django3/MESSAGE:1.1 Mon Feb 17 20:23:21 2020 +++ pkgsrc/www/py-django3/MESSAGE Mon Oct 23 06:37:56 2023 @@ -1,10 +1,9 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2020/02/17 20:23:21 adam Exp $ +$NetBSD: MESSAGE,v 1.2 2023/10/23 06:37:56 wiz Exp $ Django also requires a database backend. For PostgreSQL, install databases/py-psycopg2 package. For MySQL/MariaDB, install databases/py-mysqldb or databases/py-mysql-connector package. -For SQLite, install databases/py-sqlite3 package. For Oracle, install databases/py-cx_Oracle package. =========================================================================== Index: pkgsrc/www/py-genshi/Makefile diff -u pkgsrc/www/py-genshi/Makefile:1.21 pkgsrc/www/py-genshi/Makefile:1.22 --- pkgsrc/www/py-genshi/Makefile:1.21 Wed Aug 2 16:17:19 2023 +++ pkgsrc/www/py-genshi/Makefile Mon Oct 23 06:37:56 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2023/08/02 16:17:19 nia Exp $ +# $NetBSD: Makefile,v 1.22 2023/10/23 06:37:56 wiz Exp $ DISTNAME= Genshi-0.7.7 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} +PKGREVISION= 1 CATEGORIES= www python MASTER_SITES= ${MASTER_SITE_PYPI:=G/Genshi/} @@ -10,7 +11,6 @@ HOMEPAGE= https://genshi.edgewall.org/ COMMENT= Python toolkit for generation of output for the web LICENSE= modified-bsd -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six # "error: 'for' loop initial declarations are only allowed in C99 mode" @@ -18,6 +18,7 @@ FORCE_C_STD= c99 PYTHON_VERSIONED_DEPENDENCIES= babel +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/www/py-httpie/Makefile diff -u pkgsrc/www/py-httpie/Makefile:1.17 pkgsrc/www/py-httpie/Makefile:1.18 --- pkgsrc/www/py-httpie/Makefile:1.17 Sun Jul 30 15:41:40 2023 +++ pkgsrc/www/py-httpie/Makefile Mon Oct 23 06:37:57 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2023/07/30 15:41:40 adam Exp $ +# $NetBSD: Makefile,v 1.18 2023/10/23 06:37:57 wiz Exp $ DISTNAME= httpie-3.2.2 PKGNAME= ${PYPKGPREFIX}-${EGG_NAME} +PKGREVISION= 1 CATEGORIES= www python MASTER_SITES= ${MASTER_SITE_PYPI:=h/httpie/} @@ -11,7 +12,6 @@ COMMENT= Human-friendly command line HTT LICENSE= original-bsd DEPENDS+= ${PYPKGPREFIX}-charset-normalizer>=2.0.0:../../converters/py-charset-normalizer -DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses DEPENDS+= ${PYPKGPREFIX}-defusedxml>=0.6.0:../../textproc/py-defusedxml DEPENDS+= ${PYPKGPREFIX}-multidict>=4.7.0:../../databases/py-multidict DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip @@ -51,5 +51,6 @@ post-install: do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/www/py-sydent/Makefile diff -u pkgsrc/www/py-sydent/Makefile:1.5 pkgsrc/www/py-sydent/Makefile:1.6 --- pkgsrc/www/py-sydent/Makefile:1.5 Wed Sep 6 12:01:11 2023 +++ pkgsrc/www/py-sydent/Makefile Mon Oct 23 06:37:57 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2023/09/06 12:01:11 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2023/10/23 06:37:57 wiz Exp $ DISTNAME= py-sydent-2.5.6 EGG_NAME= SynapseIdentityServer-0.1 -PKGREVISION= 3 +PKGREVISION= 4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py-//} CATEGORIES= www GITHUB_PROJECT= sydent @@ -30,7 +30,6 @@ DEPENDS+= ${PYPKGPREFIX}-setuptools>=0:. DEPENDS+= ${PYPKGPREFIX}-setuptools_trial-[0-9]*:../../devel/py-setuptools_trial DEPENDS+= ${PYPKGPREFIX}-signedjson-[0-9]*:../../security/py-signedjson DEPENDS+= ${PYPKGPREFIX}-sortedcontainers-[0-9]*:../../devel/py-sortedcontainers -DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted DEPENDS+= ${PYPKGPREFIX}-unpaddedbase64-[0-9]*:../../devel/py-unpaddedbase64 DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml @@ -79,6 +78,7 @@ post-configure: post-install: ${INSTALL_DATA} ${WRKSRC}/sydent.conf ${DESTDIR}${EGDIR} +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/www/py-uwsgitop/Makefile diff -u pkgsrc/www/py-uwsgitop/Makefile:1.13 pkgsrc/www/py-uwsgitop/Makefile:1.14 --- pkgsrc/www/py-uwsgitop/Makefile:1.13 Wed Mar 29 09:34:15 2023 +++ pkgsrc/www/py-uwsgitop/Makefile Mon Oct 23 06:37:57 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2023/03/29 09:34:15 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2023/10/23 06:37:57 wiz Exp $ DISTNAME= uwsgitop-0.11 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= python www MASTER_SITES= ${MASTER_SITE_PYPI:=u/uwsgitop/} @@ -11,8 +11,7 @@ HOMEPAGE= https://uwsgi-docs.readthedocs COMMENT= Command to interface with the uWSGI stats server LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses - +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/pyversion.mk" .if ${PYTHON_VERSION} == 207 Index: pkgsrc/www/seamonkey/mozilla-common.mk diff -u pkgsrc/www/seamonkey/mozilla-common.mk:1.19 pkgsrc/www/seamonkey/mozilla-common.mk:1.20 --- pkgsrc/www/seamonkey/mozilla-common.mk:1.19 Tue Jun 6 12:42:51 2023 +++ pkgsrc/www/seamonkey/mozilla-common.mk Mon Oct 23 06:37:57 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.19 2023/06/06 12:42:51 riastradh Exp $ +# $NetBSD: mozilla-common.mk,v 1.20 2023/10/23 06:37:57 wiz Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -17,18 +17,16 @@ GCC_REQD+= 4.9 # Python 2.7 and Python 3.8 or later are required simultaneously. PYTHON_VERSIONS_ACCEPTED= 27 PYTHON_FOR_BUILD_ONLY= tool -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat # Include pyversion.mk after setting PYTHON_* but before testing the default. +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/pyversion.mk" # lang/python311 is not acceptable. .if !empty(PYTHON_VERSION_DEFAULT:M3[89]) || !empty(PYTHON_VERSION_DEFAULT:M310) TOOL_DEPENDS+= python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT} ALL_ENV+= PYTHON3=${PREFIX}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./} -TOOL_DEPENDS+= py${PYTHON_VERSION_DEFAULT}-expat-[0-9]*:../../textproc/py-expat .else TOOL_DEPENDS+= python38-[0-9]*:../../lang/python38 ALL_ENV+= PYTHON3=${PREFIX}/bin/python3.8 -TOOL_DEPENDS+= py38-expat-[0-9]*:../../textproc/py-expat .endif TOOL_DEPENDS+= cbindgen>=0.24.3:../../devel/cbindgen Index: pkgsrc/www/trac/options.mk diff -u pkgsrc/www/trac/options.mk:1.4 pkgsrc/www/trac/options.mk:1.5 --- pkgsrc/www/trac/options.mk:1.4 Tue Jun 11 05:30:23 2019 +++ pkgsrc/www/trac/options.mk Mon Oct 23 06:37:57 2023 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2019/06/11 05:30:23 maya Exp $ +# $NetBSD: options.mk,v 1.5 2023/10/23 06:37:57 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.trac PKG_OPTIONS_REQUIRED_GROUPS= db @@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS= sqlite .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Msqlite) -DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3 +.include "../../lang/python/batteries-included.mk" .endif # trac 0.12 dropped support for py-PgSQL. Switching to py-psycopg2 with # an existing database that used to be accessed by py-PgSQL worked. Index: pkgsrc/www/tuir/Makefile diff -u pkgsrc/www/tuir/Makefile:1.5 pkgsrc/www/tuir/Makefile:1.6 --- pkgsrc/www/tuir/Makefile:1.5 Mon Aug 14 05:25:31 2023 +++ pkgsrc/www/tuir/Makefile Mon Oct 23 06:37:57 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2023/08/14 05:25:31 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2023/10/23 06:37:57 wiz Exp $ DISTNAME= tuir-1.29.0 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_PYPI:=t/tuir/} @@ -13,7 +13,6 @@ LICENSE= mit USE_LANGUAGES= # none DEPENDS+= ${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4 -DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses DEPENDS+= ${PYPKGPREFIX}-decorator-[0-9]*:../../devel/py-decorator DEPENDS+= ${PYPKGPREFIX}-kitchen-[0-9]*:../../devel/py-kitchen DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests @@ -27,5 +26,6 @@ SUBST_SED.man+= -e "s,share/man/man1,${ PYTHON_VERSIONS_INCOMPATIBLE= 27 USE_PKG_RESOURCES= yes +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/www/webkit-gtk/Makefile diff -u pkgsrc/www/webkit-gtk/Makefile:1.250 pkgsrc/www/webkit-gtk/Makefile:1.251 --- pkgsrc/www/webkit-gtk/Makefile:1.250 Sat Oct 21 17:11:40 2023 +++ pkgsrc/www/webkit-gtk/Makefile Mon Oct 23 06:37:58 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.250 2023/10/21 17:11:40 gdt Exp $ +# $NetBSD: Makefile,v 1.251 2023/10/23 06:37:58 wiz Exp $ DISTNAME= webkitgtk-2.36.8 PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} @@ -16,7 +16,6 @@ LICENSE= 2-clause-bsd AND gnu-lgpl-v2 NOT_FOR_PLATFORM= NetBSD-[1-6].*-* TOOL_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat USE_LANGUAGES= c c++17 USE_TOOLS+= automake bash bison flex gdbus-codegen gmake perl pkg-config msgfmt @@ -113,6 +112,7 @@ TOOL_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERS CMAKE_ARGS+= -DRUBY_EXECUTABLE=${RUBY} PYTHON_FOR_BUILD_ONLY= yes +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN} Index: pkgsrc/x11/alacritty/Makefile diff -u pkgsrc/x11/alacritty/Makefile:1.27 pkgsrc/x11/alacritty/Makefile:1.28 --- pkgsrc/x11/alacritty/Makefile:1.27 Wed Oct 4 11:46:35 2023 +++ pkgsrc/x11/alacritty/Makefile Mon Oct 23 06:37:58 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2023/10/04 11:46:35 pin Exp $ +# $NetBSD: Makefile,v 1.28 2023/10/23 06:37:58 wiz Exp $ DISTNAME= alacritty-0.12.3 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GITHUB:=alacritty/} GITHUB_TAG= refs/tags/v${PKGVERSION_NOREV} @@ -11,7 +12,6 @@ COMMENT= Cross-platform, GPU-accelerated LICENSE= apache-2.0 TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat .include "cargo-depends.mk" @@ -62,6 +62,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/extra/logo/alacritty-term.svg \ ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" .include "../../lang/rust/cargo.mk" .include "../../security/openssl/buildlink3.mk" Index: pkgsrc/x11/driconf/Makefile diff -u pkgsrc/x11/driconf/Makefile:1.35 pkgsrc/x11/driconf/Makefile:1.36 --- pkgsrc/x11/driconf/Makefile:1.35 Mon Aug 14 05:25:32 2023 +++ pkgsrc/x11/driconf/Makefile Mon Oct 23 06:37:58 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2023/08/14 05:25:32 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2023/10/23 06:37:58 wiz Exp $ DISTNAME= driconf-0.9.1 -PKGREVISION= 15 +PKGREVISION= 16 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -10,7 +10,6 @@ HOMEPAGE= https://dri.freedesktop.org/wi COMMENT= Configuration applet for DRI drivers LICENSE= gnu-gpl-v2 # or later -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.4:../../x11/py-gtk2 DEPENDS+= xdriinfo>=1.0.2:../../x11/xdriinfo @@ -41,6 +40,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/driconf.desktop \ ${DESTDIR}${PREFIX}/share/applications/ +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/egg.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/x11/gtk2/Makefile diff -u pkgsrc/x11/gtk2/Makefile:1.333 pkgsrc/x11/gtk2/Makefile:1.334 --- pkgsrc/x11/gtk2/Makefile:1.333 Sat Oct 21 17:11:44 2023 +++ pkgsrc/x11/gtk2/Makefile Mon Oct 23 06:37:58 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.333 2023/10/21 17:11:44 gdt Exp $ +# $NetBSD: Makefile,v 1.334 2023/10/23 06:37:58 wiz Exp $ DISTNAME= gtk+-2.24.33 PKGNAME= ${DISTNAME:S/gtk/gtk2/} @@ -12,9 +12,6 @@ HOMEPAGE= https://www.gtk.org/ COMMENT= GIMP Toolkit v2 - libraries for building X11 user interfaces LICENSE= gnu-lgpl-v2.1 -# gtk-builder-convert uses minidom from xml.dom, which needs expat -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - CONFLICTS= gtk2-engines<2.6.0 CONFLICTS+= gail-[0-9]* @@ -110,6 +107,7 @@ BUILDLINK_API_DEPENDS.cairo+= cairo>=1.6 #.include "../../mk/jpeg.buildlink3.mk" #.include "../../graphics/png/buildlink3.mk" #.include "../../graphics/tiff/buildlink3.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/x11/py-xcbgen/Makefile diff -u pkgsrc/x11/py-xcbgen/Makefile:1.26 pkgsrc/x11/py-xcbgen/Makefile:1.27 --- pkgsrc/x11/py-xcbgen/Makefile:1.26 Sat Aug 19 07:31:05 2023 +++ pkgsrc/x11/py-xcbgen/Makefile Mon Oct 23 06:37:58 2023 @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.26 2023/08/19 07:31:05 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2023/10/23 06:37:58 wiz Exp $ # # When updating this, also update x11/xcb-proto DISTNAME= xcb-proto-1.16.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/xcb-proto/xcbgen/} +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= https://xorg.freedesktop.org/archive/individual/proto/ EXTRACT_SUFX= .tar.xz @@ -13,9 +14,6 @@ HOMEPAGE= https://xcb.freedesktop.org/ COMMENT= XCB protocol descriptions (in XML) LICENSE= mit # with no-advertising clause -DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - CONFLICTS+= xcb-proto<1.4nb1 GNU_CONFIGURE= yes @@ -27,5 +25,6 @@ PY_PATCHPLIST= yes post-install: ${RM} -f ${DESTDIR}/${PREFIX}/${PYSITELIB}/xcbgen/__pycache__/*opt-2*pyc +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/x11/qt5-qtwebengine/Makefile diff -u pkgsrc/x11/qt5-qtwebengine/Makefile:1.50 pkgsrc/x11/qt5-qtwebengine/Makefile:1.51 --- pkgsrc/x11/qt5-qtwebengine/Makefile:1.50 Sat Oct 21 17:11:54 2023 +++ pkgsrc/x11/qt5-qtwebengine/Makefile Mon Oct 23 06:37:58 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2023/10/21 17:11:54 gdt Exp $ +# $NetBSD: Makefile,v 1.51 2023/10/23 06:37:58 wiz Exp $ DISTNAME= qtwebengine-everywhere-opensource-src-${QTVERSION} PKGNAME= qt5-qtwebengine-${QTVERSION} @@ -19,8 +19,6 @@ TOOL_DEPENDS+= ninja-build-[0-9]*:../../ TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf #TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 #TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt -TOOL_DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat TOOL_DEPENDS+= yasm-[0-9]*:../../devel/yasm TOOL_DEPENDS+= nodejs>=14:../../lang/nodejs @@ -101,6 +99,7 @@ MAKE_ENV+= OSX_VERSION=${OSX_VERSION} .include "../../graphics/libwebp/buildlink3.mk" #PYTHON_VERSIONS_ACCEPTED= 27 PYTHON_FOR_BUILD_ONLY= tool +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" .include "../../multimedia/ffmpeg5/buildlink3.mk" .include "../../multimedia/libvpx/buildlink3.mk" Index: pkgsrc/x11/qt5-qtwebkit/Makefile diff -u pkgsrc/x11/qt5-qtwebkit/Makefile:1.115 pkgsrc/x11/qt5-qtwebkit/Makefile:1.116 --- pkgsrc/x11/qt5-qtwebkit/Makefile:1.115 Mon Aug 14 05:25:35 2023 +++ pkgsrc/x11/qt5-qtwebkit/Makefile Mon Oct 23 06:37:58 2023 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.115 2023/08/14 05:25:35 wiz Exp $ +# $NetBSD: Makefile,v 1.116 2023/10/23 06:37:58 wiz Exp $ QTWKVERSION= 5.212.0-alpha4 DISTNAME= qtwebkit-${QTWKVERSION} PKGNAME= qt5-qtwebkit-${QTWKVERSION:S/-/./} -PKGREVISION= 20 +PKGREVISION= 21 CATEGORIES= x11 www MASTER_SITES= ${MASTER_SITE_GITHUB:=qtwebkit/} GITHUB_PROJECT= qtwebkit @@ -18,7 +18,6 @@ LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v3 TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat USE_LANGUAGES= c c++11 USE_TOOLS+= bison perl:build pkg-config @@ -120,6 +119,7 @@ PLIST.npapi= yes .include "../../x11/qt5-qtsensors/buildlink3.mk" .include "../../x11/qt5-qtwebchannel/buildlink3.mk" PYTHON_FOR_BUILD_ONLY= tool +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" .include "../../lang/ruby/buildlink3.mk" BUILDLINK_DEPMETHOD.${RUBY_BASE}= build Index: pkgsrc/x11/xcb-util-errors/Makefile diff -u pkgsrc/x11/xcb-util-errors/Makefile:1.6 pkgsrc/x11/xcb-util-errors/Makefile:1.7 --- pkgsrc/x11/xcb-util-errors/Makefile:1.6 Mon Aug 14 05:25:36 2023 +++ pkgsrc/x11/xcb-util-errors/Makefile Mon Oct 23 06:37:58 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2023/08/14 05:25:36 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2023/10/23 06:37:58 wiz Exp $ DISTNAME= xcb-util-errors-1.0.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= https://xcb.freedesktop.org/dist/ EXTRACT_SUFX= .tar.xz @@ -11,8 +11,6 @@ HOMEPAGE= https://xcb.freedesktop.org/ COMMENT= Library for helping debug xcb problems LICENSE= x11 -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - GNU_CONFIGURE= yes USE_TOOLS+= pkg-config m4 USE_LIBTOOL= yes @@ -30,6 +28,7 @@ ALL_ENV+= PKG_CONFIG_SYSROOT_DIR=${_CROS ALL_ENV+= PKG_CONFIG_FDO_SYSROOT_RULES=1 .endif +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" .include "../../x11/libxcb/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/x11/xcolor/Makefile diff -u pkgsrc/x11/xcolor/Makefile:1.6 pkgsrc/x11/xcolor/Makefile:1.7 --- pkgsrc/x11/xcolor/Makefile:1.6 Mon Aug 14 05:25:36 2023 +++ pkgsrc/x11/xcolor/Makefile Mon Oct 23 06:37:59 2023 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2023/08/14 05:25:36 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2023/10/23 06:37:59 wiz Exp $ DISTNAME= xcolor-0.5.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GITHUB:=Soft/} @@ -10,8 +10,6 @@ HOMEPAGE= https://github.com/Soft/xcolor COMMENT= Lightweight color picker for X11 LICENSE= mit -TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat - .include "cargo-depends.mk" USE_TOOLS+= pkg-config @@ -28,6 +26,7 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/man/xcolor.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xcolor.1 .include "../../lang/rust/cargo.mk" +.include "../../lang/python/batteries-included.mk" .include "../../lang/python/tool.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libxcb/buildlink3.mk" --_----------=_16980430812450--