adguardhome: add external TOOL_DEPENDS for packr, cleanup build target

[bkrawczyk <bbartlomiej%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	bkrawczyk <bbartlomiej%gmail.com@localhost>
Pushed By:	bkrawczyk
Date:		Wed Nov 3 17:35:29 2021 +0100
Changeset:	ae158f48389ed9e6029b08e120f0077f553e0abb

Modified Files:
	adguardhome/Makefile

Log Message:
adguardhome: add external TOOL_DEPENDS for packr, cleanup build target

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ae158f48389ed9e6029b08e120f0077f553e0abb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 adguardhome/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diffs:
diff --git a/adguardhome/Makefile b/adguardhome/Makefile
index b058a5b19c..08c941dddb 100644
--- a/adguardhome/Makefile
+++ b/adguardhome/Makefile
@@ -30,6 +30,9 @@ CHECK_RELRO_SKIP+=	sbin/adguardhome
 #TOOL_DEPENDS+=	yarn>=1.22.5:../../devel/yarn
 #USE_TOOLS+=	tar
 
+TOOL_DEPENDS+=	packr:../../wip/packr
+
+
 OWN_DIRS+=	libdata/adguardhome
 
 .include "go-modules.mk"
@@ -39,7 +42,6 @@ PKG_SYSCONFSUBDIR=	adguardhome
 RCD_SCRIPTS+=		adguardhome
 
 do-build:
-	${RUN} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO} install github.com/gobuffalo/packr/packr
 	${RUN} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO} generate ./main.go
 	${RUN} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO} build --ldflags="-s -w -X github.com/AdguardTeam/AdGuardHome/internal/version.version=${DISTNAME:S,^v,,} -X github.com/AdGuardTeam/AdGuardHome/internal/version..channel=release -X github.com/AdGuardTeam/AdGuardHome/internal/version..goarm=${GOARM}"
 
@@ -56,8 +58,5 @@ generate-frontend:
 	@${ECHO} "Now upload ${WRKDIR}/${PKGNAME_NOREV}-frontend.tar.gz to LOCAL_PORTS"
 
 .include "../../mk/bsd.prefs.mk"
-
-PREPEND_PATH+=	${WRKDIR}/.gopath/bin
-
 .include "../../lang/go/go-module.mk"
 .include "../../mk/bsd.pkg.mk"