Update base layout and remove unnecessary code #13
Conversation
|
It is kind of weird to have a commit titled "Merge branch 'master' into base_port". What happened? You could add "Fixes #4" at the end of the commit log. I think it should close the corresponding issue automagically once we merge the PR. |
|
@Korusuke we don't want to have "Merge" commits in the git history. You probably did Try to recover from this first (a good way of working on your git-vodoo a bit more) and then we can review the actual content. Do make a backup first ( |
|
A merge conflict was showing up due to the newly merged #12 so I just tried solving it using the git GUI which now I guess I shouldn't have done, will fix it in few minutes. |
something is not right yet as you have duplicate fields in the template now.... |
Korusuke
force-pushed
the
base_port
branch
2 times, most recently
from
f86a41a
to
a678e31
Compare
There was a problem hiding this comment.
a suggestions to follow-up on what @Steap already mentioned, besides that it looks good to go!
upt_macports/templates/base.Portfile
Outdated
| platforms darwin | ||
| # uncomment and edit the following line depending on whether the port installs architecture-dependent files | ||
| # uncomment the following line if no architecture-dependent files are installed, otherwise remove |
There was a problem hiding this comment.
add "TODO", like: # TODO: uncomment the .....
|
I have done the necessary changes and will update the Portfile over at macports/ports once this PR is merged. |
|
this looks good to me and it can always be fine-tuned based on input from the MacPorts community later. @Steap, since it's really Portfile/MacPorts related and your suggestions incorporated I'm going to assume that your fine with me merging it ;) |
| @@ -4,16 +4,22 @@ PortSystem 1.0 | |||
| {% block portgroup %} | |||
| {% endblock %} | |||
|
|
|||
| # Portfile generated/maintained using the Universal Packaging Tool (upt) | |||
There was a problem hiding this comment.
I would probably use maintained only after we get automatic updates working :)
There was a problem hiding this comment.
we are optimistic about it ;)
| # supported_archs noarch | ||
| license {{ pkg.licenses }} | ||
| # maintainers {example.org:julesverne @GitHub-handle} openmaintainer # TODO |
There was a problem hiding this comment.
I would also keep a line for nomaintainer and let the user decide between the two.
It doesn't serve anyone to force users to assume maintainership when they are not comfortable to do so and not willing to take care of the port later.
There was a problem hiding this comment.
yes, that's a valid point - how about something like this?
# TODO: either add your e-mail address and GitHub handle or set to nomaintainer
# maintainers {example.org:julesverne @GitHub-handle} openmaintainer
# maintainers nomaintainer
There was a problem hiding this comment.
One further idea. At the end the port would ideally not contain any comments. So maybe the TODOs are a bit superfluous. Maybe something along those lines?
## If you would like to keep maintaining this port in the future as described in
## https://guide.macports.org/chunked/project.contributing.html
## please add your contacts (e-mail, github handle), else keep `nomaintainer`.
# maintainers {example.org:julesverne @github-handle} openmaintainer
# maintainers nomaintainer
And then also ask users in a comment somewhere on top to go through the commented-out sections and check them out (and ideally remove most comments).
Fixes #4