git: 103e5c70d7ee - main - www/homer: general improvements

The branch main has been updated by driesm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=103e5c70d7eeb5e1a5a4ad85163313e73733181a

commit 103e5c70d7eeb5e1a5a4ad85163313e73733181a
Author:     Dries Michiels <driesm@FreeBSD.org>
AuthorDate: 2023-11-01 00:43:54 +0000
Commit:     Dries Michiels <driesm@FreeBSD.org>
CommitDate: 2023-11-01 01:01:38 +0000

    www/homer: general improvements
    
            - set DIST_SUBDIR to not have a clash with same distfile name
            - drop GH variables and hardcode them in MASTER_SITES
            - move to homer-web following Arch naming
---
 MOVED                              |  1 +
 www/Makefile                       |  2 +-
 www/{homer => homer-web}/Makefile  | 10 ++++++----
 www/homer-web/distinfo             |  3 +++
 www/{homer => homer-web}/pkg-descr |  0
 www/{homer => homer-web}/pkg-plist |  4 ++--
 www/homer/distinfo                 |  3 ---
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/MOVED b/MOVED
index c14f4e843a2b..f6fb6dc7b71c 100644
--- a/MOVED
+++ b/MOVED
@@ -7953,3 +7953,4 @@ multimedia/subsync|multimedia/ffsubsync|2023-10-22|Project was renamed
 dns/libasr-devel||2023-10-25|Has expired: libasr will be maintained only as part of OpenSMTPD
 dns/libasr||2023-10-25|Has expired: libasr will be maintained only as part of OpenSMTPD
 textproc/xalan-c||2023-10-28|Has expired: Upstream no longer continuing; please consider textproc/libxslt, textproc/qt5-xmlpatterns or SaxonC as potential alternatives
+www/homer|www/homer-web|2023-11-01|Rename port to be consistent with Arch
diff --git a/www/Makefile b/www/Makefile
index 881cbac35c90..4f2827d528e5 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -246,7 +246,7 @@
     SUBDIR += hedgedoc
     SUBDIR += hiawatha
     SUBDIR += hiawatha-monitor
-    SUBDIR += homer
+    SUBDIR += homer-web
     SUBDIR += hotcrp
     SUBDIR += hs-DAV
     SUBDIR += hs-gitit
diff --git a/www/homer/Makefile b/www/homer-web/Makefile
similarity index 75%
rename from www/homer/Makefile
rename to www/homer-web/Makefile
index 75644fb87a77..fdd119138f17 100644
--- a/www/homer/Makefile
+++ b/www/homer-web/Makefile
@@ -1,10 +1,12 @@
 PORTNAME=	homer
 DISTVERSIONPREFIX=	v
 DISTVERSION=	23.10.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${GH_TAGNAME}/
+MASTER_SITES=	https://github.com/bastienwirtz/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
+PKGNAMESUFFIX=	-web
 DISTNAME=	homer
+DIST_SUBDIR=	${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	Dead simple static HOMepage for your servER
@@ -13,8 +15,6 @@ WWW=		https://github.com/bastienwirtz/homer
 LICENSE=	APACHE20
 
 USES=		zip
-USE_GITHUB=	nodefault
-GH_ACCOUNT=	bastienwirtz
 
 NO_ARCH=	YES
 NO_BUILD=	YES
@@ -27,6 +27,8 @@ do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}/resources
 	cd ${WRKDIR}/resources && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/resources
 	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKDIR}/assets/config.yml.dist \
+		${STAGEDIR}${ETCDIR}/config.yml.dist
 	${INSTALL_DATA} ${WRKDIR}/assets/config.yml.dist \
 		${STAGEDIR}${ETCDIR}/config.yml
 
diff --git a/www/homer-web/distinfo b/www/homer-web/distinfo
new file mode 100644
index 000000000000..33d6c4c60801
--- /dev/null
+++ b/www/homer-web/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1698800278
+SHA256 (homer-23.10.1/homer.zip) = 779b5d30464318cf78d6139fa30175c8d4b1cac0436bc61e0f1c212db7e17744
+SIZE (homer-23.10.1/homer.zip) = 981887
diff --git a/www/homer/pkg-descr b/www/homer-web/pkg-descr
similarity index 100%
rename from www/homer/pkg-descr
rename to www/homer-web/pkg-descr
diff --git a/www/homer/pkg-plist b/www/homer-web/pkg-plist
similarity index 97%
rename from www/homer/pkg-plist
rename to www/homer-web/pkg-plist
index c0f5519e8d84..047b0e5495cb 100644
--- a/www/homer/pkg-plist
+++ b/www/homer-web/pkg-plist
@@ -1,8 +1,8 @@
-@dir %%ETCDIR%%
+@sample %%ETCDIR%%/config.yml.dist %%ETCDIR%%/config.yml
 %%WWWDIR%%/assets/additional-page.yml.dist
 %%WWWDIR%%/assets/config-demo.yml.dist
 %%WWWDIR%%/assets/config.yml
-@sample %%WWWDIR%%/assets/config.yml.dist %%ETCDIR%%/config.yml
+%%WWWDIR%%/assets/config.yml.dist
 %%WWWDIR%%/assets/config.yml.dist.sample-sui
 %%WWWDIR%%/assets/custom.css.sample
 %%WWWDIR%%/assets/icons/README.md
diff --git a/www/homer/distinfo b/www/homer/distinfo
deleted file mode 100644
index 3c258033de84..000000000000
--- a/www/homer/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1698680943
-SHA256 (homer.zip) = 779b5d30464318cf78d6139fa30175c8d4b1cac0436bc61e0f1c212db7e17744
-SIZE (homer.zip) = 981887