From nobody Wed Oct 27 08:10:11 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9E3391813E27; Wed, 27 Oct 2021 08:10:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HfLw33jGGz3Fx1; Wed, 27 Oct 2021 08:10:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5C0BF47E2; Wed, 27 Oct 2021 08:10:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19R8AB2k001610; Wed, 27 Oct 2021 08:10:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R8ABK8001603; Wed, 27 Oct 2021 08:10:11 GMT (envelope-from git) Date: Wed, 27 Oct 2021 08:10:11 GMT Message-Id: <202110270810.19R8ABK8001603@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Philip Paeps Subject: git: f5006bb2aa6d - 2021Q4 - net/fort: don't depend on gcc10, fix version check List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: f5006bb2aa6dcd5ec3a48becf32df9dd3ad80e92 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by philip: URL: https://cgit.FreeBSD.org/ports/commit/?id=f5006bb2aa6dcd5ec3a48becf32df9dd3ad80e92 commit f5006bb2aa6dcd5ec3a48becf32df9dd3ad80e92 Author: Philip Paeps AuthorDate: 2021-10-27 07:59:54 +0000 Commit: Philip Paeps 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 (maintainer) Reported by: Mark Tinka [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])