From owner-svn-ports-head@freebsd.org Wed Sep 2 03:44:01 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 368313C9FD1; Wed, 2 Sep 2020 03:44:01 +0000 (UTC) (envelope-from danfe@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh8tm6LMgz46qV; Wed, 2 Sep 2020 03:44:00 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 090A9244E1; Wed, 2 Sep 2020 03:44:00 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0823hxCB066893; Wed, 2 Sep 2020 03:43:59 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0823hx4B066891; Wed, 2 Sep 2020 03:43:59 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202009020343.0823hx4B066891@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Wed, 2 Sep 2020 03:43:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547315 - in head: dns/yadifa finance/beanie X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head: dns/yadifa finance/beanie X-SVN-Commit-Revision: 547315 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 03:44:01 -0000 Author: danfe Date: Wed Sep 2 03:43:59 2020 New Revision: 547315 URL: https://svnweb.freebsd.org/changeset/ports/547315 Log: Ensure that there is only one variable definition per each object, as the C (and C++) standards mandated for years and compilers started to enforce as of recently (Clang 11, GCC 10). Reported by: pkg-fallout Modified: head/dns/yadifa/Makefile head/finance/beanie/Makefile Modified: head/dns/yadifa/Makefile ============================================================================== --- head/dns/yadifa/Makefile Wed Sep 2 03:34:32 2020 (r547314) +++ head/dns/yadifa/Makefile Wed Sep 2 03:43:59 2020 (r547315) @@ -38,6 +38,11 @@ USE_RC_SUBR= ${PORTNAME}d PORTDOCS= AUTHORS COPYING ChangeLog \ INSTALL NEWS README TODO VERSION +post-patch: +# Fix the build with -fno-common (for Clang 11 and GCC 10) + @${REINPLACE_CMD} -e '/\*g_client_logger/d' \ + ${WRKSRC}/bin/yadifa/yadifa.c + post-configure: ${REINPLACE_CMD} -e 's|^docdir = .*|docdir = ${EXAMPLESDIR}|' ${WRKSRC}/etc/Makefile ${REINPLACE_CMD} -e 's|/usr/local/var|/var|' -e 's|/var/zones|/var/${PORTNAME}|' ${WRKSRC}/etc/yadifad.conf.example Modified: head/finance/beanie/Makefile ============================================================================== --- head/finance/beanie/Makefile Wed Sep 2 03:34:32 2020 (r547314) +++ head/finance/beanie/Makefile Wed Sep 2 03:43:59 2020 (r547315) @@ -22,5 +22,8 @@ MAKE_JOBS_UNSAFE= yes post-patch: @${CP} ${WRKSRC}/beanie.mk.sample ${WRKSRC}/beanie.mk @${CP} ${WRKSRC}/tmac/lhead.sample.r ${WRKSRC}/tmac/lhead.r +# Fix the build with -fno-common (for Clang 11 and GCC 10) + @${REINPLACE_CMD} -e 's,int[[:blank:]]*itemno,extern &,' \ + ${WRKSRC}/import/salesorder.c .include