On 2021/07/24 19:09, Klemens Nanni wrote:
> On Sat, Jul 24, 2021 at 06:02:52PM +0000, Klemens Nanni wrote:
> > Two dependencies for the main port:
> >
> > Information for inst:magic-wormhole-0.12.0
> >
> > Comment:
> > securely transfer data between computers
> >
> > Description:
> > Get things from one computer to another, safely.
> >
> > This package provides a library and a command-line tool named
> > `wormhole`,
> > which makes it possible to get arbitrary-sized files and directories
> > (or short pieces of text) from one computer to another. The two
> > endpoints are
> > identified by using identical "wormhole codes": in general, the sending
> > machine generates and displays the code, which must then be typed into
> > the
> > receiving machine.
> >
> > The codes are short and human-pronounceable, using a
> > phonetically-distinct
> > wordlist. The receiving side offers tab-completion on the codewords, so
> > usually only a few characters must be typed. Wormhole codes are
> > single-use
> > and do not need to be memorized.
> >
> > Maintainer: Klemens Nanni <k...@openbsd.org>
> >
> > WWW: https://magic-wormhole.readthedocs.io
> >
> >
> > Feedback? Objections? OK?
>
> New tarball with default MODPY_VERSION removed and another missing
> dependency py-txtorcon I forgot to include (thanks sthen!).
>
some tweaks for py-txtorcon on top; with these or similar (alternative
could patch setup.py instead of mv'ing to the usual paths) then I'm
OK with this set of ports.
diff ec13130bf2b70d08f4b61aa4fdeeeb55dc0c93b9 /usr/ports/mystuff
blob - 094090549a820115dddecfb11f82ce357501c8d9
file + net/py-txtorcon/Makefile
--- net/py-txtorcon/Makefile
+++ net/py-txtorcon/Makefile
@@ -20,13 +20,11 @@ MODPY_SETUPTOOLS = Yes
FLAVORS = python3
FLAVOR = python3
-RUN_DEPENDS = devel/py-automat${MOD_FLAVOR} \
- devel/py-twisted${MOD_FLAVOR}
+RUN_DEPENDS = devel/py-automat${MODPY_FLAVOR} \
+ devel/py-twisted${MODPY_FLAVOR}
-EXAMPLEDIR = ${PREFIX}/share/examples/toxtorcon
-
post-install:
- ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
- mv ${PREFIX}/share/txtorcon/examples ${EXAMPLEDIR}
+ mv ${PREFIX}/share/txtorcon/examples ${PREFIX}/share/examples/txtorcon
+ mv ${PREFIX}/share/txtorcon ${PREFIX}/share/doc/txtorcon
.include <bsd.port.mk>
blob - acb0238b0176ae2ff93bc21386117f0bd8318217
file + net/py-txtorcon/pkg/PLIST
--- net/py-txtorcon/pkg/PLIST
+++ net/py-txtorcon/pkg/PLIST
@@ -1,7 +1,4 @@
@comment $OpenBSD: PLIST,v$
-lib/python${MODPY_VERSION}/site-packages/twisted/
-lib/python${MODPY_VERSION}/site-packages/twisted/plugins/
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/twisted/plugins/${MODPY_PYCACHE}/
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/
@@ -58,67 +55,66 @@ lib/python${MODPY_VERSION}/site-packages/txtorcon/tori
lib/python${MODPY_VERSION}/site-packages/txtorcon/torstate.py
lib/python${MODPY_VERSION}/site-packages/txtorcon/util.py
lib/python${MODPY_VERSION}/site-packages/txtorcon/web.py
-share/examples/toxtorcon/
-share/examples/toxtorcon/examples/
-share/examples/toxtorcon/examples/close_all_circuits.py
-share/examples/toxtorcon/examples/connect.py
-share/examples/toxtorcon/examples/disallow_streams_by_port.py
-share/examples/toxtorcon/examples/dns_lookups.py
-share/examples/toxtorcon/examples/hidden_echo.py
-share/examples/toxtorcon/examples/launch_tor.py
-share/examples/toxtorcon/examples/launch_tor2web.py
-share/examples/toxtorcon/examples/launch_tor_endpoint.py
-share/examples/toxtorcon/examples/launch_tor_endpoint2.py
-share/examples/toxtorcon/examples/launch_tor_unix_sockets.py
-share/examples/toxtorcon/examples/launch_tor_with_simplehttpd.py
-share/examples/toxtorcon/examples/minimal_endpoint.py
-share/examples/toxtorcon/examples/monitor.py
-share/examples/toxtorcon/examples/readme.py
-share/examples/toxtorcon/examples/readme2.py
-share/examples/toxtorcon/examples/stem_relay_descriptor.py
-share/examples/toxtorcon/examples/stream_circuit_logger.py
-share/examples/toxtorcon/examples/tor_info.py
-share/examples/toxtorcon/examples/web_client.py
-share/examples/toxtorcon/examples/web_client_authenticated.py
-share/examples/toxtorcon/examples/web_client_custom_circuit.py
-share/examples/toxtorcon/examples/web_client_treq.py
-share/examples/toxtorcon/examples/web_onion_service_aiohttp.py
-share/examples/toxtorcon/examples/web_onion_service_endpoints.py
-share/examples/toxtorcon/examples/web_onion_service_ephemeral_auth.py
-share/examples/toxtorcon/examples/web_onion_service_ephemeral_nonanon.py
-share/examples/toxtorcon/examples/web_onion_service_ephemeral_unix.py
-share/examples/toxtorcon/examples/web_onion_service_filesystem.py
-share/examples/toxtorcon/examples/web_onion_service_prop224.py
-share/examples/toxtorcon/examples/web_onion_service_prop224_endpoints_file.py
-share/examples/toxtorcon/examples/webui_server.py
-share/txtorcon/
-share/txtorcon/INSTALL
-share/txtorcon/Makefile
-share/txtorcon/README.rst
-share/txtorcon/TODO
-share/txtorcon/apilinks_sphinxext.py
-share/txtorcon/avatar.png
-share/txtorcon/conf.py
-share/txtorcon/examples.rst
-share/txtorcon/guide.rst
-share/txtorcon/hacking.rst
-share/txtorcon/haiku.css
-share/txtorcon/index.rst
-share/txtorcon/installing.rst
-share/txtorcon/interop_asyncio.rst
-share/txtorcon/introduction.rst
-share/txtorcon/logo.png
-share/txtorcon/logo.svg
-share/txtorcon/meejah.asc
-share/txtorcon/release-checklist.rst
-share/txtorcon/releases.rst
-share/txtorcon/txtorcon-config.rst
-share/txtorcon/txtorcon-controller.rst
-share/txtorcon/txtorcon-endpoints.rst
-share/txtorcon/txtorcon-interface.rst
-share/txtorcon/txtorcon-onion.rst
-share/txtorcon/txtorcon-protocol.rst
-share/txtorcon/txtorcon-socks.rst
-share/txtorcon/txtorcon-state.rst
-share/txtorcon/txtorcon-util.rst
-share/txtorcon/txtorcon.rst
+share/doc/txtorcon/
+share/doc/txtorcon/INSTALL
+@comment share/doc/txtorcon/Makefile
+share/doc/txtorcon/README.rst
+share/doc/txtorcon/TODO
+share/doc/txtorcon/apilinks_sphinxext.py
+share/doc/txtorcon/avatar.png
+share/doc/txtorcon/conf.py
+share/doc/txtorcon/examples.rst
+share/doc/txtorcon/guide.rst
+share/doc/txtorcon/hacking.rst
+share/doc/txtorcon/haiku.css
+share/doc/txtorcon/index.rst
+share/doc/txtorcon/installing.rst
+share/doc/txtorcon/interop_asyncio.rst
+share/doc/txtorcon/introduction.rst
+share/doc/txtorcon/logo.png
+share/doc/txtorcon/logo.svg
+share/doc/txtorcon/meejah.asc
+share/doc/txtorcon/release-checklist.rst
+share/doc/txtorcon/releases.rst
+share/doc/txtorcon/txtorcon-config.rst
+share/doc/txtorcon/txtorcon-controller.rst
+share/doc/txtorcon/txtorcon-endpoints.rst
+share/doc/txtorcon/txtorcon-interface.rst
+share/doc/txtorcon/txtorcon-onion.rst
+share/doc/txtorcon/txtorcon-protocol.rst
+share/doc/txtorcon/txtorcon-socks.rst
+share/doc/txtorcon/txtorcon-state.rst
+share/doc/txtorcon/txtorcon-util.rst
+share/doc/txtorcon/txtorcon.rst
+share/examples/txtorcon/
+share/examples/txtorcon/close_all_circuits.py
+share/examples/txtorcon/connect.py
+share/examples/txtorcon/disallow_streams_by_port.py
+share/examples/txtorcon/dns_lookups.py
+share/examples/txtorcon/hidden_echo.py
+share/examples/txtorcon/launch_tor.py
+share/examples/txtorcon/launch_tor2web.py
+share/examples/txtorcon/launch_tor_endpoint.py
+share/examples/txtorcon/launch_tor_endpoint2.py
+share/examples/txtorcon/launch_tor_unix_sockets.py
+share/examples/txtorcon/launch_tor_with_simplehttpd.py
+share/examples/txtorcon/minimal_endpoint.py
+share/examples/txtorcon/monitor.py
+share/examples/txtorcon/readme.py
+share/examples/txtorcon/readme2.py
+share/examples/txtorcon/stem_relay_descriptor.py
+share/examples/txtorcon/stream_circuit_logger.py
+share/examples/txtorcon/tor_info.py
+share/examples/txtorcon/web_client.py
+share/examples/txtorcon/web_client_authenticated.py
+share/examples/txtorcon/web_client_custom_circuit.py
+share/examples/txtorcon/web_client_treq.py
+share/examples/txtorcon/web_onion_service_aiohttp.py
+share/examples/txtorcon/web_onion_service_endpoints.py
+share/examples/txtorcon/web_onion_service_ephemeral_auth.py
+share/examples/txtorcon/web_onion_service_ephemeral_nonanon.py
+share/examples/txtorcon/web_onion_service_ephemeral_unix.py
+share/examples/txtorcon/web_onion_service_filesystem.py
+share/examples/txtorcon/web_onion_service_prop224.py
+share/examples/txtorcon/web_onion_service_prop224_endpoints_file.py
+share/examples/txtorcon/webui_server.py
