Date: Wed, 27 Oct 2021 08:10:11 GMT From: Philip Paeps <philip@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: f5006bb2aa6d - 2021Q4 - net/fort: don't depend on gcc10, fix version check Message-ID: <202110270810.19R8ABK8001603@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q4 has been updated by philip: URL: https://cgit.FreeBSD.org/ports/commit/?id=f5006bb2aa6dcd5ec3a48becf32df9dd3ad80e92 commit f5006bb2aa6dcd5ec3a48becf32df9dd3ad80e92 Author: Philip Paeps <philip@FreeBSD.org> AuthorDate: 2021-10-27 07:59:54 +0000 Commit: Philip Paeps <philip@FreeBSD.org> CommitDate: 2021-10-27 08:09:44 +0000 net/fort: don't depend on gcc10, fix version check The current version of FORT builds fine with any c11 compiler. There is no need for USE_GCC. Patch the build system to correctly define the version of FORT as seen in the output of "fort --version" and the "User-Agent:" HTTP header. [1] Approved by: Toni Yannick Kalombo <toni@devboks.com> (maintainer) Reported by: Mark Tinka <mark@tinka.africa> [1] (cherry picked from commit 9604608f8a2d458e8fbd0acb5fc492972098cc8e) --- net/fort/Makefile | 6 ++++-- net/fort/files/patch-configure.ac | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/net/fort/Makefile b/net/fort/Makefile index dd163a3ca597..f005b965dd2f 100644 --- a/net/fort/Makefile +++ b/net/fort/Makefile @@ -1,5 +1,6 @@ PORTNAME= fort DISTVERSION= 1.5.2 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= toni@devboks.com @@ -12,8 +13,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl libjansson.so:devel/jansson \ libxml2.so:textproc/libxml2 RUN_DEPENDS= ${LOCALBASE}/bin/rsync:net/rsync -USES= autoreconf pkgconfig ssl -USE_GCC= yes +USES= autoreconf compiler:c11 pkgconfig ssl USE_GITHUB= yes USE_RC_SUBR= fort @@ -25,6 +25,8 @@ GNU_CONFIGURE= yes SUB_FILES= pkg-message post-patch: + @${REINPLACE_CMD} -e "s|%%DISTVERSION%%|${DISTVERSION}|" \ + ${WRKSRC}/configure.ac @${REINPLACE_CMD} -e "s|/tmp/fort|${ETCDIR}|" \ ${WRKSRC}/examples/config.json @${REINPLACE_CMD} -e "s|/usr/local/ssl|/etc/ssl|" \ diff --git a/net/fort/files/patch-configure.ac b/net/fort/files/patch-configure.ac new file mode 100644 index 000000000000..36c0f268e1f3 --- /dev/null +++ b/net/fort/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2021-10-19 22:44:35 UTC ++++ configure.ac +@@ -2,7 +2,7 @@ + # Process this file with autoconf to produce a configure script. + + AC_PREREQ([2.69]) +-AC_INIT([fort], [m4_esyscmd_s([git describe --dirty --always --tags])], ++AC_INIT([fort], [%%DISTVERSION%%], + [fort-validator@nic.mx]) + AC_CONFIG_SRCDIR([src/main.c]) + AM_INIT_AUTOMAKE([subdir-objects])
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110270810.19R8ABK8001603>