Created attachment 230129 [details] git diff for net-im/openfire net-im/openfire: update to 4.6.5 Changelog: http://download.igniterealtime.org/openfire/docs/4.6.5/changelog.html P.S. For this port needed to upload to some server archive with local maven repository: https://cloud.druba.su/s/DFE22mxkEnaQpSc/download/FreeBSD-openfire-4.6.5-maven-repository.tar.gz
Are you OK with me petting portclippy & portfmt? You can check what the difference will be if you have them installed. portclippy Makefile portfmt -D Makefile Thanks Dries. When using github WRKSRC should not be set. Fixed by: Switching to DISTVERSION, DISTVERSIONPREFIX=v, removed WRKSRC, removed GH_TAGNAME.
Ah and GH_PROJECT=Openfire
Created attachment 230172 [details] mydiff My take on the change. Not yet petted portfmt, portclippy.
If I remove $WRKSRC, then will be failed the next variables: LICENSE_FILE= ${WRKSRC}/LICENSE.txt INSTALL_WRKSRC= ${WRKSRC}/distribution/target/distribution-base/ Its really necessary? Why?
If you set DEVELOPER=yes in /etc/make.conf you will see more verbose output. You need to capitalize Openfire in GH_PROJECT. (because the project is also capitalized upstream). In this case PORTNAME != GH_PROJECT. When you want to switch to USE_GITHUB=yes, WRKSRC should not be overwritten manually because it is composed out of the different GH_* variables. Try your old patch, with DEVELOPER=yes, and "make", you will see the output of the ports framework.
Created attachment 230195 [details] git diff for net-im/openfire (corrected)
(In reply to Dries Michiels from comment #5) Ok. Makefile was checked by portclippy, portfmt and diff was updated.
Thanks looks good. Is there a good reason for changing the port options?
The names of the port options, to be more specific.
(In reply to Dries Michiels from comment #8) Yes. With this names they are sorted more readable.
Fine by me, changing port option names will require user interaction to purge old configs. If you would like to get the option name changes in, could you add an entry to UPDATING outlining that users should probably run make config again. Something like, "the config options have been renamed to be more readable, run make config to regenerate your config." Thank you
Created attachment 230239 [details] git diff for net-im/openfire (corrected 2) (In reply to Dries Michiels from comment #11) I don't see no one message about changing port options in UPDATING for the last 4 years at least, but if you insist...
Thank you, patch looks good, I will get this committed.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c3d90bc940c5f5a6f96dfc2248911cda68dda3e commit 7c3d90bc940c5f5a6f96dfc2248911cda68dda3e Author: Nikita Druba <nikita@druba.su> AuthorDate: 2021-12-19 09:03:23 +0000 Commit: Dries Michiels <driesm@FreeBSD.org> CommitDate: 2021-12-20 08:46:09 +0000 net-im/openfire: Update to 4.6.5 - Change option names to be more readable - Pet portclippy and portfmt Changes: http://download.igniterealtime.org/openfire/docs/4.6.5/changelog.html PR: 260428 Approved by: philip (mentor) Differential Revision: https://reviews.freebsd.org/D33556 UPDATING | 10 +++++++++ net-im/openfire/Makefile | 47 +++++++++++++++++++++------------------ net-im/openfire/distinfo | 10 ++++----- net-im/openfire/files/openfire.in | 3 ++- net-im/openfire/pkg-plist | 10 ++++----- 5 files changed, 47 insertions(+), 33 deletions(-)
Committed, thanks!