Integrating Custom Ports

[Brooks Davis]

On Tue, Dec 10, 2013 at 12:03:46PM -0500, Rick Miller wrote:
> On Tue, Dec 10, 2013 at 11:44 AM, Kris Moore <kris at 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!

A couple more options:  If you won't be modifying the upstream tree,
it's quite plausible to merge a local directory into a portsnap managed
ports tree using the -l option.  For another option, portshaker lets you
build custom port's tree from multiple sources.

-- Brooks
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20131211/052c5c01/attachment.sig>