From owner-dev-commits-ports-all@freebsd.org Sun Apr 25 20:53:38 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 7E3105EB20F; Sun, 25 Apr 2021 20:53:38 +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 4FT0cL2jJ6z4c0h; Sun, 25 Apr 2021 20:53:38 +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 375E91B016; Sun, 25 Apr 2021 20:53:38 +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 13PKrccU011496; Sun, 25 Apr 2021 20:53:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13PKrcCC011495; Sun, 25 Apr 2021 20:53:38 GMT (envelope-from git) Date: Sun, 25 Apr 2021 20:53:38 GMT Message-Id: <202104252053.13PKrcCC011495@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 63a2b7669b00 - 2021Q2 - www/adguardhome: Use pre-bilt html frontend tarballs and mantenance mode which allows to build them. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 63a2b7669b0088f00c627973cf1238549658370f Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 20:53:38 -0000 The branch 2021Q2 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=63a2b7669b0088f00c627973cf1238549658370f commit 63a2b7669b0088f00c627973cf1238549658370f Author: Yuri Victorovich AuthorDate: 2021-04-16 21:26:03 +0000 Commit: Yuri Victorovich CommitDate: 2021-04-25 20:53:35 +0000 www/adguardhome: Use pre-bilt html frontend tarballs and mantenance mode which allows to build them. Port was broken without this since they recently added the need for html frontend being presend before build and such frontend was missing. Reported by: Sandro Wirth (cherry picked from commit 990e47d4e491bbed9bdd626b4b89f186de5804c7) --- www/adguardhome/Makefile | 30 ++++++++++++++++++++++++++++++ www/adguardhome/distinfo | 6 +++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/www/adguardhome/Makefile b/www/adguardhome/Makefile index 60e99e25c6dc..3c8cd2da87f2 100644 --- a/www/adguardhome/Makefile +++ b/www/adguardhome/Makefile @@ -2,6 +2,7 @@ PORTNAME= adguardhome DISTVERSIONPREFIX= v DISTVERSION= 0.105.2 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= yuri@FreeBSD.org @@ -14,6 +15,35 @@ USES= go:modules GO_MODULE= github.com/AdguardTeam/AdGuardHome +# to rebuild the deps archives: +# 1. set DEV_UPDATE_MODE=yes +# 2. make makesum patch build +# 3. upload the *-html-build* archives +# 4. set DEV_UPDATE_MODE=no +# 5. make clean makesum + +DEV_UPDATE_MODE= no + +.if (${DEV_UPDATE_MODE} == "yes") +BUILD_DEPENDS= npm:www/npm \ + yarn:www/yarn +do-build: + @cd ${WRKSRC} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} js-deps js-build && \ + ${TAR} czf ${DISTDIR}/${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX} build && \ + ${TAR} czf ${DISTDIR}/${PORTNAME}-html-build2-${DISTVERSION}${EXTRACT_SUFX} build2 && \ + ${ECHO} "Please upload files ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX} and ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-html-build2-${DISTVERSION}${EXTRACT_SUFX}" +.else +MASTER_SITES= LOCAL/yuri/:deps +DISTFILES= ${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX}:deps \ + ${PORTNAME}-html-build2-${DISTVERSION}${EXTRACT_SUFX}:deps +EXTRACT_ONLY= ${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX} \ + ${PORTNAME}-html-build2-${DISTVERSION}${EXTRACT_SUFX} + +pre-build: + @${CP} -r ${WRKDIR}/build ${WRKDIR}/build2 ${WRKSRC}/ +.endif + PLIST_FILES= bin/${PORTNAME} .include diff --git a/www/adguardhome/distinfo b/www/adguardhome/distinfo index 3a9749f16558..d0a74207115c 100644 --- a/www/adguardhome/distinfo +++ b/www/adguardhome/distinfo @@ -1,4 +1,8 @@ -TIMESTAMP = 1615482485 +TIMESTAMP = 1618476839 +SHA256 (go/www_adguardhome/adguardhome-v0.105.2/adguardhome-html-build-0.105.2.tar.gz) = 4226f4e211d411470a9992355b58cb9fd2eb36d50922c5df7efa46cccc04b966 +SIZE (go/www_adguardhome/adguardhome-v0.105.2/adguardhome-html-build-0.105.2.tar.gz) = 2331678 +SHA256 (go/www_adguardhome/adguardhome-v0.105.2/adguardhome-html-build2-0.105.2.tar.gz) = 713d26da7def3291c23da2129c857ff321a12f444b7197ecfdaaedcef656bee3 +SIZE (go/www_adguardhome/adguardhome-v0.105.2/adguardhome-html-build2-0.105.2.tar.gz) = 2414450 SHA256 (go/www_adguardhome/adguardhome-v0.105.2/v0.105.2.mod) = 327afecea8c2cb272a04733275b9df5e127fd846a32e48ff40c7cecf83ef84c4 SIZE (go/www_adguardhome/adguardhome-v0.105.2/v0.105.2.mod) = 1750 SHA256 (go/www_adguardhome/adguardhome-v0.105.2/v0.105.2.zip) = f72335906f3f55786e228f20fba62c7f3980e1058aeaa7d7b4d01ae0f45e87aa