Created attachment 253272 [details] www/wt: Update to 4.10.4 and revamp port a little This patch upgrades wt to 4.10.4 Furthermore, the port has been revamped a little: * Make use of standard variables, e.g. ETCDIR/EXAMPLESDIR_REL/WWWOWN * Sort options alphabetically * Renamed some variables to match those in bsd.options.desc.mk * Removed patches, they are not needed anymore * Missing examples have been added to the pkg-plist
Comment on attachment 253272 [details] www/wt: Update to 4.10.4 and revamp port a little Hello, the file that you have submitted seems to be not related to the subject. [PATCH] Conditional man pages with changes to audio/virtual_oss.
Created attachment 253274 [details] www/wt: Update to 4.10.4 and revamp port a little
(In reply to Alexander Vereeken from comment #1) My bad, I have attached the correct version now.
1. Look like you tried to sort options in CMAKE_ARGS, but not completely. 2. Typo: > QT6_CMAKE_BOOL= NABLE_QT6 3. Maybe create flavors qt5 and qt6? Or at least make qt6 option default. 4. Use portclippy to sort Makefile.
Thank you for your patch! Please give me some time to test it first and I'll get back to you.
Created attachment 253288 [details] www/wt: Update to 4.10.4 and revamp port a little Makefile has been sorted according to portclippy output. I realised Qt is only required when building the examples/wtwithqt, hence I have removed the Qt requirements.
You can use something like this: EXTRACT_AFTER_ARGS= --exclude ".gitignore" --no-same-owner --no-same-permissions instead of post-extract: ${FIND} ${WRKSRC} -name .gitignore -delete Check examples in other ports - search for EXTRACT_AFTER_ARGS.
Created attachment 253323 [details] www/wt: Update to 4.10.4 and revamp port a little Use EXTRACT_AFTER_ARGS for ignoring files in the extraction process.
(In reply to Bram Ton from comment #8) Waiting maintainer approve or 2 weeks maintainer timeout…
Comment on attachment 253323 [details] www/wt: Update to 4.10.4 and revamp port a little Looks fine to me. Tested with various configurations and it passed all tests. Thank you for the patch @Bram Ton!
I don't seem to have permission to set the Maintainer Flag to +. It just says no flags.
Please next time make separate patch for update version and for improve port/sort options.
${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT} - why not ${PORTNAME}-${DISTVERSION}?
Also are you sure option DEBUG still work after changes in patch?
Created attachment 253507 [details] Makefile v1 Check please my suggestion (Makefile).
(In reply to Vladimir Druzenko from comment #15) It seems the current patch (Makefile v1) has EXAMPLES and UNWIND enabled by default. The EXAMPLES option will also build the examples. Is it common practise to install pre-compiled examples by default for ports? Also the UNWIND option is enabled now by default, is this really necessary for normal users? It does add an extra dependency to the port. In the original Makefile there was the `PORTEXAMPLES= *`. At hindsight I think this is the better option as it avoids polluting the (already) large pkg-plist with an enoumous number of %%PORTEXAMPLES%% lines.
(In reply to Bram Ton from comment #16) > It seems the current patch (Makefile v1) has EXAMPLES and UNWIND enabled by default. > The EXAMPLES option will also build the examples. Is it common practise to install > pre-compiled examples by default for ports? > > Also the UNWIND option is enabled now by default, is this really necessary for normal users? > It does add an extra dependency to the port. This line: EXAMPLES SAML THEMES UNWIND FIREBIRD MYSQL PGSQL LIBWTTEST was added for testing only. I forgot to remove it before attach Makefile to PR. Ignore it. > In the original Makefile there was the `PORTEXAMPLES= *`. At hindsight I think this is > the better option as it avoids polluting the (already) large pkg-plist with an enoumous > number of %%PORTEXAMPLES%% lines. This was done in your patch and I didn't change it. Want to get it back?
Created attachment 253626 [details] Makefile v2 These are the changes compared to the previous Makefile: PLIST_SUB= VERSION=${DISTVERSION} +PORTEXAMPLES= * OPTIONS_DEFINE= DEBUG EXAMPLES HARU LIBWTTEST OPENGL PANGO \ RESOURCES SAML THEMES UNWIND -OPTIONS_DEFAULT= FASTCGI HARU OPENGL PANGO RESOURCES SQLITE3 WTHTTP \ - EXAMPLES SAML THEMES UNWIND FIREBIRD MYSQL PGSQL LIBWTTEST -OPTIONS_GROUP= CONNECTOR DBO WSTRING +OPTIONS_DEFAULT= HARU OPENGL PANGO RESOURCES THEMES +OPTIONS_GROUP= CONNECTOR DBO OPTIONS_GROUP_CONNECTOR= FASTCGI WTHTTP +OPTIONS_DEFAULT+= FASTCGI WTHTTP OPTIONS_GROUP_DBO= FIREBIRD MYSQL PGSQL SQLITE3 +OPTIONS_DEFAULT+= SQLITE3 NO_OPTIONS_SORT= yes OPTIONS_SUB= yes PS: for testing I found the -c option of poudriere very handy. It gives you the config menu.
Created attachment 253627 [details] pkg-plist v2
(In reply to Bram Ton from comment #18) Why split "OPTIONS_DEFAULT=" for several "OPTIONS_DEFAULT+="?
Created attachment 253686 [details] www/wt v4.8.0 update to v4.10.4 OK, I've unified all the patches into one patch with all the suggestions from Bram and Vladimir, and also: - Disabled the UNWIND option by default as it's something not used by every user and the Wt default CMake option is set to OFF. - Re-enabled all DBO backends rather than only SQLite since by default in the CMakefile all backends are enabled and it restricts the pkg binary users to SQLite. If anyone wants to limit the DBO backends to a specific database, it makes sense to build from ports since the user preferences vary regarding the database of choice.
(In reply to Mamadou Babaei from comment #21) Maybe create flavors for all DB backends?
(In reply to Vladimir Druzenko from comment #22) Well, not sure if flavorizing the port by database is a good idea or not. It's still possible an application utilizes two or more DBs at the same time, or people like myself avoid using DBO provided by Witty at all. For example, I prefer pqxx. If you still think, it's a good idea let me know and I'll look into it.
(In reply to Mamadou Babaei from comment #23) It was just an idea. Committing current patch.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=a3940b83e061e764555a568b2c92656aa6487219 commit a3940b83e061e764555a568b2c92656aa6487219 Author: Bram Ton <bram@cbbg.nl> AuthorDate: 2024-09-20 13:34:43 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2024-09-20 13:34:43 +0000 www/wt: Revamp port and update 4.8.0 → 4.10.4 Release notes: https://www.webtoolkit.eu/wt/doc/reference/html/Releasenotes.html Changelogs: https://github.com/emweb/wt/releases/tag/4.8.1 https://github.com/emweb/wt/releases/tag/4.8.2 https://github.com/emweb/wt/releases/tag/4.8.3 https://github.com/emweb/wt/releases/tag/4.9.0 https://github.com/emweb/wt/releases/tag/4.9.1 https://github.com/emweb/wt/releases/tag/4.9.2 https://github.com/emweb/wt/releases/tag/4.10.0 https://github.com/emweb/wt/releases/tag/4.10.1 https://github.com/emweb/wt/releases/tag/4.10.2 https://github.com/emweb/wt/releases/tag/4.10.3 https://github.com/emweb/wt/releases/tag/4.10.4 Improve port: - Sort options - Fix dependencies - Make all database backends default on - Add EXTRACT_AFTER_ARGS for reduce IO during build - Pet portclippy This update is a team effort between the reporter (Bram Ton), the maintainer (Mamadou Babai) and me. PR: 281206 Approved by: Mamadou Babaei <info@babaei.net> (maintainer) www/wt/Makefile | 147 ++++++++++++--------------- www/wt/distinfo | 8 +- www/wt/files/patch-CMakeLists.txt (gone) | 45 --------- www/wt/pkg-plist | 164 +++++++++++++++---------------- 4 files changed, 148 insertions(+), 216 deletions(-)
Thanks!