Date: Wed, 27 Dec 2023 21:29:07 GMT From: Oleksii Samorukov <samm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c934fdfbf6ce - main - comms/ebusd: update to 23.3 Message-ID: <202312272129.3BRLT7P8070888@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by samm: URL: https://cgit.FreeBSD.org/ports/commit/?id=c934fdfbf6ceeadb7a6436042d117caee815bea7 commit c934fdfbf6ceeadb7a6436042d117caee815bea7 Author: Oleksii Samorukov <samm@FreeBSD.org> AuthorDate: 2023-12-27 21:26:00 +0000 Commit: Oleksii Samorukov <samm@FreeBSD.org> CommitDate: 2023-12-27 21:28:09 +0000 comms/ebusd: update to 23.3 - remove outdated patches and update existing - temporary remove ebusfeed tool as it is now broken (reported to upstream) - remove dependency on libargp ChangeLog: https://github.com/john30/ebusd/discussions/1107 --- comms/ebusd/Makefile | 5 +---- comms/ebusd/distinfo | 6 +++--- comms/ebusd/files/patch-configure.ac | 10 +++++----- comms/ebusd/files/patch-src_ebusd_main.cpp | 12 ------------ comms/ebusd/files/patch-src_lib_ebus_message.h | 10 ---------- comms/ebusd/files/patch-src_tools_ebusctl.cpp | 16 ---------------- comms/ebusd/pkg-plist | 1 - 7 files changed, 9 insertions(+), 51 deletions(-) diff --git a/comms/ebusd/Makefile b/comms/ebusd/Makefile index bb001ba1c09c..3119f951e7e4 100644 --- a/comms/ebusd/Makefile +++ b/comms/ebusd/Makefile @@ -1,5 +1,5 @@ PORTNAME= ebusd -PORTVERSION= 23.2 +PORTVERSION= 23.3 CATEGORIES= comms MAINTAINER= samm@FreeBSD.org @@ -9,8 +9,6 @@ WWW= https://github.com/john30/ebusd/wiki LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libargp.so:devel/argp-standalone - USES= autoreconf compiler:c++11-lang localbase:ldflags USE_GITHUB= yes @@ -25,7 +23,6 @@ LOGDIR= /var/log/${PORTNAME} RUNDIR= /var/run/${PORTNAME} CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-ebusfeed PLIST_SUB= USER=${USERS} GROUP=${GROUPS} \ LOGDIR=${LOGDIR} \ diff --git a/comms/ebusd/distinfo b/comms/ebusd/distinfo index efc416bc0441..a3d88c714dfc 100644 --- a/comms/ebusd/distinfo +++ b/comms/ebusd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689021891 -SHA256 (john30-ebusd-23.2_GH0.tar.gz) = 133ec8f44c446e31cc73b1777af5045a228ee20e0024b626c5fbb947f6a31952 -SIZE (john30-ebusd-23.2_GH0.tar.gz) = 568811 +TIMESTAMP = 1703670595 +SHA256 (john30-ebusd-23.3_GH0.tar.gz) = 6133774523d94583333f86ff8841a725da2ac193ab1cfeddad753dae583810b3 +SIZE (john30-ebusd-23.3_GH0.tar.gz) = 583788 diff --git a/comms/ebusd/files/patch-configure.ac b/comms/ebusd/files/patch-configure.ac index 4df45b0b98d6..8201fb7422ea 100644 --- a/comms/ebusd/files/patch-configure.ac +++ b/comms/ebusd/files/patch-configure.ac @@ -1,11 +1,11 @@ ---- configure.ac.orig 2023-07-08 13:54:20 UTC +--- configure.ac.orig 2023-12-27 11:22:31 UTC +++ configure.ac -@@ -154,7 +154,7 @@ AM_COND_IF([KNX], [AC_CONFIG_FILES([ +@@ -146,7 +146,7 @@ AM_COND_IF([KNX], [AC_CONFIG_FILES([ ])]) - AC_DEFINE_UNQUOTED(PACKAGE_PIDFILE, LOCALSTATEDIR "/run/" PACKAGE ".pid", [The path and name of the PID file.]) --AC_DEFINE_UNQUOTED(PACKAGE_LOGFILE, LOCALSTATEDIR "/log/" PACKAGE ".log", [The path and name of the log file.]) -+AC_DEFINE_UNQUOTED(PACKAGE_LOGFILE, LOCALSTATEDIR "/log/" PACKAGE "/" PACKAGE ".log", [The path and name of the log file.]) + AC_DEFINE_UNQUOTED(PACKAGE_PIDFILE, "${localstatedir}/run/${PACKAGE_NAME}.pid", [The path and name of the PID file.]) +-AC_DEFINE_UNQUOTED(PACKAGE_LOGFILE, "${localstatedir}/log/${PACKAGE_NAME}.log", [The path and name of the log file.]) ++AC_DEFINE_UNQUOTED(PACKAGE_LOGFILE, "${localstatedir}/log/${PACKAGE_NAME}/${PACKAGE_NAME}.log", [The path and name of the log file.]) AC_DEFINE(SCAN_VERSION, "[m4_esyscmd_s([sed -e 's#^\([0-9]*\.[0-9]*\).*#\1#' -e 's#\.\([0-9]\)$#0\1#' -e 's#\.##' VERSION])]", [The version of the package formatted for the scan result.]) AC_DEFINE(PACKAGE_VERSION_MAJOR, [m4_esyscmd_s([sed -e 's#^\([0-9]*\)\..*$#\1#' VERSION])], [The major version of the package.]) AC_DEFINE(PACKAGE_VERSION_MINOR, [m4_esyscmd_s([sed -e 's#^.*\.\([0-9]*\)$#\1#' VERSION])], [The minor version of the package.]) diff --git a/comms/ebusd/files/patch-src_ebusd_main.cpp b/comms/ebusd/files/patch-src_ebusd_main.cpp deleted file mode 100644 index c4cf8070d4f3..000000000000 --- a/comms/ebusd/files/patch-src_ebusd_main.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- src/ebusd/main.cpp.orig 2023-07-08 13:54:20 UTC -+++ src/ebusd/main.cpp -@@ -36,6 +36,9 @@ - #include "lib/utils/httpclient.h" - #include "ebusd/scan.h" - -+#ifdef __FreeBSD__ -+extern char **environ; -+#endif - - /** the version string of the program. */ - const char *argp_program_version = "" PACKAGE_STRING "." REVISION ""; diff --git a/comms/ebusd/files/patch-src_lib_ebus_message.h b/comms/ebusd/files/patch-src_lib_ebus_message.h deleted file mode 100644 index 37800cbce71a..000000000000 --- a/comms/ebusd/files/patch-src_lib_ebus_message.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/lib/ebus/message.h.orig 2023-07-19 18:34:53 UTC -+++ src/lib/ebus/message.h -@@ -58,7 +58,6 @@ namespace ebusd { - * template class. - */ - --using std::binary_function; - using std::priority_queue; - using std::deque; - diff --git a/comms/ebusd/files/patch-src_tools_ebusctl.cpp b/comms/ebusd/files/patch-src_tools_ebusctl.cpp deleted file mode 100644 index 786c114c35fa..000000000000 --- a/comms/ebusd/files/patch-src_tools_ebusctl.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- src/tools/ebusctl.cpp.orig 2023-07-08 13:54:20 UTC -+++ src/tools/ebusctl.cpp -@@ -153,7 +153,13 @@ string fetchData(ebusd::TCPSocket* socket, bool &liste - time_t now; - time(&now); - time_t endTime = now + timeout; -+ - #ifdef HAVE_PPOLL -+ -+#ifndef POLLRDHUP -+# define POLLRDHUP 0 -+#endif -+ - int nfds = 2; - struct pollfd fds[nfds]; - diff --git a/comms/ebusd/pkg-plist b/comms/ebusd/pkg-plist index 56427226a48d..5b02899f8371 100644 --- a/comms/ebusd/pkg-plist +++ b/comms/ebusd/pkg-plist @@ -1,6 +1,5 @@ bin/ebusd bin/ebusctl -bin/ebusfeed bin/ebuspicloader %%MQTT%%%%ETCDIR%%/mqtt-hassio.cfg %%MQTT%%%%ETCDIR%%/mqtt-integration.cfg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312272129.3BRLT7P8070888>