Created attachment 234589 [details] update net-im/prosody to 0.12.1 net-im/prosody: update to 0.12.1 * Update to 0.12.1 ChangeLog: https://prosody.im/doc/release/0.12.1 QA: * portlint: OK (1 warning regarding the use of /var/db) * testport: OK (poudriere: 12.3-AMD64/i386, 13.0-AMD64/ARM64, 13.1-AMD64/ARM64) This is the first maintenance release in the 0.12.x stable branch with lots of fixes and improved compatibility. An MFH seems to be a sensible choice.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=1089efbe6e3f451d3ed453743048458734f321e0 commit 1089efbe6e3f451d3ed453743048458734f321e0 Author: Thomas Morper <thomas@beingboiled.info> AuthorDate: 2022-06-10 20:42:36 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2022-06-10 20:45:28 +0000 net-im/prosody: Update to 0.12.1 - switch to DISTVERSION ChangeLog: https://prosody.im/doc/release/0.12.1 PR: 264581 net-im/prosody/Makefile | 3 +-- net-im/prosody/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-)
Created attachment 234603 [details] net-im/prosody: blocks and variables ordered Hello, I did commit your update as it was but there are some fixes that could be done to improve port without changing functionality. I uploaded a new diff with those fixes so you can apply to your ports tree (don't forget to update it first) and see if you like the results. I will keep this PR open and wait for your approval on this diff. - pet portclippy -pet portfmt (put variables in correct Makefile blocks and order variable in alphabical order) 1. portclippy Makefile: --- # USES block USES +USE_RC_SUBR # USES=shebangfix related variables SHEBANG_FILES -LUA_PREMK # Configure block HAS_CONFIGURE CONFIGURE_ARGS # Make block MAKEFILE # Standard bsd.port.mk variables +SUB_FILES +SUB_LIST # Users and groups block USERS GROUPS -USE_RC_SUBR -SUB_FILES -SUB_LIST # Packaging list block PLIST_SUB # Unknown variables # WARNING: # The following variables were not recognized. # They could just be typos or Portclippy needs to be made aware of them. # Please double check them. # # Prefix them with an _ or wrap in '.ifnmake portclippy' to tell # Portclippy to ignore them. # # If in doubt please report this on portfmt's bug tracker: # https://github.com/t6/portfmt/issues +LUA_PREMK --- 2. portfmt -D Makefile --- --- Makefile +++ Makefile @@ -26,20 +26,20 @@ SHEBANG_FILES= prosody prosodyctl tools/migration/prosody-migrator.lua LUA_PREMK= yes HAS_CONFIGURE= yes +CONFIGURE_ARGS= --add-cflags="-fPIC -I${LOCALBASE}/include -I${OPENSSLINC}" \ + --add-ldflags="-shared -L${LOCALBASE}/lib -L${OPENSSLLIB}" \ + --c-compiler="${CC}" \ + --cflags="${CFLAGS}" \ -CONFIGURE_ARGS= --prefix="${PREFIX}" \ --datadir="/var/db/prosody" \ + --ldflags="${LDFLAGS}" \ + --linker="${CC}" \ + --lua-suffix="${LUA_VER_STR}" \ --lua-version="${LUA_VER}" \ + --no-example-certs \ + --prefix="${PREFIX}" \ - --lua-suffix="${LUA_VER_STR}" \ --with-lua-include="${LUA_INCDIR}" \ --with-lua-lib="${LUA_LIBDIR}" \ + --with-random=arc4random - --with-random=arc4random \ - --c-compiler="${CC}" \ - --cflags="${CFLAGS}" \ - --add-cflags="-fPIC -I${LOCALBASE}/include -I${OPENSSLINC}" \ - --linker="${CC}" \ - --ldflags="${LDFLAGS}" \ - --add-ldflags="-shared -L${LOCALBASE}/lib -L${OPENSSLLIB}" \ - --no-example-certs MAKEFILE= GNUmakefile USERS= prosody @@ -47,8 +47,12 @@ USE_RC_SUBR= prosody SUB_FILES= pkg-deinstall +SUB_LIST= GROUPS=${GROUPS} \ + LUA_CMD=${LUA_CMD} \ + LUA_PREFIX=${LUA_PREFIX} \ + USERS=${USERS} +PLIST_SUB= PROSODY_GROUP=${GROUPS} \ + PROSODY_USER=${USERS} -SUB_LIST= USERS=${USERS} GROUPS=${GROUPS} LUA_PREFIX=${LUA_PREFIX} LUA_CMD=${LUA_CMD} -PLIST_SUB= PROSODY_USER=${USERS} PROSODY_GROUP=${GROUPS} post-install: @${REINPLACE_CMD} -e "s|\"luarocks |\"luarocks${LUA_VER_STR} |" ${STAGEDIR}${PREFIX}/lib/prosody/util/prosodyctl.lua --- Cheers, Nuno Teixeira
Committed, thank you!
... Other question: I missed merge-quarterly flag! Should this version be merged to 2022Q2?
I'll MFH.
Committed!
A commit in branch 2022Q2 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=c3b1f36fdb8e7e4169bc6cfc9b60c7caf862557a commit c3b1f36fdb8e7e4169bc6cfc9b60c7caf862557a Author: Thomas Morper <thomas@beingboiled.info> AuthorDate: 2022-06-30 00:38:17 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> CommitDate: 2022-06-30 00:38:51 +0000 net-im/prosody: Update to 0.12.1 - switch to DISTVERSION ChangeLog: https://prosody.im/doc/release/0.12.1 PR: 264581 Approved by: bugfix blanket (cherry picked from commit 2272379b7c81f9638e7908f6360c8afa8324e49b) net-im/prosody/Makefile | 2 +- net-im/prosody/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)