Created attachment 144490 [details] Add staging-support and take maintainership. Add staging-support and take maintainership.
Thanks for the interest. I was unable to commit your patch: svn: E165001: Commit failed (details follow): svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output: Do not commit ports with NOPORTDOCS or NOPORTEXAMPLES. The port must be converted to proper OPTIONS. See http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/makefile-options.html As the new maintainer, would you mind fixing that as well? :-)
Created attachment 144516 [details] New Maintainer, Stagify and convertion NOPORTSTOC
I have no idea what to do. ;) Therefore i spend some time to work this out. After some testing i would say, the new patch works correctly. :)
It's actually quite simple: - NOPORTDOCS and NOPORTEXAMPLES are deprecated and shouldn't be used anymore. - You can just install all documentation and examples and rely on %%PORTDOCS%% and %%PORTEXAMPLES%% in the plist to do the job and only add the files when the options are set. - There is no need to set a description for the DOCS option, as it has a default one in Mk/bsd.options.desc.mk. - Given the above, it is also unnecessary to include <bsd.port.options.mk>. - You can use the ${DOCSDIR} variable to refer to the documentation directory. Additionally, I don't see the need to rename the DOCS variable. I'm going to attach a patch with what I meant (it also uses ${MKDIR} instead of ${INSTALL} since the permission and ownership changes in the latter do not work if I try to build/package the port as a regular user).
Created attachment 144518 [details] Proposed patch Let me know if you're OK with it.
Thank you for your help. I understand your changes, but now it seems, that no documentation is installed, even if selected. From the point of code i expected it to be installed everytime, regardless of selection. But i'm not sure (just had some minutes to test) and i will have a closer look at it tomorrow. :)
> I understand your changes, but now it seems, that no documentation is > installed, even if selected. From the point of code i expected it to > be installed everytime, regardless of selection. Well, you can just check the package generated with `make package' yourself -- if the DOCS option is set, I get: -rw-r--r-- 0 root wheel 834 Jan 1 1970 +COMPACT_MANIFEST -rw-r--r-- 0 root wheel 2108 Jan 1 1970 +MANIFEST -rw-r--r-- 0 root wheel 17652 Jan 1 1970 +MTREE_DIRS -r-xr-xr-x 0 root wheel 47546 Jul 10 22:13 /usr/local/bin/tlb -r-xr-xr-x 0 root wheel 817 Jul 10 22:13 /usr/local/bin/mungelist -r--r--r-- 0 root wheel 3223 Jul 10 22:13 /usr/local/share/doc/tlb/FAQ -r--r--r-- 0 root wheel 3692 Jul 10 22:13 /usr/local/share/doc/tlb/INSTALL -r--r--r-- 0 root wheel 4493 Jul 10 22:13 /usr/local/share/doc/tlb/README -r--r--r-- 0 root wheel 571 Jul 10 22:13 /usr/local/share/doc/tlb/README.loglevels -r--r--r-- 0 root wheel 1038 Jul 10 22:13 /usr/local/share/doc/tlb/README.mungelist -r--r--r-- 0 root wheel 2680 Jul 10 22:13 /usr/local/share/doc/tlb/TIPS -r--r--r-- 0 root wheel 915 Jul 10 22:13 /usr/local/share/doc/tlb/TODO -r--r--r-- 0 root wheel 14174 Jul 10 22:13 /usr/local/share/doc/tlb/complete.tlb -r--r--r-- 0 root wheel 2177 Jul 10 22:13 /usr/local/share/doc/tlb/mj.tlb -r--r--r-- 0 root wheel 659 Jul 10 22:13 /usr/local/share/doc/tlb/simple.tlb drwxr-xr-x 0 root wheel 0 Jul 10 22:13 /usr/local/share/doc/tlb/ If I call `make package' with DOCS off, I get: -rw-r--r-- 0 root wheel 835 Jan 1 1970 +COMPACT_MANIFEST -rw-r--r-- 0 root wheel 1027 Jan 1 1970 +MANIFEST -rw-r--r-- 0 root wheel 17652 Jan 1 1970 +MTREE_DIRS -r-xr-xr-x 0 root wheel 47546 Jul 10 22:13 /usr/local/bin/tlb -r-xr-xr-x 0 root wheel 817 Jul 10 22:13 /usr/local/bin/mungelist This is all controlled by the %%PORTDOCS%% variable in the plist, which is set to "@comment " if DOCS is not on.
My problem was that the documentation was never installed, even after following your advise. After a night the solution was clear: 'make clean' before every test. ;) So everything works fine like you already said. I'm fine with your patch. It can be committed. Thank you very much for your help!
A commit references this bug: Author: rakuco Date: Fri Jul 11 14:43:23 UTC 2014 New revision: 361544 URL: http://svnweb.freebsd.org/changeset/ports/361544 Log: - Support staging. - Get rid of NOPORTDOCS. - Pass maintainership to submitter. PR: 191703 Submitted by: Torsten Z?\195?\188hlsdorff <ports@toco-domains.de> Changes: head/mail/tlb/Makefile
Committed, thanks!