From owner-freebsd-ports@FreeBSD.ORG  Tue Dec 10 17:03:47 2013
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 98BD7144
 for <freebsd-ports@freebsd.org>; Tue, 10 Dec 2013 17:03:47 +0000 (UTC)
Received: from mail-ie0-x232.google.com (mail-ie0-x232.google.com
 [IPv6:2607:f8b0:4001:c03::232])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 64F591DA9
 for <freebsd-ports@freebsd.org>; Tue, 10 Dec 2013 17:03:47 +0000 (UTC)
Received: by mail-ie0-f178.google.com with SMTP id lx4so9177831iec.9
 for <freebsd-ports@freebsd.org>; Tue, 10 Dec 2013 09:03:46 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=Fw2PEUTKv0v4K80xoZM/ULmU2Lw+Lk15wwHY4tnbbxM=;
 b=AyivXk/yuJXJ0zoVHrhfP03fKjgwFas631TSEfAALVIBc7LYlAy5yDSEcBhMb2FIig
 f6ShZU5Z8aqlaTuziOj3LQb4vHNOtjl5Rgr+NcktUn3MmaPxpkbMP3n7vxI3ZS1CuVj6
 pDNOd5e9xVrxYU5GyjYPD5xhBYLh7i9TaKVRmd9bFgsWIvQPJ75WrcnyRdyLcPKwZ099
 OVN7IYb+6VtiVEwl9DmMccz1QK3jKCyRy0R6XAgkNVZ13chVq9b6eCaY6GBtWoARDnv/
 Ag5QU4SvKqIyjajGuvcfciC+KkrUTgQHEhRpVxOeakjpz+7X2xFZ1dYPSTrc6VXRbgYy
 ehhg==
MIME-Version: 1.0
X-Received: by 10.50.66.180 with SMTP id g20mr20667234igt.29.1386695026715;
 Tue, 10 Dec 2013 09:03:46 -0800 (PST)
Sender: vrwmiller@gmail.com
Received: by 10.64.9.39 with HTTP; Tue, 10 Dec 2013 09:03:46 -0800 (PST)
In-Reply-To: <52A744EF.2090400@pcbsd.org>
References: <CAHzLAVGxkfEPUwb1nuEMFFqF9f8XZ0h4R62+QRdm5fUx7QM4TA@mail.gmail.com>
 <52A744EF.2090400@pcbsd.org>
Date: Tue, 10 Dec 2013 12:03:46 -0500
X-Google-Sender-Auth: Qv28ORrJ6uW5fgSHB3m2zCs9BvQ
Message-ID: <CAHzLAVEGb1uAYfhDvgE5UqGK8Qf=3TYs3_zdV-XJCc5vNFryVQ@mail.gmail.com>
Subject: Re: Integrating Custom Ports
From: Rick Miller <vmiller@hostileadmin.com>
To: Kris Moore <kris@pcbsd.org>
Content-Type: text/plain; charset=ISO-8859-1
X-Content-Filtered-By: Mailman/MimeDel 2.1.17
Cc: freebsd-ports@freebsd.org
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports/>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Dec 2013 17:03:47 -0000

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!