git: e718cd701176 - main - net/teddycloud: do not overwrite config on update

From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Fri, 06 Jun 2025 11:49:52 UTC
The branch main has been updated by mfechner:

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

commit e718cd7011766bc670ccbb531c0455934d53ab5f
Author:     Michael Pape <freebsd@pe82.de>
AuthorDate: 2025-06-05 18:18:04 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-06-06 11:49:35 +0000

    net/teddycloud: do not overwrite config on update
    
    Make sure files in etc are only created on first install and not
    overwritten by subsequent updates.
    This fixes the problem, that the following files are always
    overwritten by updates:
    /usr/local/etc/teddycloud/tonieboxes.json
    /usr/local/etc/teddycloud/tonies.json
    And also the nightly checksum test does not complain anymore.
    
    PR:             287263
    Reported by:    Matthias Fechner <mfechner@FreeBSD.org>
    Tested by:      Michael Pape <freebsd@pe82.de>
---
 net/teddycloud/Makefile  | 5 +++--
 net/teddycloud/pkg-plist | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/net/teddycloud/Makefile b/net/teddycloud/Makefile
index 0bcf24fe7813..0303c4384eda 100644
--- a/net/teddycloud/Makefile
+++ b/net/teddycloud/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	teddycloud
 DISTVERSIONPREFIX=	tc_v
 DISTVERSION=	0.6.4
+PORTREVISION=	1
 CATEGORIES=	net
 # Get the latest commit hashes here: https://github.com/toniebox-reverse-engineering/tonies-json/commits/release/
 # NOTE: remove the existing tonies.json and tonieboxes.json from DISTDIR before you do a `make makesum`
@@ -74,7 +75,7 @@ do-install:
 	@(cd ${WRKSRC}/install/pre/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/data)
 	@${MKDIR} ${STAGEDIR}${DATADIR}/certs
 	@(cd ${WRKSRC}/install/pre/certs && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/certs)
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/teddycloud
-	@(cd ${WRKSRC}/install/pre/config && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/etc/teddycloud)
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@(cd ${WRKSRC}/install/pre/config && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/net/teddycloud/pkg-plist b/net/teddycloud/pkg-plist
index 7e462283ecea..4b357f18a1c3 100644
--- a/net/teddycloud/pkg-plist
+++ b/net/teddycloud/pkg-plist
@@ -1,8 +1,8 @@
 bin/teddycloud
-%%ETCDIR%%/tonieboxes.custom.json
-%%ETCDIR%%/tonieboxes.json
-%%ETCDIR%%/tonies.custom.json
-%%ETCDIR%%/tonies.json
+@sample %%EXAMPLESDIR%%/tonieboxes.custom.json %%ETCDIR%%/tonieboxes.custom.json
+@sample %%EXAMPLESDIR%%/tonieboxes.json %%ETCDIR%%/tonieboxes.json
+@sample %%EXAMPLESDIR%%/tonies.custom.json %%ETCDIR%%/tonies.custom.json
+@sample %%EXAMPLESDIR%%/tonies.json %%ETCDIR%%/tonies.json
 %%DATADIR%%/data/www/404.html
 %%DATADIR%%/data/www/encode_test.html
 %%DATADIR%%/data/www/favicon.ico