Summary: | [MAINTAINER] games/minecraft-server: Update to 1.8.1 | ||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | Ports & Packages | Reporter: | Jonathan Price <freebsd> | ||||||||||||||||||||||||
Component: | Individual Port(s) | Assignee: | Thomas Zander <riggs> | ||||||||||||||||||||||||
Status: | Closed FIXED | ||||||||||||||||||||||||||
Severity: | Affects Only Me | CC: | freebsd, riggs | ||||||||||||||||||||||||
Priority: | Normal | Keywords: | easy, patch, patch-ready | ||||||||||||||||||||||||
Version: | Latest | ||||||||||||||||||||||||||
Hardware: | Any | ||||||||||||||||||||||||||
OS: | Any | ||||||||||||||||||||||||||
Attachments: |
|
Created attachment 151041 [details]
See comment for details
Two fixes:
- Added a link to the EULA in %%ETCDIR%%, as it makes sense to.
- Updated pkg-message to reflect this change.
Created attachment 151044 [details]
Added missing entry from pkg-plist
Created attachment 151048 [details]
See notes
- Added %%ETCDIR%%/java-args.txt, so that the java arguments can be set without having to edit the file in %%PREFIX%%/bin
- Updated pkg-message to reflect the above change
- Removed redundant ETCDIR= line
- Removed redundant PORTREVISION= 0
Created attachment 151051 [details]
Replaced ${INSTALL_SCRIPT} with ${CP} for java-args.txt
Thanks for your submission Jonathan For this and future submissions: - Attach portlint output - Attach successful build output using poudriere (ideally), or: make stage && make check-plist && make stage-qa && make package These will help identify any outstanding issues and encourage committers to take and commit your patches since they are well tested. Created attachment 151062 [details]
Added missing file
Created attachment 151063 [details]
Portlint output
Created attachment 151064 [details]
Build output
Output from:
make stage
make check-plist
make stage-qa
make package
(In reply to Kubilay Kocak from comment #5) > Thanks for your submission Jonathan > > For this and future submissions: > > - Attach portlint output > - Attach successful build output using poudriere (ideally), or: > > make stage && make check-plist && make stage-qa && make package > > These will help identify any outstanding issues and encourage committers to > take and commit your patches since they are well tested. Hi Kubilay, Thanks for the advice. In running these tests I discovered that I had missed an svn add, causing one of the files to not be included in the diff. I have now fixed this and the tests run successfully. I have attached the output of both tests to the bug. When I have some time shortly, I will have a look at using poudriere. In the meantime I have run the make stage etc. Perfect Jonathan, thank you for getting all this back to us Created attachment 151162 [details]
Patch file
My previous attachment had a malformed patch of pkg-plist, which caused one of the lines to duplicate. That has been fixed in this version.
Created attachment 151163 [details]
Patch file
Adjusted permissions of bin/minecraft-server
Created attachment 151164 [details]
Poudriere output
I believe I've done this correctly. I ran a poudriere testport and built this port. Attached is the log file that poudriere generated.
A commit references this bug: Author: riggs Date: Thu Jan 1 20:21:38 UTC 2015 New revision: 376029 URL: https://svnweb.freebsd.org/changeset/ports/376029 Log: Update to upstream version 1.8.1 PR: 196169 Submitted by: freebsd@jonathanprice.org (maintainer) Changes: head/games/minecraft-server/Makefile head/games/minecraft-server/distinfo head/games/minecraft-server/files/java-args.txt head/games/minecraft-server/files/minecraft-server head/games/minecraft-server/files/pkg-deinstall.in head/games/minecraft-server/files/pkg-message.in head/games/minecraft-server/pkg-plist |
Created attachment 150821 [details] See description for details Summary of changes: - Upgraded version from 1.8 to 1.8.1 - Moved "base" directory from /usr/local/share to /usr/local - Adjusted installation / deinstallation messages Regarding the directory move: Inherited from the previous versions of this port (before I was maintainer), it stored the jar and configuration in /usr/local/share. Since then, I have learned that /usr/local/share should be reserved for static files, making this an unsuitable location to continue using. For this reason, I have decided to move it to /usr/local/minecraft-server. If somebody thinks there is a more suitable location I would be interested to know. Also, if you uninstall the old version, and then install the new version, it just leaves eula.txt in /usr/local/share/minecraft-server (expected behaviour). However, if you upgrade over the old version, it doesn't remove any of the files from /usr/local/share/minecraft-server. I have added a note to the install message mentioning about having to re-accept the EULA and mentioning that /usr/local/share/minecraft-server is now redundant and can be deleted.