* Updated to version 6.0 - http://beta.madsonic.org/pages/changelog.jsp#6.0.7860 * Make use of PKGNAMESUFFIX * Remove no longer needed ${PORTSDIR} * Make use of NO_WRKSUBDIR * Specify JAVA_RUN * Install application files to DATADIR instead of in PREFIX/PORTNAME - See 5.15.5 https://www.freebsd.org/doc/en/books/porters-handbook/install.html * Use MKDIR when appropriate * Fix typos and missing plist entry causing ffmpeg link not to be installed * (Possibly) Empty directories should be created during post-install * Add `REQUIRE: LOGIN` and `KEYWORD: shutdown` - See 6.27 https://www.freebsd.org/doc/en/books/porters-handbook/rc-scripts.html * Remove folder options from rc.conf - These commandline switches only have an effect before they are overwritten in the subsonic WebUI. To make things act more as expected, set them to sane default but don't expose them as changes in rc.conf likely will not. I matched the folder names with what madsonic creates by default * Use FreeBSD rc.d framework instead of madsonic.sh script - pidfile no longer needed - standardize how variable are set - utilize daemon to watch process * Set LC_TYPE to 'UTF-8' - allows files with complex characters to be properly handled * Instead of exposing madsonic_http_port and madsonic_https_port, change options to madsonic_port and madsonic_ssl - Madsonic only can be accessed from HTTP or HTTPS at any one time. If you specify an HTTPS port other than 0 (disabled) HTTP does not work as expected and is just a redirect to HTTPS. I believe this change makes the settings act more as expected. * Allow specifying a custom SSL Keystore and associated password
Created attachment 171901 [details] madsonic-standalone diff
Created attachment 172373 [details] madsonic-standalone diff fix typo
Created attachment 172629 [details] madsonic-standalone diff The attached diff... - reverts the PKGNAMESUFFIX change - handles the changes to http_port/https_port/port/ssl
Created attachment 172767 [details] madsonic-standalone diff Improve the script logic
Created attachment 172812 [details] madsonic-standalone fixes * I decided to put back the use of PKGNAMESUFFIX. Feel free to modify my diff if you like - This is what the www/madsonic port uses to distinguish between distribution methods. - I checked and the note here says if ports have the same PORTNAME to add a PKGNAMESUFFIX, which is exactly what I am doing. https://www.freebsd.org/doc/en/books/porters-handbook/makefile-naming.html#porting-pkgnameprefix-suffix - portlint complains if a "-" is in PORTNAME but I think that is for other reasons. * Added CONFLICTS_INSTALL with the various madsonic package names
Created attachment 172813 [details] madsonic-standalone update Requires this patch be applied first. https://bugs.freebsd.org/bugzilla/attachment.cgi?id=172812
Created attachment 172821 [details] madsonic-standalone output Output of "make stage && make check-plist && make stage-qa && make package" attached.
Looks good to me. I approved it. Sorry for the delay in response, but I had little time lately (baby, family visiting, work...). Josh, if you're interested, I could transfer the maintainership to you for this port. koobs@ can you approve it as well, I don't have port commit bit.
(In reply to Jeremie Le Hen from comment #8) Thanks for the review on this one as well!
FYI, I put madsonic-standalone fixes on review on Phabricator, I was told there are a few glitches which needs to be taken care of: https://reviews.freebsd.org/D7305 I'll take care of the updates.
I haven't seen any activity on Phabricator. Would it help if I included this fix in the diff posted here? https://reviews.freebsd.org/D7305#153595 What other "glitches" needed to be taken care of? Thanks, Josh
A commit references this bug: Author: jlh Date: Mon Aug 22 13:27:52 UTC 2016 New revision: 420614 URL: https://svnweb.freebsd.org/changeset/ports/420614 Log: Minor improvements. Most noticeable changes in no particular order: - The rc.d script doesn't use the provided shell script to start the daemon, but starts it directly. - This is now installed in ${DATADIR}, not in ${PREFIX}/${PORTDIRNAME}. - Define CONFLICTS_INSTALL so as to avoid colliding with non standalone version. - Use post-install-${OPTION}-on. PR: 210651 Submitted by: joshruehlig@gmail.com Reviewed by: crees Approved by: crees Differential Revision: https://reviews.freebsd.org/D7305 Changes: head/www/madsonic-standalone/Makefile head/www/madsonic-standalone/files/madsonic.in head/www/madsonic-standalone/pkg-plist
Awesome thanks for everyone's work on this. The fixes are in, so I assume it is ready for the version update then?
Yes, I'm in the process of getting the approval.
A commit references this bug: Author: jlh Date: Mon Aug 22 21:13:50 UTC 2016 New revision: 420635 URL: https://svnweb.freebsd.org/changeset/ports/420635 Log: Update to version 6.0. PR: 172813 Submitted by: joshruehlig@gmail.com Approved by: brd Changes: head/www/madsonic-standalone/Makefile head/www/madsonic-standalone/distinfo
Finally updated! Thanks for the work and sorry for the long time it took.