Daniel Jakots <danj+o...@chown.me> wrote:
> On Thu, 09 Nov 2017 11:30:24 -0600, attila <att...@stalphonsos.com>
> wrote:
>
> > The attached patch adds a python3 flavor to net/stem.
>
> It's more complicated than that because PKGNAME must be renamed in
> py-stem.
After some feedback on IRC and email I have another attempt, attached.
Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D 09C1 4068 D5D5 62A7 29CF
? net/stem/pkg/PFRAG.no-python3
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.542
diff -u -p -r1.542 Makefile
--- devel/quirks/Makefile 11 Nov 2017 10:48:25 -0000 1.542
+++ devel/quirks/Makefile 11 Nov 2017 20:11:08 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-2.387
+PKGNAME = quirks-2.388
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.555
diff -u -p -r1.555 Quirks.pm
--- devel/quirks/files/Quirks.pm 11 Nov 2017 10:48:25 -0000 1.555
+++ devel/quirks/files/Quirks.pm 11 Nov 2017 20:11:08 -0000
@@ -494,6 +494,7 @@ my $stem_extensions = {
'ruby-arirang' => 'arirang',
'ja-mplus-ttf' => 'mixfont-mplus-ipa',
'kdirstat' => 'qdirstat',
+ 'stem' => 'py-stem',
};
my $obsolete_reason = {
Index: net/stem/Makefile
===================================================================
RCS file: /cvs/ports/net/stem/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- net/stem/Makefile 9 Nov 2017 16:37:42 -0000 1.6
+++ net/stem/Makefile 11 Nov 2017 20:11:08 -0000
@@ -5,7 +5,7 @@ COMMENT = Tor controller library
MODPY_EGG_VERSION = 1.6.0
V = ${MODPY_EGG_VERSION:S/b//}
DISTNAME = stem-${MODPY_EGG_VERSION}
-PKGNAME = stem-${V}
+PKGNAME = py-stem-${V}
WRKDIST = ${WRKDIR}/stem-${V}
SUBST_VARS += V
@@ -19,9 +19,17 @@ MAINTAINER = Pascal Stumpf <pascal@stum
# GPLv3
PERMIT_PACKAGE_CDROM = Yes
+FLAVORS = python3
+FLAVOR ?=
+
MODULES = lang/python
MODPY_PI = Yes
+RUN_DEPENDS = security/py-crypto${MODPY_FLAVOR}
+
NO_TEST = Yes
+
+post-install:
+ mv ${PREFIX}/bin/tor-prompt{,${MODPY_BIN_SUFFIX}}
.include <bsd.port.mk>
Index: net/stem/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/stem/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- net/stem/pkg/PLIST 9 Nov 2017 16:37:42 -0000 1.5
+++ net/stem/pkg/PLIST 11 Nov 2017 20:11:08 -0000
@@ -1,107 +1,113 @@
@comment $OpenBSD: PLIST,v 1.5 2017/11/09 16:37:42 pascal Exp $
-bin/tor-prompt
+!%%python3%%
+@conflict stem-*
+bin/tor-prompt${MODPY_BIN_SUFFIX}
lib/python${MODPY_VERSION}/site-packages/stem/
-lib/python${MODPY_VERSION}/site-packages/stem-${V}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/stem-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/stem/__init__.py
-lib/python${MODPY_VERSION}/site-packages/stem/__init__.pyc
+${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}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}control.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}exit_policy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}manual.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}prereq.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}process.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}socket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/stem/cached_tor_manual.sqlite
lib/python${MODPY_VERSION}/site-packages/stem/connection.py
-lib/python${MODPY_VERSION}/site-packages/stem/connection.pyc
lib/python${MODPY_VERSION}/site-packages/stem/control.py
-lib/python${MODPY_VERSION}/site-packages/stem/control.pyc
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/
lib/python${MODPY_VERSION}/site-packages/stem/descriptor/__init__.py
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}certificate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}export.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}extrainfo_descriptor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}hidden_service_descriptor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}microdescriptor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}networkstatus.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}reader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}remote.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}router_status_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}server_descriptor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/descriptor/${MODPY_PYCACHE}tordnsel.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/stem/descriptor/certificate.py
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/certificate.pyc
lib/python${MODPY_VERSION}/site-packages/stem/descriptor/export.py
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/export.pyc
lib/python${MODPY_VERSION}/site-packages/stem/descriptor/extrainfo_descriptor.py
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/extrainfo_descriptor.pyc
lib/python${MODPY_VERSION}/site-packages/stem/descriptor/fallback_directories.cfg
lib/python${MODPY_VERSION}/site-packages/stem/descriptor/hidden_service_descriptor.py
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/hidden_service_descriptor.pyc
lib/python${MODPY_VERSION}/site-packages/stem/descriptor/microdescriptor.py
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/microdescriptor.pyc
lib/python${MODPY_VERSION}/site-packages/stem/descriptor/networkstatus.py
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/networkstatus.pyc
lib/python${MODPY_VERSION}/site-packages/stem/descriptor/reader.py
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/reader.pyc
lib/python${MODPY_VERSION}/site-packages/stem/descriptor/remote.py
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/remote.pyc
lib/python${MODPY_VERSION}/site-packages/stem/descriptor/router_status_entry.py
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/router_status_entry.pyc
lib/python${MODPY_VERSION}/site-packages/stem/descriptor/server_descriptor.py
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/server_descriptor.pyc
lib/python${MODPY_VERSION}/site-packages/stem/descriptor/tordnsel.py
-lib/python${MODPY_VERSION}/site-packages/stem/descriptor/tordnsel.pyc
lib/python${MODPY_VERSION}/site-packages/stem/exit_policy.py
-lib/python${MODPY_VERSION}/site-packages/stem/exit_policy.pyc
lib/python${MODPY_VERSION}/site-packages/stem/interpreter/
lib/python${MODPY_VERSION}/site-packages/stem/interpreter/__init__.py
-lib/python${MODPY_VERSION}/site-packages/stem/interpreter/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/stem/interpreter/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/stem/interpreter/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/interpreter/${MODPY_PYCACHE}arguments.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/interpreter/${MODPY_PYCACHE}autocomplete.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/interpreter/${MODPY_PYCACHE}commands.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/interpreter/${MODPY_PYCACHE}help.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/stem/interpreter/arguments.py
-lib/python${MODPY_VERSION}/site-packages/stem/interpreter/arguments.pyc
lib/python${MODPY_VERSION}/site-packages/stem/interpreter/autocomplete.py
-lib/python${MODPY_VERSION}/site-packages/stem/interpreter/autocomplete.pyc
lib/python${MODPY_VERSION}/site-packages/stem/interpreter/commands.py
-lib/python${MODPY_VERSION}/site-packages/stem/interpreter/commands.pyc
lib/python${MODPY_VERSION}/site-packages/stem/interpreter/help.py
-lib/python${MODPY_VERSION}/site-packages/stem/interpreter/help.pyc
lib/python${MODPY_VERSION}/site-packages/stem/interpreter/settings.cfg
lib/python${MODPY_VERSION}/site-packages/stem/manual.py
-lib/python${MODPY_VERSION}/site-packages/stem/manual.pyc
lib/python${MODPY_VERSION}/site-packages/stem/prereq.py
-lib/python${MODPY_VERSION}/site-packages/stem/prereq.pyc
lib/python${MODPY_VERSION}/site-packages/stem/process.py
-lib/python${MODPY_VERSION}/site-packages/stem/process.pyc
lib/python${MODPY_VERSION}/site-packages/stem/response/
lib/python${MODPY_VERSION}/site-packages/stem/response/__init__.py
-lib/python${MODPY_VERSION}/site-packages/stem/response/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/stem/response/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/stem/response/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/response/${MODPY_PYCACHE}add_onion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/response/${MODPY_PYCACHE}authchallenge.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/response/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/response/${MODPY_PYCACHE}getconf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/response/${MODPY_PYCACHE}getinfo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/response/${MODPY_PYCACHE}mapaddress.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/response/${MODPY_PYCACHE}protocolinfo.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/stem/response/add_onion.py
-lib/python${MODPY_VERSION}/site-packages/stem/response/add_onion.pyc
lib/python${MODPY_VERSION}/site-packages/stem/response/authchallenge.py
-lib/python${MODPY_VERSION}/site-packages/stem/response/authchallenge.pyc
lib/python${MODPY_VERSION}/site-packages/stem/response/events.py
-lib/python${MODPY_VERSION}/site-packages/stem/response/events.pyc
lib/python${MODPY_VERSION}/site-packages/stem/response/getconf.py
-lib/python${MODPY_VERSION}/site-packages/stem/response/getconf.pyc
lib/python${MODPY_VERSION}/site-packages/stem/response/getinfo.py
-lib/python${MODPY_VERSION}/site-packages/stem/response/getinfo.pyc
lib/python${MODPY_VERSION}/site-packages/stem/response/mapaddress.py
-lib/python${MODPY_VERSION}/site-packages/stem/response/mapaddress.pyc
lib/python${MODPY_VERSION}/site-packages/stem/response/protocolinfo.py
-lib/python${MODPY_VERSION}/site-packages/stem/response/protocolinfo.pyc
lib/python${MODPY_VERSION}/site-packages/stem/settings.cfg
lib/python${MODPY_VERSION}/site-packages/stem/socket.py
-lib/python${MODPY_VERSION}/site-packages/stem/socket.pyc
lib/python${MODPY_VERSION}/site-packages/stem/util/
lib/python${MODPY_VERSION}/site-packages/stem/util/__init__.py
-lib/python${MODPY_VERSION}/site-packages/stem/util/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/stem/util/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/stem/util/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/util/${MODPY_PYCACHE}conf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/util/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/util/${MODPY_PYCACHE}enum.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/util/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/util/${MODPY_PYCACHE}lru_cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/util/${MODPY_PYCACHE}ordereddict.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/util/${MODPY_PYCACHE}proc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/util/${MODPY_PYCACHE}str_tools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/util/${MODPY_PYCACHE}system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/util/${MODPY_PYCACHE}term.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/util/${MODPY_PYCACHE}test_tools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/stem/util/${MODPY_PYCACHE}tor_tools.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/stem/util/conf.py
-lib/python${MODPY_VERSION}/site-packages/stem/util/conf.pyc
lib/python${MODPY_VERSION}/site-packages/stem/util/connection.py
-lib/python${MODPY_VERSION}/site-packages/stem/util/connection.pyc
lib/python${MODPY_VERSION}/site-packages/stem/util/enum.py
-lib/python${MODPY_VERSION}/site-packages/stem/util/enum.pyc
lib/python${MODPY_VERSION}/site-packages/stem/util/log.py
-lib/python${MODPY_VERSION}/site-packages/stem/util/log.pyc
lib/python${MODPY_VERSION}/site-packages/stem/util/lru_cache.py
-lib/python${MODPY_VERSION}/site-packages/stem/util/lru_cache.pyc
lib/python${MODPY_VERSION}/site-packages/stem/util/ordereddict.py
-lib/python${MODPY_VERSION}/site-packages/stem/util/ordereddict.pyc
lib/python${MODPY_VERSION}/site-packages/stem/util/ports.cfg
lib/python${MODPY_VERSION}/site-packages/stem/util/proc.py
-lib/python${MODPY_VERSION}/site-packages/stem/util/proc.pyc
lib/python${MODPY_VERSION}/site-packages/stem/util/str_tools.py
-lib/python${MODPY_VERSION}/site-packages/stem/util/str_tools.pyc
lib/python${MODPY_VERSION}/site-packages/stem/util/system.py
-lib/python${MODPY_VERSION}/site-packages/stem/util/system.pyc
lib/python${MODPY_VERSION}/site-packages/stem/util/term.py
-lib/python${MODPY_VERSION}/site-packages/stem/util/term.pyc
lib/python${MODPY_VERSION}/site-packages/stem/util/test_tools.py
-lib/python${MODPY_VERSION}/site-packages/stem/util/test_tools.pyc
lib/python${MODPY_VERSION}/site-packages/stem/util/tor_tools.py
-lib/python${MODPY_VERSION}/site-packages/stem/util/tor_tools.pyc
lib/python${MODPY_VERSION}/site-packages/stem/version.py
-lib/python${MODPY_VERSION}/site-packages/stem/version.pyc
