git: 0ee088869dcd - main - net/py-pyshark: Convert REINPLACE_CMD to patch file

Po-Chuan Hsieh sunpoet at FreeBSD.org
Sun May 2 19:52:38 UTC 2021


The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0ee088869dcdff4e60b7a3cfe8460ca80e018221

commit 0ee088869dcdff4e60b7a3cfe8460ca80e018221
Author:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
AuthorDate: 2021-05-02 19:45:24 +0000
Commit:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
CommitDate: 2021-05-02 19:45:24 +0000

    net/py-pyshark: Convert REINPLACE_CMD to patch file
---
 net/py-pyshark/Makefile                       |  2 +-
 net/py-pyshark/files/patch-pyshark-config.ini | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/net/py-pyshark/Makefile b/net/py-pyshark/Makefile
index 53301ec6ddcb..0ff049dfbe6c 100644
--- a/net/py-pyshark/Makefile
+++ b/net/py-pyshark/Makefile
@@ -23,6 +23,6 @@ USE_PYTHON=	autoplist concurrent distutils
 NO_ARCH=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|C:\\Program Files\\Wireshark\\\(.*\).exe|${LOCALBASE}/bin/\1|' ${WRKSRC}/pyshark/config.ini
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/pyshark/config.ini
 
 .include <bsd.port.mk>
diff --git a/net/py-pyshark/files/patch-pyshark-config.ini b/net/py-pyshark/files/patch-pyshark-config.ini
new file mode 100644
index 000000000000..69eda6fb2c35
--- /dev/null
+++ b/net/py-pyshark/files/patch-pyshark-config.ini
@@ -0,0 +1,12 @@
+--- pyshark/config.ini.orig	2020-05-27 13:39:51 UTC
++++ pyshark/config.ini
+@@ -7,7 +7,7 @@
+ # (Linux): /usr/local/bin/tshark
+ # (Windows): %ProgramFiles%\Wireshark\tshark.exe
+ # (Windows): %ProgramFiles(x86)%\Wireshark\tshark.exe
+-tshark_path = C:\Program Files\Wireshark\tshark.exe
++tshark_path = %%LOCALBASE%%/bin/tshark
+ 
+ [dumpcap]
+-dumpcap_path = C:\Program Files\Wireshark\dumpcap.exe
++dumpcap_path = /usr/local/bin/dumpcap


More information about the dev-commits-ports-all mailing list