Created attachment 272479 [details] Fix pkg-plist As described in the title: pkg-plist misses @sample and includes extraneous files. Was very confused when I lost my rather complex config.kdl after a pkg upgrade -f.
Created attachment 272481 [details] Fix pkg-plist and Makefile My apologies for the noise, forgot to remove extraneous install calls from the Makefile and account for file names in @sample lines.
Created attachment 272486 [details] Fix pkg-plist and Makefile (third time's the charm) Fixed the proposed patch: it now properly renames the distributed .kdl files to .sample before packaging. I never dealt with @sample before and apologise for the glaring mistake in the previous patch revision. Bumping PORTREVISION as well.
Sorry for the silence. As written in other PRs I didn't receive mails from bugzilla for a while. I hope this is resolved now, but somehow I missed to catch up on this PR, sorry for that. Test build with patch applied went through and test (re-)install seems to work as intended, i.e. it no longer overwrites the user-created config files. Thanks!
(In reply to Sebastian Oswald from comment #3) As long as any working fix gets committed and I can remove my current override, ahaha. (Having to git stash/stash apply for ports tree updates is a bit of a chore.)
(In reply to Kamigishi Rei from comment #4) You can just rebase your local changes on top of the branch. That's what I'm doing on my buildhosts. Alternatively poudriere can apply local patches via hooks: https://dan.langille.org/2019/08/10/poudriere-hooks/ I used the extra patches/hooks mechanism quite a while, but keeping local commits on top of the master branch (latest or quarterly) IMHO is a bit easier to maintain, as those fail during rebase at the end of a 'git pull' instead of the build job failing at patch stage, so you can fix all at once and you even get a "patch contents already upstream" if your local commit has been committed and its automagically dropped (or you can 'rebase --skip'). With local patches you only find out if the port is being build and have to fix your patch files instead of just fixing the conflicting files directly, then 'git add' && 'git rebase --continue'.
(In reply to Sebastian Oswald from comment #5) Sorry, my comment (#3) was made on assumption that you were the port's maintainer and able to commit the change to the ports tree, so that would-be users of the package avoid hitting this issue in the future. Admittedly, I am unsure how to deal with the current users who will unavoidably lose their configuration when invoking `pkg upgrade` (due to `pkg remove` happening in the upgrade process, and the plist being kept locally) unless they back up their existing config.kdl in advance.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=0f8691c17b7fe9d9788145516d463b27e83ae651 commit 0f8691c17b7fe9d9788145516d463b27e83ae651 Author: Kamigishi Rei <spambox@haruhiism.net> AuthorDate: 2026-07-18 15:39:12 +0000 Commit: Yusuf Yaman <nxjoseph@FreeBSD.org> CommitDate: 2026-07-18 15:43:11 +0000 www/iocaine: Install configuration files as sample So that there is no possibility of losing your configurations. While here, also remove the .orig file. PR: 296506 Reported by: Kamigishi Rei <spambox@haruhiism.net> Approved by: Sebastian Oswald <sko@rostwald.de> (maintainer) Approved by: osa, vvd (Mentors, implicit) MFH: 2026Q3 www/iocaine/Makefile | 7 +++---- www/iocaine/pkg-plist | 7 ++----- 2 files changed, 5 insertions(+), 9 deletions(-)
A commit in branch 2026Q3 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=4d61821e09bafeb993f058e18e575a9b0a908a2a commit 4d61821e09bafeb993f058e18e575a9b0a908a2a Author: Kamigishi Rei <spambox@haruhiism.net> AuthorDate: 2026-07-18 15:39:12 +0000 Commit: Yusuf Yaman <nxjoseph@FreeBSD.org> CommitDate: 2026-07-18 15:43:39 +0000 www/iocaine: Install configuration files as sample So that there is no possibility of losing your configurations. While here, also remove the .orig file. PR: 296506 Reported by: Kamigishi Rei <spambox@haruhiism.net> Approved by: Sebastian Oswald <sko@rostwald.de> (maintainer) Approved by: osa, vvd (Mentors, implicit) MFH: 2026Q3 (cherry picked from commit 0f8691c17b7fe9d9788145516d463b27e83ae651) www/iocaine/Makefile | 7 +++---- www/iocaine/pkg-plist | 7 ++----- 2 files changed, 5 insertions(+), 9 deletions(-)
Hi, Thank you for the collaboration! And sorry that you lost your configuration. :/ Thanks, committed.