[MacPorts] #64142: New Port - ntpstat
MacPorts
noreply at macports.org
Thu Dec 16 17:16:12 UTC 2021
#64142: New Port - ntpstat
-------------------------+--------------------
Reporter: RobK88 | Owner: (none)
Type: submission | Status: new
Priority: Normal | Milestone:
Component: ports | Version: 2.7.1
Resolution: | Keywords:
Port: ntpstat |
-------------------------+--------------------
Comment (by RobK88):
@Renee -- Many thanks for all your help. I see from the buildbot, that
the C code for ntpstat is not building in 10.15 and macOS 11. The error
shown is not very helpful. And I do not have a Mac running either 10.15
or 11 to debug on my end. If you have any insight that would be very
helpful.
Many many thanks for the link to the wiki on using `git`. It was
extremely helpful!
P.S. In my view, the wiki on `git` could be clearer in some sections.
1. Under the section "Using a branch for development", I would add the
following note:
{{{
Note: If your upstream macports-ports repo is your personal fork of the
official macports-port repo, you should first make sure
your fork is up to date by clicking "Fetch Upstream" on the webpage for
the fork on GitHib.com before running the commands above.
}}}
2. Under the section "Checking out a working copy of the ports tree". I
would change the note as follows (changes in **BOLD**):
Note: If you intend to submit a pull request on GitHub to get your changes
included in MacPorts, you may want to create a fork of the repository
first. **To do that, first log into GitHub.com with your personal GitHub
username and password, if you are not already logged in. Then,** go to
https://github.com/macports/macports-ports/ and click the fork button at
the top right. **(Now you will have a fork or clone of the macports-ports
repo on your personal GitHib.com website).** Then, run the command above,
but use <your**GitHub**username>/macports-ports.git instead of macports
/macports-ports.git. **(Now you will have a local git repo of the forked
macports-ports repo).**
I may go ahead and edit the wiki accordingly with my suggested changes.
**WorkFlow for Pull Requests (PR's)**
The wiki has confirmed that the following is the best workflow for Pull
Requests:
1. If this has not been done before, fork the Macports GitHub repo (which
will create an identical repo on one's personal GitHub website).
2. Clone your personal forked GitHub repo to a local git repo located on
their own Mac. (i.e. `git clone https://github.com/<YourGitHubUsername
>/macports-ports.git` or `git clone git at github.com:<YourGitHubUsername
>/macports-ports.git` where <YourGitHubUsername> is your personal GitHub
username).
3. Using the local git repo, make a branch, makes changes to files in the
branch (or add files to the branch), test the port, add changes (and new
files) to the git staging area or index, commit the changes to the local
git repo.
4. If additional commits are needed locally, please use "git commit
--amend" which will amend the initial commit with the changes. The goal
here is to submit ONLY one commit with each Pull Request (PR), if at all
possible, to make life easier for the Macports' committers.
5. Push one's changes from the local git repo to one's personal GitHub.com
repo. (i.e. `git push origin`).
6. Make sure that your personal Githib.com repo is up to date by doing a
"fetch upstream" on the website, if necessary.
7. Make a Pull Request (PR) from the branch of one's personal GitHub repo
(that contains the new port or proposed changes) to the Macports Github
site.
8. If Step 5 fetched any new files or changed files, you will likely want
these changes to be reflected in your local git repo as well. To do this,
run `git fetch origin` or simply `git fetch`.
Alternatively, you can update your local repo directly from the official
Macports repo. (see "Updating your Fork" on the wiki
https://trac.macports.org/wiki/WorkingWithGit#upstream-fetch ).
9. If the committers suggest changes and you agree to them, you will
likely be asked to rebase your changes on top of the official Macports
current master branch. The easiest way to do this is adding the official
repository as a second remote to your working copy and pulling from it.
Then rebase the changes. (see
https://trac.macports.org/wiki/WorkingWithGit#upstream-fetch for details).
Once all of that is done, do not forget to push the changes to your fork
on your personal GitHub website. (i.e. `git push origin`). Once the push
is complete, the associated Pull Request (PR) request will automatically
be updated!
--
Ticket URL: <https://trac.macports.org/ticket/64142#comment:12>
MacPorts <https://www.macports.org/>
Ports system for macOS
More information about the macports-tickets
mailing list