Date: Tue, 10 Dec 2013 12:03:46 -0500 From: Rick Miller <vmiller@hostileadmin.com> To: Kris Moore <kris@pcbsd.org> Cc: freebsd-ports@freebsd.org Subject: Re: Integrating Custom Ports Message-ID: <CAHzLAVEGb1uAYfhDvgE5UqGK8Qf=3TYs3_zdV-XJCc5vNFryVQ@mail.gmail.com> In-Reply-To: <52A744EF.2090400@pcbsd.org> References: <CAHzLAVGxkfEPUwb1nuEMFFqF9f8XZ0h4R62%2BQRdm5fUx7QM4TA@mail.gmail.com> <52A744EF.2090400@pcbsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Dec 10, 2013 at 11:44 AM, Kris Moore <kris@pcbsd.org> wrote: > On 12/10/2013 09:37, Rick Miller wrote: > > > > This is my first foray into Ports beyond just installing what is > available. > > So, just looking for some feedback from others doing similar. Is there > > someone that can provide a few pointers in putting together and managing > > such a system? > > > > Rick, > > So the way we've been doing it is with git. > > I started by forking the ports tree from here: > > https://github.com/freebsd/freebsd-ports/ > > After cloning the fork to disk, I added a new "remote" for the original > ports tree: > > % git remote add freebsd https://github.com/freebsd/freebsd-ports.git > > I then added any custom ports / patches to our fork. When I want to > import changes from upstream I just go to my fork and do a new pull: > > % git pull freebsd master > > Merge any conflicts and commit. > Haha. Thanks, Kris! I was making this harder than it needed to be :) I appreciate the simple solution!
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAHzLAVEGb1uAYfhDvgE5UqGK8Qf=3TYs3_zdV-XJCc5vNFryVQ>