From nobody Wed Nov 01 01:01:58 2023 X-Original-To: dev-commits-ports-all@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 4SKpcl0WsTz4yR0J; Wed, 1 Nov 2023 01:01:59 +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 4SKpcl030bz3Nfm; Wed, 1 Nov 2023 01:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698800519; 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=OjS1L/tmc/KuNetRo5flo/sN9cuRBYIOunZzFaHdB+o=; b=ZIBY0RIin6sKf+qcHn1/tjXZyGZmZdywTiOgv6SU3qaid/1GCntYaKfqqGy7m95oP7PwQ8 cWdwSIwOmNsxz3Xi/wemL93mFvGiHrMUBNZJLOzFcKgsiBhu6s8rW5DdFUNii+SntS1PaH c6lOutExAGHQa2J8M1atXvKHeBcnq/IJ36hPtSUh26vfWOxB8nPvoeZIZ5HTD57fMyGdsq ZROtULGUE+0rQGz1S0UhoVQ5alG9tD/GhTaxvVM7btd/Nli1+O4XZUvDv8QfVLhjc5FvWD 4RWfjHpw+2DSH+bjnloMsVrxfoKU5jp3qKXVNZYWQHFtAYrQ4lmxbL8p2oGAJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698800519; 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=OjS1L/tmc/KuNetRo5flo/sN9cuRBYIOunZzFaHdB+o=; b=by8/dsgDJypP3StU3ZjRg4CK9xmdtfmOtf70AdqP/bBGbj9Qt8E4ek+szYNqsLhmtj7SPA k4FoKqQ/IOrIaBIqi8n5vUroxTdRSr+fyOOW8QJdMxAJXVgV0Y7e8g/YUOzlttdaZfAUb1 L1EdJGSQDjAV2/6ZX195un7SdGu+Gi1YAZaQC4F5SfZPbcYPq3I68/LsGz5ghmM+ZuY4nK csatyUQyvMw+TIaaUMaeC2SdKGTCMOG1m+Z9TWTtp/jVktaVjoLgUwh1qvLYAuK9cDaiG/ tsEMd4LtvIRhd7CvUm6O5q+hk1UjZxaNN6dleyC8xhFZi+LdzAnRro8ApBSW4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698800519; a=rsa-sha256; cv=none; b=lsa2hVGhJTLQr0waYMoWn2wdKfVsfuQJgnA0IXYH/BFC/uB2QCgz5ENk9dnr2HXGFPd+rY pVd/iu0YExnPwXLalUjfMiD2qidJ3BdQvMruO3RBpZfkYN/fPOU6kjhxp4IFKqRw3FUbPe ZKGuxwAJ2SEG44svIk1Y6B0SzEW27TioVWWe2rqY6Kh3gD8IAnENMWaS81M8QzYw0YLA6l Ji50YzSC9ZCHmorUCn36tYgR9fhSI1U3cUe4lRP2ebXghZvRXNk9ttL/hVkAeOo1mLXGMT NXstCUHn3SnXNpDWseCjmR9e7dciT8e2tI8u4F90VwCSi/lLhpDFa1rz04I7zg== 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 4SKpck6DwmzBKJ; Wed, 1 Nov 2023 01:01:58 +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 3A111wZ7043371; Wed, 1 Nov 2023 01:01:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A111wIW043369; Wed, 1 Nov 2023 01:01:58 GMT (envelope-from git) Date: Wed, 1 Nov 2023 01:01:58 GMT Message-Id: <202311010101.3A111wIW043369@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: 103e5c70d7ee - main - www/homer: general improvements List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 103e5c70d7eeb5e1a5a4ad85163313e73733181a Auto-Submitted: auto-generated The branch main has been updated by driesm: URL: https://cgit.FreeBSD.org/ports/commit/?id=103e5c70d7eeb5e1a5a4ad85163313e73733181a commit 103e5c70d7eeb5e1a5a4ad85163313e73733181a Author: Dries Michiels AuthorDate: 2023-11-01 00:43:54 +0000 Commit: Dries Michiels 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