From owner-freebsd-ports@freebsd.org Mon Aug 13 23:00:44 2018 Return-Path: Delivered-To: freebsd-ports@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ECC7B105551E for ; Mon, 13 Aug 2018 23:00:43 +0000 (UTC) (envelope-from gurenchan@gmail.com) Received: from mail-it0-x232.google.com (mail-it0-x232.google.com [IPv6:2607:f8b0:4001:c0b::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8464671221 for ; Mon, 13 Aug 2018 23:00:43 +0000 (UTC) (envelope-from gurenchan@gmail.com) Received: by mail-it0-x232.google.com with SMTP id v71-v6so16920116itb.3 for ; Mon, 13 Aug 2018 16:00:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Qky3c+hnKSxNxEbcEKY2OZpCfWqJAp//qb7qgrpWjeE=; b=YYdyUp+9H+MmP1eANe7QqdyRAvfy2AdrWoe+KbpMg4gRPFsU+gu1ZLzG0WRqIWMli1 JzdljyjStVHAoJr8oQBHLaTeLhzcM1vKvqu+dhEIxTJX9py4r8QsOoo9JtiMbTeKwAoJ iFemB67AHb/1E7IJDJG9nyCOS98rGcMR84aeSm1tkAxJwaieisQCZJYYkeO/qWFfna9M EsNoPtv8DG0a+YpnHad9z4EVRlRa17qUbgxyWNEPvwQdpjNZzBAOP18cTm0+nDDQJlDC HuA3ObEJ6T4oqyzIUEumf0ui/DDuYhbN7TMh1jL3gjJSovMbSdfNIyVgEKjXYZxVAZiZ ldEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Qky3c+hnKSxNxEbcEKY2OZpCfWqJAp//qb7qgrpWjeE=; b=mFdOJdBV0NhAKXuPiSVDop/ReGiNLCwpzzt3RJTQ0DqSIvE35orw0DRS0UH9GLUjLM FKibOecAcHpiatt6926fE4tJynjgUQEp0KRyftZgK0qezHDuBNGvBS4kxhX+eIG4x28C c9ocvc08FlnY5S7fClPWOvSexAN66/HFKNGgXGOjZToCfMbvDMhZ40nbd9fSNPqO7fyp s5Q3ZkbJyK2LG/6X1kpsTJE5hnbaRRsQyZPkg6tjZeuq1PPLlGwDGEckqAVHI7uA0ukr tIij7ydTAB/RURnRWOOpapHGDHxJRME8+lIThlD/cLiGts+5Nr5uPv8tVoZLEI+j9T+o w5Gw== X-Gm-Message-State: AOUpUlEPVFAR4gstRchLWCxA2YoFiCiB6CSoNqOavLQqC71RRje991el LEVqw9T2MAZtqSUq6fzMdUpCX+A4kW8bdCNNS5sxvA== X-Google-Smtp-Source: AA+uWPz3q/stVrMhY6/tHTq6Dj0DkFmmy/V0GfXP6SuuXJX/i0aGIPzWLY9iwSFB0LKxwX+m3PRjvKkicm8Tci7WiCY= X-Received: by 2002:a02:8d43:: with SMTP id o3-v6mr16748697jal.133.1534201242995; Mon, 13 Aug 2018 16:00:42 -0700 (PDT) MIME-Version: 1.0 References: <05457c2b-b85c-a929-20e7-38ff1b2899d6@collabora.com> In-Reply-To: <05457c2b-b85c-a929-20e7-38ff1b2899d6@collabora.com> From: blubee blubeeme Date: Tue, 14 Aug 2018 07:00:51 +0800 Message-ID: Subject: Re: workflow question: how do you maintain the port in sync with upstream? To: Helen Koike Cc: freebsd-ports@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.27 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Aug 2018 23:00:44 -0000 On Tue, Aug 14, 2018, 06:30 Helen Koike wrote: > Hello, > > I am new to the community, I am maintaining two packages and I would > like to check with you if there is a better workflow to do this. > > The upstream project of the port I am maintaining is held in github, and > I also have patches in the /usr/ports/sysutils/myport/file/ folder. > > So I keep a fork of the upstream project with a branch containing a > commit with the patches from the /usr/ports/sysutils/myport/file/. > > Every time I need to update the port to a newer version, I do a git pull > in this branch, then I run a script [1] to re-generate the patches in > the /usr/ports/sysutils/myport/file/ > > This script basically generates a file.orig of all modified files in > git, then copy the modified file to WORK_DIR, then run make makepatch. > > > for file in ${CHANGES}; do > mv ${WORK_DIR}/${file} ${WORK_DIR}/${file}.orig > cp ${PROJECT_PATH}/${file} ${WORK_DIR}/${file} > done > make makepatch > > > I would like to know if there is a better way to do this (some tool that > I am not aware of?). > > [1] > > https://github.com/helen-fornazier/bsd-update-patches/blob/master/freebsd-gce-update.sh > > Thanks > Helen > > _______________________________________________ > freebsd-ports@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-ports > To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org" > Submit your patches upstream, once they get accepted your work on FreeBSD is greatly simplified. Best, Owen >