From nobody Tue Oct 31 12:39:27 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SKV7z44pNz4yL90; Tue, 31 Oct 2023 12:39:27 +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 4SKV7z3J91z4cyk; Tue, 31 Oct 2023 12:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698755967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sCCP7HzMWdKwvyQIAmaqWZ5HYO5j1wdRSqWpsG6UtgM=; b=sU7M6PV48BaVFn2Tn0cPXx8NarFlqQeEK4D4v0UapKxyRF7yzetG0a8T2SwLZON+AvHAKa fnUgIRtQTfX0dNkQv6peinAC2QtW78m0v1Be6tKBtKitxay3zau6Byinr4bYin0jDDHHZa rF0C1VkaP4a4AoIN+0sxXjMKqZKxElyVr1prZ4tq878tsCxmwn4PXLn+h9yxbdzpsq68y4 MjmG5N4bslDC3m9FWUW58uTR++j0EBzV6Y/FCrQ6L23+MqrDEh9DJxyEafSzdfpbxU1/f5 WEZxuVAiSVJFK5SyKmb4agzA8LIUWhU69ihQ0hISe1Il+YdxL6/PaMOOi7YOOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698755967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sCCP7HzMWdKwvyQIAmaqWZ5HYO5j1wdRSqWpsG6UtgM=; b=Zd8pDjitCMczY9/CQjUoxzB4JcGxZ5Cy1fM75fcSqlVnhKTcwRQCtRW9AXQlI9J9eqEWVZ KOM7vUMIZ6WYTDvI2JENVw9MEoitKSiPXPbi2tPryjhR4ZZw6yCFntsQw1EnRwIoaZ5W2b Ww1ZdC1U8fPMI2/ALxNCPBANz96R4nYU+RLHQkN/iSRZ8nIOPF4q8KdNGIZ+H0pyZ+1c8Z ndSWMRopB9qKu84p2S61MMFh8XQYymKVdoBe207QfrlcbIgujjxi/NDwGAXYE8zZQKQcWH y1bmgGepWsACnqhW5PWnS+EloNdtNvGGFPKuQK8zUbbIWXaiif1uX+A2UuTRcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698755967; a=rsa-sha256; cv=none; b=HRswNivQTZGk9eynCba8HeNHRS19BOszb3ABpfgXO9e6U9sjzRbLGmSwaDHU2Nwf7cF4Kz n0X5R6IQto2CzvUWr2jqbXLxkOEUURhqp29OJU+KdPDXV84s0sI1kr2Zp6zx+Kp33xmO1H WrJXOgQVLeWusqSU1xvmbK1KwtETQgiu/Oi/alDA/3zktfCFuQ+pADri9dxjBPSKD+iemS IogfCCHsUQaAHAfiXxhA8jF+nSAX+inOR2byMoDQfQVWSnjrBzmyJ59YEgpPnWZVK3uYkn X581B+KqrOsrEkqx3NAH2IZwC82lnB+NvKhky2m2n7bYLv3Ktgd4+L1e62NByA== 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 4SKV7z2FdFz13ZC; Tue, 31 Oct 2023 12:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39VCdRca097868; Tue, 31 Oct 2023 12:39:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39VCdRuO097865; Tue, 31 Oct 2023 12:39:27 GMT (envelope-from git) Date: Tue, 31 Oct 2023 12:39:27 GMT Message-Id: <202310311239.39VCdRuO097865@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dries Michiels Subject: git: b890ffa426c9 - main - www/homer: general improvements List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: driesm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b890ffa426c92aeae2026635a9fea06819112ab9 Auto-Submitted: auto-generated The branch main has been updated by driesm: URL: https://cgit.FreeBSD.org/ports/commit/?id=b890ffa426c92aeae2026635a9fea06819112ab9 commit b890ffa426c92aeae2026635a9fea06819112ab9 Author: Dries Michiels AuthorDate: 2023-10-31 12:25:33 +0000 Commit: Dries Michiels CommitDate: 2023-10-31 12:39:14 +0000 www/homer: general improvements - Config file now located in ETCDIR, adhere to hier - No need to own files by user, they don't need to be writeable --- www/homer/Makefile | 10 +++++++--- www/homer/pkg-plist | 9 +++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/www/homer/Makefile b/www/homer/Makefile index cdfae06d8b5e..75644fb87a77 100644 --- a/www/homer/Makefile +++ b/www/homer/Makefile @@ -1,6 +1,7 @@ PORTNAME= homer DISTVERSIONPREFIX= v DISTVERSION= 23.10.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${GH_TAGNAME}/ DISTNAME= homer @@ -18,8 +19,6 @@ GH_ACCOUNT= bastienwirtz NO_ARCH= YES NO_BUILD= YES -PLIST_SUB= HOMER_USERNAME=${WWWOWN} - do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} ${CP} -a ${WRKDIR}/*.js ${WRKDIR}/logo.png ${WRKDIR}/index.html ${STAGEDIR}${WWWDIR} @@ -27,7 +26,12 @@ do-install: cd ${WRKDIR}/assets && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/assets ${MKDIR} ${STAGEDIR}${WWWDIR}/resources cd ${WRKDIR}/resources && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/resources + ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/assets/config.yml.dist \ - ${STAGEDIR}${WWWDIR}/assets/config.yml + ${STAGEDIR}${ETCDIR}/config.yml + +post-install: + ${RLN} ${STAGEDIR}${ETCDIR}/config.yml ${STAGEDIR}${WWWDIR}/assets/config.yml + .include diff --git a/www/homer/pkg-plist b/www/homer/pkg-plist index 6477ccb8ff81..c0f5519e8d84 100644 --- a/www/homer/pkg-plist +++ b/www/homer/pkg-plist @@ -1,11 +1,8 @@ -@owner %%HOMER_USERNAME%% -@dir %%WWWDIR%%/assets -@dir %%WWWDIR%%/assets/icons -@dir %%WWWDIR%%/assets/tools -@dir %%WWWDIR%%/resources +@dir %%ETCDIR%% %%WWWDIR%%/assets/additional-page.yml.dist %%WWWDIR%%/assets/config-demo.yml.dist -@sample %%WWWDIR%%/assets/config.yml.dist %%WWWDIR%%/assets/config.yml +%%WWWDIR%%/assets/config.yml +@sample %%WWWDIR%%/assets/config.yml.dist %%ETCDIR%%/config.yml %%WWWDIR%%/assets/config.yml.dist.sample-sui %%WWWDIR%%/assets/custom.css.sample %%WWWDIR%%/assets/icons/README.md