vile 9.8v was released on December 12, 2021. The existing port makefiles for editors/vile and editors/xvile conflict. In 9.8v, the sources include updated makefiles which make the two ports nonconflicting. That is done by using sed-scripts within the makefiles to rename files owned by xvile (along with some updates to the latter's plist file). https://github.com/ThomasDickey/vile-snapshots/tree/master/package/freebsd/vile https://github.com/ThomasDickey/vile-snapshots/tree/master/package/freebsd/xvile Please update the port to use this improvement.
Could you post a diff file so that one can easily examine what have changed since the last version?
Created attachment 230169 [details] patch for editors/vile Makefile | 10 +++------- distinfo | 6 +++--- files/patch-configure | 11 ----------- 3 files changed, 6 insertions(+), 21 deletions(-)
Created attachment 230170 [details] patch for editors/xvile Makefile | 28 +++++--- distinfo | 6 - files/patch-configure | 11 --- files/patch-x11menu.c | 23 ------ files/patch-x11vile.h | 21 ------ pkg-plist | 174 +++++++++++++++++++++++++------------------------- 6 files changed, 109 insertions(+), 154 deletions(-)
I created those diffs by cd /usr/ports/editors diff -Naur vile.orig vile >/tmp/vile.diff diff -Naur xvile.orig xvile >/tmp/xvile.diff
Thanks for providing the patches. One question. Why have you removed the line: LICENSE_FILE= ${WRKSRC}/COPYING from both ports? I checked the source archive and it contains COPYING file. So I would advise keeping the line as it is.
agree - add that line back. I did not remove it, but it was not in the source for vile which I used to develop the changes. I overlooked that (I see to recall seeing it, but did not investigate omitting it did not stop the port compiling, etc). I see that line was added in PR 246386 after my suggested changes to update the port to 9.8u in May 2020. It appears in the final comment (#5) and commit https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=246586
(In reply to Thomas E. Dickey from comment #6) Thanks for the investigation. After all that line was added by me :) when I committed the update to 9.8u. I will add the LICENSE_FILE line back.
The patches do not apply cleanly. Can you make it sure that the patches are made against the latest version of the official ports tree?
Created attachment 230220 [details] git-diff for 9.8v
Created attachment 230221 [details] git format-patch for 9.8v
Referring to https://docs.freebsd.org/en/books/porters-handbook/upgrading/#git-diff it's unclear if the "git format-patch" is suitable (since I'm not going to fork freebsd-ports). Perhaps the handbook will be made clearer.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=823697cbe7e54b611a089d49eadb871cc0e24c99 commit 823697cbe7e54b611a089d49eadb871cc0e24c99 Author: Thomas E. Dickey <dickey@invisible-island.net> AuthorDate: 2021-12-20 05:40:07 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2021-12-20 05:41:37 +0000 editors/xvile: update to 9.8v While here, remove CONFLICTS_INSTALL. In 9.8v, the sources include updated makefiles which make the two ports nonconflicting. That is done by using sed-scripts within the makefiles to rename files owned by xvile (along with some updates to the latter's plist file). Changelog: https://invisible-island.net/vile/CHANGES.html#v9_8v PR: 260382 Reported by: Thomas E. Dickey <dickey@invisible-island.net> (maintainer) editors/xvile/Makefile | 25 +++-- editors/xvile/distinfo | 6 +- editors/xvile/files/patch-configure (gone) | 11 -- editors/xvile/files/patch-x11menu.c (gone) | 23 ---- editors/xvile/files/patch-x11vile.h (gone) | 21 ---- editors/xvile/pkg-plist | 174 ++++++++++++++--------------- 6 files changed, 108 insertions(+), 152 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=f96d43f530b9d0f311bc55cec4009455f13a8a10 commit f96d43f530b9d0f311bc55cec4009455f13a8a10 Author: Thomas E. Dickey <dickey@invisible-island.net> AuthorDate: 2021-12-20 05:29:24 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2021-12-20 05:41:37 +0000 editors/vile: update to 9.8v While here, remove CONFLICTS_INSTALL. In 9.8v, the sources include updated makefiles which make the two ports nonconflicting. That is done by using sed-scripts within the makefiles to rename files owned by xvile (along with some updates to the latter's plist file). Changelog: https://invisible-island.net/vile/CHANGES.html#v9_8v PR: 260382 Reported by: Thomas E. Dickey <dickey@invisible-island.net> (maintainer) editors/vile/Makefile | 7 ++----- editors/vile/distinfo | 6 +++--- editors/vile/files/patch-configure (gone) | 11 ----------- 3 files changed, 5 insertions(+), 19 deletions(-)
Committed, thanks!