From owner-svn-ports-head@freebsd.org Sun Sep 29 04:15:47 2019 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 D8193F1CA2; Sun, 29 Sep 2019 04:15:47 +0000 (UTC) (envelope-from bapt@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) server-signature RSA-PSS (4096 bits) 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 46gsdv4yqSz45Wm; Sun, 29 Sep 2019 04:15:47 +0000 (UTC) (envelope-from bapt@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 8A166C796; Sun, 29 Sep 2019 04:15:47 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8T4FltM031159; Sun, 29 Sep 2019 04:15:47 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8T4FldF031158; Sun, 29 Sep 2019 04:15:47 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201909290415.x8T4FldF031158@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 29 Sep 2019 04:15:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513191 - head/Mk X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/Mk X-SVN-Commit-Revision: 513191 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.29 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: Sun, 29 Sep 2019 04:15:47 -0000 Author: bapt Date: Sun Sep 29 04:15:47 2019 New Revision: 513191 URL: https://svnweb.freebsd.org/changeset/ports/513191 Log: Reduce code duplication by calling fetch target when converting the do-fetch target to proper scripting we lost the ability to overwrite do-fetch when running make makesum. as reported here: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id= Let's call again do-fetch directly instead of duplicating its content PR: 215530 Reported by: jbeich Differential Revision: https://reviews.freebsd.org/D21544 Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Sun Sep 29 03:54:21 2019 (r513190) +++ head/Mk/bsd.port.mk Sun Sep 29 04:15:47 2019 (r513191) @@ -3873,20 +3873,8 @@ _CHECKSUM_INIT_ENV= \ # As we're fetching new distfiles, that are not in the distinfo file, disable # checksum and sizes checks. makesum: check-sanity -.if !empty(DISTFILES) - @${SETENV} \ - ${_DO_FETCH_ENV} ${_MASTER_SITES_ENV} \ - dp_NO_CHECKSUM=yes dp_DISABLE_SIZE=yes \ - dp_SITE_FLAVOR=MASTER \ - ${SH} ${SCRIPTSDIR}/do-fetch.sh ${DISTFILES:C/.*/'&'/} -.endif -.if defined(PATCHFILES) && !empty(PATCHFILES) - @${SETENV} \ - ${_DO_FETCH_ENV} ${_PATCH_SITES_ENV} \ - dp_NO_CHECKSUM=yes dp_DISABLE_SIZE=yes \ - dp_SITE_FLAVOR=PATCH \ - ${SH} ${SCRIPTSDIR}/do-fetch.sh ${PATCHFILES:C/:-p[0-9]//:C/.*/'&'/} -.endif + @cd ${.CURDIR} && ${MAKE} fetch NO_CHECKSUM=yes \ + DISABLE_SIZE=yes @${SETENV} \ ${_CHECKSUM_INIT_ENV} \ dp_CHECKSUM_ALGORITHMS='${CHECKSUM_ALGORITHMS:tu}' \