Created attachment 165351 [details] moderniz port, add urlview option - Convert to options helpers when possible - Add URLVIEW option (on by default) - Add patch to make parent directory entry (..) always on top of browser menu
Thanks for that, Alex. This patch is very OK for me.
Created attachment 165436 [details] Also cleanup MASTER_SITES Also cleanup MASTER_SITES: Remove unused: http://www.spinnaker.de/mutt/compressed/:rr http://lunar-linux.org/~tchan/mutt/:tchan http://www.emaillab.org/mutt/${AC_PATCH_VERSION}/:jp Duplicates: http://www3.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv (the same ip ad www2.mutt.org.ua) ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv (the same ip as www.mutt.org.ua) ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv (the same ip as www3.mutt.org.ua) If you alright with it, I'll commit it shortly.
I'm fine with that. Please commit. Thanks! Udo
A commit references this bug: Author: ak Date: Tue Jan 12 16:07:13 UTC 2016 New revision: 405889 URL: https://svnweb.freebsd.org/changeset/ports/405889 Log: - Convert to options helpers when possible - Add URLVIEW option (on by default) - Add patch to make parent directory entry (..) always on top of browser menu (with any $sort_browser value) - Clean up MASTER_SITES PR: 206092 Approved by: udo.schweigert@siemens.com (maintainer) Changes: head/mail/mutt/Makefile head/mail/mutt/files/extra-patch-doc-ref head/mail/mutt/files/patch-browser.c head/mail/mutt/pkg-plist
Committed, thanks. Please note, that there is still room for more improvements, like most post-patch targets with ${PATCH} -p1 can be converted to _EXTRA_PATCHES with some minor extra-patch-* modification; kerberus block can be moved to USES=gssapi and simplified; the same for autotools, etc.
Hi Alex, would you mind to check the changes against mutt-lite? The post is failing now: ===> Parsing plist ===> Checking for items in STAGEDIR missing from pkg-plist Error: Orphaned: lib/charset.alias Error: Orphaned: share/locale/bg/LC_MESSAGES/mutt.mo Error: Orphaned: share/locale/ca/LC_MESSAGES/mutt.mo Error: Orphaned: share/locale/cs/LC_MESSAGES/mutt.mo .... ===> Checking for items in pkg-plist which are not in STAGEDIR Error: Missing: %%HTML%%@comment %%DOCSDIR%%/advancedusage.html Error: Missing: %%HTML%%@comment %%DOCSDIR%%/configuration.html ... Error: Missing: %%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo Error: Missing: %%NLS%%share/locale/ca/LC_MESSAGES/mutt.mo ... Error: Missing: %%NNTP%%@comment %%DOCSDIR%%/ChangeLog.nntp Error: Missing: %%XML%%%%HTML%%%%COMPRESSED_FOLDERS%%@comment %%DOCSDIR%%/compressed-folders.html ===> Error: Plist issues found. *** Error code 1 Stop. make: stopped in /usr/ports/mail/mutt-lite ====>> Error: check-plist failures detected ====>> Cleaning up wrkdir ===> Cleaning for mutt-lite-1.5.24_1
Created attachment 165480 [details] Fix mutt-lite pig-plist. Fixes mutt-lite.
Created attachment 165483 [details] [patch] mutt-lite v2 Hi Udo, Thanks for the quick patch, my poudriere complains now only for ====> Checking for pkg-plist issues (check-plist) ===> Parsing plist ===> Checking for items in STAGEDIR missing from pkg-plist Error: Orphaned: lib/charset.alias Error: Orphaned: share/locale/locale.alias ===> Checking for items in pkg-plist which are not in STAGEDIR ===> Error: Plist issues found. *** Error code 1 I've attached a patch with your changes and an additional cleanup that is working for me.
Yes, please commit. Sorry, I missed looking into the charset-issue.
A commit references this bug: Author: ohauer Date: Wed Jan 13 10:05:33 UTC 2016 New revision: 406030 URL: https://svnweb.freebsd.org/changeset/ports/406030 Log: - fix mutt-lite build PR: 206092 (follow up) Approved by: udo.schweigert@siemens.com (maintainer) Changes: head/mail/mutt/Makefile
Patch committed, thanks for the quick review!
Sorry about the breakage. Interesting thing, while COMPRESSED_FOLDERS, HTML, XML and NNTP options are not defined in LITE case, NLS is, because it's a global option, so it should have been set to @comment like DOCS and EXAMPLES were. I think it's a bug in bsd.port.mk Also, can you please try to add USES+=charsetfix instead of deleting lib/charset.alias? Sorry again.
I'm sure I have tested charsetfix, anyway I tested again with the following patch Index: /usr/ports/mail/mutt/Makefile =================================================================== --- /usr/ports/mail/mutt/Makefile (revision 406068) +++ /usr/ports/mail/mutt/Makefile (working copy) @@ -52,6 +52,7 @@ .if defined (LITE) OPTIONS_UNSET= NLS DOCS EXAMPLES +USES+= charsetfix PLIST_SUB+= COMPRESSED_FOLDERS="@comment " PLIST_SUB+= HTML="@comment " PLIST_SUB+= NLS="@comment " @@ -340,9 +341,4 @@ ${WRKSRC}/doc/Makefile .endif -post-stage: -.if defined(LITE) - -${RM} ${STAGEDIR}${PREFIX}/lib/charset.alias - -${RM} ${STAGEDIR}${PREFIX}/share/locale/locale.alias -.endif .include <bsd.port.mk> Now the scary part. Building manually in the tree no *.alias file can be found in $STAGEDIR but it fails in my poudriere with the same leftover error @Alex Perhaps you can verify this behavior?
Created attachment 165528 [details] fix nls issue It seems that because of bug(?) with NLS knob, NLS_CONFIGURE_OFF doesn't work. Please try attached patch (I also grouped PLIST_SUB entries together).
Patch 165528 is working, no leftovers :) ====>> Cleaning up wrkdir ===> Cleaning for mutt-lite-1.5.24_1 ====>> Warning: Leftover processes: USER PID %CPU %MEM VSZ RSS TT STAT STARTED TIME COMMAND build of mail/mutt-lite ended at Thu Jan 14 05:27:04 CET 2016 build time: 00:00:24
A commit references this bug: Author: ohauer Date: Thu Jan 14 04:49:20 UTC 2016 New revision: 406090 URL: https://svnweb.freebsd.org/changeset/ports/406090 Log: - fix mutt-lite NLS leftovers [1] [1] patch by ak@ PR: 206092 Changes: head/mail/mutt/Makefile