Date: Tue, 28 Sep 2021 14:33:56 GMT From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 70a90d069bab - main - sysutils/nut-devel: Update to the latest networkupstools/nut github commit Message-ID: <202109281433.18SEXuKr048943@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=70a90d069bab917eb8a325a754e7982cd1e47177 commit 70a90d069bab917eb8a325a754e7982cd1e47177 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2021-09-28 14:30:16 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2021-09-28 14:33:48 +0000 sysutils/nut-devel: Update to the latest networkupstools/nut github commit --- sysutils/nut-devel/Makefile | 4 ++-- sysutils/nut-devel/distinfo | 6 +++--- sysutils/nut-devel/files/patch-configure.ac | 11 ----------- sysutils/nut-devel/files/patch-docs_Makefile.am | 17 ----------------- sysutils/nut-devel/files/patch-docs_man_Makefile.am | 11 ----------- 5 files changed, 5 insertions(+), 44 deletions(-) diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile index d96df80b6756..dfcdee60c12a 100644 --- a/sysutils/nut-devel/Makefile +++ b/sysutils/nut-devel/Makefile @@ -14,8 +14,8 @@ COMMENT= Network UPS Tools USE_GITHUB= yes GH_ACCOUNT= networkupstools -GH_TAGNAME= 8890ec02 -NUT_COMMIT_DATE= 2021.09.13 +GH_TAGNAME= 4722a4f0 +NUT_COMMIT_DATE= 2021.09.28 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/sysutils/nut-devel/distinfo b/sysutils/nut-devel/distinfo index ec9941fa551d..3ce29e6de04e 100644 --- a/sysutils/nut-devel/distinfo +++ b/sysutils/nut-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1631548492 -SHA256 (networkupstools-nut-2021.09.13-8890ec02_GH0.tar.gz) = ed635bdc773ba4a044037530764f4c2eb456c3286425347ad8856705ac25c64c -SIZE (networkupstools-nut-2021.09.13-8890ec02_GH0.tar.gz) = 3047305 +TIMESTAMP = 1632838590 +SHA256 (networkupstools-nut-2021.09.28-4722a4f0_GH0.tar.gz) = d2843b323e0abd9768b7c1856e54c036d9edc2058066c87a4d44727ff7133318 +SIZE (networkupstools-nut-2021.09.28-4722a4f0_GH0.tar.gz) = 3073997 diff --git a/sysutils/nut-devel/files/patch-configure.ac b/sysutils/nut-devel/files/patch-configure.ac deleted file mode 100644 index 185104be2596..000000000000 --- a/sysutils/nut-devel/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2020-02-09 18:44:01 UTC -+++ configure.ac -@@ -818,7 +818,7 @@ dnl not fail if we have no tools to generate it (so ad - AC_MSG_CHECKING([if we can build ${nut_doc_build_target_base}]) - can_build_doc_man=no - if test "${nut_have_asciidoc}" = yes ; then -- ( cd "$DOCTESTDIR" && ${A2X} --format manpage --destination-dir=. --xsltproc-opts "--nonet" "${abs_srcdir}"/docs/man/snmp-ups.txt && test -s snmp-ups.8 ) && can_build_doc_man=yes -+ ( cd "$DOCTESTDIR" && ${A2X} --format manpage --destination-dir=. --xsltproc-opts="--nonet" "${abs_srcdir}"/docs/man/snmp-ups.txt && test -s snmp-ups.8 ) && can_build_doc_man=yes - rm -f "${DOCTESTDIR}"/snmp-ups.8 - fi - if test "${can_build_doc_man}" = yes ; then diff --git a/sysutils/nut-devel/files/patch-docs_Makefile.am b/sysutils/nut-devel/files/patch-docs_Makefile.am deleted file mode 100644 index c927aeb66568..000000000000 --- a/sysutils/nut-devel/files/patch-docs_Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ ---- docs/Makefile.am.orig 2020-02-09 18:44:01 UTC -+++ docs/Makefile.am -@@ -102,10 +102,10 @@ solaris-usb.html solaris-usb.chunked solaris-usb.pdf: - # variable ASCIIDOC_VERBOSE to "-v", ie: - # $ ASCIIDOC_VERBOSE=-v make - A2X_COMMON_OPTS = $(ASCIIDOC_VERBOSE) --attribute icons \ -- --xsltproc-opts "--nonet" \ -- --xsltproc-opts "--stringparam nut.localdate \"`TZ=UTC date +%Y-%m-%d`\"" \ -- --xsltproc-opts "--stringparam nut.localtime \"`TZ=UTC date +%H:%M:%S`\"" \ -- --xsltproc-opts "--stringparam nut.nutversion \"@PACKAGE_VERSION@\"" \ -+ --xsltproc-opts="--nonet" \ -+ --xsltproc-opts="--stringparam nut.localdate \"`TZ=UTC date +%Y-%m-%d`\"" \ -+ --xsltproc-opts="--stringparam nut.localtime \"`TZ=UTC date +%H:%M:%S`\"" \ -+ --xsltproc-opts="--stringparam nut.nutversion \"@PACKAGE_VERSION@\"" \ - --attribute iconsdir=$(srcdir)/images \ - --attribute=badges \ - --attribute=external_title \ diff --git a/sysutils/nut-devel/files/patch-docs_man_Makefile.am b/sysutils/nut-devel/files/patch-docs_man_Makefile.am deleted file mode 100644 index dfc2b72acd60..000000000000 --- a/sysutils/nut-devel/files/patch-docs_man_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- docs/man/Makefile.am.orig 2020-02-09 18:44:01 UTC -+++ docs/man/Makefile.am -@@ -745,7 +745,7 @@ if HAVE_ASCIIDOC - ### Prior to Asciidoc ~8.6.8, the --destination-dir flag didn't seem to affect the location of the intermediate .xml file. - ### This parameter is currently required; see docs/Makefile.am for more detail. - A2X_MANPAGE_OPTS = --doctype manpage --format manpage \ -- --xsltproc-opts "--nonet" \ -+ --xsltproc-opts="--nonet" \ - --attribute mansource="Network UPS Tools" \ - --attribute manversion="@PACKAGE_VERSION@" \ - --attribute manmanual="NUT Manual" \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109281433.18SEXuKr048943>