diff --git a/www/adguardhome/Makefile b/www/adguardhome/Makefile index 224d49277ac27..d73b7961f4336 100644 --- a/www/adguardhome/Makefile +++ b/www/adguardhome/Makefile @@ -1,7 +1,6 @@ PORTNAME= adguardhome DISTVERSIONPREFIX= v -DISTVERSION= 0.107.22 -PORTREVISION= 5 +DISTVERSION= 0.107.32 CATEGORIES= www MAINTAINER= yuri@FreeBSD.org @@ -16,12 +15,12 @@ RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss USES= cpe go:1.19,modules GO_MODULE= github.com/AdguardTeam/AdGuardHome -GO_BUILDFLAGS= -ldflags="-s -w -X github.com/AdguardTeam/AdGuardHome/internal/version.version=${DISTVERSION}" # workaround for https://github.com/AdguardTeam/AdGuardHome/issues/4774 +GO_BUILDFLAGS= -ldflags="-s -w -X github.com/AdguardTeam/AdGuardHome/internal/version.version=${DISTVERSION}" # workaround for https://github.com/AdguardTeam/AdGuardHome/issues/4774 # to rebuild the deps archives: # 1. set DEV_UPDATE_MODE=yes -# 2. make makesum patch build -# 3. upload the *-html-build* archives +# 2. make makesum build +# 3. upload the *-html-{build,client}* archives # 4. set DEV_UPDATE_MODE=no # 5. make clean makesum @@ -41,15 +40,15 @@ do-build: @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} js-deps js-build && \ ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX} build && \ - ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${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}" + ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-html-client-${DISTVERSION}${EXTRACT_SUFX} client && \ + ${ECHO} "Please upload files ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX} and ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-html-client-${DISTVERSION}${EXTRACT_SUFX}" .else MASTER_SITES= LOCAL/yuri/:deps DISTFILES= ${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX}:deps \ - ${PORTNAME}-html-build2-${DISTVERSION}${EXTRACT_SUFX}:deps + ${PORTNAME}-html-client-${DISTVERSION}${EXTRACT_SUFX}:deps pre-build: - @${CP} -r ${WRKDIR}/build ${WRKDIR}/build2 ${WRKSRC}/ + @${CP} -r ${WRKDIR}/build ${WRKDIR}/client ${WRKSRC}/ .endif PLIST_FILES= bin/${PORTNAME} diff --git a/www/adguardhome/distinfo b/www/adguardhome/distinfo index b633e583b7237..40756bcf7232f 100644 --- a/www/adguardhome/distinfo +++ b/www/adguardhome/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1674409910 -SHA256 (go/www_adguardhome/adguardhome-v0.107.22/adguardhome-html-build-0.107.22.tar.gz) = f1c3db46979011a80f5ccb6963e937334b598617c21df511c1e584e383a017a3 -SIZE (go/www_adguardhome/adguardhome-v0.107.22/adguardhome-html-build-0.107.22.tar.gz) = 2619529 -SHA256 (go/www_adguardhome/adguardhome-v0.107.22/adguardhome-html-build2-0.107.22.tar.gz) = 77bdbb634be1a68f9ed2720ff12f887a5cb2b05e49a480c30403de160a812457 -SIZE (go/www_adguardhome/adguardhome-v0.107.22/adguardhome-html-build2-0.107.22.tar.gz) = 2414618 -SHA256 (go/www_adguardhome/adguardhome-v0.107.22/v0.107.22.mod) = 7ca708395f842f487c1ebbe09aa78dee58276d652814a6d6df5ad027b7525d82 -SIZE (go/www_adguardhome/adguardhome-v0.107.22/v0.107.22.mod) = 2648 -SHA256 (go/www_adguardhome/adguardhome-v0.107.22/v0.107.22.zip) = 5ec5796edf532c2a3c34846857c34512878bb3615c395ec366f7577955be3696 -SIZE (go/www_adguardhome/adguardhome-v0.107.22/v0.107.22.zip) = 2440396 +TIMESTAMP = 1686672877 +SHA256 (go/www_adguardhome/adguardhome-v0.107.32/adguardhome-html-build-0.107.32.tar.gz) = 7c46cc1f9555fee0ec3bf0fe01042698c7eee65c581a5dec26fb93f033331ada +SIZE (go/www_adguardhome/adguardhome-v0.107.32/adguardhome-html-build-0.107.32.tar.gz) = 2683105 +SHA256 (go/www_adguardhome/adguardhome-v0.107.32/adguardhome-html-client-0.107.32.tar.gz) = 32a0e82a0b3332f8545a4d3fd6acebb806bb4d15543942e4169e5e7b9899d0c2 +SIZE (go/www_adguardhome/adguardhome-v0.107.32/adguardhome-html-client-0.107.32.tar.gz) = 36109852 +SHA256 (go/www_adguardhome/adguardhome-v0.107.32/v0.107.32.mod) = 1e976fd186a9cc2fb7b16b300690ae6fd31389a107ff6d5eeb954901bd9d5091 +SIZE (go/www_adguardhome/adguardhome-v0.107.32/v0.107.32.mod) = 2587 +SHA256 (go/www_adguardhome/adguardhome-v0.107.32/v0.107.32.zip) = ff19d679e162ab58bc3af9d6a45f729b4d2652bde73c261d19333137cc323c0e +SIZE (go/www_adguardhome/adguardhome-v0.107.32/v0.107.32.zip) = 2154123