diff --git a/net/Makefile b/net/Makefile index d4da868a61d..cde2c7e5ede 100644 --- a/net/Makefile +++ b/net/Makefile @@ -551,82 +551,82 @@ SUBDIR += purple-matrix SUBDIR += purple-rocketchat SUBDIR += putty - SUBDIR += py-IOSXR,python3 - SUBDIR += py-IP,python3 - SUBDIR += py-aiodns,python3 - SUBDIR += py-anyio,python3 - SUBDIR += py-apprise,python3 - SUBDIR += py-b2sdk,python3 - SUBDIR += py-boto3,python3 - SUBDIR += py-botocore,python3 - SUBDIR += py-cares,python3 - SUBDIR += py-curl,python3 - SUBDIR += py-cymruwhois,python3 - SUBDIR += py-dns - SUBDIR += py-dnslib,python3 + SUBDIR += py-IOSXR + SUBDIR += py-IP + SUBDIR += py-aiodns + SUBDIR += py-anyio + SUBDIR += py-apprise + SUBDIR += py-b2sdk + SUBDIR += py-boto3 + SUBDIR += py-botocore + SUBDIR += py-cares + SUBDIR += py-curl + SUBDIR += py-cymruwhois + SUBDIR += py-dns # py2 + SUBDIR += py-dnslib SUBDIR += py2-dnspython - SUBDIR += py-dnspython,python3 - SUBDIR += py-dpkt,python3 - SUBDIR += py-eapi,python3 - SUBDIR += py-engineio,python3 + SUBDIR += py-dnspython + SUBDIR += py-dpkt + SUBDIR += py-eapi + SUBDIR += py-engineio SUBDIR += py-ephemeral_port_reserve - SUBDIR += py-fqdn,python3 - SUBDIR += py-ftpdlib,python3 - SUBDIR += py-gevent-websocket,python3 - SUBDIR += py-geventhttpclient,python3 - SUBDIR += py-idna,python3 - SUBDIR += py-ifaddr,python3 - SUBDIR += py-impacket,python3 - SUBDIR += py-irclib,python3 - SUBDIR += py-junos-eznc,python3 - SUBDIR += py-libcloud,python3 - SUBDIR += py-libknot,python3 - SUBDIR += py-minimalmodbus,python3 - SUBDIR += py-modbus,python3 - SUBDIR += py-msgpack,python3 - SUBDIR += py-nbxmpp,python3 - SUBDIR += py-ncclient,python3 - SUBDIR += py-netaddr,python3 - SUBDIR += py-netifaces,python3 - SUBDIR += py-netmiko,python3 - SUBDIR += py-nmap,python3 - SUBDIR += py-nxos,python3 - SUBDIR += py-paho-mqtt,python3 - SUBDIR += py-pcapy,python3 - SUBDIR += py-pf,python3 - SUBDIR += py-portend,python3 - SUBDIR += py-publicsuffix2,python3 - SUBDIR += py-python-lsp-jsonrpc,python3 - SUBDIR += py-ripe.atlas.cousteau,python3 - SUBDIR += py-ripe.atlas.sagan,python3 - SUBDIR += py-ripe.atlas.tools # standalone, uses python3 - SUBDIR += py-rrdtool,python3 - SUBDIR += py-s3transfer,python3 - SUBDIR += py-simplesoap,python3 - SUBDIR += py-siphon,python3 - SUBDIR += py-slixmpp,python3 - SUBDIR += py-smbc,python3 - SUBDIR += py-snmp,python3 - SUBDIR += py-socketio,python3 - SUBDIR += py-socketio-client,python3 - SUBDIR += py-socks,python3 - SUBDIR += py-solaredge-interface,python3 - SUBDIR += py-solaredge-modbus,python3 - SUBDIR += py-stem,python3 - SUBDIR += py-telegram,python3 - SUBDIR += py-tinytuya,python3 - SUBDIR += py-tld,python3 - SUBDIR += py-tlslite-ng,python3 - SUBDIR += py-transmissionrpc-ng,python3 - SUBDIR += py-trio-websocket,python3 - SUBDIR += py-twitter,python3 - SUBDIR += py-txtorcon,python3 - SUBDIR += py-u-msgpack,python3 - SUBDIR += py-websocket-client,python3 - SUBDIR += py-websockets,python3 - SUBDIR += py-wsproto,python3 - SUBDIR += py-zeroconf,python3 - SUBDIR += py-zmq,python3 + SUBDIR += py-fqdn + SUBDIR += py-ftpdlib + SUBDIR += py-gevent-websocket + SUBDIR += py-geventhttpclient + SUBDIR += py-idna + SUBDIR += py-ifaddr + SUBDIR += py-impacket + SUBDIR += py-irclib + SUBDIR += py-junos-eznc + SUBDIR += py-libcloud + SUBDIR += py-libknot + SUBDIR += py-minimalmodbus + SUBDIR += py-modbus + SUBDIR += py-msgpack + SUBDIR += py-nbxmpp + SUBDIR += py-ncclient + SUBDIR += py-netaddr + SUBDIR += py-netifaces + SUBDIR += py-netmiko + SUBDIR += py-nmap + SUBDIR += py-nxos + SUBDIR += py-paho-mqtt + SUBDIR += py-pcapy + SUBDIR += py-pf + SUBDIR += py-portend + SUBDIR += py-publicsuffix2 + SUBDIR += py-python-lsp-jsonrpc + SUBDIR += py-ripe.atlas.cousteau + SUBDIR += py-ripe.atlas.sagan + SUBDIR += py-ripe.atlas.tools + SUBDIR += py-rrdtool + SUBDIR += py-s3transfer + SUBDIR += py-simplesoap + SUBDIR += py-siphon + SUBDIR += py-slixmpp + SUBDIR += py-smbc + SUBDIR += py-snmp + SUBDIR += py-socketio + SUBDIR += py-socketio-client + SUBDIR += py-socks + SUBDIR += py-solaredge-interface + SUBDIR += py-solaredge-modbus + SUBDIR += py-stem + SUBDIR += py-telegram + SUBDIR += py-tinytuya + SUBDIR += py-tld + SUBDIR += py-tlslite-ng + SUBDIR += py-transmissionrpc-ng + SUBDIR += py-trio-websocket + SUBDIR += py-twitter + SUBDIR += py-txtorcon + SUBDIR += py-u-msgpack + SUBDIR += py-websocket-client + SUBDIR += py-websockets + SUBDIR += py-wsproto + SUBDIR += py-zeroconf + SUBDIR += py-zmq SUBDIR += qbittorrent SUBDIR += quagga SUBDIR += queryperf diff --git a/net/aggregate6/Makefile b/net/aggregate6/Makefile index a0211d7c471..46facbf9844 100644 --- a/net/aggregate6/Makefile +++ b/net/aggregate6/Makefile @@ -1,9 +1,10 @@ COMMENT= optimise a list of IPv4/IPv6 prefixes -MODPY_EGG_VERSION= 1.0.14 +MODPY_DISTV= 1.0.14 -DISTNAME= aggregate6-${MODPY_EGG_VERSION} +DISTNAME= aggregate6-${MODPY_DISTV} CATEGORIES= net +REVISION= 0 HOMEPAGE= https://github.com/job/aggregate6/ @@ -17,10 +18,10 @@ MODULES= lang/python MODPY_PI= Yes MODPY_PYBUILD= setuptools -RUN_DEPENDS= devel/py-radix${MODPY_FLAVOR} +RUN_DEPENDS= devel/py-radix -TEST_DEPENDS= devel/py-coverage${MODPY_FLAVOR} \ - devel/py-mock${MODPY_FLAVOR} \ - devel/py-nose${MODPY_FLAVOR} +TEST_DEPENDS= devel/py-coverage \ + devel/py-mock \ + devel/py-nose .include diff --git a/net/arouteserver/Makefile b/net/arouteserver/Makefile index ce00b83cb3c..8b2ab12b8ea 100644 --- a/net/arouteserver/Makefile +++ b/net/arouteserver/Makefile @@ -3,10 +3,11 @@ COMMENT= tool to automatically build BGP route server configurations # pypi sdist doesn't include tests GH_ACCOUNT= pierky GH_PROJECT= arouteserver -GH_TAGNAME= v${MODPY_EGG_VERSION} +GH_TAGNAME= v${MODPY_DISTV} -MODPY_EGG_VERSION= 1.23.1 -DISTNAME= arouteserver-${MODPY_EGG_VERSION} +MODPY_DISTV= 1.23.1 +DISTNAME= arouteserver-${MODPY_DISTV} +REVISION= 0 CATEGORIES= net @@ -19,12 +20,12 @@ MODULES= lang/python RUN_DEPENDS= net/aggregate6 \ net/bgpq4 \ - sysutils/py-packaging${MODPY_FLAVOR} \ - textproc/py-yaml${MODPY_FLAVOR} \ - www/py-jinja2${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} \ - www/py-urllib3${MODPY_FLAVOR} -TEST_DEPENDS= www/py-requests-mock${MODPY_FLAVOR} \ + sysutils/py-packaging \ + textproc/py-yaml \ + www/py-jinja2 \ + www/py-requests \ + www/py-urllib3 +TEST_DEPENDS= www/py-requests-mock \ net/bgpq3 MODPY_PYBUILD= setuptools diff --git a/net/avahi/Makefile b/net/avahi/Makefile index 8eefe2a77c7..1af7c372b96 100755 --- a/net/avahi/Makefile +++ b/net/avahi/Makefile @@ -18,8 +18,8 @@ PKGNAME-gui= avahi-gui-${V} PKGNAME-libs= avahi-libs-${V} PKGNAME-python= py3-avahi-${V} -REVISION-python= 7 -REVISION-gui= 10 +REVISION-python= 8 +REVISION-gui= 11 REVISION-gtk3= 5 REVISION-main= 10 REVISION-libs= 5 @@ -95,9 +95,9 @@ BUILD_PACKAGES := ${BUILD_PACKAGES:N-gtk3:N-python} .if ${BUILD_PACKAGES:M-gui} ### common MODULES+= lang/python -BUILD_DEPENDS+= devel/py-gobject3${MODPY_FLAVOR} \ +BUILD_DEPENDS+= devel/py-gobject3 \ ${MODPY_RUN_DEPENDS},-gdbm \ - x11/dbus-python${MODPY_FLAVOR} + x11/dbus-python ### -gtk3 LIB_DEPENDS-gtk3= databases/gdbm \ @@ -118,8 +118,8 @@ WANTLIB-gtk3 += ${COMPILER_LIBCXX} execinfo jpeg Xau Xdmcp LIB_DEPENDS-gui= ${BUILD_PKGPATH},-gtk3 RUN_DEPENDS-gui= ${MODPY_RUN_DEPENDS} \ ${BUILD_PKGPATH},-python \ - x11/dbus-python${MODPY_FLAVOR} \ - devel/py-twisted${MODPY_FLAVOR} \ + x11/dbus-python \ + devel/py-twisted \ devel/desktop-file-utils WANTLIB-gui += X11 Xcomposite Xcursor Xdamage Xext Xfixes harfbuzz diff --git a/net/blaeu/Makefile b/net/blaeu/Makefile index a1dfb17298c..75e2a136bf0 100644 --- a/net/blaeu/Makefile +++ b/net/blaeu/Makefile @@ -1,9 +1,9 @@ COMMENT = create measurements on RIPE Atlas probes -MODPY_EGG_VERSION = 2.0.0 -DISTNAME = blaeu-${MODPY_EGG_VERSION} +MODPY_DISTV = 2.0.0 +DISTNAME = blaeu-${MODPY_DISTV} CATEGORIES = net -REVISION = 0 +REVISION = 1 MAINTAINER = Denis Fondras @@ -17,9 +17,9 @@ MODPY_PI = Yes MODPY_PYBUILD = setuptools NO_TEST = Yes -RUN_DEPENDS = net/py-dnspython${MODPY_FLAVOR} \ - net/py-cymruwhois${MODPY_FLAVOR} \ - security/py-openssl${MODPY_FLAVOR} +RUN_DEPENDS = net/py-dnspython \ + net/py-cymruwhois \ + security/py-openssl BUILD_DEPENDS = ${RUN_DEPENDS} diff --git a/net/bro/Makefile b/net/bro/Makefile index caf38854e33..ada7e725f25 100644 --- a/net/bro/Makefile +++ b/net/bro/Makefile @@ -6,6 +6,7 @@ COMMENT= network analysis and security monitoring framework V= 6.0.5 DISTNAME= zeek-${V} +REVISION= 0 SHARED_LIBS += binpac 3.0 SHARED_LIBS += broccoli 10.0 diff --git a/net/deluge-ltconfig/Makefile b/net/deluge-ltconfig/Makefile index b6609227eb9..cac7424b25a 100644 --- a/net/deluge-ltconfig/Makefile +++ b/net/deluge-ltconfig/Makefile @@ -1,11 +1,11 @@ COMMENT = libtorrent settings modification plugin for deluge -MODPY_EGG_VERSION = 2.0.0 -REVISION = 0 +MODPY_DISTV = 2.0.0 +REVISION = 1 GH_ACCOUNT = ratanakvlun GH_PROJECT = deluge-ltconfig -GH_TAGNAME = v${MODPY_EGG_VERSION} +GH_TAGNAME = v${MODPY_DISTV} CATEGORIES = net diff --git a/net/deluge/Makefile b/net/deluge/Makefile index 28526571c38..aed26292158 100644 --- a/net/deluge/Makefile +++ b/net/deluge/Makefile @@ -1,8 +1,8 @@ COMMENT = bittorrent client -DISTNAME = deluge-${MODPY_EGG_VERSION} -MODPY_EGG_VERSION = 2.1.1 -REVISION = 0 +DISTNAME = deluge-${MODPY_DISTV} +MODPY_DISTV = 2.1.1 +REVISION = 1 CATEGORIES = net @@ -11,7 +11,7 @@ HOMEPAGE = https://www.deluge-torrent.org/ # GPLv3+ PERMIT_PACKAGE = Yes -SITES = https://ftp.osuosl.org/pub/deluge/source/${MODPY_EGG_VERSION:R}/ +SITES = https://ftp.osuosl.org/pub/deluge/source/${MODPY_DISTV:R}/ EXTRACT_SUFX = .tar.xz @@ -28,20 +28,20 @@ MODPY_PYTEST_ARGS = -v \ # share/appdata/deluge.appdata.xml # share/applications/deluge.desktop MODPY_SETUPTOOLS = Yes -BUILD_DEPENDS = devel/py-wheel${MODPY_FLAVOR} \ - devel/py-xdg${MODPY_FLAVOR} \ +BUILD_DEPENDS = devel/py-wheel \ + devel/py-xdg \ net/libtorrent-rasterbar \ - textproc/py-chardet${MODPY_FLAVOR} + textproc/py-chardet RUN_DEPENDS = devel/desktop-file-utils \ - devel/py-gobject3${MODPY_FLAVOR} \ - devel/py-rencode${MODPY_FLAVOR} \ - devel/py-setproctitle${MODPY_FLAVOR} \ - devel/py-twisted${MODPY_FLAVOR} \ - devel/py-xdg${MODPY_FLAVOR} \ - graphics/py-Pillow${MODPY_FLAVOR} \ + devel/py-gobject3 \ + devel/py-rencode \ + devel/py-setproctitle \ + devel/py-twisted \ + devel/py-xdg \ + graphics/py-Pillow \ net/libtorrent-rasterbar \ - textproc/py-chardet${MODPY_FLAVOR} \ - www/py-mako${MODPY_FLAVOR} \ + textproc/py-chardet \ + www/py-mako \ x11/gtk+3 \ x11/gtk+4,-guic diff --git a/net/dico/Makefile b/net/dico/Makefile index a5af0c3d8e0..366ecb83593 100644 --- a/net/dico/Makefile +++ b/net/dico/Makefile @@ -2,7 +2,7 @@ COMMENT = GNU dictionary server V = 2.11 DISTNAME = dico-$V -REVISION = 0 +REVISION = 1 SHARED_LIBS += dico 0.0 # 2.0 diff --git a/net/dleyna/Makefile b/net/dleyna/Makefile index 419910acb95..3b779146d26 100644 --- a/net/dleyna/Makefile +++ b/net/dleyna/Makefile @@ -1,7 +1,7 @@ COMMENT= services and D-Bus APIs to access UPnP and DLNA devices DIST_TUPLE= gnome World dLeyna v0.8.3 . -REVISION= 2 +REVISION= 3 SHARED_LIBS += dleyna-core-1.0 1.1 # 6.0.0 SHARED_LIBS += dleyna-renderer-1.0 1.1 # 1.0.3 @@ -22,15 +22,15 @@ MODULES= devel/meson \ x11/gnome BUILD_DEPENDS= devel/epoll-shim \ - textproc/py-docutils${MODPY_FLAVOR} \ - textproc/py-sphinx${MODPY_FLAVOR} + textproc/py-docutils \ + textproc/py-sphinx LIB_DEPENDS= net/gupnp/core \ net/gupnp/av \ net/gupnp/dlna -RUN_DEPENDS= devel/py-gobject3${MODPY_FLAVOR} \ - x11/dbus-python${MODPY_FLAVOR} +RUN_DEPENDS= devel/py-gobject3 \ + x11/dbus-python MODGNOME_CPPFLAGS= -I${LOCALBASE}/include/libepoll-shim diff --git a/net/dnsperf/Makefile b/net/dnsperf/Makefile index 38686d5966e..66bc50ca354 100644 --- a/net/dnsperf/Makefile +++ b/net/dnsperf/Makefile @@ -2,7 +2,7 @@ COMMENT= DNS performance testing tools # newer versions needs libck ("Concurrency Kit") not yet in ports DISTNAME= dnsperf-2.4.2 -REVISION= 2 +REVISION= 3 CATEGORIES= net benchmarks @@ -26,8 +26,8 @@ CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \ LDFLAGS=-L${LOCALBASE}/lib -RUN_DEPENDS= net/py-dnspython${MODPY_FLAVOR} \ - net/py-pcapy${MODPY_FLAVOR} +RUN_DEPENDS= net/py-dnspython \ + net/py-pcapy post-install: cd ${WRKSRC}/contrib/queryparse; \ diff --git a/net/epic5/Makefile b/net/epic5/Makefile index 7a1f4732110..21556fceac7 100644 --- a/net/epic5/Makefile +++ b/net/epic5/Makefile @@ -6,7 +6,7 @@ CATEGORIES= net HOMEPAGE= http://www.epicsol.org/ MAINTAINER= Joey Beach SITES= http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/ -REVISION= 1 +REVISION= 2 # BSD PERMIT_PACKAGE= Yes diff --git a/net/exabgp/Makefile b/net/exabgp/Makefile index e2b4b7951be..c2ac3868200 100644 --- a/net/exabgp/Makefile +++ b/net/exabgp/Makefile @@ -1,9 +1,10 @@ COMMENT= BGP route injector (supporting flow routes, etc) -MODPY_EGG_VERSION= 4.2.22 +MODPY_DISTV= 4.2.22 GH_ACCOUNT= exa-networks GH_PROJECT= exabgp -GH_TAGNAME= ${MODPY_EGG_VERSION} +GH_TAGNAME= ${MODPY_DISTV} +REVISION= 0 CATEGORIES= net @@ -13,10 +14,10 @@ PERMIT_PACKAGE= Yes MODULES= lang/python MODPY_PYBUILD= setuptools -TEST_DEPENDS= devel/py-coverage${MODPY_FLAVOR} \ - devel/py-nose${MODPY_FLAVOR} \ - devel/py-six${MODPY_FLAVOR} \ - sysutils/py-psutil${MODPY_FLAVOR} +TEST_DEPENDS= devel/py-coverage \ + devel/py-nose \ + devel/py-six \ + sysutils/py-psutil # Generate current version's exabgp.env in post-extract so we can patch # it rather than using a static copy in FILESDIR. The rc script uses diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile index 21d0aae5788..10fdbb20a64 100644 --- a/net/flow-tools/Makefile +++ b/net/flow-tools/Makefile @@ -9,7 +9,7 @@ DISTNAME= flow-tools-0.68.6pl20210211 EPOCH= 0 CATEGORIES= net -REVISION= 5 +REVISION= 6 # BSD PERMIT_PACKAGE= Yes diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 33b80761cff..fab266ea52a 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -8,6 +8,7 @@ COMMENT-pgsql= freeradius pgsql rlm addon COMMENT-python3= freeradius python3 rlm addon V= 3.2.6 +REVISION-python3= 0 DISTNAME= freeradius-server-$V EXTRACT_SUFX= .tar.bz2 diff --git a/net/gajim/Makefile b/net/gajim/Makefile index a571aeefa6d..bec69f5746b 100644 --- a/net/gajim/Makefile +++ b/net/gajim/Makefile @@ -1,13 +1,14 @@ COMMENT= fully-featured XMPP client written in Python -MODPY_EGG_VERSION= 1.9.5 -DISTNAME= gajim-${MODPY_EGG_VERSION} +MODPY_DISTV= 1.9.5 +DISTNAME= gajim-${MODPY_DISTV} CATEGORIES= net x11 +REVISION= 0 HOMEPAGE= https://www.gajim.org MAINTAINER= Paco Esteban -SITES= ${HOMEPAGE}/downloads/${MODPY_EGG_VERSION:R}/ +SITES= ${HOMEPAGE}/downloads/${MODPY_DISTV:R}/ # GPLv3 only PERMIT_PACKAGE= Yes @@ -18,29 +19,29 @@ MODPY_PYBUILD= setuptools BUILD_DEPENDS= devel/gettext,-tools RUN_DEPENDS= audio/gsound \ - databases/py-sqlalchemy${MODPY_FLAVOR} \ + databases/py-sqlalchemy \ devel/desktop-file-utils \ devel/glib2>=2.66.0 \ devel/libsoup3 \ devel/pango>=1.50.0 \ devel/py-gobject3 \ - graphics/py-Pillow${MODPY_FLAVOR} \ - graphics/py-cairo${MODPY_FLAVOR} \ - graphics/py-qrcode${MODPY_FLAVOR}>=7.3.1 \ - multimedia/gstreamer1/py-gstreamer${MODPY_FLAVOR} \ - net/py-nbxmpp${MODPY_FLAVOR}>=5.0.4 \ - security/py-cryptodome${MODPY_FLAVOR} \ - security/py-cryptography${MODPY_FLAVOR} \ - security/py-gnupg${MODPY_FLAVOR} \ - security/py-keyring${MODPY_FLAVOR} \ - security/py-omemo-dr${MODPY_FLAVOR}>=1.0.0 \ - security/py-openssl${MODPY_FLAVOR} \ - sysutils/py-packaging${MODPY_FLAVOR} \ + graphics/py-Pillow \ + graphics/py-cairo \ + graphics/py-qrcode>=7.3.1 \ + multimedia/gstreamer1/py-gstreamer \ + net/py-nbxmpp>=5.0.4 \ + security/py-cryptodome \ + security/py-cryptography \ + security/py-gnupg \ + security/py-keyring \ + security/py-omemo-dr>=1.0.0 \ + security/py-openssl \ + sysutils/py-packaging \ textproc/gspell \ - textproc/py-css-parser${MODPY_FLAVOR} \ - textproc/py-emoji${MODPY_FLAVOR}>=2.6.0 \ - textproc/py-precis_i18n${MODPY_FLAVOR} \ - x11/dbus-python${MODPY_FLAVOR} \ + textproc/py-css-parser \ + textproc/py-emoji>=2.6.0 \ + textproc/py-precis_i18n \ + x11/dbus-python \ x11/gtk+4,-guic \ x11/gtksourceview4 diff --git a/net/gpodder/Makefile b/net/gpodder/Makefile index 86fd98458a4..ea90e51c720 100644 --- a/net/gpodder/Makefile +++ b/net/gpodder/Makefile @@ -1,11 +1,11 @@ COMMENT= media aggregator and podcast client -MODPY_EGG_VERSION= 3.11.4 -REVISION= 3 +MODPY_DISTV= 3.11.4 +REVISION= 4 GH_ACCOUNT= gpodder GH_PROJECT= gpodder -GH_TAGNAME= ${MODPY_EGG_VERSION} +GH_TAGNAME= ${MODPY_DISTV} CATEGORIES= net www @@ -24,20 +24,20 @@ TEST_ENV= PYTEST=py.test RUN_DEPENDS= devel/desktop-file-utils \ devel/gettext,-runtime \ - devel/py-html5lib${MODPY_FLAVOR} \ - devel/py-gobject3${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} \ + devel/py-html5lib \ + devel/py-gobject3 \ + www/py-requests \ net/mygpoclient \ - textproc/py-podcastparser${MODPY_FLAVOR} \ + textproc/py-podcastparser \ www/yt-dlp \ www/webkitgtk4 \ - x11/dbus-python${MODPY_FLAVOR} \ + x11/dbus-python \ x11/gtk+4,-guic -TEST_DEPENDS= devel/py-coverage${MODPY_FLAVOR} \ - devel/py-minimock${MODPY_FLAVOR} \ - devel/py-test${MODPY_FLAVOR} \ - devel/py-test-cov${MODPY_FLAVOR} \ - textproc/py-podcastparser${MODPY_FLAVOR} \ +TEST_DEPENDS= devel/py-coverage \ + devel/py-minimock \ + devel/py-test \ + devel/py-test-cov \ + textproc/py-podcastparser \ net/mygpoclient USE_GMAKE= Yes diff --git a/net/hexchat/Makefile b/net/hexchat/Makefile index 553ebf7daf2..4ef359d79d8 100644 --- a/net/hexchat/Makefile +++ b/net/hexchat/Makefile @@ -3,7 +3,7 @@ V = 2.16.2 DISTNAME = hexchat-$V EXTRACT_SUFX = .tar.xz CATEGORIES = net x11 -REVISION = 2 +REVISION = 3 HOMEPAGE = https://hexchat.github.io/ @@ -28,7 +28,7 @@ MODULES = devel/meson \ textproc/intltool BUILD_DEPENDS = devel/iso-codes \ - devel/py-cffi${MODPY_FLAVOR} + devel/py-cffi # work towards gtk+3 support is in # https://github.com/hexchat/hexchat/tree/wip/gtk3 diff --git a/net/isc-bind/Makefile b/net/isc-bind/Makefile index 8f519c85d7a..5fc27568380 100644 --- a/net/isc-bind/Makefile +++ b/net/isc-bind/Makefile @@ -33,7 +33,7 @@ SITES= ${SITE_ISC:=bind9/$V/} MODULES= lang/python # used for dnssec-checkds/dnssec-coverage, but don't want to force the run dep. MODPY_RUNDEP= No -BUILD_DEPENDS= textproc/py-sphinx${MODPY_FLAVOR} +BUILD_DEPENDS= textproc/py-sphinx LIB_DEPENDS= converters/libiconv \ devel/json-c \ devel/libidn2 \ diff --git a/net/kdeconnect-kde/Makefile b/net/kdeconnect-kde/Makefile index c374008f672..c85afc17dfb 100644 --- a/net/kdeconnect-kde/Makefile +++ b/net/kdeconnect-kde/Makefile @@ -1,6 +1,7 @@ COMMENT = KDE app that allows your devices to communicate DISTNAME = kdeconnect-kde-${MODKDE_GEAR_VERSION} +REVISION = 0 SHARED_LIBS += kdeconnectcore 7.0 # 1.4 SHARED_LIBS += kdeconnectpluginkcm 1.0 # 1.4 diff --git a/net/konversation/Makefile b/net/konversation/Makefile index 88298deb268..535d182ad9d 100644 --- a/net/konversation/Makefile +++ b/net/konversation/Makefile @@ -1,6 +1,7 @@ COMMENT = IRC client for KDE DISTNAME = konversation-${MODKDE_GEAR_VERSION} +REVISION = 0 CATEGORIES = net diff --git a/net/libaccounts-glib/Makefile b/net/libaccounts-glib/Makefile index 0c5d4798b45..2cd7435189a 100644 --- a/net/libaccounts-glib/Makefile +++ b/net/libaccounts-glib/Makefile @@ -4,7 +4,7 @@ CATEGORIES = net V = 1.26 DISTNAME = libaccounts-glib-${V} -REVISION = 3 +REVISION = 4 SHARED_LIBS += accounts-glib 0.0 # 0.0 @@ -22,12 +22,12 @@ MODPY_RUNDEP = No CONFIGURE_STYLE = meson -RUN_DEPENDS = devel/py-gobject3${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-gobject3 BUILD_DEPENDS = lang/vala \ devel/check \ devel/gobject-introspection \ - devel/py-gobject3${MODPY_FLAVOR} \ + devel/py-gobject3 \ textproc/gtk-doc LIB_DEPENDS = databases/sqlite3 \ diff --git a/net/libdnet/Makefile b/net/libdnet/Makefile index b1a434f4faa..2a07ce535c7 100644 --- a/net/libdnet/Makefile +++ b/net/libdnet/Makefile @@ -1,7 +1,7 @@ COMMENT-main= portable low-level networking library COMMENT-python= python interface to libdnet -MODPY_EGG_VERSION= 1.16.4 +MODPY_DISTV= 1.16.4 GH_ACCOUNT= ofalk GH_PROJECT= libdnet # 1.16.4 release with my merged PRs on top @@ -9,8 +9,8 @@ GH_COMMIT= 8a0163b38fefdf6184f41645548cfbe306a254b5 DISTNAME= libdnet-1.16.4 PKGNAME-main= ${DISTNAME} PKGNAME-python= ${MODPY_PY_PREFIX}${DISTNAME} -REVISION-main= 0 -REVISION-python=0 +REVISION-main= 1 +REVISION-python=1 SHARED_LIBS= dnet 1.1 @@ -38,11 +38,11 @@ CONFIGURE_ARGS += --without-check MODULES+= lang/python MODPY_ADJ_FILES= python/test.py CONFIGURE_ARGS+= --with-python -BUILD_DEPENDS+= devel/py-setuptools${MODPY_FLAVOR} \ - lang/cython${MODPY_FLAVOR} +BUILD_DEPENDS+= devel/py-setuptools \ + lang/cython MAKE_FLAGS= PYTHON=${MODPY_BIN} TEST_DEPENDS= ${FULLPKGNAME-python}:${FULLPKGPATH-python} \ - net/py-netifaces${MODPY_FLAVOR} + net/py-netifaces TEST_FLAGS= TESTS_ENVIRONMENT=${MODPY_BIN} TEST_IS_INTERACTIVE= needs root WANTLIB-python= ${MODPY_WANTLIB} m pthread util diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile index f23af194b15..503d6cc7a56 100644 --- a/net/libproxy/Makefile +++ b/net/libproxy/Makefile @@ -3,6 +3,7 @@ COMMENT= library for automatic proxy configuration management GH_ACCOUNT= libproxy GH_PROJECT= libproxy GH_TAGNAME= 0.5.9 +REVISION= 0 CATEGORIES= net diff --git a/net/librenms/Makefile b/net/librenms/Makefile index 6c8b2162d42..8733a488177 100644 --- a/net/librenms/Makefile +++ b/net/librenms/Makefile @@ -4,6 +4,7 @@ COMMENT= auto-discovering network management/monitoring system GH_ACCOUNT= librenms GH_PROJECT= librenms GH_TAGNAME= 24.12.0 +REVISION= 0 DISTFILES.dep= librenms-${GH_TAGNAME:R}-vendor.tar.xz EPOCH= 0 @@ -29,11 +30,11 @@ RUN_DEPENDS= lang/php/${MODPHP_VERSION},-curl \ lang/php/${MODPHP_VERSION},-mysqli \ lang/php/${MODPHP_VERSION},-pdo_mysql \ lang/php/${MODPHP_VERSION},-snmp \ - databases/py-pymysql${MODPY_FLAVOR} \ - databases/py-redis${MODPY_FLAVOR} \ - sysutils/py-command_runner${MODPY_FLAVOR} \ - sysutils/py-dotenv${MODPY_FLAVOR} \ - sysutils/py-psutil${MODPY_FLAVOR}>=5.6.0 \ + databases/py-pymysql \ + databases/py-redis \ + sysutils/py-command_runner \ + sysutils/py-dotenv \ + sysutils/py-psutil>=5.6.0 \ net/fping \ net/mtr \ net/net-snmp \ diff --git a/net/libtorrent-rasterbar/Makefile b/net/libtorrent-rasterbar/Makefile index 533da6409cd..5e24ad9f913 100644 --- a/net/libtorrent-rasterbar/Makefile +++ b/net/libtorrent-rasterbar/Makefile @@ -2,7 +2,7 @@ COMMENT = C++ library implementing a BitTorrent client V = 2.0.10 DISTNAME = libtorrent-rasterbar-${V} -REVISION = 0 +REVISION = 1 SHARED_LIBS += torrent-rasterbar 9.0 # 10.0.0 diff --git a/net/magic-wormhole/Makefile b/net/magic-wormhole/Makefile index ae6d5ef30d4..6f96f988f9a 100644 --- a/net/magic-wormhole/Makefile +++ b/net/magic-wormhole/Makefile @@ -1,8 +1,9 @@ COMMENT = securely transfer data between computers -MODPY_EGG_VERSION = 0.17.0 -DISTNAME = magic_wormhole-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.17.0 +DISTNAME = magic_wormhole-${MODPY_DISTV} PKGNAME = ${DISTNAME:S/_/-/} +REVISION = 0 HOMEPAGE = https://magic-wormhole.readthedocs.io @@ -17,29 +18,29 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -RUN_DEPENDS = archivers/py-zipstream-ng${MODPY_FLAVOR} \ - devel/py-attrs${MODPY_FLAVOR} \ - devel/py-automat${MODPY_FLAVOR} \ - devel/py-click${MODPY_FLAVOR} \ - devel/py-iterable-io${MODPY_FLAVOR} \ - devel/py-six${MODPY_FLAVOR} \ - devel/py-tqdm${MODPY_FLAVOR} \ - devel/py-twisted${MODPY_FLAVOR} \ - devel/py-txaio${MODPY_FLAVOR} \ - net/py-txtorcon${MODPY_FLAVOR} \ - security/py-PyNaCl${MODPY_FLAVOR} \ - security/py-cryptography${MODPY_FLAVOR} \ - security/py-hkdf${MODPY_FLAVOR} \ - security/py-spake2${MODPY_FLAVOR}>=0.9 \ - textproc/py-humanize${MODPY_FLAVOR} \ - www/py-autobahn${MODPY_FLAVOR} +RUN_DEPENDS = archivers/py-zipstream-ng \ + devel/py-attrs \ + devel/py-automat \ + devel/py-click \ + devel/py-iterable-io \ + devel/py-six \ + devel/py-tqdm \ + devel/py-twisted \ + devel/py-txaio \ + net/py-txtorcon \ + security/py-PyNaCl \ + security/py-cryptography \ + security/py-hkdf \ + security/py-spake2>=0.9 \ + textproc/py-humanize \ + www/py-autobahn # XXX completes partially, needs unported # "magic-wormhole-transit-relay==0.1.2" # "magic-wormhole-mailbox-server==0.3.1" -TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR} \ - devel/py-txaio${MODPY_FLAVOR} \ - devel/pyflakes${MODPY_FLAVOR} +TEST_DEPENDS = devel/py-mock \ + devel/py-txaio \ + devel/pyflakes post-install: ${INSTALL_DATA} -D ${PREFIX}/{wormhole_complete.bash,share/bash-completion/completions/wormhole} diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile index b93e22df88b..13dfef5c13d 100644 --- a/net/mosquitto/Makefile +++ b/net/mosquitto/Makefile @@ -41,7 +41,7 @@ TEST_DEPENDS= ${MODPY_RUN_DEPENDS} \ ${FULLPKGNAME}:${BUILD_PKGPATH} \ devel/cunit \ devel/gmake \ - sysutils/py-psutil${MODPY_FLAVOR} + sysutils/py-psutil pre-test: ln -fs ${WRKBUILD}/src/mosquitto ${WRKSRC}/src/ diff --git a/net/mygpoclient/Makefile b/net/mygpoclient/Makefile index 9fe8e7e32e6..3d601516fdf 100644 --- a/net/mygpoclient/Makefile +++ b/net/mygpoclient/Makefile @@ -1,9 +1,9 @@ COMMENT= gpodder.net client library -MODPY_EGG_VERSION= 1.9 -DISTNAME= mygpoclient-${MODPY_EGG_VERSION} +MODPY_DISTV= 1.9 +DISTNAME= mygpoclient-${MODPY_DISTV} CATEGORIES= net devel -REVISION= 1 +REVISION= 2 MAINTAINER= Tim Meunier diff --git a/net/nagios/check_esxi_hardware/Makefile b/net/nagios/check_esxi_hardware/Makefile index d31518100d8..a701996598e 100644 --- a/net/nagios/check_esxi_hardware/Makefile +++ b/net/nagios/check_esxi_hardware/Makefile @@ -5,6 +5,7 @@ COMMENT= monitoring plugin to check the status of ESX/i hardware GH_ACCOUNT= Napsty GH_PROJECT= check_esxi_hardware GH_TAGNAME= 20241129 +REVISION= 0 CATEGORIES= net @@ -16,7 +17,7 @@ PERMIT_PACKAGE= Yes NO_BUILD= Yes NO_TEST= Yes -RUN_DEPENDS= devel/py-wbem${MODPY_FLAVOR} +RUN_DEPENDS= devel/py-wbem MODULES= lang/python diff --git a/net/napalm/Makefile.inc b/net/napalm/Makefile.inc index 7b20d82b5b0..f76d4b41879 100644 --- a/net/napalm/Makefile.inc +++ b/net/napalm/Makefile.inc @@ -4,8 +4,5 @@ MODULES += lang/python MODPY_PI ?= Yes MODPY_PYBUILD ?= setuptools -FLAVORS = python3 -FLAVOR = python3 - # Apache 2.0 PERMIT_PACKAGE ?= Yes diff --git a/net/napalm/py-napalm/Makefile b/net/napalm/py-napalm/Makefile index ff78c517553..8cdf634910c 100644 --- a/net/napalm/py-napalm/Makefile +++ b/net/napalm/py-napalm/Makefile @@ -1,21 +1,21 @@ COMMENT = network automation abstraction layer -MODPY_EGG_VERSION = 2.3.3 -REVISION = 7 -DISTNAME = napalm-${MODPY_EGG_VERSION} +MODPY_DISTV = 2.3.3 +REVISION = 8 +DISTNAME = napalm-${MODPY_DISTV} PKGNAME = py-${DISTNAME} HOMEPAGE = https://github.com/napalm-automation/napalm -BUILD_DEPENDS = devel/py-pip${MODPY_FLAVOR} -RUN_DEPENDS = devel/py-cffi${MODPY_FLAVOR}>=1.11.5 \ - net/py-IOSXR${MODPY_FLAVOR} \ - net/py-eapi${MODPY_FLAVOR} \ - net/py-netaddr${MODPY_FLAVOR} \ - net/py-netmiko${MODPY_FLAVOR} \ - net/py-nxos${MODPY_FLAVOR} \ - net/py-junos-eznc${MODPY_FLAVOR} \ - textproc/py-yaml${MODPY_FLAVOR} \ - www/py-jinja2${MODPY_FLAVOR} +BUILD_DEPENDS = devel/py-pip +RUN_DEPENDS = devel/py-cffi>=1.11.5 \ + net/py-IOSXR \ + net/py-eapi \ + net/py-netaddr \ + net/py-netmiko \ + net/py-nxos \ + net/py-junos-eznc \ + textproc/py-yaml \ + www/py-jinja2 .include diff --git a/net/napalm/py-napalm/pkg/PLIST b/net/napalm/py-napalm/pkg/PLIST index 62e63300ca2..4971ef4cd87 100644 --- a/net/napalm/py-napalm/pkg/PLIST +++ b/net/napalm/py-napalm/pkg/PLIST @@ -1,16 +1,16 @@ +@pkgpath net/napalm/py-napalm,python3 @conflict py-napalm-* -@pkgpath net/napalm/py-napalm bin/cl_napalm_configure bin/cl_napalm_test bin/cl_napalm_validate bin/napalm lib/python${MODPY_VERSION}/site-packages/napalm/ -lib/python${MODPY_VERSION}/site-packages/napalm-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/napalm-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/napalm-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/napalm-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/napalm-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/napalm-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/napalm-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/napalm-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/napalm-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/napalm-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/napalm-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/napalm-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/napalm/_SUPPORTED_DRIVERS.py lib/python${MODPY_VERSION}/site-packages/napalm/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/napalm/${MODPY_PYCACHE}/ diff --git a/net/nicotine-plus/Makefile b/net/nicotine-plus/Makefile index 6471a163674..5ac644e6a4c 100644 --- a/net/nicotine-plus/Makefile +++ b/net/nicotine-plus/Makefile @@ -3,7 +3,7 @@ COMMENT = graphical client for the SoulSeek peer-to-peer system GH_ACCOUNT = Nicotine-Plus GH_PROJECT = nicotine-plus GH_TAGNAME = 3.2.9 -REVISION = 2 +REVISION = 3 CATEGORIES = net @@ -16,7 +16,7 @@ MODULES = lang/python MODPY_SETUPTOOLS = Yes BUILD_DEPENDS = devel/gettext,-tools RUN_DEPENDS = devel/desktop-file-utils \ - devel/py-gobject3${MODPY_FLAVOR} \ + devel/py-gobject3 \ ${MODPY_RUN_DEPENDS},-gdbm \ x11/gtk+4,-guic diff --git a/net/nmap/Makefile b/net/nmap/Makefile index 747a2a3a234..7ddb68b2c67 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -1,8 +1,9 @@ COMMENT-main= scan ports and fingerprint stack of network hosts -MODPY_EGG_VERSION= 7.92 -DISTNAME= nmap-${MODPY_EGG_VERSION} -PKGNAME-main= ${DISTNAME} +MODPY_DISTV= 7.92 +DISTNAME= nmap-${MODPY_DISTV} +PKGNAME-main= ${DISTNAME} +REVISION-main= 0 CATEGORIES= net security SITES= ${HOMEPAGE}/dist/ diff --git a/net/nyx/Makefile b/net/nyx/Makefile index 56eacbed972..4527a0284fa 100644 --- a/net/nyx/Makefile +++ b/net/nyx/Makefile @@ -1,8 +1,8 @@ COMMENT = terminal status monitor for Tor -MODPY_EGG_VERSION = 2.1.0 -DISTNAME = nyx-${MODPY_EGG_VERSION} -REVISION = 6 +MODPY_DISTV = 2.1.0 +DISTNAME = nyx-${MODPY_DISTV} +REVISION = 7 CATEGORIES = net @@ -17,8 +17,8 @@ MODULES = lang/python MODPY_PYBUILD = setuptools MODPY_PI = Yes -BUILD_DEPENDS = net/py-stem${MODPY_FLAVOR} -RUN_DEPENDS = net/py-stem${MODPY_FLAVOR} +BUILD_DEPENDS = net/py-stem +RUN_DEPENDS = net/py-stem pre-configure: diff --git a/net/onionshare/Makefile b/net/onionshare/Makefile index 5d2a626e563..fe48f553a00 100644 --- a/net/onionshare/Makefile +++ b/net/onionshare/Makefile @@ -3,13 +3,13 @@ COMMENT-gui = graphical user interface for onionshare based on Qt GH_ACCOUNT = micahflee GH_PROJECT = onionshare -GH_TAGNAME = v${MODPY_EGG_VERSION} -MODPY_EGG_VERSION = 2.0 -REVISION-main = 7 -REVISION-gui = 7 +GH_TAGNAME = v${MODPY_DISTV} +MODPY_DISTV = 2.0 +REVISION-main = 8 +REVISION-gui = 8 -PKGNAME-main = onionshare-${MODPY_EGG_VERSION} -PKGNAME-gui = onionshare-gui-${MODPY_EGG_VERSION} +PKGNAME-main = onionshare-${MODPY_DISTV} +PKGNAME-gui = onionshare-gui-${MODPY_DISTV} CATEGORIES = net @@ -25,16 +25,16 @@ MULTI_PACKAGES = -main -gui MODULES = lang/python MODPY_PYBUILD = setuptools -RUN_DEPENDS = devel/py-sip${MODPY_FLAVOR} \ - www/py-flask${MODPY_FLAVOR} \ - net/py-stem${MODPY_FLAVOR} \ +RUN_DEPENDS = devel/py-sip \ + www/py-flask \ + net/py-stem \ net/tor \ - security/py-cryptodome${MODPY_FLAVOR} + security/py-cryptodome RUN_DEPENDS-gui = ${RUN_DEPENDS} \ devel/desktop-file-utils \ - net/onionshare=${MODPY_EGG_VERSION} \ - net/py-socks${MODPY_FLAVOR} \ - x11/py-qt5${MODPY_FLAVOR} + net/onionshare=${MODPY_DISTV} \ + net/py-socks \ + x11/py-qt5 # XXX: not yet working NO_TEST = Yes diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index 813f379d2df..f22a72acd0a 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -15,7 +15,7 @@ WANTLIB += c lz4 lzo2 SITES= https://swupdate.openvpn.org/community/releases/ -BUILD_DEPENDS= textproc/py-docutils,python3 +BUILD_DEPENDS= textproc/py-docutils LIB_DEPENDS= archivers/lzo2 \ archivers/lz4 TEST_DEPENDS= devel/cmocka diff --git a/net/pbgpp/Makefile b/net/pbgpp/Makefile index b01906988db..3978b42e750 100644 --- a/net/pbgpp/Makefile +++ b/net/pbgpp/Makefile @@ -1,8 +1,8 @@ COMMENT = pcap bgp parser -MODPY_EGG_VERSION = 0.2.22 -DISTNAME = pbgpp-${MODPY_EGG_VERSION} -REVISION = 4 +MODPY_DISTV = 0.2.22 +DISTNAME = pbgpp-${MODPY_DISTV} +REVISION = 5 CATEGORIES = net @@ -15,7 +15,7 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -RUN_DEPENDS = net/py-pcapy${MODPY_FLAVOR} +RUN_DEPENDS = net/py-pcapy BUILD_DEPENDS += ${RUN_DEPENDS} # tests depend on a running kafka diff --git a/net/pcapdiff/Makefile b/net/pcapdiff/Makefile index 0d2b910322c..3c820e4b029 100644 --- a/net/pcapdiff/Makefile +++ b/net/pcapdiff/Makefile @@ -4,7 +4,7 @@ GH_ACCOUNT = isginf GH_PROJECT = pcap-diff GH_COMMIT = d4c129e98527f42fbd94362d50608d5286e3f57d DISTNAME = pcapdiff-0.20180816 -REVISION = 3 +REVISION = 4 CATEGORIES = net security diff --git a/net/pidgin/Makefile b/net/pidgin/Makefile index efecc48e0f9..53a302ae7ba 100644 --- a/net/pidgin/Makefile +++ b/net/pidgin/Makefile @@ -47,9 +47,9 @@ MODULES= textproc/intltool \ lang/python \ devel/gconf2 -BUILD_DEPENDS= x11/dbus-python${MODPY_FLAVOR} +BUILD_DEPENDS= x11/dbus-python LIB_DEPENDS= devel/glib2 -RUN_DEPENDS-main= x11/dbus-python${MODPY_FLAVOR} \ +RUN_DEPENDS-main= x11/dbus-python \ devel/desktop-file-utils \ x11/gtk+4,-guic LIB_DEPENDS-main= ${LIB_DEPENDS} \ diff --git a/net/poezio/Makefile b/net/poezio/Makefile index 9d456520d9c..12d70c87979 100644 --- a/net/poezio/Makefile +++ b/net/poezio/Makefile @@ -1,9 +1,9 @@ COMMENT = console XMPP client -MODPY_EGG_VERSION = 0.13.1 -DISTNAME = poezio-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.13.1 +DISTNAME = poezio-${MODPY_DISTV} CATEGORIES = net -REVISION = 4 +REVISION = 5 HOMEPAGE = https://poez.io/ @@ -20,11 +20,11 @@ MODPY_PYTEST_ARGS = -v test/ MODPY_DISTUTILS_BUILD = build_ext --inplace -BUILD_DEPENDS = lang/cython${MODPY_FLAVOR} +BUILD_DEPENDS = lang/cython RUN_DEPENDS = devel/desktop-file-utils \ - net/py-aiodns${MODPY_FLAVOR} \ - net/py-slixmpp${MODPY_FLAVOR} \ - security/py-potr${MODPY_FLAVOR} + net/py-aiodns \ + net/py-slixmpp \ + security/py-potr .include diff --git a/net/profanity/Makefile b/net/profanity/Makefile index 4de504619a7..a9a7e4ff829 100644 --- a/net/profanity/Makefile +++ b/net/profanity/Makefile @@ -1,6 +1,6 @@ COMMENT = console based XMPP client DISTNAME = profanity-0.14.0 -REVISION = 1 +REVISION = 2 CATEGORIES = net HOMEPAGE = https://profanity-im.github.io/ diff --git a/net/py-IOSXR/Makefile b/net/py-IOSXR/Makefile index c46879ef217..3bb53d3309d 100644 --- a/net/py-IOSXR/Makefile +++ b/net/py-IOSXR/Makefile @@ -1,9 +1,9 @@ COMMENT = library to manage IOS-XR devices -MODPY_EGG_VERSION = 0.53 -DISTNAME = pyIOSXR-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.53 +DISTNAME = pyIOSXR-${MODPY_DISTV} PKGNAME = py-${DISTNAME:S/py//} -REVISION = 7 +REVISION = 8 CATEGORIES = net @@ -15,10 +15,7 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -FLAVORS = python3 -FLAVOR = python3 - -RUN_DEPENDS = net/py-netmiko${MODPY_FLAVOR} \ - textproc/py-lxml${MODPY_FLAVOR} +RUN_DEPENDS = net/py-netmiko \ + textproc/py-lxml .include diff --git a/net/py-IOSXR/pkg/PLIST b/net/py-IOSXR/pkg/PLIST index 5bd4c77a8d7..a43ed3e5aa5 100644 --- a/net/py-IOSXR/pkg/PLIST +++ b/net/py-IOSXR/pkg/PLIST @@ -1,11 +1,11 @@ +@pkgpath net/py-IOSXR,python3 @conflict py-IOSXR-* -@pkgpath net/py-IOSXR lib/python${MODPY_VERSION}/site-packages/pyIOSXR/ -lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pyIOSXR-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/pyIOSXR/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyIOSXR/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/pyIOSXR/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-IP/Makefile b/net/py-IP/Makefile index 2e88cee96b8..48436f2b244 100644 --- a/net/py-IP/Makefile +++ b/net/py-IP/Makefile @@ -1,7 +1,7 @@ COMMENT = Python module to handle IPv4 and IPv6 address -MODPY_EGG_VERSION = 1.1 -REVISION = 4 +MODPY_DISTV = 1.1 +REVISION = 5 DISTNAME = IPy-1.01 PKGNAME = py-IP-1.01 CATEGORIES = net @@ -17,7 +17,4 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -FLAVORS = python3 -FLAVOR = python3 - .include diff --git a/net/py-IP/pkg/PLIST b/net/py-IP/pkg/PLIST index 8efa7bc4221..cbd614b8c67 100644 --- a/net/py-IP/pkg/PLIST +++ b/net/py-IP/pkg/PLIST @@ -1,11 +1,11 @@ -@pkgpath net/py-IP -lib/python${MODPY_VERSION}/site-packages/IPy-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/IPy-${MODPY_EGG_VERSION}.dist-info/AUTHORS -lib/python${MODPY_VERSION}/site-packages/IPy-${MODPY_EGG_VERSION}.dist-info/COPYING -lib/python${MODPY_VERSION}/site-packages/IPy-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/IPy-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/IPy-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/IPy-${MODPY_EGG_VERSION}.dist-info/top_level.txt +@pkgpath net/py-IP,python3 +lib/python${MODPY_VERSION}/site-packages/IPy-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/IPy-${MODPY_DISTV}.dist-info/AUTHORS +lib/python${MODPY_VERSION}/site-packages/IPy-${MODPY_DISTV}.dist-info/COPYING +lib/python${MODPY_VERSION}/site-packages/IPy-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/IPy-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/IPy-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/IPy-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/IPy.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}IPy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-aiodns/Makefile b/net/py-aiodns/Makefile index 99c6b659d11..6ffef7e3fe6 100644 --- a/net/py-aiodns/Makefile +++ b/net/py-aiodns/Makefile @@ -1,9 +1,10 @@ COMMENT = simple DNS resolver for asyncio -MODPY_EGG_VERSION = 3.2.0 -DISTNAME = aiodns-${MODPY_EGG_VERSION} +MODPY_DISTV = 3.2.0 +DISTNAME = aiodns-${MODPY_DISTV} PKGNAME = py-${DISTNAME} CATEGORIES = net +REVISION = 0 HOMEPAGE = https://github.com/aio-libs/aiodns @@ -18,9 +19,6 @@ MODPY_PI = Yes MODPY_PYBUILD = setuptools MODPY_PYTEST_ARGS = tests.py -FLAVORS = python3 -FLAVOR = python3 - -RUN_DEPENDS = net/py-cares${MODPY_FLAVOR}>=4.0.0 +RUN_DEPENDS = net/py-cares>=4.0.0 .include diff --git a/net/py-aiodns/pkg/PLIST b/net/py-aiodns/pkg/PLIST index 1361674e445..c8c505c8658 100644 --- a/net/py-aiodns/pkg/PLIST +++ b/net/py-aiodns/pkg/PLIST @@ -1,12 +1,12 @@ +@pkgpath net/py-aiodns,python3 @conflict py-aiodns-* -@pkgpath net/py-aiodns lib/python${MODPY_VERSION}/site-packages/aiodns/ -lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/aiodns-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/aiodns/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/aiodns/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/aiodns/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-anyio/Makefile b/net/py-anyio/Makefile index 91187f55937..535a710f33c 100644 --- a/net/py-anyio/Makefile +++ b/net/py-anyio/Makefile @@ -1,9 +1,9 @@ COMMENT = async library on top of asyncio or trio -MODPY_EGG_VERSION = 3.7.1 -DISTNAME = anyio-${MODPY_EGG_VERSION} +MODPY_DISTV = 3.7.1 +DISTNAME = anyio-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = net @@ -16,20 +16,17 @@ PERMIT_PACKAGE = Yes MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 - MODPY_PI = Yes MODPY_PYBUILD = setuptools_scm -RUN_DEPENDS = devel/py-exceptiongroup${MODPY_FLAVOR} \ - devel/py-sniffio${MODPY_FLAVOR} \ - devel/py-trio${MODPY_FLAVOR} \ - net/py-idna${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-exceptiongroup \ + devel/py-sniffio \ + devel/py-trio \ + net/py-idna -TEST_DEPENDS = devel/py-hypothesis${MODPY_FLAVOR} \ - devel/py-test-mock${MODPY_FLAVOR} \ - security/py-trustme${MODPY_FLAVOR} \ - sysutils/py-psutil${MODPY_FLAVOR} +TEST_DEPENDS = devel/py-hypothesis \ + devel/py-test-mock \ + security/py-trustme \ + sysutils/py-psutil .include diff --git a/net/py-anyio/pkg/PLIST b/net/py-anyio/pkg/PLIST index 6047a0bffbd..caeb565e8e2 100644 --- a/net/py-anyio/pkg/PLIST +++ b/net/py-anyio/pkg/PLIST @@ -1,11 +1,12 @@ +@pkgpath net/py-anyio,python3 lib/python${MODPY_VERSION}/site-packages/anyio/ -lib/python${MODPY_VERSION}/site-packages/anyio-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/anyio-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/anyio-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/anyio-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/anyio-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/anyio-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/anyio-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/anyio-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/anyio-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/anyio-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/anyio-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/anyio-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/anyio-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/anyio-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/anyio/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/anyio/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/anyio/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-apprise/Makefile b/net/py-apprise/Makefile index 46f9eab3834..e90ab1dcbd0 100644 --- a/net/py-apprise/Makefile +++ b/net/py-apprise/Makefile @@ -1,8 +1,9 @@ COMMENT= multi-platform push notification library and CLI tool -MODPY_EGG_VERSION= 1.9.0 -DISTNAME= apprise-${MODPY_EGG_VERSION} +MODPY_DISTV= 1.9.0 +DISTNAME= apprise-${MODPY_DISTV} PKGNAME= py-${DISTNAME:S/py//} +REVISION= 0 CATEGORIES= net @@ -13,19 +14,16 @@ PERMIT_PACKAGE= Yes MODULES= lang/python -FLAVORS= python3 -FLAVOR= python3 - MODPY_PI= Yes MODPY_PYBUILD= setuptools -BUILD_DEPENDS= devel/py-babel${MODPY_FLAVOR} -RUN_DEPENDS= devel/py-certifi${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} \ - www/py-requests-oauthlib${MODPY_FLAVOR} \ - devel/py-click${MODPY_FLAVOR} \ - textproc/py-markdown${MODPY_FLAVOR} \ - textproc/py-yaml${MODPY_FLAVOR} -TEST_DEPENDS= devel/py-test-mock${MODPY_FLAVOR} +BUILD_DEPENDS= devel/py-babel +RUN_DEPENDS= devel/py-certifi \ + www/py-requests \ + www/py-requests-oauthlib \ + devel/py-click \ + textproc/py-markdown \ + textproc/py-yaml +TEST_DEPENDS= devel/py-test-mock .include diff --git a/net/py-apprise/pkg/PLIST b/net/py-apprise/pkg/PLIST index 4bbf9c11906..ad9b014beeb 100644 --- a/net/py-apprise/pkg/PLIST +++ b/net/py-apprise/pkg/PLIST @@ -1,12 +1,13 @@ +@pkgpath net/py-apprise,python3 bin/apprise lib/python${MODPY_VERSION}/site-packages/apprise/ -lib/python${MODPY_VERSION}/site-packages/apprise-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/apprise-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/apprise-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/apprise-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/apprise-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/apprise-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/apprise-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/apprise-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/apprise-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/apprise-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/apprise-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/apprise-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/apprise-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/apprise-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/apprise/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/apprise/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/apprise/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-b2sdk/Makefile b/net/py-b2sdk/Makefile index e101e443404..24110b0af1b 100644 --- a/net/py-b2sdk/Makefile +++ b/net/py-b2sdk/Makefile @@ -1,9 +1,10 @@ COMMENT = client lib to access B2 cloud storage -MODPY_EGG_VERSION = 2.5.1 -DISTNAME = b2sdk-${MODPY_EGG_VERSION} +MODPY_DISTV = 2.5.1 +DISTNAME = b2sdk-${MODPY_DISTV} PKGNAME = py-${DISTNAME} CATEGORIES = devel net +REVISION = 0 # MIT PERMIT_PACKAGE = Yes @@ -15,15 +16,12 @@ MODPY_PYBUILD = pdm # Tests require a Backblaze account and network connectivity NO_TEST = Yes -BUILD_DEPENDS = devel/py-annotated_types${MODPY_FLAVOR} +BUILD_DEPENDS = devel/py-annotated_types -RUN_DEPENDS = devel/py-annotated_types${MODPY_FLAVOR} \ - devel/py-arrow${MODPY_FLAVOR} \ - devel/py-logfury${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} \ - devel/py-typing-extensions${MODPY_FLAVOR} - -FLAVORS = python3 -FLAVOR = python3 +RUN_DEPENDS = devel/py-annotated_types \ + devel/py-arrow \ + devel/py-logfury \ + www/py-requests \ + devel/py-typing-extensions .include diff --git a/net/py-b2sdk/pkg/PLIST b/net/py-b2sdk/pkg/PLIST index 09bb8bb3d72..cb918fd9f50 100644 --- a/net/py-b2sdk/pkg/PLIST +++ b/net/py-b2sdk/pkg/PLIST @@ -1,11 +1,12 @@ +@pkgpath net/py-b2sdk,python3 lib/python${MODPY_VERSION}/site-packages/b2sdk/ -lib/python${MODPY_VERSION}/site-packages/b2sdk-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/b2sdk-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/b2sdk-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/b2sdk-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/b2sdk-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/b2sdk-${MODPY_EGG_VERSION}.dist-info/licenses/ -lib/python${MODPY_VERSION}/site-packages/b2sdk-${MODPY_EGG_VERSION}.dist-info/licenses/LICENSE +lib/python${MODPY_VERSION}/site-packages/b2sdk-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/b2sdk-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/b2sdk-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/b2sdk-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/b2sdk-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/b2sdk-${MODPY_DISTV}.dist-info/licenses/ +lib/python${MODPY_VERSION}/site-packages/b2sdk-${MODPY_DISTV}.dist-info/licenses/LICENSE lib/python${MODPY_VERSION}/site-packages/b2sdk/LICENSE lib/python${MODPY_VERSION}/site-packages/b2sdk/__init__.py lib/python${MODPY_VERSION}/site-packages/b2sdk/__main__.py diff --git a/net/py-boto3/Makefile b/net/py-boto3/Makefile index 4e2ffba1eb1..aa451f19aa5 100644 --- a/net/py-boto3/Makefile +++ b/net/py-boto3/Makefile @@ -1,8 +1,9 @@ COMMENT= AWS SDK for Python -MODPY_EGG_VERSION= 1.35.86 -DISTNAME= boto3-${MODPY_EGG_VERSION} +MODPY_DISTV= 1.35.86 +DISTNAME= boto3-${MODPY_DISTV} PKGNAME= py-${DISTNAME} +REVISION= 0 CATEGORIES= net devel @@ -18,11 +19,8 @@ MODULES= lang/python MODPY_PI= Yes MODPY_PYBUILD= setuptools -FLAVORS= python3 -FLAVOR= python3 - -RUN_DEPENDS= devel/py-jmespath${MODPY_FLAVOR} \ - net/py-botocore${MODPY_FLAVOR}=${MODPY_EGG_VERSION} \ - net/py-s3transfer${MODPY_FLAVOR}>=0.10.0,<0.11.0 +RUN_DEPENDS= devel/py-jmespath \ + net/py-botocore=${MODPY_DISTV} \ + net/py-s3transfer>=0.10.0,<0.11.0 .include diff --git a/net/py-boto3/pkg/PLIST b/net/py-boto3/pkg/PLIST index 1d3cca971dc..83bb5c19295 100644 --- a/net/py-boto3/pkg/PLIST +++ b/net/py-boto3/pkg/PLIST @@ -1,15 +1,14 @@ -@conflict py-boto3-* -@pkgpath net/py-boto3 +@pkgpath net/py-boto3,python3 @pkgpath net/py-boto @pkgpath net/py-boto,python3 lib/python${MODPY_VERSION}/site-packages/boto3/ -lib/python${MODPY_VERSION}/site-packages/boto3-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/boto3-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/boto3-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/boto3-${MODPY_EGG_VERSION}.dist-info/NOTICE -lib/python${MODPY_VERSION}/site-packages/boto3-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/boto3-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/boto3-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/boto3-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/boto3-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/boto3-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/boto3-${MODPY_DISTV}.dist-info/NOTICE +lib/python${MODPY_VERSION}/site-packages/boto3-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/boto3-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/boto3-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/boto3/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/boto3/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/boto3/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-botocore/Makefile b/net/py-botocore/Makefile index 29363a00d1d..d79e27fc1b5 100644 --- a/net/py-botocore/Makefile +++ b/net/py-botocore/Makefile @@ -4,9 +4,10 @@ COMMENT= low-level interface to Amazon Web Services -MODPY_EGG_VERSION= 1.35.86 -DISTNAME= botocore-${MODPY_EGG_VERSION} +MODPY_DISTV= 1.35.86 +DISTNAME= botocore-${MODPY_DISTV} PKGNAME= py-${DISTNAME} +REVISION= 0 CATEGORIES= net devel @@ -22,18 +23,15 @@ MODULES= lang/python MODPY_PI= Yes MODPY_PYBUILD= setuptools -RUN_DEPENDS= devel/py-dateutil${MODPY_FLAVOR} \ - devel/py-jmespath${MODPY_FLAVOR} \ - textproc/py-docutils${MODPY_FLAVOR} \ - www/py-urllib3${MODPY_FLAVOR} - -FLAVORS= python3 -FLAVOR= python3 +RUN_DEPENDS= devel/py-dateutil \ + devel/py-jmespath \ + textproc/py-docutils \ + www/py-urllib3 # XXX py-behave, unported yet TEST_DEPENDS= ${BUILD_PKGPATH} \ - devel/py-mock${MODPY_FLAVOR} \ - devel/py-nose${MODPY_FLAVOR} + devel/py-mock \ + devel/py-nose # needs a driver and a runner TEST_IS_INTERACTIVE= Yes diff --git a/net/py-botocore/pkg/PLIST b/net/py-botocore/pkg/PLIST index 2b33f12af04..8b30feefef3 100644 --- a/net/py-botocore/pkg/PLIST +++ b/net/py-botocore/pkg/PLIST @@ -1,13 +1,13 @@ +@pkgpath net/py-botocore,python3 @conflict py-botocore-* -@pkgpath net/py-botocore lib/python${MODPY_VERSION}/site-packages/botocore/ -lib/python${MODPY_VERSION}/site-packages/botocore-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/botocore-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt -lib/python${MODPY_VERSION}/site-packages/botocore-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/botocore-${MODPY_EGG_VERSION}.dist-info/NOTICE -lib/python${MODPY_VERSION}/site-packages/botocore-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/botocore-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/botocore-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/botocore-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/botocore-${MODPY_DISTV}.dist-info/LICENSE.txt +lib/python${MODPY_VERSION}/site-packages/botocore-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/botocore-${MODPY_DISTV}.dist-info/NOTICE +lib/python${MODPY_VERSION}/site-packages/botocore-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/botocore-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/botocore-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/botocore/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/botocore/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/botocore/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-cares/Makefile b/net/py-cares/Makefile index 44ad303e03b..8311b1a6487 100644 --- a/net/py-cares/Makefile +++ b/net/py-cares/Makefile @@ -1,10 +1,11 @@ # using bundled c-ares which is patched for TTL support COMMENT= Python interface to c-ares -MODPY_EGG_VERSION= 4.4.0 -DISTNAME= pycares-${MODPY_EGG_VERSION} -PKGNAME= py-cares-${MODPY_EGG_VERSION} +MODPY_DISTV= 4.4.0 +DISTNAME= pycares-${MODPY_DISTV} +PKGNAME= py-cares-${MODPY_DISTV} CATEGORIES= net +REVISION= 0 # MIT PERMIT_PACKAGE= Yes @@ -19,10 +20,7 @@ MODPY_PYBUILD= setuptools USE_GMAKE= Yes -FLAVORS= python3 -FLAVOR= python3 - -RUN_DEPENDS= devel/py-cffi${MODPY_FLAVOR} +RUN_DEPENDS= devel/py-cffi BUILD_DEPENDS= ${RUN_DEPENDS} .include diff --git a/net/py-cares/pkg/PLIST b/net/py-cares/pkg/PLIST index c0ffc634bdc..69df396ec9d 100644 --- a/net/py-cares/pkg/PLIST +++ b/net/py-cares/pkg/PLIST @@ -1,12 +1,12 @@ +@pkgpath net/py-cares,python3 @conflict py-cares-* -@pkgpath net/py-cares lib/python${MODPY_VERSION}/site-packages/pycares/ -lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/pycares/__init__.py lib/python${MODPY_VERSION}/site-packages/pycares/__main__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}/ diff --git a/net/py-curl/Makefile b/net/py-curl/Makefile index 339bd7678dc..96f6363d635 100644 --- a/net/py-curl/Makefile +++ b/net/py-curl/Makefile @@ -1,9 +1,10 @@ COMMENT= Python interface to cURL library -MODPY_EGG_VERSION= 7.45.3 -DISTNAME= pycurl-${MODPY_EGG_VERSION} -PKGNAME= py-curl-${MODPY_EGG_VERSION} +MODPY_DISTV= 7.45.3 +DISTNAME= pycurl-${MODPY_DISTV} +PKGNAME= py-curl-${MODPY_DISTV} CATEGORIES= net +REVISION= 0 HOMEPAGE= http://pycurl.io/ @@ -17,9 +18,6 @@ MODULES= lang/python MODPY_PI= Yes MODPY_PYBUILD= setuptools -FLAVORS= python3 -FLAVOR= python3 - LIB_DEPENDS= net/curl post-install: @@ -29,7 +27,7 @@ post-install: mv ${PREFIX}/share/doc/pycurl ${PREFIX}/share/doc/py-curl/ TEST_DEPENDS= ${BUILD_PKGPATH} \ - devel/py-flaky${MODPY_FLAVOR} \ - www/py-bottle${MODPY_FLAVOR} + devel/py-flaky \ + www/py-bottle .include diff --git a/net/py-curl/pkg/PLIST b/net/py-curl/pkg/PLIST index 57a6e0d5f1f..f883443bf12 100644 --- a/net/py-curl/pkg/PLIST +++ b/net/py-curl/pkg/PLIST @@ -1,17 +1,17 @@ -@pkgpath net/py-curl +@pkgpath net/py-curl,python3 lib/python${MODPY_VERSION}/site-packages/curl/ lib/python${MODPY_VERSION}/site-packages/curl/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/curl/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/curl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/curl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}.dist-info/AUTHORS -lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}.dist-info/COPYING-LGPL -lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}.dist-info/COPYING-MIT -lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_DISTV}.dist-info/AUTHORS +lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_DISTV}.dist-info/COPYING-LGPL +lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_DISTV}.dist-info/COPYING-MIT +lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pycurl-${MODPY_DISTV}.dist-info/top_level.txt @so lib/python${MODPY_VERSION}/site-packages/pycurl.${MODPY_PYC_MAGIC_TAG}so share/doc/py-curl/ share/doc/py-curl/AUTHORS diff --git a/net/py-cymruwhois/Makefile b/net/py-cymruwhois/Makefile index 46c9442d1ca..d562468453a 100644 --- a/net/py-cymruwhois/Makefile +++ b/net/py-cymruwhois/Makefile @@ -1,9 +1,9 @@ COMMENT= client for the whois.cymru.com service -MODPY_EGG_VERSION= 1.6 -DISTNAME= cymruwhois-${MODPY_EGG_VERSION} +MODPY_DISTV= 1.6 +DISTNAME= cymruwhois-${MODPY_DISTV} PKGNAME= py-${DISTNAME} -REVISION= 8 +REVISION= 9 CATEGORIES= net @@ -17,9 +17,6 @@ MODPY_PI= Yes MODPY_PYBUILD= setuptools MODPY_ADJ_FILES= cymruwhois.py -FLAVORS= python3 -FLAVOR= python3 - -TEST_DEPENDS= devel/py-nose${MODPY_FLAVOR} +TEST_DEPENDS= devel/py-nose .include diff --git a/net/py-cymruwhois/pkg/PLIST b/net/py-cymruwhois/pkg/PLIST index 2417fe4de89..f26c4c21c37 100644 --- a/net/py-cymruwhois/pkg/PLIST +++ b/net/py-cymruwhois/pkg/PLIST @@ -1,13 +1,13 @@ +@pkgpath net/py-cymruwhois,python3 @conflict py-cymruwhois-<1.6p2 -@pkgpath net/py-cymruwhois bin/cymruwhois lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}cymruwhois.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}cymruwhois.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/cymruwhois-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/cymruwhois.py diff --git a/net/py-dnslib/Makefile b/net/py-dnslib/Makefile index 97b31177b4c..9364c4f0674 100644 --- a/net/py-dnslib/Makefile +++ b/net/py-dnslib/Makefile @@ -1,10 +1,10 @@ COMMENT= library to en/decode DNS wire-format packets for Python -MODPY_EGG_VERSION= 0.9.23 -DISTNAME= dnslib-${MODPY_EGG_VERSION} +MODPY_DISTV= 0.9.23 +DISTNAME= dnslib-${MODPY_DISTV} PKGNAME= py-${DISTNAME} CATEGORIES= net -REVISION= 1 +REVISION= 2 MAINTAINER= Bryan Everly @@ -15,9 +15,6 @@ MODULES= lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -FLAVORS = python3 -FLAVOR = python3 - do-test: ${SUBST_CMD} ${WRKSRC}/run_tests.sh cd ${WRKSRC} && ./run_tests.sh diff --git a/net/py-dnslib/pkg/PLIST b/net/py-dnslib/pkg/PLIST index 5c120f1b884..3302c873434 100644 --- a/net/py-dnslib/pkg/PLIST +++ b/net/py-dnslib/pkg/PLIST @@ -1,11 +1,11 @@ -@pkgpath net/py-dnslib +@pkgpath net/py-dnslib,python3 lib/python${MODPY_VERSION}/site-packages/dnslib/ -lib/python${MODPY_VERSION}/site-packages/dnslib-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/dnslib-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/dnslib-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/dnslib-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/dnslib-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/dnslib-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/dnslib-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/dnslib-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/dnslib-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/dnslib-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/dnslib-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/dnslib-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/dnslib/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dnslib/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/dnslib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-dnspython/Makefile b/net/py-dnspython/Makefile index 61de0ef01fc..1b1d491821f 100644 --- a/net/py-dnspython/Makefile +++ b/net/py-dnspython/Makefile @@ -1,25 +1,23 @@ COMMENT= DNS toolkit for Python # see net/py2-dnspython for py2 version -MODPY_EGG_VERSION= 2.7.0 -DISTNAME= dnspython-${MODPY_EGG_VERSION} +MODPY_DISTV= 2.7.0 +DISTNAME= dnspython-${MODPY_DISTV} PKGNAME= py-${DISTNAME} CATEGORIES= net +REVISION= 0 HOMEPAGE= https://www.dnspython.org/ # BSD PERMIT_PACKAGE= Yes -FLAVORS= python3 -FLAVOR= python3 - MODULES= lang/python MODPY_PI= Yes MODPY_PYBUILD= hatchling MODPY_ADJ_FILES= examples/*.py -TEST_DEPENDS= security/py-ecdsa${MODPY_FLAVOR} +TEST_DEPENDS= security/py-ecdsa post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${MODPY_PY_PREFIX}dnspython diff --git a/net/py-dnspython/pkg/PLIST b/net/py-dnspython/pkg/PLIST index ad09e7e7f88..28b61cbbb0a 100644 --- a/net/py-dnspython/pkg/PLIST +++ b/net/py-dnspython/pkg/PLIST @@ -1,3 +1,4 @@ +@pkgpath net/py-dnspython,python3 lib/python${MODPY_VERSION}/site-packages/dns/ lib/python${MODPY_VERSION}/site-packages/dns/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dns/${MODPY_PYCACHE}/ @@ -445,12 +446,12 @@ lib/python${MODPY_VERSION}/site-packages/dns/xfr.py lib/python${MODPY_VERSION}/site-packages/dns/zone.py lib/python${MODPY_VERSION}/site-packages/dns/zonefile.py lib/python${MODPY_VERSION}/site-packages/dns/zonetypes.py -lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}.dist-info/licenses/ -lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_EGG_VERSION}.dist-info/licenses/LICENSE +lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_DISTV}.dist-info/licenses/ +lib/python${MODPY_VERSION}/site-packages/dnspython-${MODPY_DISTV}.dist-info/licenses/LICENSE share/examples/${MODPY_PY_PREFIX}dnspython/ share/examples/${MODPY_PY_PREFIX}dnspython/async_dns.py share/examples/${MODPY_PY_PREFIX}dnspython/ddns.py diff --git a/net/py-dpkt/Makefile b/net/py-dpkt/Makefile index 1907e3a1f3e..33678bb6045 100644 --- a/net/py-dpkt/Makefile +++ b/net/py-dpkt/Makefile @@ -1,9 +1,9 @@ COMMENT = Python network packet manipulation library -MODPY_EGG_VERSION = 1.9.8 -DISTNAME = dpkt-${MODPY_EGG_VERSION} -PKGNAME = py-dpkt-${MODPY_EGG_VERSION} -REVISION = 0 +MODPY_DISTV = 1.9.8 +DISTNAME = dpkt-${MODPY_DISTV} +PKGNAME = py-dpkt-${MODPY_DISTV} +REVISION = 1 CATEGORIES = net @@ -19,9 +19,6 @@ MODPY_PYBUILD = setuptools MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 - NO_TEST = Yes .include diff --git a/net/py-dpkt/pkg/PLIST b/net/py-dpkt/pkg/PLIST index c92cd13ee09..e49b19c1631 100644 --- a/net/py-dpkt/pkg/PLIST +++ b/net/py-dpkt/pkg/PLIST @@ -1,12 +1,12 @@ -@pkgpath net/py-dpkt +@pkgpath net/py-dpkt,python3 lib/python${MODPY_VERSION}/site-packages/dpkt/ -lib/python${MODPY_VERSION}/site-packages/dpkt-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/dpkt-${MODPY_EGG_VERSION}.dist-info/AUTHORS -lib/python${MODPY_VERSION}/site-packages/dpkt-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/dpkt-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/dpkt-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/dpkt-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/dpkt-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/dpkt-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/dpkt-${MODPY_DISTV}.dist-info/AUTHORS +lib/python${MODPY_VERSION}/site-packages/dpkt-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/dpkt-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/dpkt-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/dpkt-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/dpkt-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/dpkt/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dpkt/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/dpkt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-eapi/Makefile b/net/py-eapi/Makefile index aace35c602f..e5187ca8ee2 100644 --- a/net/py-eapi/Makefile +++ b/net/py-eapi/Makefile @@ -1,8 +1,9 @@ COMMENT= Python client for Arista eAPI -MODPY_EGG_VERSION= 1.0.2 -DISTNAME= pyeapi-${MODPY_EGG_VERSION} +MODPY_DISTV= 1.0.2 +DISTNAME= pyeapi-${MODPY_DISTV} PKGNAME= py-${DISTNAME:S/py//} +REVISION= 0 CATEGORIES= net @@ -10,14 +11,12 @@ CATEGORIES= net PERMIT_PACKAGE= Yes MODULES= lang/python -FLAVORS= python3 -FLAVOR= python3 MODPY_PI= Yes MODPY_PYBUILD= setuptools MODPY_PYTEST_ARGS= test/unit -RUN_DEPENDS= net/py-netaddr${MODPY_FLAVOR} -TEST_DEPENDS= devel/py-mock${MODPY_FLAVOR} +RUN_DEPENDS= net/py-netaddr +TEST_DEPENDS= devel/py-mock .include diff --git a/net/py-eapi/pkg/PLIST b/net/py-eapi/pkg/PLIST index 8a17dc527c0..177acd14ddd 100644 --- a/net/py-eapi/pkg/PLIST +++ b/net/py-eapi/pkg/PLIST @@ -1,11 +1,11 @@ -@pkgpath net/py-eapi +@pkgpath net/py-eapi,python3 lib/python${MODPY_VERSION}/site-packages/pyeapi/ -lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/pyeapi/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyeapi/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/pyeapi/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-engineio/Makefile b/net/py-engineio/Makefile index f592e6c5cd3..97de5842b84 100644 --- a/net/py-engineio/Makefile +++ b/net/py-engineio/Makefile @@ -1,10 +1,10 @@ COMMENT= client/server implementation of Engine.IO # py-ripe.atlas.cousteau 1.5.0 needs socketio<5 which needs engineio<4 -MODPY_EGG_VERSION= 3.14.2 -DISTNAME= python-engineio-${MODPY_EGG_VERSION} +MODPY_DISTV= 3.14.2 +DISTNAME= python-engineio-${MODPY_DISTV} PKGNAME= ${DISTNAME:S/python-/py-/} -REVISION= 2 +REVISION= 3 CATEGORIES= net @@ -19,11 +19,8 @@ MODPY_PYBUILD= setuptools MODPY_PI= Yes NO_TEST= Yes -RUN_DEPENDS= devel/py-six${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} \ - net/py-websocket-client${MODPY_FLAVOR} - -FLAVORS= python3 -FLAVOR= python3 +RUN_DEPENDS= devel/py-six \ + www/py-requests \ + net/py-websocket-client .include diff --git a/net/py-engineio/pkg/PLIST b/net/py-engineio/pkg/PLIST index eb0737e1239..7c7ee595daa 100644 --- a/net/py-engineio/pkg/PLIST +++ b/net/py-engineio/pkg/PLIST @@ -1,3 +1,4 @@ +@pkgpath net/py-engineio,python3 lib/python${MODPY_VERSION}/site-packages/engineio/ lib/python${MODPY_VERSION}/site-packages/engineio/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/engineio/${MODPY_PYCACHE}/ @@ -65,9 +66,9 @@ lib/python${MODPY_VERSION}/site-packages/engineio/payload.py lib/python${MODPY_VERSION}/site-packages/engineio/server.py lib/python${MODPY_VERSION}/site-packages/engineio/socket.py lib/python${MODPY_VERSION}/site-packages/engineio/static_files.py -lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/python_engineio-${MODPY_DISTV}.dist-info/top_level.txt diff --git a/net/py-ephemeral_port_reserve/Makefile b/net/py-ephemeral_port_reserve/Makefile index 2a235edc7b3..b8b98fa7390 100644 --- a/net/py-ephemeral_port_reserve/Makefile +++ b/net/py-ephemeral_port_reserve/Makefile @@ -1,9 +1,9 @@ COMMENT = implementation of the port 0 trick -MODPY_EGG_VERSION = 1.1.4 -DISTNAME = ephemeral_port_reserve-${MODPY_EGG_VERSION} +MODPY_DISTV = 1.1.4 +DISTNAME = ephemeral_port_reserve-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = net www @@ -14,9 +14,6 @@ PERMIT_PACKAGE = Yes MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 - MODPY_PYBUILD = setuptools MODPY_PI = Yes diff --git a/net/py-ephemeral_port_reserve/pkg/PLIST b/net/py-ephemeral_port_reserve/pkg/PLIST index 1ddb59b7dce..3108cdb542f 100644 --- a/net/py-ephemeral_port_reserve/pkg/PLIST +++ b/net/py-ephemeral_port_reserve/pkg/PLIST @@ -1,12 +1,13 @@ +@pkgpath net/py-ephemeral_port_reserve,python3 bin/ephemeral-port-reserve lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ephemeral_port_reserve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ephemeral_port_reserve.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/ephemeral_port_reserve-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/ephemeral_port_reserve-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/ephemeral_port_reserve-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/ephemeral_port_reserve-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/ephemeral_port_reserve-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/ephemeral_port_reserve-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/ephemeral_port_reserve-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/ephemeral_port_reserve-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/ephemeral_port_reserve-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/ephemeral_port_reserve-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/ephemeral_port_reserve-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/ephemeral_port_reserve-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/ephemeral_port_reserve-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/ephemeral_port_reserve-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/ephemeral_port_reserve.py diff --git a/net/py-fqdn/Makefile b/net/py-fqdn/Makefile index 369efe5c747..7a6e7168df4 100644 --- a/net/py-fqdn/Makefile +++ b/net/py-fqdn/Makefile @@ -1,8 +1,9 @@ COMMENT = validates that domain names are acceptable to browsers -MODPY_EGG_VERSION = 1.5.1 -DISTNAME = fqdn-${MODPY_EGG_VERSION} +MODPY_DISTV = 1.5.1 +DISTNAME = fqdn-${MODPY_DISTV} PKGNAME = py-${DISTNAME} +REVISION = 0 CATEGORIES = net @@ -13,9 +14,6 @@ PERMIT_PACKAGE = Yes MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 - MODPY_PI = Yes MODPY_PYBUILD = setuptools diff --git a/net/py-fqdn/pkg/PLIST b/net/py-fqdn/pkg/PLIST index 4a90fc748fb..63acc630b0b 100644 --- a/net/py-fqdn/pkg/PLIST +++ b/net/py-fqdn/pkg/PLIST @@ -1,10 +1,11 @@ +@pkgpath net/py-fqdn,python3 lib/python${MODPY_VERSION}/site-packages/fqdn/ -lib/python${MODPY_VERSION}/site-packages/fqdn-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/fqdn-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/fqdn-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/fqdn-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/fqdn-${MODPY_EGG_VERSION}.dist-info/top_level.txt -lib/python${MODPY_VERSION}/site-packages/fqdn-${MODPY_EGG_VERSION}.dist-info/zip-safe +lib/python${MODPY_VERSION}/site-packages/fqdn-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/fqdn-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/fqdn-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/fqdn-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/fqdn-${MODPY_DISTV}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/fqdn-${MODPY_DISTV}.dist-info/zip-safe lib/python${MODPY_VERSION}/site-packages/fqdn/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fqdn/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/fqdn/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-ftpdlib/Makefile b/net/py-ftpdlib/Makefile index fbcf329d53c..8d42d86051f 100644 --- a/net/py-ftpdlib/Makefile +++ b/net/py-ftpdlib/Makefile @@ -1,9 +1,9 @@ COMMENT = FTP server library for Python -MODPY_EGG_VERSION = 1.5.7 -DISTNAME = pyftpdlib-${MODPY_EGG_VERSION} -PKGNAME = py-ftpdlib-${MODPY_EGG_VERSION} -REVISION = 0 +MODPY_DISTV = 1.5.7 +DISTNAME = pyftpdlib-${MODPY_DISTV} +PKGNAME = py-ftpdlib-${MODPY_DISTV} +REVISION = 1 CATEGORIES = net devel @@ -18,9 +18,6 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -FLAVORS = python3 -FLAVOR = python3 - NO_TEST = Yes .include diff --git a/net/py-ftpdlib/pkg/PLIST b/net/py-ftpdlib/pkg/PLIST index 62e1796c638..fa5e8055692 100644 --- a/net/py-ftpdlib/pkg/PLIST +++ b/net/py-ftpdlib/pkg/PLIST @@ -1,13 +1,13 @@ +@pkgpath net/py-ftpdlib,python3 @conflict py-ftpdlib-<1.5.6p1 -@pkgpath net/py-ftpdlib bin/ftpbench lib/python${MODPY_VERSION}/site-packages/pyftpdlib/ -lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/pyftpdlib/__init__.py lib/python${MODPY_VERSION}/site-packages/pyftpdlib/__main__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyftpdlib/${MODPY_PYCACHE}/ diff --git a/net/py-gevent-websocket/Makefile b/net/py-gevent-websocket/Makefile index 9f8e1855be5..7de856d57f8 100644 --- a/net/py-gevent-websocket/Makefile +++ b/net/py-gevent-websocket/Makefile @@ -1,10 +1,10 @@ COMMENT = WebSocket handler for the gevent pywsgi server -MODPY_EGG_VERSION = 0.10.1 +MODPY_DISTV = 0.10.1 -DISTNAME = gevent-websocket-${MODPY_EGG_VERSION} +DISTNAME = gevent-websocket-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 1 +REVISION = 2 CATEGORIES = net @@ -18,9 +18,7 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -FLAVOR = python3 -FLAVORS = python3 -RUN_DEPENDS = devel/py-gevent${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-gevent .include diff --git a/net/py-gevent-websocket/pkg/PLIST b/net/py-gevent-websocket/pkg/PLIST index 91cd8b1e6f6..345ee82e1f2 100644 --- a/net/py-gevent-websocket/pkg/PLIST +++ b/net/py-gevent-websocket/pkg/PLIST @@ -1,10 +1,11 @@ -lib/python${MODPY_VERSION}/site-packages/gevent_websocket-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/gevent_websocket-${MODPY_EGG_VERSION}.dist-info/AUTHORS -lib/python${MODPY_VERSION}/site-packages/gevent_websocket-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/gevent_websocket-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/gevent_websocket-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/gevent_websocket-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/gevent_websocket-${MODPY_EGG_VERSION}.dist-info/top_level.txt +@pkgpath net/py-gevent-websocket,python3 +lib/python${MODPY_VERSION}/site-packages/gevent_websocket-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/gevent_websocket-${MODPY_DISTV}.dist-info/AUTHORS +lib/python${MODPY_VERSION}/site-packages/gevent_websocket-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/gevent_websocket-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/gevent_websocket-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/gevent_websocket-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/gevent_websocket-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/geventwebsocket/ lib/python${MODPY_VERSION}/site-packages/geventwebsocket/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/geventwebsocket/${MODPY_PYCACHE}/ diff --git a/net/py-geventhttpclient/Makefile b/net/py-geventhttpclient/Makefile index 7dead02e61e..4e7d12c47c2 100644 --- a/net/py-geventhttpclient/Makefile +++ b/net/py-geventhttpclient/Makefile @@ -1,10 +1,10 @@ COMMENT = high performance, concurrent HTTP client library -MODPY_EGG_VERSION = 1.5.3 -DISTNAME = geventhttpclient-${MODPY_EGG_VERSION} +MODPY_DISTV = 1.5.3 +DISTNAME = geventhttpclient-${MODPY_DISTV} PKGNAME = ${MODPY_PY_PREFIX}${DISTNAME} CATEGORIES = net devel -REVISION = 2 +REVISION = 3 HOMEPAGE = https://github.com/gwik/geventhttpclient @@ -18,12 +18,9 @@ MODPY_PI = Yes MODPY_PYBUILD = setuptools MODPY_PYTEST_ARGS = src/geventhttpclient/ -FLAVORS = python3 -FLAVOR = python3 - -RUN_DEPENDS += devel/py-gevent${MODPY_FLAVOR} \ - devel/py-certifi${MODPY_FLAVOR} \ - devel/py-six${MODPY_FLAVOR} -TEST_DEPENDS = net/py-dpkt${MODPY_FLAVOR} +RUN_DEPENDS += devel/py-gevent \ + devel/py-certifi \ + devel/py-six +TEST_DEPENDS = net/py-dpkt .include diff --git a/net/py-geventhttpclient/pkg/PLIST b/net/py-geventhttpclient/pkg/PLIST index 7b95f8caaef..debf0f7f106 100644 --- a/net/py-geventhttpclient/pkg/PLIST +++ b/net/py-geventhttpclient/pkg/PLIST @@ -1,11 +1,11 @@ -@pkgpath net/py-geventhttpclient +@pkgpath net/py-geventhttpclient,python3 lib/python${MODPY_VERSION}/site-packages/geventhttpclient/ -lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}.dist-info/LICENSE-MIT -lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_DISTV}.dist-info/LICENSE-MIT +lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/geventhttpclient-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/geventhttpclient/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/geventhttpclient/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-idna/Makefile b/net/py-idna/Makefile index a5a5d1bf420..1471c026fc3 100644 --- a/net/py-idna/Makefile +++ b/net/py-idna/Makefile @@ -1,9 +1,10 @@ COMMENT= Python library to support the IDNA protocol -MODPY_EGG_VERSION= 3.10 -DISTNAME= idna-${MODPY_EGG_VERSION} +MODPY_DISTV= 3.10 +DISTNAME= idna-${MODPY_DISTV} PKGNAME= py-${DISTNAME} CATEGORIES= net +REVISION= 0 HOMEPAGE= https://github.com/kjd/idna @@ -15,7 +16,4 @@ MODULES= lang/python MODPY_PI= Yes MODPY_PYBUILD= flit_core -FLAVORS= python3 -FLAVOR= python3 - .include diff --git a/net/py-idna/pkg/PLIST b/net/py-idna/pkg/PLIST index f83faa9e491..4843ff3cf1c 100644 --- a/net/py-idna/pkg/PLIST +++ b/net/py-idna/pkg/PLIST @@ -1,10 +1,10 @@ -@pkgpath net/py-idna +@pkgpath net/py-idna,python3 lib/python${MODPY_VERSION}/site-packages/idna/ -lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_EGG_VERSION}.dist-info/LICENSE.md -lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_EGG_VERSION}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_DISTV}.dist-info/LICENSE.md +lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/idna-${MODPY_DISTV}.dist-info/WHEEL lib/python${MODPY_VERSION}/site-packages/idna/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/idna/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-ifaddr/Makefile b/net/py-ifaddr/Makefile index 32c22ff67c2..4021e6086cb 100644 --- a/net/py-ifaddr/Makefile +++ b/net/py-ifaddr/Makefile @@ -1,9 +1,9 @@ COMMENT= enumerate IP addresses on the local network adapters -MODPY_EGG_VERSION= 0.2.0 -DISTNAME= ifaddr-${MODPY_EGG_VERSION} +MODPY_DISTV= 0.2.0 +DISTNAME= ifaddr-${MODPY_DISTV} PKGNAME= py-${DISTNAME} -REVISION= 0 +REVISION= 1 CATEGORIES= net @@ -16,7 +16,4 @@ MODPY_PI= Yes MODPY_PYBUILD= setuptools # MODPY_PYTEST_ARGS= ifaddr -FLAVORS= python3 -FLAVOR= python3 - .include diff --git a/net/py-ifaddr/pkg/PLIST b/net/py-ifaddr/pkg/PLIST index b401da2b58f..594f423fb87 100644 --- a/net/py-ifaddr/pkg/PLIST +++ b/net/py-ifaddr/pkg/PLIST @@ -1,12 +1,12 @@ +@pkgpath net/py-ifaddr,python3 @conflict py-ifaddr-* -@pkgpath net/py-ifaddr lib/python${MODPY_VERSION}/site-packages/ifaddr/ -lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt -lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_DISTV}.dist-info/LICENSE.txt +lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/ifaddr-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/ifaddr/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ifaddr/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/ifaddr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-impacket/Makefile b/net/py-impacket/Makefile index db995524e5a..560ac371679 100644 --- a/net/py-impacket/Makefile +++ b/net/py-impacket/Makefile @@ -2,12 +2,12 @@ FIX_EXTRACT_PERMISSIONS = Yes COMMENT = Python classes providing access to network packets -MODPY_EGG_VERSION = 0.9.24 -DISTNAME = impacket-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.9.24 +DISTNAME = impacket-${MODPY_DISTV} PKGNAME = py-${DISTNAME} EPOCH = 0 CATEGORIES = net security -REVISION = 3 +REVISION = 4 HOMEPAGE = https://github.com/fortra/impacket @@ -31,17 +31,14 @@ MODPY_ADJ_FILES = impacket/ese.py \ impacket/tds.py # ntlmrelayx can additionaly use py-ldap3, py-flask and unported py-ldapdomaindump -RUN_DEPENDS = devel/py-asn1${MODPY_FLAVOR} \ - devel/py-future${MODPY_FLAVOR} \ - net/py-pcapy${MODPY_FLAVOR} \ - security/py-cryptodomex${MODPY_FLAVOR} \ - security/py-openssl${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-asn1 \ + devel/py-future \ + net/py-pcapy \ + security/py-cryptodomex \ + security/py-openssl NO_TEST = Yes -FLAVORS = python3 -FLAVOR = python3 - pre-configure: ${SUBST_CMD} ${WRKSRC}/examples/goldenPac.py \ ${WRKSRC}/examples/nmapAnswerMachine.py \ diff --git a/net/py-impacket/pkg/PLIST b/net/py-impacket/pkg/PLIST index 7fdbf918734..c82cabd3551 100644 --- a/net/py-impacket/pkg/PLIST +++ b/net/py-impacket/pkg/PLIST @@ -1,12 +1,12 @@ +@pkgpath net/py-impacket,python3 @conflict py-impacket-* -@pkgpath net/py-impacket lib/python${MODPY_VERSION}/site-packages/impacket/ -lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/impacket-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/impacket/Dot11Crypto.py lib/python${MODPY_VERSION}/site-packages/impacket/Dot11KeyManager.py lib/python${MODPY_VERSION}/site-packages/impacket/ICMP6.py diff --git a/net/py-irclib/Makefile b/net/py-irclib/Makefile index f58f7e2a69b..822be6cb9bc 100644 --- a/net/py-irclib/Makefile +++ b/net/py-irclib/Makefile @@ -4,7 +4,7 @@ GH_ACCOUNT= sixohsix GH_PROJECT= python-irclib GH_COMMIT= acd5aa66f431550bd142e90590b64ff6840e6648 DISTNAME= py-irclib-0.4.8.20110306 -REVISION= 4 +REVISION= 5 CATEGORIES= net @@ -14,9 +14,6 @@ PERMIT_PACKAGE= Yes MODULES= lang/python MODPY_PYBUILD= setuptools -FLAVORS= python3 -FLAVOR= python3 - NO_TEST= Yes EXAMPLES= dccreceive dccsend irccat irccat2 servermap testbot.py diff --git a/net/py-irclib/pkg/PLIST b/net/py-irclib/pkg/PLIST index 8ab8831e580..7fc1d4b6fe0 100644 --- a/net/py-irclib/pkg/PLIST +++ b/net/py-irclib/pkg/PLIST @@ -1,5 +1,5 @@ +@pkgpath net/py-irclib,python3 @conflict py-irclib-* -@pkgpath net/py-irclib lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ircbot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ircbot.${MODPY_PYC_MAGIC_TAG}pyc diff --git a/net/py-junos-eznc/Makefile b/net/py-junos-eznc/Makefile index f260f5c807f..1d80326e31d 100644 --- a/net/py-junos-eznc/Makefile +++ b/net/py-junos-eznc/Makefile @@ -1,9 +1,9 @@ COMMENT = library for Junos automation -MODPY_EGG_VERSION = 2.7.0 -DISTNAME = junos-eznc-${MODPY_EGG_VERSION} +MODPY_DISTV = 2.7.0 +DISTNAME = junos-eznc-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = net @@ -11,8 +11,6 @@ CATEGORIES = net PERMIT_PACKAGE = Yes MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 MODPY_PI = Yes MODPY_PYBUILD = setuptools @@ -21,16 +19,16 @@ MODPY_PYBUILD = setuptools # tests not present in pypi distfile, only github. NO_TEST = Yes -RUN_DEPENDS = devel/py-parsing${MODPY_FLAVOR} \ - devel/py-serial${MODPY_FLAVOR} \ - devel/py-six${MODPY_FLAVOR} \ - devel/py-transitions${MODPY_FLAVOR} \ - net/py-ncclient${MODPY_FLAVOR} \ - security/py-paramiko${MODPY_FLAVOR} \ - security/py-scp${MODPY_FLAVOR} \ - textproc/py-lxml${MODPY_FLAVOR} \ - textproc/py-yaml${MODPY_FLAVOR} \ - textproc/py-yamlordereddictloader${MODPY_FLAVOR} \ - www/py-jinja2${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-parsing \ + devel/py-serial \ + devel/py-six \ + devel/py-transitions \ + net/py-ncclient \ + security/py-paramiko \ + security/py-scp \ + textproc/py-lxml \ + textproc/py-yaml \ + textproc/py-yamlordereddictloader \ + www/py-jinja2 .include diff --git a/net/py-junos-eznc/pkg/PLIST b/net/py-junos-eznc/pkg/PLIST index a613946ef31..8755dcfb6af 100644 --- a/net/py-junos-eznc/pkg/PLIST +++ b/net/py-junos-eznc/pkg/PLIST @@ -1,4 +1,4 @@ -@pkgpath net/py-junos-eznc +@pkgpath net/py-junos-eznc,python3 lib/python${MODPY_VERSION}/site-packages/jnpr/ lib/python${MODPY_VERSION}/site-packages/jnpr/junos/ lib/python${MODPY_VERSION}/site-packages/jnpr/junos/__init__.py @@ -345,11 +345,11 @@ lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/start_shell.py lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/sw.py lib/python${MODPY_VERSION}/site-packages/jnpr/junos/utils/util.py lib/python${MODPY_VERSION}/site-packages/jnpr/junos/version.py -lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}-nspkg.pth -lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}.dist-info/namespace_packages.txt -lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_DISTV}-py${MODPY_VERSION}-nspkg.pth +lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_DISTV}.dist-info/namespace_packages.txt +lib/python${MODPY_VERSION}/site-packages/junos_eznc-${MODPY_DISTV}.dist-info/top_level.txt diff --git a/net/py-libcloud/Makefile b/net/py-libcloud/Makefile index faa0bfe1636..d892e839969 100644 --- a/net/py-libcloud/Makefile +++ b/net/py-libcloud/Makefile @@ -1,9 +1,9 @@ COMMENT= unified interface for interacting with cloud services -MODPY_EGG_VERSION= 3.8.0 -DISTNAME= apache-libcloud-${MODPY_EGG_VERSION} -PKGNAME= py-libcloud-${MODPY_EGG_VERSION} -REVISION= 1 +MODPY_DISTV= 3.8.0 +DISTNAME= apache-libcloud-${MODPY_DISTV} +PKGNAME= py-libcloud-${MODPY_DISTV} +REVISION= 2 CATEGORIES= net @@ -20,19 +20,16 @@ MODULES= lang/python MODPY_PYBUILD= setuptools -FLAVORS= python3 -FLAVOR= python3 +BUILD_DEPENDS= devel/py-test-runner -BUILD_DEPENDS= devel/py-test-runner${MODPY_FLAVOR} - -RUN_DEPENDS= sysutils/py-lockfile${MODPY_FLAVOR} +RUN_DEPENDS= sysutils/py-lockfile TEST_DEPENDS= devel/flake8 \ - devel/py-mock${MODPY_FLAVOR} \ - devel/py-test-runner${MODPY_FLAVOR} \ - security/py-openssl${MODPY_FLAVOR} \ - sysutils/py-lockfile${MODPY_FLAVOR} \ - www/py-requests-mock${MODPY_FLAVOR} + devel/py-mock \ + devel/py-test-runner \ + security/py-openssl \ + sysutils/py-lockfile \ + www/py-requests-mock # no need to package the test suite post-install: diff --git a/net/py-libcloud/pkg/PLIST b/net/py-libcloud/pkg/PLIST index 5df7bc45e66..08c6828a921 100644 --- a/net/py-libcloud/pkg/PLIST +++ b/net/py-libcloud/pkg/PLIST @@ -1,12 +1,12 @@ +@pkgpath net/py-libcloud,python3 @conflict py-libcloud-* -@pkgpath net/py-libcloud -lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}.dist-info/NOTICE -lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_DISTV}.dist-info/NOTICE +lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/apache_libcloud-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/libcloud/ lib/python${MODPY_VERSION}/site-packages/libcloud/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libcloud/${MODPY_PYCACHE}/ diff --git a/net/py-libknot/Makefile b/net/py-libknot/Makefile index d2c6f1c347e..00683536e87 100644 --- a/net/py-libknot/Makefile +++ b/net/py-libknot/Makefile @@ -1,9 +1,10 @@ COMMENT = Python bindings for libknot -MODPY_EGG_VERSION = 3.3.9 +MODPY_DISTV = 3.3.9 -DISTNAME = libknot-${MODPY_EGG_VERSION} +DISTNAME = libknot-${MODPY_DISTV} PKGNAME = py-${DISTNAME} +REVISION = 0 CATEGORIES = net @@ -18,9 +19,6 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = hatchling -FLAVORS = python3 -FLAVOR = python3 - -RUN_DEPENDS = net/knot=${MODPY_EGG_VERSION} +RUN_DEPENDS = net/knot=${MODPY_DISTV} .include diff --git a/net/py-libknot/pkg/PLIST b/net/py-libknot/pkg/PLIST index 040cda477ca..cf257ee47bc 100644 --- a/net/py-libknot/pkg/PLIST +++ b/net/py-libknot/pkg/PLIST @@ -1,13 +1,14 @@ +@pkgpath net/py-libknot,python3 @comment lib/python${MODPY_VERSION}/site-packages/PKG-INFO @comment lib/python${MODPY_VERSION}/site-packages/README.md @comment lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/ @comment lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} @comment lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/libknot/ -lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_EGG_VERSION}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/libknot-${MODPY_DISTV}.dist-info/WHEEL lib/python${MODPY_VERSION}/site-packages/libknot/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libknot/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/libknot/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-minimalmodbus/Makefile b/net/py-minimalmodbus/Makefile index f2dd056e326..b93778e1890 100644 --- a/net/py-minimalmodbus/Makefile +++ b/net/py-minimalmodbus/Makefile @@ -1,10 +1,10 @@ COMMENT= easy-to-use Modbus RTU/ASCII implementation for Python -MODPY_EGG_VERSION= 2.1.1 -DISTNAME= minimalmodbus-${MODPY_EGG_VERSION} +MODPY_DISTV= 2.1.1 +DISTNAME= minimalmodbus-${MODPY_DISTV} PKGNAME= py-${DISTNAME} CATEGORIES= net -REVISION= 0 +REVISION= 1 HOMEPAGE= https://github.com/pyhys/minimalmodbus @@ -19,12 +19,9 @@ MODPY_PYTEST= Yes MODULES= lang/python -FLAVORS= python3 -FLAVOR= python3 +RUN_DEPENDS= devel/py-serial -RUN_DEPENDS= devel/py-serial${MODPY_FLAVOR} - -TEST_DEPENDS= devel/py-coveralls${MODPY_FLAVOR} \ - devel/py-test-cov${MODPY_FLAVOR} +TEST_DEPENDS= devel/py-coveralls \ + devel/py-test-cov .include diff --git a/net/py-minimalmodbus/pkg/PLIST b/net/py-minimalmodbus/pkg/PLIST index d1b925fe777..1abcec55ef1 100644 --- a/net/py-minimalmodbus/pkg/PLIST +++ b/net/py-minimalmodbus/pkg/PLIST @@ -1,11 +1,11 @@ +@pkgpath net/py-minimalmodbus,python3 @conflict py-minimalmodbus-* -@pkgpath net/py-minimalmodbus lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}minimalmodbus.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}minimalmodbus.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_EGG_VERSION}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/minimalmodbus-${MODPY_DISTV}.dist-info/WHEEL lib/python${MODPY_VERSION}/site-packages/minimalmodbus.py diff --git a/net/py-modbus/Makefile b/net/py-modbus/Makefile index 6114da84f8c..4f134471f8c 100644 --- a/net/py-modbus/Makefile +++ b/net/py-modbus/Makefile @@ -1,8 +1,9 @@ COMMENT = full modbus protocol written in python -MODPY_EGG_VERSION = 3.7.4 -DISTNAME = pymodbus-${MODPY_EGG_VERSION} +MODPY_DISTV = 3.7.4 +DISTNAME = pymodbus-${MODPY_DISTV} PKGNAME = py-${DISTNAME} +REVISION = 0 CATEGORIES = net @@ -17,8 +18,6 @@ MODPY_PYBUILD = setuptools MODPY_PI = Yes NO_TEST = Yes -RUN_DEPENDS = devel/py-serial${MODPY_FLAVOR} -FLAVORS = python3 -FLAVOR = python3 +RUN_DEPENDS = devel/py-serial .include diff --git a/net/py-modbus/pkg/PLIST b/net/py-modbus/pkg/PLIST index 3d189b2ed90..f0bd5bec345 100644 --- a/net/py-modbus/pkg/PLIST +++ b/net/py-modbus/pkg/PLIST @@ -1,15 +1,16 @@ +@pkgpath net/py-modbus,python3 @conflict pymodbus-* bin/pymodbus.simulator lib/python${MODPY_VERSION}/site-packages/pymodbus/ -lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_EGG_VERSION}.dist-info/AUTHORS.rst -lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_EGG_VERSION}.dist-info/top_level.txt -lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_EGG_VERSION}.dist-info/zip-safe +lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_DISTV}.dist-info/AUTHORS.rst +lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_DISTV}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/pymodbus-${MODPY_DISTV}.dist-info/zip-safe lib/python${MODPY_VERSION}/site-packages/pymodbus/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pymodbus/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/pymodbus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-msgpack/Makefile b/net/py-msgpack/Makefile index 70e6ada2be6..e6bc96aefd6 100644 --- a/net/py-msgpack/Makefile +++ b/net/py-msgpack/Makefile @@ -1,9 +1,10 @@ COMMENT = messagepack (de)serializer -MODPY_EGG_VERSION = 1.1.0 +MODPY_DISTV = 1.1.0 EPOCH = 0 -DISTNAME = msgpack-${MODPY_EGG_VERSION} -PKGNAME = py-msgpack-${MODPY_EGG_VERSION} +DISTNAME = msgpack-${MODPY_DISTV} +PKGNAME = py-msgpack-${MODPY_DISTV} +REVISION = 0 CATEGORIES = net textproc @@ -18,7 +19,4 @@ MODULES = lang/python MODPY_PYBUILD = setuptools MODPY_PI = Yes -FLAVORS = python3 -FLAVOR = python3 - .include diff --git a/net/py-msgpack/pkg/PLIST b/net/py-msgpack/pkg/PLIST index 42805a88f36..f2ff3e214fd 100644 --- a/net/py-msgpack/pkg/PLIST +++ b/net/py-msgpack/pkg/PLIST @@ -1,11 +1,11 @@ -@pkgpath net/py-msgpack +@pkgpath net/py-msgpack,python3 lib/python${MODPY_VERSION}/site-packages/msgpack/ -lib/python${MODPY_VERSION}/site-packages/msgpack-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/msgpack-${MODPY_EGG_VERSION}.dist-info/COPYING -lib/python${MODPY_VERSION}/site-packages/msgpack-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/msgpack-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/msgpack-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/msgpack-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/msgpack-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/msgpack-${MODPY_DISTV}.dist-info/COPYING +lib/python${MODPY_VERSION}/site-packages/msgpack-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/msgpack-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/msgpack-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/msgpack-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/msgpack/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-nbxmpp/Makefile b/net/py-nbxmpp/Makefile index 8711e1c8add..2666a7984da 100644 --- a/net/py-nbxmpp/Makefile +++ b/net/py-nbxmpp/Makefile @@ -1,9 +1,10 @@ COMMENT = Python XMPP and Jabber implementation -MODPY_EGG_VERSION = 5.0.4 -DISTNAME = nbxmpp-${MODPY_EGG_VERSION} +MODPY_DISTV = 5.0.4 +DISTNAME = nbxmpp-${MODPY_DISTV} PKGNAME = py-${DISTNAME} CATEGORIES = net devel +REVISION = 0 HOMEPAGE = https://python-nbxmpp.gajim.org/ @@ -18,12 +19,9 @@ MODPY_PYBUILD = setuptools RUN_DEPENDS = devel/glib2>=2.66.0 \ devel/libsoup3 \ - devel/py-gobject3${MODPY_FLAVOR} \ - net/py-idna${MODPY_FLAVOR} \ - sysutils/py-packaging${MODPY_FLAVOR} \ - textproc/py-precis_i18n${MODPY_FLAVOR} - -FLAVORS = python3 -FLAVOR = python3 + devel/py-gobject3 \ + net/py-idna \ + sysutils/py-packaging \ + textproc/py-precis_i18n .include diff --git a/net/py-nbxmpp/pkg/PLIST b/net/py-nbxmpp/pkg/PLIST index 93c9de7832d..34adfa699be 100644 --- a/net/py-nbxmpp/pkg/PLIST +++ b/net/py-nbxmpp/pkg/PLIST @@ -1,11 +1,11 @@ -@pkgpath net/py-nbxmpp +@pkgpath net/py-nbxmpp,python3 lib/python${MODPY_VERSION}/site-packages/nbxmpp/ -lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}.dist-info/COPYING -lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_DISTV}.dist-info/COPYING +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/nbxmpp/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-ncclient/Makefile b/net/py-ncclient/Makefile index 9de471c3981..9d7ec169b6d 100644 --- a/net/py-ncclient/Makefile +++ b/net/py-ncclient/Makefile @@ -1,15 +1,15 @@ COMMENT = Python library for NETCONF clients -MODPY_EGG_VERSION = 0.6.15 +MODPY_DISTV = 0.6.15 # using github distfile for tests GH_ACCOUNT = ncclient GH_PROJECT = ncclient GH_TAGNAME = v0.6.15 -DISTNAME = ncclient-${MODPY_EGG_VERSION} +DISTNAME = ncclient-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = net @@ -19,13 +19,11 @@ HOMEPAGE = https://ncclient.readthedocs.io/en/latest/ PERMIT_PACKAGE = Yes MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 MODPY_PYBUILD = setuptools -RUN_DEPENDS = security/py-paramiko${MODPY_FLAVOR} \ - devel/py-six${MODPY_FLAVOR} \ - textproc/py-lxml${MODPY_FLAVOR} +RUN_DEPENDS = security/py-paramiko \ + devel/py-six \ + textproc/py-lxml .include diff --git a/net/py-ncclient/pkg/PLIST b/net/py-ncclient/pkg/PLIST index 778b63528b7..11eb8b64735 100644 --- a/net/py-ncclient/pkg/PLIST +++ b/net/py-ncclient/pkg/PLIST @@ -1,12 +1,12 @@ -@pkgpath net/py-ncclient +@pkgpath net/py-ncclient,python3 lib/python${MODPY_VERSION}/site-packages/ncclient/ -lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}.dist-info/NOTICE -lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_DISTV}.dist-info/NOTICE +lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/ncclient-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/ncclient/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ncclient/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/ncclient/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-netaddr/Makefile b/net/py-netaddr/Makefile index 7de68c688ce..56b118ed315 100644 --- a/net/py-netaddr/Makefile +++ b/net/py-netaddr/Makefile @@ -1,9 +1,9 @@ COMMENT= network address representation and manipulation library -MODPY_EGG_VERSION= 0.10.1 -DISTNAME= netaddr-${MODPY_EGG_VERSION} +MODPY_DISTV= 0.10.1 +DISTNAME= netaddr-${MODPY_DISTV} PKGNAME= py-${DISTNAME} -REVISION= 0 +REVISION= 1 # 1.0.0 removes is_private() which is used by at least Ansible EPOCH= 0 @@ -19,7 +19,4 @@ MODULES= lang/python MODPY_PI= Yes MODPY_PYBUILD= setuptools -FLAVOR= python3 -FLAVORS= python3 - .include diff --git a/net/py-netaddr/pkg/PLIST b/net/py-netaddr/pkg/PLIST index 0fe17c3eb84..9c9ef57166d 100644 --- a/net/py-netaddr/pkg/PLIST +++ b/net/py-netaddr/pkg/PLIST @@ -1,15 +1,15 @@ +@pkgpath net/py-netaddr,python3 @conflict py-netaddr-<0.7.19p3 -@pkgpath net/py-netaddr bin/netaddr lib/python${MODPY_VERSION}/site-packages/netaddr/ -lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}.dist-info/AUTHORS -lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_DISTV}.dist-info/AUTHORS +lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/netaddr/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netaddr/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/netaddr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-netifaces/Makefile b/net/py-netifaces/Makefile index 96566a91d93..bd12b8fed4c 100644 --- a/net/py-netifaces/Makefile +++ b/net/py-netifaces/Makefile @@ -2,10 +2,10 @@ COMMENT = portable network interface information CATEGORIES = net -MODPY_EGG_VERSION = 0.11.0 -DISTNAME = netifaces-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.11.0 +DISTNAME = netifaces-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 2 +REVISION = 3 # MIT PERMIT_PACKAGE = Yes @@ -14,9 +14,6 @@ WANTLIB += pthread ${MODPY_WANTLIB} MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 - MODPY_PI = Yes MODPY_PYBUILD = setuptools diff --git a/net/py-netifaces/pkg/PLIST b/net/py-netifaces/pkg/PLIST index 9a01b782c42..e5837ef3f41 100644 --- a/net/py-netifaces/pkg/PLIST +++ b/net/py-netifaces/pkg/PLIST @@ -1,9 +1,9 @@ -@pkgpath net/py-netifaces -lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}.dist-info/top_level.txt -lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}.dist-info/zip-safe +@pkgpath net/py-netifaces,python3 +lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_DISTV}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_DISTV}.dist-info/zip-safe @so lib/python${MODPY_VERSION}/site-packages/netifaces.${MODPY_PYC_MAGIC_TAG}so diff --git a/net/py-netmiko/Makefile b/net/py-netmiko/Makefile index 1acf628c16b..6026ac56fb4 100644 --- a/net/py-netmiko/Makefile +++ b/net/py-netmiko/Makefile @@ -1,9 +1,9 @@ COMMENT = simplify Paramiko connections to network devices -MODPY_EGG_VERSION = 3.1.1 -DISTNAME= netmiko-${MODPY_EGG_VERSION} +MODPY_DISTV = 3.1.1 +DISTNAME= netmiko-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 4 +REVISION = 5 CATEGORIES = net @@ -15,13 +15,10 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -FLAVORS = python3 -FLAVOR = python3 - -RUN_DEPENDS = devel/py-serial${MODPY_FLAVOR} \ - security/py-paramiko${MODPY_FLAVOR} \ - security/py-scp${MODPY_FLAVOR} \ - textproc/py-textfsm${MODPY_FLAVOR} \ - textproc/py-yaml${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-serial \ + security/py-paramiko \ + security/py-scp \ + textproc/py-textfsm \ + textproc/py-yaml .include diff --git a/net/py-netmiko/pkg/PLIST b/net/py-netmiko/pkg/PLIST index b1669428980..fa95dd941a3 100644 --- a/net/py-netmiko/pkg/PLIST +++ b/net/py-netmiko/pkg/PLIST @@ -1,12 +1,12 @@ +@pkgpath net/py-netmiko,python3 @conflict py-netmiko-* -@pkgpath net/py-netmiko lib/python${MODPY_VERSION}/site-packages/netmiko/ -lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/netmiko-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/netmiko/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/netmiko/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-nmap/Makefile b/net/py-nmap/Makefile index 1f2b9f81f43..9bed25220d2 100644 --- a/net/py-nmap/Makefile +++ b/net/py-nmap/Makefile @@ -1,10 +1,10 @@ COMMENT = python interface to the nmap scan data -MODPY_EGG_VERSION = 0.6.1 -DISTNAME = python-nmap-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.6.1 +DISTNAME = python-nmap-${MODPY_DISTV} PKGNAME = ${DISTNAME:S/python/py/} CATEGORIES = net -REVISION = 7 +REVISION = 8 HOMEPAGE = http://xael.org/norman/python/python-nmap/ SITES = http://xael.org/pages/ @@ -27,7 +27,4 @@ post-install: ${INSTALL_DATA_DIR} ${EXAMPLESDIR} ${INSTALL_SCRIPT} ${WRKSRC}/example.py ${EXAMPLESDIR} -FLAVORS = python3 -FLAVOR = python3 - .include diff --git a/net/py-nmap/pkg/PLIST b/net/py-nmap/pkg/PLIST index b17b9d45557..1d4bb10dd1c 100644 --- a/net/py-nmap/pkg/PLIST +++ b/net/py-nmap/pkg/PLIST @@ -1,4 +1,4 @@ -@pkgpath net/py-nmap +@pkgpath net/py-nmap,python3 lib/python${MODPY_VERSION}/site-packages/nmap/ lib/python${MODPY_VERSION}/site-packages/nmap/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/nmap/${MODPY_PYCACHE}/ @@ -13,10 +13,10 @@ lib/python${MODPY_VERSION}/site-packages/nmap/${MODPY_PYCACHE}test_nmap.${MODPY_ lib/python${MODPY_VERSION}/site-packages/nmap/nmap.py lib/python${MODPY_VERSION}/site-packages/nmap/test.py lib/python${MODPY_VERSION}/site-packages/nmap/test_nmap.py -lib/python${MODPY_VERSION}/site-packages/python_nmap-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/python_nmap-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/python_nmap-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/python_nmap-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/python_nmap-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/python_nmap-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/python_nmap-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/python_nmap-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/python_nmap-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/python_nmap-${MODPY_DISTV}.dist-info/top_level.txt share/examples/${MODPY_PY_PREFIX}nmap/ share/examples/${MODPY_PY_PREFIX}nmap/example.py diff --git a/net/py-nxos/Makefile b/net/py-nxos/Makefile index bb2f7c4c9ca..0723f9efd00 100644 --- a/net/py-nxos/Makefile +++ b/net/py-nxos/Makefile @@ -1,8 +1,8 @@ COMMENT = library for managing Cisco NX-OS devices through NX-API -MODPY_EGG_VERSION = 0.0.5 -REVISION = 7 -DISTNAME = pynxos-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.0.5 +REVISION = 8 +DISTNAME = pynxos-${MODPY_DISTV} PKGNAME = py-${DISTNAME:S/py//} CATEGORIES = net @@ -11,15 +11,13 @@ CATEGORIES = net PERMIT_PACKAGE = Yes MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 MODPY_PI = Yes MODPY_PYBUILD = setuptools NO_TEST = Yes -RUN_DEPENDS = devel/py-future${MODPY_FLAVOR} \ - security/py-scp${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-future \ + security/py-scp \ + www/py-requests .include diff --git a/net/py-nxos/pkg/PLIST b/net/py-nxos/pkg/PLIST index 27dab7b4c6d..5205576137f 100644 --- a/net/py-nxos/pkg/PLIST +++ b/net/py-nxos/pkg/PLIST @@ -1,10 +1,10 @@ -@pkgpath net/py-nxos +@pkgpath net/py-nxos,python3 lib/python${MODPY_VERSION}/site-packages/pynxos/ -lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pynxos-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/pynxos/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pynxos/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/pynxos/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-paho-mqtt/Makefile b/net/py-paho-mqtt/Makefile index 50cfdf6d1ca..830add874e0 100644 --- a/net/py-paho-mqtt/Makefile +++ b/net/py-paho-mqtt/Makefile @@ -1,9 +1,9 @@ COMMENT = MQTT Python client library -MODPY_EGG_VERSION = 1.6.1 -DISTNAME = paho-mqtt-${MODPY_EGG_VERSION} +MODPY_DISTV = 1.6.1 +DISTNAME = paho-mqtt-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 2 +REVISION = 3 HOMEPAGE = http://www.eclipse.org/paho/clients/python/ @@ -16,12 +16,9 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools # not in pypi tarball. -#TEST_DEPENDS = devel/py-test-runner${MODPY_FLAVOR} +#TEST_DEPENDS = devel/py-test-runner NO_TEST = Yes -FLAVORS = python3 -FLAVOR = python3 - MODPY_ADJ_FILES = examples/*.py post-install: diff --git a/net/py-paho-mqtt/pkg/PLIST b/net/py-paho-mqtt/pkg/PLIST index 3e1ab2ce6fc..a082d2e6a3c 100644 --- a/net/py-paho-mqtt/pkg/PLIST +++ b/net/py-paho-mqtt/pkg/PLIST @@ -1,4 +1,4 @@ -@pkgpath net/py-paho-mqtt +@pkgpath net/py-paho-mqtt,python3 lib/python${MODPY_VERSION}/site-packages/paho/ lib/python${MODPY_VERSION}/site-packages/paho/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/paho/${MODPY_PYCACHE}/ @@ -33,12 +33,12 @@ lib/python${MODPY_VERSION}/site-packages/paho/mqtt/publish.py lib/python${MODPY_VERSION}/site-packages/paho/mqtt/reasoncodes.py lib/python${MODPY_VERSION}/site-packages/paho/mqtt/subscribe.py lib/python${MODPY_VERSION}/site-packages/paho/mqtt/subscribeoptions.py -lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt -lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_DISTV}.dist-info/LICENSE.txt +lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/paho_mqtt-${MODPY_DISTV}.dist-info/top_level.txt share/examples/${MODPY_PY_PREFIX}paho-mqtt/ share/examples/${MODPY_PY_PREFIX}paho-mqtt/aws_iot.py share/examples/${MODPY_PY_PREFIX}paho-mqtt/client_logger.py diff --git a/net/py-pcapy/Makefile b/net/py-pcapy/Makefile index a0d1532bc98..b8b091883b1 100644 --- a/net/py-pcapy/Makefile +++ b/net/py-pcapy/Makefile @@ -4,13 +4,12 @@ COMMENT = libpcap module for Python # ports will need syncing. this will fail with py3.10. # https://github.com/stamparm/pcapy-ng - -MODPY_EGG_VERSION = 0.11.5.dev0 +MODPY_DISTV = 0.11.5.dev0 GH_ACCOUNT = helpsystems GH_PROJECT = pcapy -GH_TAGNAME = ${MODPY_EGG_VERSION:S/.dev0//} +GH_TAGNAME = ${MODPY_DISTV:S/.dev0//} PKGNAME = py-${DISTNAME} -REVISION = 4 +REVISION = 5 CATEGORIES = net devel @@ -24,9 +23,6 @@ COMPILER = base-clang ports-gcc MODULES = lang/python MODPY_PYBUILD = setuptools -FLAVORS = python3 -FLAVOR = python3 - MAKE_ENV += LDSHARED="${CC} -shared -fPIC" MAKE_ENV += LDFLAGS="-L${LOCALBASE}/lib" TEST_DEPENDS = ${BASE_PKGPATH} diff --git a/net/py-pcapy/pkg/PLIST b/net/py-pcapy/pkg/PLIST index 52609988bf6..4ba5948b5fc 100644 --- a/net/py-pcapy/pkg/PLIST +++ b/net/py-pcapy/pkg/PLIST @@ -1,9 +1,10 @@ -lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_EGG_VERSION}.dist-info/top_level.txt +@pkgpath net/py-pcapy,python3 +lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pcapy-${MODPY_DISTV}.dist-info/top_level.txt @so lib/python${MODPY_VERSION}/site-packages/pcapy.${MODPY_PYC_MAGIC_TAG}so share/doc/pcapy/ share/doc/pcapy/LICENSE diff --git a/net/py-pf/Makefile b/net/py-pf/Makefile index fcf104ed230..c3ea48f3989 100644 --- a/net/py-pf/Makefile +++ b/net/py-pf/Makefile @@ -1,10 +1,10 @@ COMMENT = Python module for managing PF -MODPY_EGG_VERSION = 0.2.3 +MODPY_DISTV = 0.2.3 GH_ACCOUNT = dotpy GH_PROJECT = py-pf -GH_TAGNAME = ${MODPY_EGG_VERSION} -REVISION = 0 +GH_TAGNAME = ${MODPY_DISTV} +REVISION = 1 MAINTAINER = Jasper Lievisse Adriaanse @@ -16,7 +16,4 @@ PERMIT_PACKAGE = Yes MODULES = lang/python MODPY_PYBUILD = setuptools -FLAVORS = python3 -FLAVOR = python3 - .include diff --git a/net/py-pf/pkg/PLIST b/net/py-pf/pkg/PLIST index 9ff58f38503..fb22fce859d 100644 --- a/net/py-pf/pkg/PLIST +++ b/net/py-pf/pkg/PLIST @@ -1,4 +1,4 @@ -@pkgpath net/py-pf +@pkgpath net/py-pf,python3 lib/python${MODPY_VERSION}/site-packages/pf/ lib/python${MODPY_VERSION}/site-packages/pf/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}/ @@ -51,9 +51,9 @@ lib/python${MODPY_VERSION}/site-packages/pf/tests/${MODPY_PYCACHE}test_filter.${ lib/python${MODPY_VERSION}/site-packages/pf/tests/${MODPY_PYCACHE}test_filter.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/pf/tests/cmd.py lib/python${MODPY_VERSION}/site-packages/pf/tests/test_filter.py -lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_EGG_VERSION}.dist-info/LICENSE.md -lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_DISTV}.dist-info/LICENSE.md +lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/py_pf-${MODPY_DISTV}.dist-info/top_level.txt diff --git a/net/py-portend/Makefile b/net/py-portend/Makefile index 6538c3fbeac..b4536a9cbbf 100644 --- a/net/py-portend/Makefile +++ b/net/py-portend/Makefile @@ -1,9 +1,9 @@ COMMENT = monitor TCP ports for bound or unbound states -MODPY_EGG_VERSION = 3.2.0 -DISTNAME = portend-${MODPY_EGG_VERSION} +MODPY_DISTV = 3.2.0 +DISTNAME = portend-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = net @@ -12,14 +12,11 @@ HOMEPAGE = https://github.com/jaraco/portend # MIT PERMIT_PACKAGE = Yes -FLAVORS = python3 -FLAVOR = python3 - MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools_scm -RUN_DEPENDS = devel/py-tempora${MODPY_FLAVOR}>=1.8 +RUN_DEPENDS = devel/py-tempora>=1.8 NO_TEST = Yes diff --git a/net/py-portend/pkg/PLIST b/net/py-portend/pkg/PLIST index 2faf7e8d7ac..6c4d46011ab 100644 --- a/net/py-portend/pkg/PLIST +++ b/net/py-portend/pkg/PLIST @@ -1,11 +1,11 @@ -@pkgpath net/py-portend +@pkgpath net/py-portend,python3 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}portend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}portend.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/portend.py diff --git a/net/py-publicsuffix2/Makefile b/net/py-publicsuffix2/Makefile index 281f959ffb7..c375f76ca93 100644 --- a/net/py-publicsuffix2/Makefile +++ b/net/py-publicsuffix2/Makefile @@ -1,8 +1,9 @@ COMMENT = pure-Python interface to publicsuffix.org -MODPY_EGG_VERSION = 2.20191221 -DISTNAME = publicsuffix2-${MODPY_EGG_VERSION} +MODPY_DISTV = 2.20191221 +DISTNAME = publicsuffix2-${MODPY_DISTV} PKGNAME = py-${DISTNAME} +REVISION = 0 CATEGORIES = net @@ -13,14 +14,11 @@ MODULES = lang/python HOMEPAGE = https://github.com/nexB/python-publicsuffix2 -FLAVORS = python3 -FLAVOR = python3 - MODPY_PI = Yes MODPY_PYBUILD = setuptools -RUN_DEPENDS = www/py-requests${MODPY_FLAVOR} -BUILD_DEPENDS = www/py-requests${MODPY_FLAVOR} +RUN_DEPENDS = www/py-requests +BUILD_DEPENDS = www/py-requests # pypi artifact hasn't got any tests NO_TEST = YES diff --git a/net/py-publicsuffix2/pkg/PLIST b/net/py-publicsuffix2/pkg/PLIST index e1fe8da68bd..24dd6acea01 100644 --- a/net/py-publicsuffix2/pkg/PLIST +++ b/net/py-publicsuffix2/pkg/PLIST @@ -1,9 +1,10 @@ +@pkgpath net/py-publicsuffix2,python3 lib/python${MODPY_VERSION}/site-packages/publicsuffix2/ -lib/python${MODPY_VERSION}/site-packages/publicsuffix2-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/publicsuffix2-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/publicsuffix2-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/publicsuffix2-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/publicsuffix2-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/publicsuffix2-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/publicsuffix2-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/publicsuffix2-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/publicsuffix2-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/publicsuffix2-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/publicsuffix2/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/publicsuffix2/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/publicsuffix2/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-python-lsp-jsonrpc/Makefile b/net/py-python-lsp-jsonrpc/Makefile index c285065d006..2bb1694ead7 100644 --- a/net/py-python-lsp-jsonrpc/Makefile +++ b/net/py-python-lsp-jsonrpc/Makefile @@ -1,8 +1,9 @@ COMMENT = json rpc server library -MODPY_EGG_VERSION = 1.1.2 -DISTNAME = python-lsp-jsonrpc-${MODPY_EGG_VERSION} +MODPY_DISTV = 1.1.2 +DISTNAME = python-lsp-jsonrpc-${MODPY_DISTV} PKGNAME = py-${DISTNAME} +REVISION = 0 CATEGORIES = net @@ -13,15 +14,12 @@ PERMIT_PACKAGE = Yes MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 - MODPY_PI = Yes MODPY_PYBUILD = setuptools_scm -RUN_DEPENDS = textproc/py-ujson${MODPY_FLAVOR}>=3.0.0 +RUN_DEPENDS = textproc/py-ujson>=3.0.0 -TEST_DEPENDS = devel/py-test-cov${MODPY_FLAVOR} \ - devel/py-mock${MODPY_FLAVOR} +TEST_DEPENDS = devel/py-test-cov \ + devel/py-mock .include diff --git a/net/py-python-lsp-jsonrpc/pkg/PLIST b/net/py-python-lsp-jsonrpc/pkg/PLIST index 2a23441a55d..8bbe51b4822 100644 --- a/net/py-python-lsp-jsonrpc/pkg/PLIST +++ b/net/py-python-lsp-jsonrpc/pkg/PLIST @@ -1,3 +1,4 @@ +@pkgpath net/py-python-lsp-jsonrpc,python3 lib/python${MODPY_VERSION}/site-packages/pylsp_jsonrpc/ lib/python${MODPY_VERSION}/site-packages/pylsp_jsonrpc/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pylsp_jsonrpc/${MODPY_PYCACHE}/ @@ -18,9 +19,9 @@ lib/python${MODPY_VERSION}/site-packages/pylsp_jsonrpc/dispatchers.py lib/python${MODPY_VERSION}/site-packages/pylsp_jsonrpc/endpoint.py lib/python${MODPY_VERSION}/site-packages/pylsp_jsonrpc/exceptions.py lib/python${MODPY_VERSION}/site-packages/pylsp_jsonrpc/streams.py -lib/python${MODPY_VERSION}/site-packages/python_lsp_jsonrpc-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/python_lsp_jsonrpc-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/python_lsp_jsonrpc-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/python_lsp_jsonrpc-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/python_lsp_jsonrpc-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/python_lsp_jsonrpc-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/python_lsp_jsonrpc-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/python_lsp_jsonrpc-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/python_lsp_jsonrpc-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/python_lsp_jsonrpc-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/python_lsp_jsonrpc-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/python_lsp_jsonrpc-${MODPY_DISTV}.dist-info/top_level.txt diff --git a/net/py-ripe.atlas.cousteau/Makefile b/net/py-ripe.atlas.cousteau/Makefile index c1ae17baa64..7c2b80045b0 100644 --- a/net/py-ripe.atlas.cousteau/Makefile +++ b/net/py-ripe.atlas.cousteau/Makefile @@ -1,12 +1,12 @@ COMMENT = Python bindings for the RIPE Atlas API -MODPY_EGG_VERSION = 2.0.0 +MODPY_DISTV = 2.0.0 GH_ACCOUNT = RIPE-NCC GH_PROJECT = ripe-atlas-cousteau -GH_TAGNAME = v${MODPY_EGG_VERSION} +GH_TAGNAME = v${MODPY_DISTV} -PKGNAME = py-ripe.atlas.cousteau-${MODPY_EGG_VERSION} -REVISION = 0 +PKGNAME = py-ripe.atlas.cousteau-${MODPY_DISTV} +REVISION = 1 CATEGORIES = net @@ -17,11 +17,8 @@ MODPY_PYBUILD = setuptools MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 - -RUN_DEPENDS = devel/py-dateutil${MODPY_FLAVOR} \ - net/py-socketio${MODPY_FLAVOR}<5 \ - www/py-requests${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-dateutil \ + net/py-socketio<5 \ + www/py-requests .include diff --git a/net/py-ripe.atlas.cousteau/pkg/PLIST b/net/py-ripe.atlas.cousteau/pkg/PLIST index 0f20f27d149..bd88fb7d95d 100644 --- a/net/py-ripe.atlas.cousteau/pkg/PLIST +++ b/net/py-ripe.atlas.cousteau/pkg/PLIST @@ -1,13 +1,13 @@ -@pkgpath net/py-ripe.atlas.cousteau +@pkgpath net/py-ripe.atlas.cousteau,python3 lib/python${MODPY_VERSION}/site-packages/ripe/ -lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}-py${MODPY_VERSION}-nspkg.pth -lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}.dist-info/namespace_packages.txt -lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_DISTV}-py${MODPY_VERSION}-nspkg.pth +lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_DISTV}.dist-info/namespace_packages.txt +lib/python${MODPY_VERSION}/site-packages/ripe.atlas.cousteau-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/ripe/atlas/ lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/ lib/python${MODPY_VERSION}/site-packages/ripe/atlas/cousteau/__init__.py diff --git a/net/py-ripe.atlas.sagan/Makefile b/net/py-ripe.atlas.sagan/Makefile index 1a057c6da24..53936f644aa 100644 --- a/net/py-ripe.atlas.sagan/Makefile +++ b/net/py-ripe.atlas.sagan/Makefile @@ -1,12 +1,12 @@ COMMENT = parsing library for RIPE Atlas measurement results -MODPY_EGG_VERSION = 1.3.1 +MODPY_DISTV = 1.3.1 GH_ACCOUNT = RIPE-NCC GH_PROJECT = ripe-atlas-sagan -GH_TAGNAME = v${MODPY_EGG_VERSION} -REVISION = 2 +GH_TAGNAME = v${MODPY_DISTV} +REVISION = 3 -PKGNAME = py-ripe.atlas.sagan-${MODPY_EGG_VERSION} +PKGNAME = py-ripe.atlas.sagan-${MODPY_DISTV} CATEGORIES = net @@ -20,13 +20,10 @@ MODPY_PYTEST_ARGS = tests/*.py MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 +RUN_DEPENDS = devel/py-dateutil \ + devel/py-tz \ + security/py-cryptography -RUN_DEPENDS = devel/py-dateutil${MODPY_FLAVOR} \ - devel/py-tz${MODPY_FLAVOR} \ - security/py-cryptography${MODPY_FLAVOR} - -TEST_DEPENDS = devel/py-nose${MODPY_FLAVOR} +TEST_DEPENDS = devel/py-nose .include diff --git a/net/py-ripe.atlas.sagan/pkg/PLIST b/net/py-ripe.atlas.sagan/pkg/PLIST index c1e3a2e1309..c2f05d84439 100644 --- a/net/py-ripe.atlas.sagan/pkg/PLIST +++ b/net/py-ripe.atlas.sagan/pkg/PLIST @@ -1,13 +1,13 @@ -@pkgpath net/py-ripe.atlas.sagan +@pkgpath net/py-ripe.atlas.sagan,python3 lib/python${MODPY_VERSION}/site-packages/ripe/ -lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}-py${MODPY_VERSION}-nspkg.pth -lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}.dist-info/namespace_packages.txt -lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_DISTV}-py${MODPY_VERSION}-nspkg.pth +lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_DISTV}.dist-info/namespace_packages.txt +lib/python${MODPY_VERSION}/site-packages/ripe.atlas.sagan-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/ripe/atlas/ lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/ lib/python${MODPY_VERSION}/site-packages/ripe/atlas/sagan/__init__.py diff --git a/net/py-ripe.atlas.tools/Makefile b/net/py-ripe.atlas.tools/Makefile index a98af3afcd4..b3fea8dde19 100644 --- a/net/py-ripe.atlas.tools/Makefile +++ b/net/py-ripe.atlas.tools/Makefile @@ -1,12 +1,12 @@ COMMENT = official command-line client for RIPE Atlas -MODPY_EGG_VERSION = 3.1.0 +MODPY_DISTV = 3.1.0 GH_ACCOUNT = RIPE-NCC GH_PROJECT = ripe-atlas-tools -GH_TAGNAME = v${MODPY_EGG_VERSION} +GH_TAGNAME = v${MODPY_DISTV} -PKGNAME = ripe.atlas.tools-${MODPY_EGG_VERSION} -REVISION = 0 +PKGNAME = ripe.atlas.tools-${MODPY_DISTV} +REVISION = 1 CATEGORIES = net @@ -17,19 +17,19 @@ MODPY_PYBUILD = setuptools MODULES = lang/python -RUN_DEPENDS = devel/py-dateutil${MODPY_FLAVOR} \ - devel/py-tzlocal${MODPY_FLAVOR} \ - net/py-IP${MODPY_FLAVOR} \ - net/py-ripe.atlas.cousteau${MODPY_FLAVOR} \ - net/py-ripe.atlas.sagan${MODPY_FLAVOR} \ - security/py-openssl${MODPY_FLAVOR} \ - textproc/py-yaml${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-dateutil \ + devel/py-tzlocal \ + net/py-IP \ + net/py-ripe.atlas.cousteau \ + net/py-ripe.atlas.sagan \ + security/py-openssl \ + textproc/py-yaml \ + www/py-requests # some network tests PORTHOME = ${WRKDIST} TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} \ - devel/py-mock${MODPY_FLAVOR} \ - textproc/py-sphinx${MODPY_FLAVOR} + devel/py-mock \ + textproc/py-sphinx .include diff --git a/net/py-rrdtool/Makefile b/net/py-rrdtool/Makefile index 03d66867b13..bd805ed93cb 100644 --- a/net/py-rrdtool/Makefile +++ b/net/py-rrdtool/Makefile @@ -1,10 +1,10 @@ COMMENT = Python bindings for rrdtool -MODPY_EGG_VERSION = 0.1.16 +MODPY_DISTV = 0.1.16 -DISTNAME = rrdtool-${MODPY_EGG_VERSION} +DISTNAME = rrdtool-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 2 +REVISION = 3 CATEGORIES = databases net @@ -22,7 +22,4 @@ MODPY_PI = Yes MODPY_PYBUILD = setuptools NO_TEST = Yes -FLAVORS = python3 -FLAVOR = python3 - .include diff --git a/net/py-rrdtool/pkg/PLIST b/net/py-rrdtool/pkg/PLIST index 04f1c9f639b..7f1cbf658c8 100644 --- a/net/py-rrdtool/pkg/PLIST +++ b/net/py-rrdtool/pkg/PLIST @@ -1,10 +1,8 @@ -@conflict py-rrd-* -@pkgpath net/rrdtool,-python -@pkgpath net/py-rrdtool -lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}.dist-info/top_level.txt +@pkgpath net/py-rrdtool,python3 +lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_DISTV}.dist-info/top_level.txt @so lib/python${MODPY_VERSION}/site-packages/rrdtool.${MODPY_PYC_MAGIC_TAG}so diff --git a/net/py-s3transfer/Makefile b/net/py-s3transfer/Makefile index e44613fe57c..fc20e64aeaa 100644 --- a/net/py-s3transfer/Makefile +++ b/net/py-s3transfer/Makefile @@ -4,9 +4,10 @@ COMMENT= Amazon S3 transfer manager for Python -MODPY_EGG_VERSION= 0.10.4 -DISTNAME= s3transfer-${MODPY_EGG_VERSION} +MODPY_DISTV= 0.10.4 +DISTNAME= s3transfer-${MODPY_DISTV} PKGNAME= py-${DISTNAME} +REVISION= 0 CATEGORIES= net devel @@ -22,9 +23,6 @@ MODULES= lang/python MODPY_PI= Yes MODPY_PYBUILD= setuptools -FLAVORS= python3 -FLAVOR= python3 - -RUN_DEPENDS= net/py-botocore${MODPY_FLAVOR} +RUN_DEPENDS= net/py-botocore .include diff --git a/net/py-s3transfer/pkg/PLIST b/net/py-s3transfer/pkg/PLIST index 9a74c40d56d..7ea20892eb3 100644 --- a/net/py-s3transfer/pkg/PLIST +++ b/net/py-s3transfer/pkg/PLIST @@ -1,13 +1,13 @@ +@pkgpath net/py-s3transfer,python3 @conflict py-s3transfer-* -@pkgpath net/py-s3transfer lib/python${MODPY_VERSION}/site-packages/s3transfer/ -lib/python${MODPY_VERSION}/site-packages/s3transfer-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/s3transfer-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt -lib/python${MODPY_VERSION}/site-packages/s3transfer-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/s3transfer-${MODPY_EGG_VERSION}.dist-info/NOTICE.txt -lib/python${MODPY_VERSION}/site-packages/s3transfer-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/s3transfer-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/s3transfer-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/s3transfer-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/s3transfer-${MODPY_DISTV}.dist-info/LICENSE.txt +lib/python${MODPY_VERSION}/site-packages/s3transfer-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/s3transfer-${MODPY_DISTV}.dist-info/NOTICE.txt +lib/python${MODPY_VERSION}/site-packages/s3transfer-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/s3transfer-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/s3transfer-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/s3transfer/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/s3transfer/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/s3transfer/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-simplesoap/Makefile b/net/py-simplesoap/Makefile index ebdc060f27e..bc758044ddc 100644 --- a/net/py-simplesoap/Makefile +++ b/net/py-simplesoap/Makefile @@ -1,9 +1,9 @@ COMMENT = simple and lightweight SOAP library -MODPY_EGG_VERSION = 1.16.2 -DISTNAME = PySimpleSOAP-${MODPY_EGG_VERSION} -PKGNAME = py-simplesoap-${MODPY_EGG_VERSION} -REVISION = 6 +MODPY_DISTV = 1.16.2 +DISTNAME = PySimpleSOAP-${MODPY_DISTV} +PKGNAME = py-simplesoap-${MODPY_DISTV} +REVISION = 7 CATEGORIES = net @@ -14,9 +14,6 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -FLAVORS = python3 -FLAVOR = python3 - NO_TEST = Yes .include diff --git a/net/py-simplesoap/pkg/PLIST b/net/py-simplesoap/pkg/PLIST index a18dc646937..52ab8558be1 100644 --- a/net/py-simplesoap/pkg/PLIST +++ b/net/py-simplesoap/pkg/PLIST @@ -1,9 +1,9 @@ -@pkgpath net/py-simplesoap -lib/python${MODPY_VERSION}/site-packages/PySimpleSOAP-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/PySimpleSOAP-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/PySimpleSOAP-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/PySimpleSOAP-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/PySimpleSOAP-${MODPY_EGG_VERSION}.dist-info/top_level.txt +@pkgpath net/py-simplesoap,python3 +lib/python${MODPY_VERSION}/site-packages/PySimpleSOAP-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/PySimpleSOAP-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/PySimpleSOAP-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/PySimpleSOAP-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/PySimpleSOAP-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/pysimplesoap/ lib/python${MODPY_VERSION}/site-packages/pysimplesoap/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysimplesoap/${MODPY_PYCACHE}/ diff --git a/net/py-siphon/Makefile b/net/py-siphon/Makefile index f435d9f491f..346dc47febb 100644 --- a/net/py-siphon/Makefile +++ b/net/py-siphon/Makefile @@ -1,9 +1,10 @@ COMMENT= download data from remote data services (such as THREDDS) -MODPY_EGG_VERSION= 0.10.0 -DISTNAME= siphon-${MODPY_EGG_VERSION} +MODPY_DISTV= 0.10.0 +DISTNAME= siphon-${MODPY_DISTV} PKGNAME= py-${DISTNAME} CATEGORIES= net +REVISION= 0 HOMEPAGE= https://unidata.github.io/siphon/ @@ -17,18 +18,15 @@ MODPY_PI= Yes MODULES= lang/python -FLAVORS= python3 -FLAVOR= python3 +RUN_DEPENDS+= devel/py-protobuf \ + math/py-numpy \ + math/py-pandas \ + www/py-beautifulsoup4 \ + www/py-requests -RUN_DEPENDS+= devel/py-protobuf${MODPY_FLAVOR} \ - math/py-numpy${MODPY_FLAVOR} \ - math/py-pandas${MODPY_FLAVOR} \ - www/py-beautifulsoup4${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} - -TEST_DEPENDS= devel/py-coveralls${MODPY_FLAVOR} \ - devel/py-test-cov${MODPY_FLAVOR} \ - math/py-netcdf4${MODPY_FLAVOR} \ - www/py-vcrpy${MODPY_FLAVOR} +TEST_DEPENDS= devel/py-coveralls \ + devel/py-test-cov \ + math/py-netcdf4 \ + www/py-vcrpy .include diff --git a/net/py-siphon/pkg/PLIST b/net/py-siphon/pkg/PLIST index 938f6916433..8d1c987e13b 100644 --- a/net/py-siphon/pkg/PLIST +++ b/net/py-siphon/pkg/PLIST @@ -1,13 +1,13 @@ +@pkgpath net/py-siphon,python3 @conflict py-siphon-* -@pkgpath net/py-siphon lib/python${MODPY_VERSION}/site-packages/siphon/ -lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}.dist-info/AUTHORS.txt -lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_DISTV}.dist-info/AUTHORS.txt +lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/siphon-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/siphon/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/siphon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-slixmpp/Makefile b/net/py-slixmpp/Makefile index f2d03a4e6a4..de9aa5cb6ad 100644 --- a/net/py-slixmpp/Makefile +++ b/net/py-slixmpp/Makefile @@ -1,10 +1,10 @@ COMMENT = slixmpp is an elegant Python library for XMPP -MODPY_EGG_VERSION = 1.8.3 -DISTNAME = slixmpp-${MODPY_EGG_VERSION} +MODPY_DISTV = 1.8.3 +DISTNAME = slixmpp-${MODPY_DISTV} PKGNAME = py-${DISTNAME} CATEGORIES = net -REVISION = 0 +REVISION = 1 MAINTAINER = Kurt Mosiejczuk @@ -13,17 +13,14 @@ PERMIT_PACKAGE = Yes MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 - MODPY_PI = Yes MODPY_PYBUILD = setuptools MODPY_PYTEST = Yes -RUN_DEPENDS = devel/py-asn1${MODPY_FLAVOR} \ - devel/py-asn1-modules${MODPY_FLAVOR} \ - net/py-aiodns${MODPY_FLAVOR} \ - www/py-aiohttp${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-asn1 \ + devel/py-asn1-modules \ + net/py-aiodns \ + www/py-aiohttp TEST_DEPENDS = security/gnupg diff --git a/net/py-slixmpp/pkg/PLIST b/net/py-slixmpp/pkg/PLIST index 549153e8320..98d44926396 100644 --- a/net/py-slixmpp/pkg/PLIST +++ b/net/py-slixmpp/pkg/PLIST @@ -1,11 +1,11 @@ -@pkgpath net/py-slixmpp +@pkgpath net/py-slixmpp,python3 lib/python${MODPY_VERSION}/site-packages/slixmpp/ -lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/slixmpp/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/slixmpp/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/slixmpp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-smbc/Makefile b/net/py-smbc/Makefile index 70d01414c58..d6bfdcc6d08 100644 --- a/net/py-smbc/Makefile +++ b/net/py-smbc/Makefile @@ -1,9 +1,9 @@ COMMENT= Python bindings to wrap the libsmbclient API -MODPY_EGG_VERSION= 1.0.25.1 -DISTNAME= pysmbc-${MODPY_EGG_VERSION} -PKGNAME= py-smbc-${MODPY_EGG_VERSION} -REVISION= 0 +MODPY_DISTV= 1.0.25.1 +DISTNAME= pysmbc-${MODPY_DISTV} +PKGNAME= py-smbc-${MODPY_DISTV} +REVISION= 1 CATEGORIES= net devel @@ -21,12 +21,9 @@ MODULES= lang/python MODPY_PI= Yes MODPY_PYBUILD= setuptools -FLAVORS= python3 -FLAVOR= python3 - LIB_DEPENDS= net/samba -CFLAGS += -I${LOCALBASE}/include -DVERSION=\"${MODPY_EGG_VERSION}\" +CFLAGS += -I${LOCALBASE}/include -DVERSION=\"${MODPY_DISTV}\" LDFLAGS= -L${LOCALBASE}/lib MAKE_ENV= PYTHON="${MODPY_BIN}" \ CFLAGS="${CFLAGS}" \ diff --git a/net/py-smbc/pkg/PLIST b/net/py-smbc/pkg/PLIST index d7eedf8a921..238ca0b8a2f 100644 --- a/net/py-smbc/pkg/PLIST +++ b/net/py-smbc/pkg/PLIST @@ -1,12 +1,12 @@ +@pkgpath net/py-smbc,python3 @conflict py-smbc-* -@pkgpath net/py-smbc @so lib/python${MODPY_VERSION}/site-packages/_smbc.${MODPY_PYC_MAGIC_TAG}so -lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_EGG_VERSION}.dist-info/COPYING -lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_DISTV}.dist-info/COPYING +lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pysmbc-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/smbc/ lib/python${MODPY_VERSION}/site-packages/smbc/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/smbc/${MODPY_PYCACHE}/ diff --git a/net/py-snmp/Makefile b/net/py-snmp/Makefile index 16851e19860..656cea5f8fa 100644 --- a/net/py-snmp/Makefile +++ b/net/py-snmp/Makefile @@ -1,10 +1,10 @@ COMMENT = SNMP framework for Python -MODPY_EGG_VERSION = 4.4.12 -DISTNAME = pysnmp-${MODPY_EGG_VERSION} +MODPY_DISTV = 4.4.12 +DISTNAME = pysnmp-${MODPY_DISTV} PKGNAME = ${DISTNAME:S/py/py-/} CATEGORIES = net -REVISION = 6 +REVISION = 7 HOMEPAGE = http://snmplabs.com/ @@ -19,15 +19,12 @@ MODPY_PI = Yes MODPY_PYBUILD = setuptools BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = security/py-cryptodome${MODPY_FLAVOR} \ - devel/py-asn1${MODPY_FLAVOR} +RUN_DEPENDS = security/py-cryptodome \ + devel/py-asn1 DOCSDIR = ${PREFIX}/share/doc/${MODPY_PY_PREFIX}snmp EXAMPLESDIR = ${PREFIX}/share/examples/${MODPY_PY_PREFIX}snmp -FLAVORS = python3 -FLAVOR = python3 - post-install: ${INSTALL_DATA_DIR} ${DOCSDIR} ${EXAMPLESDIR} cd ${WRKSRC}/docs; tar cf - . | tar xf - -C ${DOCSDIR} diff --git a/net/py-snmp/pkg/PLIST b/net/py-snmp/pkg/PLIST index 4507bbf6237..4ef50ada653 100644 --- a/net/py-snmp/pkg/PLIST +++ b/net/py-snmp/pkg/PLIST @@ -1,12 +1,12 @@ -@pkgpath net/py-snmp +@pkgpath net/py-snmp,python3 lib/python${MODPY_VERSION}/site-packages/pysnmp/ -lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}.dist-info/LICENSE.rst -lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}.dist-info/top_level.txt -lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_EGG_VERSION}.dist-info/zip-safe +lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_DISTV}.dist-info/LICENSE.rst +lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_DISTV}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/pysnmp-${MODPY_DISTV}.dist-info/zip-safe lib/python${MODPY_VERSION}/site-packages/pysnmp/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysnmp/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/pysnmp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-socketio-client/Makefile b/net/py-socketio-client/Makefile index 2a9eacd0a37..241385d5ef2 100644 --- a/net/py-socketio-client/Makefile +++ b/net/py-socketio-client/Makefile @@ -1,9 +1,9 @@ COMMENT = python socket.io client library -MODPY_EGG_VERSION = 0.7.2 -DISTNAME = socketIO-client-${MODPY_EGG_VERSION} -PKGNAME = py-socketIO-client-${MODPY_EGG_VERSION} -REVISION = 0 +MODPY_DISTV = 0.7.2 +DISTNAME = socketIO-client-${MODPY_DISTV} +PKGNAME = py-socketIO-client-${MODPY_DISTV} +REVISION = 1 CATEGORIES = net @@ -17,12 +17,10 @@ MODPY_PI_DIR = s/socketIO-client MODPY_PYBUILD = setuptools MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 -RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} \ - net/py-websocket-client${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-six \ + net/py-websocket-client \ + www/py-requests # Requires running stuff with node in another terminal NO_TEST = Yes diff --git a/net/py-socketio-client/pkg/PLIST b/net/py-socketio-client/pkg/PLIST index 43cb38309b8..ed375ef6786 100644 --- a/net/py-socketio-client/pkg/PLIST +++ b/net/py-socketio-client/pkg/PLIST @@ -1,11 +1,11 @@ -@pkgpath net/py-socketio-client +@pkgpath net/py-socketio-client,python3 lib/python${MODPY_VERSION}/site-packages/socketIO_client/ -lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/socketIO_client-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/socketIO_client/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/socketIO_client/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-socketio/Makefile b/net/py-socketio/Makefile index 7000f8c427c..c6141cc7d85 100644 --- a/net/py-socketio/Makefile +++ b/net/py-socketio/Makefile @@ -1,10 +1,10 @@ COMMENT= client/server implementation of Socket.IO # py-ripe.atlas.cousteau 1.5.0 needs <5.0 -MODPY_EGG_VERSION= 4.6.1 -DISTNAME= python-socketio-${MODPY_EGG_VERSION} +MODPY_DISTV= 4.6.1 +DISTNAME= python-socketio-${MODPY_DISTV} PKGNAME= ${DISTNAME:S/python-/py-/} -REVISION= 2 +REVISION= 3 CATEGORIES= net @@ -19,11 +19,8 @@ MODPY_PYBUILD= setuptools MODPY_PI= Yes NO_TEST= Yes -RUN_DEPENDS= devel/py-six${MODPY_FLAVOR} \ - net/py-engineio${MODPY_FLAVOR}<4 \ - sysutils/py-find${MODPY_FLAVOR} - -FLAVORS= python3 -FLAVOR= python3 +RUN_DEPENDS= devel/py-six \ + net/py-engineio<4 \ + sysutils/py-find .include diff --git a/net/py-socketio/pkg/PLIST b/net/py-socketio/pkg/PLIST index ede214c7f2f..3f86068cfe8 100644 --- a/net/py-socketio/pkg/PLIST +++ b/net/py-socketio/pkg/PLIST @@ -1,9 +1,10 @@ -lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_EGG_VERSION}.dist-info/top_level.txt +@pkgpath net/py-socketio,python3 +lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/python_socketio-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/socketio/ lib/python${MODPY_VERSION}/site-packages/socketio/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/socketio/${MODPY_PYCACHE}/ diff --git a/net/py-socks/Makefile b/net/py-socks/Makefile index 3976c2e931f..9e9b5fcc492 100644 --- a/net/py-socks/Makefile +++ b/net/py-socks/Makefile @@ -1,9 +1,9 @@ COMMENT = Python module for working with SOCKS proxies -MODPY_EGG_VERSION = 1.7.1 -DISTNAME = PySocks-${MODPY_EGG_VERSION} -PKGNAME = py-socks-${MODPY_EGG_VERSION} -REVISION = 6 +MODPY_DISTV = 1.7.1 +DISTNAME = PySocks-${MODPY_DISTV} +PKGNAME = py-socks-${MODPY_DISTV} +REVISION = 7 CATEGORIES = net @@ -19,9 +19,6 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -FLAVORS = python3 -FLAVOR = python3 - # Tests depend on bundled Linux binary NO_TEST = Yes diff --git a/net/py-socks/pkg/PLIST b/net/py-socks/pkg/PLIST index 2fd5f448d02..514650368d6 100644 --- a/net/py-socks/pkg/PLIST +++ b/net/py-socks/pkg/PLIST @@ -1,10 +1,10 @@ -@pkgpath net/py-socks -lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_EGG_VERSION}.dist-info/top_level.txt +@pkgpath net/py-socks,python3 +lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/PySocks-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}socks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}socks.${MODPY_PYC_MAGIC_TAG}pyc diff --git a/net/py-solaredge-interface/Makefile b/net/py-solaredge-interface/Makefile index c23621342af..c2c2916282b 100644 --- a/net/py-solaredge-interface/Makefile +++ b/net/py-solaredge-interface/Makefile @@ -1,9 +1,9 @@ COMMENT = collect data from SolarEdge API -MODPY_EGG_VERSION = 0.3.2 -DISTNAME = solaredge-interface-${MODPY_EGG_VERSION} -PKGNAME = py-solaredge-interface-${MODPY_EGG_VERSION} -REVISION = 0 +MODPY_DISTV = 0.3.2 +DISTNAME = solaredge-interface-${MODPY_DISTV} +PKGNAME = py-solaredge-interface-${MODPY_DISTV} +REVISION = 1 CATEGORIES = net @@ -18,13 +18,10 @@ MODPY_PYBUILD = setuptools MODPY_PI = Yes NO_TEST = Yes -RUN_DEPENDS = math/py-pandas${MODPY_FLAVOR} \ - devel/py-click${MODPY_FLAVOR} \ - devel/py-dateutil${MODPY_FLAVOR} \ - devel/py-tz${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} - -FLAVORS = python3 -FLAVOR = python3 +RUN_DEPENDS = math/py-pandas \ + devel/py-click \ + devel/py-dateutil \ + devel/py-tz \ + www/py-requests .include diff --git a/net/py-solaredge-interface/pkg/PLIST b/net/py-solaredge-interface/pkg/PLIST index f8c240b00d3..8b76ff1ebed 100644 --- a/net/py-solaredge-interface/pkg/PLIST +++ b/net/py-solaredge-interface/pkg/PLIST @@ -1,13 +1,14 @@ +@pkgpath net/py-solaredge-interface,python3 bin/solaredge-interface lib/python${MODPY_VERSION}/site-packages/solaredge_interface/ -lib/python${MODPY_VERSION}/site-packages/solaredge_interface-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/solaredge_interface-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/solaredge_interface-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/solaredge_interface-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/solaredge_interface-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/solaredge_interface-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/solaredge_interface-${MODPY_EGG_VERSION}.dist-info/top_level.txt -lib/python${MODPY_VERSION}/site-packages/solaredge_interface-${MODPY_EGG_VERSION}.dist-info/zip-safe +lib/python${MODPY_VERSION}/site-packages/solaredge_interface-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/solaredge_interface-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/solaredge_interface-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/solaredge_interface-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/solaredge_interface-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/solaredge_interface-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/solaredge_interface-${MODPY_DISTV}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/solaredge_interface-${MODPY_DISTV}.dist-info/zip-safe lib/python${MODPY_VERSION}/site-packages/solaredge_interface/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/solaredge_interface/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/solaredge_interface/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-solaredge-modbus/Makefile b/net/py-solaredge-modbus/Makefile index ed258bc679d..4bbc8e59217 100644 --- a/net/py-solaredge-modbus/Makefile +++ b/net/py-solaredge-modbus/Makefile @@ -1,8 +1,9 @@ COMMENT = collect data from SolarEdge inverters over Modbus -MODPY_EGG_VERSION = 0.8.0 -DISTNAME = solaredge_modbus-${MODPY_EGG_VERSION} -PKGNAME = py-solaredge-modbus-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.8.0 +DISTNAME = solaredge_modbus-${MODPY_DISTV} +PKGNAME = py-solaredge-modbus-${MODPY_DISTV} +REVISION = 0 CATEGORIES = net @@ -17,8 +18,6 @@ MODPY_PYBUILD = setuptools MODPY_PI = Yes NO_TEST = Yes -RUN_DEPENDS = net/py-modbus${MODPY_FLAVOR}>=3.7.0 -FLAVORS = python3 -FLAVOR = python3 +RUN_DEPENDS = net/py-modbus>=3.7.0 .include diff --git a/net/py-solaredge-modbus/pkg/PLIST b/net/py-solaredge-modbus/pkg/PLIST index 1884c6d04c7..40a07681b5b 100644 --- a/net/py-solaredge-modbus/pkg/PLIST +++ b/net/py-solaredge-modbus/pkg/PLIST @@ -1,10 +1,11 @@ +@pkgpath net/py-solaredge-modbus,python3 lib/python${MODPY_VERSION}/site-packages/solaredge_modbus/ -lib/python${MODPY_VERSION}/site-packages/solaredge_modbus-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/solaredge_modbus-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/solaredge_modbus-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/solaredge_modbus-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/solaredge_modbus-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/solaredge_modbus-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/solaredge_modbus-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/solaredge_modbus-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/solaredge_modbus-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/solaredge_modbus-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/solaredge_modbus-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/solaredge_modbus-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/solaredge_modbus/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/solaredge_modbus/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/solaredge_modbus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-stem/Makefile b/net/py-stem/Makefile index 5ae383603f1..daa6b11a567 100644 --- a/net/py-stem/Makefile +++ b/net/py-stem/Makefile @@ -1,9 +1,9 @@ COMMENT = Tor controller library -MODPY_EGG_VERSION = 1.8.2 -DISTNAME = stem-${MODPY_EGG_VERSION} +MODPY_DISTV = 1.8.2 +DISTNAME = stem-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 1 +REVISION = 2 CATEGORIES = net @@ -14,9 +14,6 @@ MAINTAINER = Pascal Stumpf # GPLv3 PERMIT_PACKAGE = Yes -FLAVORS = python3 -FLAVOR = python3 - MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools diff --git a/net/py-stem/pkg/PLIST b/net/py-stem/pkg/PLIST index 55e294d46ac..5f0e4d640a1 100644 --- a/net/py-stem/pkg/PLIST +++ b/net/py-stem/pkg/PLIST @@ -1,15 +1,13 @@ +@pkgpath net/py-stem,python3 @conflict py-stem-<1.7.1p2 -@conflict stem-* -@pkgpath net/stem -@pkgpath net/py-stem bin/tor-prompt lib/python${MODPY_VERSION}/site-packages/stem/ -lib/python${MODPY_VERSION}/site-packages/stem-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/stem-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/stem-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/stem-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/stem-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/stem-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/stem-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/stem-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/stem-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/stem-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/stem-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/stem-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/stem/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-telegram/Makefile b/net/py-telegram/Makefile index a805449c227..145d22d80d9 100644 --- a/net/py-telegram/Makefile +++ b/net/py-telegram/Makefile @@ -1,10 +1,10 @@ COMMENT = Python wrapper for Telegram tdlib -MODPY_EGG_VERSION = 0.16.0 +MODPY_DISTV = 0.16.0 -DISTNAME = python-telegram-${MODPY_EGG_VERSION} +DISTNAME = python-telegram-${MODPY_DISTV} PKGNAME = ${DISTNAME:S/^python-/py-/} -REVISION = 0 +REVISION = 1 CATEGORIES = net @@ -18,9 +18,6 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -FLAVORS = python3 -FLAVOR = python3 - RUN_DEPENDS = net/tdlib NO_TEST = Yes diff --git a/net/py-telegram/pkg/PLIST b/net/py-telegram/pkg/PLIST index 420de3b86b3..01784c1b741 100644 --- a/net/py-telegram/pkg/PLIST +++ b/net/py-telegram/pkg/PLIST @@ -1,8 +1,9 @@ -lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_EGG_VERSION}.dist-info/top_level.txt +@pkgpath net/py-telegram,python3 +lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/telegram/ lib/python${MODPY_VERSION}/site-packages/telegram/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}/ diff --git a/net/py-tinytuya/Makefile b/net/py-tinytuya/Makefile index 25ecb277f3a..401f9cb5dce 100644 --- a/net/py-tinytuya/Makefile +++ b/net/py-tinytuya/Makefile @@ -1,12 +1,13 @@ COMMENT = interface with Tuya WiFi smart devices -MODPY_EGG_VERSION = 1.15.1 +MODPY_DISTV = 1.15.1 GH_ACCOUNT = jasonacox GH_PROJECT = tinytuya -GH_TAGNAME = v${MODPY_EGG_VERSION} +GH_TAGNAME = v${MODPY_DISTV} -DISTNAME = tinytuya-${MODPY_EGG_VERSION} -PKGNAME = py-tinytuya-${MODPY_EGG_VERSION} +DISTNAME = tinytuya-${MODPY_DISTV} +PKGNAME = py-tinytuya-${MODPY_DISTV} +REVISION = 0 CATEGORIES = net @@ -20,13 +21,10 @@ PERMIT_PACKAGE = Yes MODULES = lang/python MODPY_PYBUILD = setuptools -FLAVORS = python3 -FLAVOR = python3 - -RUN_DEPENDS = devel/py-colorama${MODPY_FLAVOR} \ - security/py-cryptodome${MODPY_FLAVOR} \ - security/py-cryptography${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-colorama \ + security/py-cryptodome \ + security/py-cryptography \ + www/py-requests BUILD_DEPENDS = ${RUN_DEPENDS} # tests require actual devices and editing the test file diff --git a/net/py-tinytuya/pkg/PLIST b/net/py-tinytuya/pkg/PLIST index 9ddd7310353..d653a9b334c 100644 --- a/net/py-tinytuya/pkg/PLIST +++ b/net/py-tinytuya/pkg/PLIST @@ -1,12 +1,13 @@ +@pkgpath net/py-tinytuya,python3 bin/tinytuya lib/python${MODPY_VERSION}/site-packages/tinytuya/ -lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/tinytuya-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/tinytuya/BulbDevice.py lib/python${MODPY_VERSION}/site-packages/tinytuya/Cloud.py lib/python${MODPY_VERSION}/site-packages/tinytuya/Contrib/ diff --git a/net/py-tld/Makefile b/net/py-tld/Makefile index 10031bddb8d..5eee238169f 100644 --- a/net/py-tld/Makefile +++ b/net/py-tld/Makefile @@ -1,9 +1,9 @@ COMMENT = extracts the top level domain (TLD) from the URL given -MODPY_EGG_VERSION = 0.13 -DISTNAME = tld-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.13 +DISTNAME = tld-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 0 +REVISION = 1 CATEGORIES = net @@ -18,7 +18,4 @@ MODPY_PI = Yes # requires Faker (not in ports) NO_TEST = Yes -FLAVORS = python3 -FLAVOR = python3 - .include diff --git a/net/py-tld/pkg/PLIST b/net/py-tld/pkg/PLIST index 67242f23893..1ab2db94751 100644 --- a/net/py-tld/pkg/PLIST +++ b/net/py-tld/pkg/PLIST @@ -1,14 +1,14 @@ +@pkgpath net/py-tld,python3 @conflict py-tld-<0.9.3p1 -@pkgpath net/py-tld bin/update-tld-names lib/python${MODPY_VERSION}/site-packages/tld/ -lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}.dist-info/LICENSE_LGPL_2.1.txt -lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_DISTV}.dist-info/LICENSE_LGPL_2.1.txt +lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/tld-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/tld/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/tld/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-tlslite-ng/Makefile b/net/py-tlslite-ng/Makefile index c829c9e4ba2..ce73666c6da 100644 --- a/net/py-tlslite-ng/Makefile +++ b/net/py-tlslite-ng/Makefile @@ -1,24 +1,22 @@ COMMENT = Python SSL and TLS library -MODPY_EGG_VERSION = 0.8.0 -DISTNAME = tlslite-ng-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.8.0 +DISTNAME = tlslite-ng-${MODPY_DISTV} PKGNAME = py-${DISTNAME:S/-beta/beta/} EPOCH = 0 +REVISION = 0 -PLIST_VERSION = ${MODPY_EGG_VERSION:S/-/_/} +PLIST_VERSION = ${MODPY_DISTV:S/-/_/} SUBST_VARS += PLIST_VERSION CATEGORIES = net GH_ACCOUNT = tlsfuzzer GH_PROJECT = tlslite-ng -GH_TAGNAME = v${MODPY_EGG_VERSION} +GH_TAGNAME = v${MODPY_DISTV} MAINTAINER = Theo Buehler -FLAVOR = python3 -FLAVORS = python3 - WANTLIB += ${MODPY_WANTLIB} # LGPLv2 @@ -29,15 +27,15 @@ MODULES = lang/python MODPY_PYBUILD = setuptools MODPY_PYTEST = Yes -RUN_DEPENDS += devel/py-six${MODPY_FLAVOR} \ - security/py-M2Crypto${MODPY_FLAVOR} \ - security/py-ecdsa${MODPY_FLAVOR} +RUN_DEPENDS += devel/py-six \ + security/py-M2Crypto \ + security/py-ecdsa -TEST_DEPENDS += devel/py-coveralls${MODPY_FLAVOR} \ - devel/py-hypothesis${MODPY_FLAVOR} \ - devel/py-mock${MODPY_FLAVOR} \ - devel/py-pluggy${MODPY_FLAVOR} \ - security/py-ecdsa${MODPY_FLAVOR} +TEST_DEPENDS += devel/py-coveralls \ + devel/py-hypothesis \ + devel/py-mock \ + devel/py-pluggy \ + security/py-ecdsa TEST_ENV += PYTHONPATH=${WRKSRC}/src diff --git a/net/py-tlslite-ng/pkg/PLIST b/net/py-tlslite-ng/pkg/PLIST index f093f30b7be..413e344b202 100644 --- a/net/py-tlslite-ng/pkg/PLIST +++ b/net/py-tlslite-ng/pkg/PLIST @@ -1,3 +1,4 @@ +@pkgpath net/py-tlslite-ng,python3 bin/tls.py bin/tlsdb.py lib/python${MODPY_VERSION}/site-packages/tlslite/ diff --git a/net/py-transmissionrpc-ng/Makefile b/net/py-transmissionrpc-ng/Makefile index 8778c879006..14a4ab92980 100644 --- a/net/py-transmissionrpc-ng/Makefile +++ b/net/py-transmissionrpc-ng/Makefile @@ -1,9 +1,9 @@ COMMENT = json-rpc client library for Transmission -MODPY_EGG_VERSION = 0.14.1 -DISTNAME = transmissionrpc-ng-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.14.1 +DISTNAME = transmissionrpc-ng-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 4 +REVISION = 5 CATEGORIES = net @@ -19,9 +19,6 @@ MODPY_PI = Yes MODPY_PYBUILD = setuptools MODPY_PYTEST_ARGS = test/*.py -FLAVORS = python3 -FLAVOR = python3 - -RUN_DEPENDS = net/py-curl${MODPY_FLAVOR} +RUN_DEPENDS = net/py-curl .include diff --git a/net/py-transmissionrpc-ng/pkg/PLIST b/net/py-transmissionrpc-ng/pkg/PLIST index 89afae956da..07dd77db427 100644 --- a/net/py-transmissionrpc-ng/pkg/PLIST +++ b/net/py-transmissionrpc-ng/pkg/PLIST @@ -1,4 +1,4 @@ -@pkgpath net/py-transmissionrpc-ng +@pkgpath net/py-transmissionrpc-ng,python3 lib/python${MODPY_VERSION}/site-packages/transmissionrpc/ lib/python${MODPY_VERSION}/site-packages/transmissionrpc/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/transmissionrpc/${MODPY_PYCACHE}/ @@ -25,9 +25,9 @@ lib/python${MODPY_VERSION}/site-packages/transmissionrpc/httphandler.py lib/python${MODPY_VERSION}/site-packages/transmissionrpc/session.py lib/python${MODPY_VERSION}/site-packages/transmissionrpc/torrent.py lib/python${MODPY_VERSION}/site-packages/transmissionrpc/utils.py -lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}.dist-info/top_level.txt -lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_EGG_VERSION}.dist-info/zip-safe +lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_DISTV}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/transmissionrpc_ng-${MODPY_DISTV}.dist-info/zip-safe diff --git a/net/py-trio-websocket/Makefile b/net/py-trio-websocket/Makefile index 268ad7eca41..4994cd35cd1 100644 --- a/net/py-trio-websocket/Makefile +++ b/net/py-trio-websocket/Makefile @@ -1,9 +1,9 @@ COMMENT= websocket library for Trio -MODPY_EGG_VERSION= 0.11.1 -DISTNAME= trio-websocket-${MODPY_EGG_VERSION} +MODPY_DISTV= 0.11.1 +DISTNAME= trio-websocket-${MODPY_DISTV} PKGNAME= py-${DISTNAME} -REVISION= 0 +REVISION= 1 CATEGORIES= net @@ -14,15 +14,12 @@ MODULES= lang/python HOMEPAGE= https://github.com/python-trio/trio-websocket -FLAVORS= python3 -FLAVOR= python3 - MODPY_PI= Yes MODPY_PYBUILD= setuptools # needs "nursery" NO_TEST= Yes -RUN_DEPENDS= devel/py-trio${MODPY_FLAVOR} \ - net/py-wsproto${MODPY_FLAVOR} +RUN_DEPENDS= devel/py-trio \ + net/py-wsproto .include diff --git a/net/py-trio-websocket/pkg/PLIST b/net/py-trio-websocket/pkg/PLIST index 4b021a93c02..8fd135f8110 100644 --- a/net/py-trio-websocket/pkg/PLIST +++ b/net/py-trio-websocket/pkg/PLIST @@ -1,10 +1,11 @@ +@pkgpath net/py-trio-websocket,python3 lib/python${MODPY_VERSION}/site-packages/trio_websocket/ -lib/python${MODPY_VERSION}/site-packages/trio_websocket-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/trio_websocket-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/trio_websocket-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/trio_websocket-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/trio_websocket-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/trio_websocket-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/trio_websocket-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/trio_websocket-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/trio_websocket-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/trio_websocket-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/trio_websocket-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/trio_websocket-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/trio_websocket/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/trio_websocket/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/trio_websocket/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-twitter/Makefile b/net/py-twitter/Makefile index 445d8f05669..bb77f3f8466 100644 --- a/net/py-twitter/Makefile +++ b/net/py-twitter/Makefile @@ -1,9 +1,9 @@ COMMENT= twitter python module -MODPY_EGG_VERSION= 1.18.0 -DISTNAME= twitter-${MODPY_EGG_VERSION} -PKGNAME= py-twitter-${MODPY_EGG_VERSION} -REVISION= 4 +MODPY_DISTV= 1.18.0 +DISTNAME= twitter-${MODPY_DISTV} +PKGNAME= py-twitter-${MODPY_DISTV} +REVISION= 5 CATEGORIES= net www @@ -18,11 +18,9 @@ MODPY_PI= Yes MODULES= lang/python MODPY_PYBUILD= setuptools -FLAVORS= python3 -FLAVOR= python3 -RUN_DEPENDS= net/py-irclib${MODPY_FLAVOR} +RUN_DEPENDS= net/py-irclib BUILD_DEPENDS= ${RUN_DEPENDS} -TEST_DEPENDS= devel/py-nose${MODPY_FLAVOR} +TEST_DEPENDS= devel/py-nose .include diff --git a/net/py-twitter/pkg/PLIST b/net/py-twitter/pkg/PLIST index b909e8461f2..567531c78c0 100644 --- a/net/py-twitter/pkg/PLIST +++ b/net/py-twitter/pkg/PLIST @@ -1,5 +1,5 @@ +@pkgpath net/py-twitter,python3 @conflict py-twitter-* -@pkgpath net/py-twitter bin/twitter bin/twitter-archiver bin/twitter-follow @@ -7,15 +7,15 @@ bin/twitter-log bin/twitter-stream-example bin/twitterbot lib/python${MODPY_VERSION}/site-packages/twitter/ -lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/AUTHORS -lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/top_level.txt -lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_EGG_VERSION}.dist-info/zip-safe +lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_DISTV}.dist-info/AUTHORS +lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_DISTV}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/twitter-${MODPY_DISTV}.dist-info/zip-safe lib/python${MODPY_VERSION}/site-packages/twitter/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/twitter/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-txtorcon/Makefile b/net/py-txtorcon/Makefile index 5a95f97ba7d..c858dda28cc 100644 --- a/net/py-txtorcon/Makefile +++ b/net/py-txtorcon/Makefile @@ -1,9 +1,9 @@ COMMENT = control-spec implementation for Tor -MODPY_EGG_VERSION = 22.0.0 -DISTNAME = txtorcon-${MODPY_EGG_VERSION} +MODPY_DISTV = 22.0.0 +DISTNAME = txtorcon-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 2 +REVISION = 3 HOMEPAGE = https://txtorcon.readthedocs.org @@ -16,11 +16,8 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -FLAVORS = python3 -FLAVOR = python3 - -RUN_DEPENDS = devel/py-automat${MODPY_FLAVOR} \ - devel/py-twisted${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-automat \ + devel/py-twisted post-install: mv ${PREFIX}/share/txtorcon/examples ${PREFIX}/share/examples/txtorcon diff --git a/net/py-txtorcon/pkg/PLIST b/net/py-txtorcon/pkg/PLIST index f1adc1df733..a936727ba57 100644 --- a/net/py-txtorcon/pkg/PLIST +++ b/net/py-txtorcon/pkg/PLIST @@ -1,13 +1,14 @@ +@pkgpath net/py-txtorcon,python3 lib/python${MODPY_VERSION}/site-packages/twisted/plugins/${MODPY_PYCACHE}txtorcon_endpoint_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/twisted/plugins/${MODPY_PYCACHE}txtorcon_endpoint_parser.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/twisted/plugins/txtorcon_endpoint_parser.py lib/python${MODPY_VERSION}/site-packages/txtorcon/ -lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/txtorcon-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/txtorcon/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/txtorcon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-u-msgpack/Makefile b/net/py-u-msgpack/Makefile index 65270f7a8e5..41d571ba0ca 100644 --- a/net/py-u-msgpack/Makefile +++ b/net/py-u-msgpack/Makefile @@ -1,9 +1,9 @@ COMMENT = portable, lightweight MessagePack (de)serializer -MODPY_EGG_VERSION = 2.7.2 -DISTNAME = u-msgpack-python-${MODPY_EGG_VERSION} -PKGNAME = py-u-msgpack-${MODPY_EGG_VERSION} -REVISION = 0 +MODPY_DISTV = 2.7.2 +DISTNAME = u-msgpack-python-${MODPY_DISTV} +PKGNAME = py-u-msgpack-${MODPY_DISTV} +REVISION = 1 CATEGORIES = net textproc @@ -16,7 +16,4 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -FLAVORS = python3 -FLAVOR = python3 - .include diff --git a/net/py-u-msgpack/pkg/PLIST b/net/py-u-msgpack/pkg/PLIST index 7e24216fec0..95ef9369afa 100644 --- a/net/py-u-msgpack/pkg/PLIST +++ b/net/py-u-msgpack/pkg/PLIST @@ -1,10 +1,11 @@ +@pkgpath net/py-u-msgpack,python3 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}umsgpack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}umsgpack.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/u_msgpack_python-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/umsgpack.py diff --git a/net/py-websocket-client/Makefile b/net/py-websocket-client/Makefile index 39a684c6fcd..7dd1882c2be 100644 --- a/net/py-websocket-client/Makefile +++ b/net/py-websocket-client/Makefile @@ -1,9 +1,9 @@ COMMENT = WebSocket client for Python -MODPY_EGG_VERSION = 1.7.0 -DISTNAME = websocket-client-${MODPY_EGG_VERSION} -PKGNAME = py-websocket-client-${MODPY_EGG_VERSION} -REVISION = 0 +MODPY_DISTV = 1.7.0 +DISTNAME = websocket-client-${MODPY_DISTV} +PKGNAME = py-websocket-client-${MODPY_DISTV} +REVISION = 1 CATEGORIES = net @@ -17,12 +17,10 @@ MODPY_PI_DIR = w/websocket-client MODPY_PYBUILD = setuptools MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 # optional (also optional: wsaccel, not ported) -RUN_DEPENDS = net/py-socks${MODPY_FLAVOR} +RUN_DEPENDS = net/py-socks -TEST_DEPENDS = net/py-websockets${MODPY_FLAVOR} +TEST_DEPENDS = net/py-websockets .include diff --git a/net/py-websocket-client/pkg/PLIST b/net/py-websocket-client/pkg/PLIST index 26700b65f2f..783e34689b5 100644 --- a/net/py-websocket-client/pkg/PLIST +++ b/net/py-websocket-client/pkg/PLIST @@ -1,5 +1,5 @@ +@pkgpath net/py-websocket-client,python3 @conflict py-websocket-client-* -@pkgpath net/py-websocket-client bin/wsdump lib/python${MODPY_VERSION}/site-packages/websocket/ lib/python${MODPY_VERSION}/site-packages/websocket/__init__.py @@ -75,10 +75,10 @@ lib/python${MODPY_VERSION}/site-packages/websocket/tests/test_cookiejar.py lib/python${MODPY_VERSION}/site-packages/websocket/tests/test_http.py lib/python${MODPY_VERSION}/site-packages/websocket/tests/test_url.py lib/python${MODPY_VERSION}/site-packages/websocket/tests/test_websocket.py -lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/websocket_client-${MODPY_DISTV}.dist-info/top_level.txt diff --git a/net/py-websockets/Makefile b/net/py-websockets/Makefile index d542f83d6a9..5d23ad8f3bd 100644 --- a/net/py-websockets/Makefile +++ b/net/py-websockets/Makefile @@ -1,9 +1,10 @@ COMMENT = Python library for building WebSocket servers and clients -MODPY_EGG_VERSION = 13.1 +MODPY_DISTV = 13.1 -DISTNAME = websockets-${MODPY_EGG_VERSION} +DISTNAME = websockets-${MODPY_DISTV} PKGNAME = py-${DISTNAME} +REVISION = 0 CATEGORIES = net @@ -25,7 +26,4 @@ MODPY_PYBUILD = setuptools # present in github and mostly work NO_TEST = Yes -FLAVOR = python3 -FLAVORS = python3 - .include diff --git a/net/py-websockets/pkg/PLIST b/net/py-websockets/pkg/PLIST index b421886c9e2..d0ae7912a1a 100644 --- a/net/py-websockets/pkg/PLIST +++ b/net/py-websockets/pkg/PLIST @@ -1,10 +1,11 @@ +@pkgpath net/py-websockets,python3 lib/python${MODPY_VERSION}/site-packages/websockets/ -lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/websockets/__init__.py lib/python${MODPY_VERSION}/site-packages/websockets/__main__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}/ diff --git a/net/py-wsproto/Makefile b/net/py-wsproto/Makefile index a5dfceb7ffa..6926420bb00 100644 --- a/net/py-wsproto/Makefile +++ b/net/py-wsproto/Makefile @@ -1,9 +1,9 @@ COMMENT= state-machine based WebSocket protocol implementation -MODPY_EGG_VERSION= 1.2.0 -DISTNAME= wsproto-${MODPY_EGG_VERSION} +MODPY_DISTV= 1.2.0 +DISTNAME= wsproto-${MODPY_DISTV} PKGNAME= py-${DISTNAME} -REVISION= 0 +REVISION= 1 CATEGORIES= net @@ -14,12 +14,9 @@ MODULES= lang/python HOMEPAGE= https://github.com/python-hyper/wsproto/ -FLAVORS= python3 -FLAVOR= python3 - MODPY_PI= Yes MODPY_PYBUILD= setuptools -RUN_DEPENDS= www/py-h11${MODPY_FLAVOR} +RUN_DEPENDS= www/py-h11 .include diff --git a/net/py-wsproto/pkg/PLIST b/net/py-wsproto/pkg/PLIST index 6c02b2254fe..17621a76b34 100644 --- a/net/py-wsproto/pkg/PLIST +++ b/net/py-wsproto/pkg/PLIST @@ -1,10 +1,11 @@ +@pkgpath net/py-wsproto,python3 lib/python${MODPY_VERSION}/site-packages/wsproto/ -lib/python${MODPY_VERSION}/site-packages/wsproto-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/wsproto-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/wsproto-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/wsproto-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/wsproto-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/wsproto-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/wsproto-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/wsproto-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/wsproto-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/wsproto-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/wsproto-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/wsproto-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/wsproto/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wsproto/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/wsproto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-zeroconf/Makefile b/net/py-zeroconf/Makefile index 584c2d94268..f2a08514ef2 100644 --- a/net/py-zeroconf/Makefile +++ b/net/py-zeroconf/Makefile @@ -1,9 +1,9 @@ COMMENT = pure Python Multicast DNS Service Discovery Library -MODPY_EGG_VERSION = 0.28.8 -DISTNAME = zeroconf-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.28.8 +DISTNAME = zeroconf-${MODPY_DISTV} PKGNAME = py-${DISTNAME} -REVISION = 3 +REVISION = 4 CATEGORIES = net @@ -17,9 +17,6 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -FLAVORS = python3 -FLAVOR = python3 - -RUN_DEPENDS = net/py-ifaddr${MODPY_FLAVOR} +RUN_DEPENDS = net/py-ifaddr .include diff --git a/net/py-zeroconf/pkg/PLIST b/net/py-zeroconf/pkg/PLIST index 7bd59961687..96d683fc466 100644 --- a/net/py-zeroconf/pkg/PLIST +++ b/net/py-zeroconf/pkg/PLIST @@ -1,11 +1,11 @@ -@pkgpath net/py-zeroconf +@pkgpath net/py-zeroconf,python3 lib/python${MODPY_VERSION}/site-packages/zeroconf/ -lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}.dist-info/COPYING -lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_DISTV}.dist-info/COPYING +lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/zeroconf-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/zeroconf/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zeroconf/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/zeroconf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/net/py-zmq/Makefile b/net/py-zmq/Makefile index 897065f2732..19470ea28c7 100644 --- a/net/py-zmq/Makefile +++ b/net/py-zmq/Makefile @@ -1,10 +1,10 @@ COMMENT = Python bindings for ZeroMQ # 26+ requires scikit-build-core -MODPY_EGG_VERSION = 25.1.1 -DISTNAME = pyzmq-${MODPY_EGG_VERSION} +MODPY_DISTV = 25.1.1 +DISTNAME = pyzmq-${MODPY_DISTV} PKGNAME = ${DISTNAME:S/py/py-/} -REVISION = 0 +REVISION = 1 CATEGORIES = net devel @@ -19,11 +19,8 @@ WANTLIB = ${MODPY_WANTLIB} pthread zmq MODULES = lang/python -FLAVORS = python3 -FLAVOR = python3 - -BUILD_DEPENDS = sysutils/py-packaging${MODPY_FLAVOR} \ - lang/cython${MODPY_FLAVOR} +BUILD_DEPENDS = sysutils/py-packaging \ + lang/cython LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \ net/zeromq @@ -36,7 +33,7 @@ MAKE_ENV = LC_CTYPE=en_US.UTF-8 MODPY_PYTEST_ARGS = -v build/lib.* # ulimit -n 1024 -TEST_DEPENDS = math/py-numpy${MODPY_FLAVOR} \ - www/py-tornado${MODPY_FLAVOR} +TEST_DEPENDS = math/py-numpy \ + www/py-tornado .include diff --git a/net/py-zmq/pkg/PLIST b/net/py-zmq/pkg/PLIST index 0d55c5ef430..d6e36a2672c 100644 --- a/net/py-zmq/pkg/PLIST +++ b/net/py-zmq/pkg/PLIST @@ -1,13 +1,13 @@ +@pkgpath net/py-zmq,python3 @conflict py-zmq-* -@pkgpath net/py-zmq -lib/python${MODPY_VERSION}/site-packages/pyzmq-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pyzmq-${MODPY_EGG_VERSION}.dist-info/AUTHORS.md -lib/python${MODPY_VERSION}/site-packages/pyzmq-${MODPY_EGG_VERSION}.dist-info/LICENSE.BSD -lib/python${MODPY_VERSION}/site-packages/pyzmq-${MODPY_EGG_VERSION}.dist-info/LICENSE.LESSER -lib/python${MODPY_VERSION}/site-packages/pyzmq-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pyzmq-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pyzmq-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pyzmq-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/pyzmq-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pyzmq-${MODPY_DISTV}.dist-info/AUTHORS.md +lib/python${MODPY_VERSION}/site-packages/pyzmq-${MODPY_DISTV}.dist-info/LICENSE.BSD +lib/python${MODPY_VERSION}/site-packages/pyzmq-${MODPY_DISTV}.dist-info/LICENSE.LESSER +lib/python${MODPY_VERSION}/site-packages/pyzmq-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pyzmq-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pyzmq-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pyzmq-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/zmq/ lib/python${MODPY_VERSION}/site-packages/zmq/__init__.pxd lib/python${MODPY_VERSION}/site-packages/zmq/__init__.py diff --git a/net/qbittorrent/qbittorrent/Makefile b/net/qbittorrent/qbittorrent/Makefile index e77c3f5aa5e..831f23c0c0d 100644 --- a/net/qbittorrent/qbittorrent/Makefile +++ b/net/qbittorrent/qbittorrent/Makefile @@ -1,4 +1,5 @@ COMMENT = BitTorrent client with Qt interface +REVISION = 0 WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6DBus Qt6Gui Qt6Network WANTLIB += Qt6Sql Qt6Widgets Qt6Xml c crypto m ssl torrent-rasterbar z diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile index 23fe2997872..f9a9163361c 100644 --- a/net/rabbitmq/Makefile +++ b/net/rabbitmq/Makefile @@ -4,6 +4,7 @@ V = 4.0.5 DISTNAME = rabbitmq-server-${V} PKGNAME = rabbitmq-${V} CATEGORIES = net +REVISION = 0 HOMEPAGE = https://www.rabbitmq.com/ diff --git a/net/scapy/Makefile b/net/scapy/Makefile index 001a638e214..6747538482f 100644 --- a/net/scapy/Makefile +++ b/net/scapy/Makefile @@ -1,9 +1,9 @@ COMMENT = powerful interactive packet manipulation in python -MODPY_EGG_VERSION = 2.4.4 -REVISION = 5 +MODPY_DISTV = 2.4.4 +REVISION = 6 -DISTNAME = scapy-${MODPY_EGG_VERSION} +DISTNAME = scapy-${MODPY_DISTV} CATEGORIES = net @@ -28,7 +28,7 @@ UPDATE_PLIST_ARGS = -i MODPY_PY_PREFIX # py-cryptography is only for architectures with newer compilers. # it is not needed for all features; include the dependency # where available but skip it on base-gcc architectures. -RUN_DEPENDS = security/py-cryptography${MODPY_FLAVOR} +RUN_DEPENDS = security/py-cryptography .endif pre-configure: diff --git a/net/seafile/libsearpc/Makefile b/net/seafile/libsearpc/Makefile index 03084f34dab..55fba1f2ad4 100644 --- a/net/seafile/libsearpc/Makefile +++ b/net/seafile/libsearpc/Makefile @@ -5,7 +5,7 @@ GH_PROJECT = libsearpc # this commit is from the "v3.3-latest" tag GH_COMMIT = 15f6f0b9f451b9ecf99dedab72e9242e54e124eb DISTNAME = libsearpc-3.3.0pl20221111 -REVISION = 1 +REVISION = 2 SHARED_LIBS += searpc 0.0 # 1.2 diff --git a/net/seafile/seafile/Makefile b/net/seafile/seafile/Makefile index c490d28aab1..e2ed2a86fde 100644 --- a/net/seafile/seafile/Makefile +++ b/net/seafile/seafile/Makefile @@ -6,6 +6,7 @@ GH_PROJECT = seafile GH_COMMIT = 5517d012bde196a7bab99a08db6580d52630862a DISTNAME = seafile-daemon-9.0.6pl20240525 EPOCH = 0 +REVISION = 0 SHARED_LIBS = seafile 4.0 diff --git a/net/sshuttle/Makefile b/net/sshuttle/Makefile index d91ecbf05eb..e886f4db522 100644 --- a/net/sshuttle/Makefile +++ b/net/sshuttle/Makefile @@ -1,8 +1,8 @@ COMMENT= VPN over an SSH tunnel -MODPY_EGG_VERSION= 1.1.2 -DISTNAME= sshuttle-${MODPY_EGG_VERSION} -REVISION= 0 +MODPY_DISTV= 1.1.2 +DISTNAME= sshuttle-${MODPY_DISTV} +REVISION= 1 FIX_EXTRACT_PERMISSIONS=Yes @@ -15,17 +15,14 @@ PERMIT_PACKAGE= Yes MODULES= lang/python -FLAVORS= python3 -FLAVOR= python3 - MODPY_PI= Yes MODPY_PYBUILD= setuptools_scm USE_GMAKE= Yes -BUILD_DEPENDS= devel/py-poetry-core${MODPY_FLAVOR} \ - textproc/py-sphinx${MODPY_FLAVOR} +BUILD_DEPENDS= devel/py-poetry-core \ + textproc/py-sphinx -TEST_DEPENDS= devel/py-test-cov${MODPY_FLAVOR} +TEST_DEPENDS= devel/py-test-cov .include diff --git a/net/sshuttle/pkg/PLIST b/net/sshuttle/pkg/PLIST index dc3964f2230..7d9b58088e2 100644 --- a/net/sshuttle/pkg/PLIST +++ b/net/sshuttle/pkg/PLIST @@ -1,11 +1,12 @@ +@pkgpath net/sshuttle,python3 bin/sshuttle lib/python${MODPY_VERSION}/site-packages/sshuttle/ -lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_EGG_VERSION}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/sshuttle-${MODPY_DISTV}.dist-info/entry_points.txt lib/python${MODPY_VERSION}/site-packages/sshuttle/__init__.py lib/python${MODPY_VERSION}/site-packages/sshuttle/__main__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sshuttle/${MODPY_PYCACHE}/ diff --git a/net/synapse/Makefile b/net/synapse/Makefile index 6c882ef42c6..ccbae1d5c57 100644 --- a/net/synapse/Makefile +++ b/net/synapse/Makefile @@ -1,10 +1,11 @@ COMMENT = open network for secure, decentralized communication -MODPY_EGG_VERSION = 1.121.1 +MODPY_DISTV = 1.121.1 +REVISION = 0 GH_ACCOUNT = element-hq GH_PROJECT = synapse -GH_TAGNAME = v${MODPY_EGG_VERSION} +GH_TAGNAME = v${MODPY_DISTV} CATEGORIES = net HOMEPAGE = https://matrix.org/ @@ -27,51 +28,51 @@ MODCARGO_TEST = No MAKE_ENV += ${MODCARGO_ENV} -BUILD_DEPENDS += devel/py-setuptools-rust${MODPY_FLAVOR}>=1.3.0 +BUILD_DEPENDS += devel/py-setuptools-rust>=1.3.0 # in same order as in pyproject.toml: mandatory section -RUN_DEPENDS = devel/py-jsonschema${MODPY_FLAVOR}>=3.0.0 \ - devel/py-immutabledict${MODPY_FLAVOR} \ - textproc/py-unpaddedbase64${MODPY_FLAVOR}>=2.1.0 \ - textproc/py-canonicaljson${MODPY_FLAVOR}<3.0.0,>=2.0.0 \ - textproc/py-signedjson${MODPY_FLAVOR} \ - security/py-service_identity${MODPY_FLAVOR} \ - devel/py-twisted${MODPY_FLAVOR} \ - www/py-treq${MODPY_FLAVOR} \ - security/py-openssl${MODPY_FLAVOR} \ - textproc/py-yaml${MODPY_FLAVOR} \ - devel/py-asn1${MODPY_FLAVOR} \ - devel/py-asn1-modules${MODPY_FLAVOR} \ - security/py-bcrypt${MODPY_FLAVOR} \ - graphics/py-Pillow${MODPY_FLAVOR}>=10.0.1 \ - devel/py-sortedcontainers${MODPY_FLAVOR} \ - devel/py-pydantic${MODPY_FLAVOR} \ - www/py-macaroons${MODPY_FLAVOR} \ - net/py-msgpack${MODPY_FLAVOR} \ - telephony/py-phonenumbers${MODPY_FLAVOR} \ - sysutils/py-prometheus_client${MODPY_FLAVOR} \ - devel/py-attrs${MODPY_FLAVOR} \ - net/py-netaddr${MODPY_FLAVOR} \ - www/py-jinja2${MODPY_FLAVOR} \ - www/py-bleach${MODPY_FLAVOR} \ - devel/py-typing-extensions${MODPY_FLAVOR}>=4.3.0 \ - security/py-cryptography${MODPY_FLAVOR} \ - textproc/py-ijson${MODPY_FLAVOR} \ - devel/py-matrix-common${MODPY_FLAVOR}>=1.3.0,<2.0.0 \ - sysutils/py-packaging${MODPY_FLAVOR} \ - www/py-multipart${MODPY_FLAVOR} +RUN_DEPENDS = devel/py-jsonschema>=3.0.0 \ + devel/py-immutabledict \ + textproc/py-unpaddedbase64>=2.1.0 \ + textproc/py-canonicaljson<3.0.0,>=2.0.0 \ + textproc/py-signedjson \ + security/py-service_identity \ + devel/py-twisted \ + www/py-treq \ + security/py-openssl \ + textproc/py-yaml \ + devel/py-asn1 \ + devel/py-asn1-modules \ + security/py-bcrypt \ + graphics/py-Pillow>=10.0.1 \ + devel/py-sortedcontainers \ + devel/py-pydantic \ + www/py-macaroons \ + net/py-msgpack \ + telephony/py-phonenumbers \ + sysutils/py-prometheus_client \ + devel/py-attrs \ + net/py-netaddr \ + www/py-jinja2 \ + www/py-bleach \ + devel/py-typing-extensions>=4.3.0 \ + security/py-cryptography \ + textproc/py-ijson \ + devel/py-matrix-common>=1.3.0,<2.0.0 \ + sysutils/py-packaging \ + www/py-multipart # still relying on pkg_resources, see comments in # https://github.com/matrix-org/synapse/pull/12542 -RUN_DEPENDS += devel/py-setuptools${MODPY_FLAVOR} +RUN_DEPENDS += devel/py-setuptools # optional section -RUN_DEPENDS += textproc/py-lxml${MODPY_FLAVOR} +RUN_DEPENDS += textproc/py-lxml # not listed but used in some scripts/ files -RUN_DEPENDS += www/py-requests${MODPY_FLAVOR} +RUN_DEPENDS += www/py-requests TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} \ - devel/py-mock${MODPY_FLAVOR} \ - devel/py-parameterized${MODPY_FLAVOR} \ - www/py-jwt${MODPY_FLAVOR} + devel/py-mock \ + devel/py-parameterized \ + www/py-jwt do-configure: @${MODCARGO_configure} diff --git a/net/tacacs+/Makefile b/net/tacacs+/Makefile index 3f8a0a83fd4..29dc3fdefe3 100644 --- a/net/tacacs+/Makefile +++ b/net/tacacs+/Makefile @@ -4,7 +4,7 @@ V = 4.0.4.28 DISTNAME = tacacs-F${V} PKGNAME = tacacs+-${V} EPOCH = 0 -REVISION = 3 +REVISION = 4 SHARED_LIBS += tacacs 1.0 diff --git a/net/telepathy/folks/Makefile b/net/telepathy/folks/Makefile index 2071b21f1b1..4bec5ecc6af 100644 --- a/net/telepathy/folks/Makefile +++ b/net/telepathy/folks/Makefile @@ -2,7 +2,7 @@ COMMENT= people aggregation library GNOME_PROJECT= folks GNOME_VERSION= 0.15.9 -REVISION= 2 +REVISION= 3 # see BACKEND_DIR in config.h API_V= 26 diff --git a/net/telepathy/telepathy-idle/Makefile b/net/telepathy/telepathy-idle/Makefile index 95ce378de8a..53efc7d989d 100644 --- a/net/telepathy/telepathy-idle/Makefile +++ b/net/telepathy/telepathy-idle/Makefile @@ -14,13 +14,13 @@ MODULES= lang/python MODPY_RUNDEP= No BUILD_DEPENDS= devel/gettext,-tools \ - devel/py-twisted${MODPY_FLAVOR} \ + devel/py-twisted \ textproc/libxslt RUN_DEPENDS= textproc/libxslt LIB_DEPENDS= net/telepathy/telepathy-glib -TEST_DEPENDS= devel/py-twisted${MODPY_FLAVOR} +TEST_DEPENDS= devel/py-twisted .include diff --git a/net/telepathy/telepathy-logger/Makefile b/net/telepathy/telepathy-logger/Makefile index 7d89bd663d0..cc3b9582fc6 100644 --- a/net/telepathy/telepathy-logger/Makefile +++ b/net/telepathy/telepathy-logger/Makefile @@ -21,7 +21,7 @@ MODULES= devel/dconf \ MODPY_RUNDEP= No BUILD_DEPENDS= devel/gobject-introspection \ - devel/py-twisted${MODPY_FLAVOR} \ + devel/py-twisted \ textproc/libxslt LIB_DEPENDS= databases/sqlite3 \ net/telepathy/telepathy-glib \ diff --git a/net/tg/Makefile b/net/tg/Makefile index 2b2e6bfafbb..31f38fcab3e 100644 --- a/net/tg/Makefile +++ b/net/tg/Makefile @@ -1,9 +1,9 @@ COMMENT = ncurses Telegram client -MODPY_EGG_VERSION = 0.19.0 +MODPY_DISTV = 0.19.0 -DISTNAME = tg-${MODPY_EGG_VERSION} -REVISION = 2 +DISTNAME = tg-${MODPY_DISTV} +REVISION = 3 CATEGORIES = net @@ -18,6 +18,6 @@ MODPY_PI = Yes MODPY_PYBUILD = poetry-core NO_TEST = Yes -RUN_DEPENDS = net/py-telegram${MODPY_FLAVOR} +RUN_DEPENDS = net/py-telegram .include diff --git a/net/toot/Makefile b/net/toot/Makefile index a765104e4b8..f26d9fc1dda 100644 --- a/net/toot/Makefile +++ b/net/toot/Makefile @@ -1,7 +1,8 @@ COMMENT= CLI and TUI tool to interact with Mastodon instances -MODPY_EGG_VERSION= 0.47.1 -DISTNAME= toot-${MODPY_EGG_VERSION} +MODPY_DISTV= 0.47.1 +DISTNAME= toot-${MODPY_DISTV} +REVISION= 0 CATEGORIES= net @@ -20,13 +21,13 @@ MODPY_PYBUILD= setuptools_scm MODPY_PYTEST_ARGS= --ignore tests/integration \ --ignore tests/tui/test_rich_text.py -RUN_DEPENDS= devel/py-click${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} \ - www/py-beautifulsoup4${MODPY_FLAVOR} \ - devel/py-wcwidth${MODPY_FLAVOR} \ - devel/py-urwid${MODPY_FLAVOR} \ - textproc/py-tomlkit${MODPY_FLAVOR} -TEST_DEPENDS= devel/py-test-cov${MODPY_FLAVOR} +RUN_DEPENDS= devel/py-click \ + www/py-requests \ + www/py-beautifulsoup4 \ + devel/py-wcwidth \ + devel/py-urwid \ + textproc/py-tomlkit +TEST_DEPENDS= devel/py-test-cov MAKE_ENV= LC_CTYPE=C.UTF-8 diff --git a/net/toxic/Makefile b/net/toxic/Makefile index 8f430adb608..722f2157ebe 100755 --- a/net/toxic/Makefile +++ b/net/toxic/Makefile @@ -1,4 +1,5 @@ COMMENT = ncurses-based Tox client +REVISION = 1 DIST_TUPLE = github Jfreegman toxic v0.15.1 . diff --git a/net/tremc/Makefile b/net/tremc/Makefile index e8c341f210a..63a0b1fe2c0 100644 --- a/net/tremc/Makefile +++ b/net/tremc/Makefile @@ -3,7 +3,7 @@ COMMENT = curses interface for transmission GH_ACCOUNT = tremc GH_PROJECT = tremc GH_TAGNAME = 0.9.3 -REVISION = 1 +REVISION = 2 CATEGORIES = net @@ -14,7 +14,7 @@ PERMIT_PACKAGE = Yes MODULES = lang/python -RUN_DEPENDS = sysutils/py-pyperclip${MODPY_FLAVOR} +RUN_DEPENDS = sysutils/py-pyperclip NO_TEST = Yes NO_BUILD = Yes diff --git a/net/vf1/Makefile b/net/vf1/Makefile index 8602a6482a5..fc7bee525ac 100644 --- a/net/vf1/Makefile +++ b/net/vf1/Makefile @@ -1,9 +1,9 @@ COMMENT = command line gopher client -MODPY_EGG_VERSION = 0.0.11 -DISTNAME = VF-1-${MODPY_EGG_VERSION} -PKGNAME = vf1-${MODPY_EGG_VERSION} -REVISION = 4 +MODPY_DISTV = 0.0.11 +DISTNAME = VF-1-${MODPY_DISTV} +PKGNAME = vf1-${MODPY_DISTV} +REVISION = 5 CATEGORIES = net diff --git a/net/websockify/Makefile b/net/websockify/Makefile index 80d29bf2ec3..ede19bdd383 100644 --- a/net/websockify/Makefile +++ b/net/websockify/Makefile @@ -1,10 +1,10 @@ COMMENT= WebSocket to TCP proxy -MODPY_EGG_VERSION= 0.11.0 +MODPY_DISTV= 0.11.0 GH_ACCOUNT= novnc GH_PROJECT= websockify -GH_TAGNAME= v${MODPY_EGG_VERSION} -REVISION= 0 +GH_TAGNAME= v${MODPY_DISTV} +REVISION= 1 CATEGORIES= net @@ -14,8 +14,8 @@ PERMIT_PACKAGE= Yes MODULES= lang/python MODPY_PYBUILD= setuptools MODPY_PYTEST_ARGS= --ignore tests/test_token_plugins.py -RUN_DEPENDS= math/py-numpy${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} +RUN_DEPENDS= math/py-numpy \ + www/py-requests post-build: cd ${WRKSRC}; env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} diff --git a/net/weechat/Makefile b/net/weechat/Makefile index e80f161c481..1e09df1a13e 100644 --- a/net/weechat/Makefile +++ b/net/weechat/Makefile @@ -10,6 +10,7 @@ DISTNAME= weechat-${V} PKGNAME-main= weechat-${V} PKGNAME-lua= weechat-lua-${V} PKGNAME-python= weechat-python-${V} +REVISION-python= 0 PKGNAME-ruby= weechat-ruby-${V} PKGNAME-tcl= weechat-tcl-${V}