From owner-freebsd-ports@freebsd.org Tue Aug 14 00:50:01 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 50566105AEDA for ; Tue, 14 Aug 2018 00:50:01 +0000 (UTC) (envelope-from gurenchan@gmail.com) Received: from mail-it0-x236.google.com (mail-it0-x236.google.com [IPv6:2607:f8b0:4001:c0b::236]) (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 DAA0474A4D for ; Tue, 14 Aug 2018 00:50:00 +0000 (UTC) (envelope-from gurenchan@gmail.com) Received: by mail-it0-x236.google.com with SMTP id 139-v6so17273212itf.0 for ; Mon, 13 Aug 2018 17:50:00 -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=QGRs1liu906zFx5AsnbMkf4pWQ+/Epuu6qUd79WZZkA=; b=dCBavjzaKdyKyBm8O4kl6XmSKGafOMVQUivlWueNcoyVQJqWwSgiUZ8BY46tjXI6ZH oouBCdkAB4VTruw0HSDscw2QtMbBp8zcOU+LZGae8LmhZHtIJVbc+yyeZxcUqxEZag66 7KI9maqtioZCyjI9aWX9+rPxGj0Yd6My8+Jl24+KHmgLdpqawyg6azEQmwdABGY6xsLr oKUMBAUvSzWc54pE4oRitCuU3DZrzprJ1+pL474q9oCy7A4uBqn9vpINLPZtcXYkNaFN iIDLifIkdg+YWqEbhi5oLccrO3pe594w+1QYzXyy9yrOJd66J3pEJ4T1bWIm3X+rxVsJ PbDg== 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=QGRs1liu906zFx5AsnbMkf4pWQ+/Epuu6qUd79WZZkA=; b=s4luo4Z8ORiIH9iwCMbdzv8H8VbauWYl889UpSuQARKyryTZ+z9IT72aKGbrKuePip sJ/BuikZgDMix/gt+uTlfpGAHJ5ItcchbrhCQjrYNEWiFUjPKiEpotRnPP1tFxMAx3+D 25/VXpmJfqejxXnPgZz6IJ7HhN3CjlBxEyqM2tfOzosBcHrUpp3a6+/X7SFteyVUZfux WtasqfHAfSB5mFpjKPlIZlfBcfQmeuaoo/qIBHqycHpftODOdLbKtA0uS+rZmNRbXvYL Dpmi8O7CMZT/X+hhYSyyUDikujuZommdy4cJGIa8mSw1gUOFRBoQUa2y7IeoTZ4lDUdW ovKQ== X-Gm-Message-State: AOUpUlFSYxbBev9zYoj0TLhHbeR5hV43p5OaU4Qe2IbFGvVt5sruXN2M mQXheMEiRlC8zpZcnf7JRi+XSKpjIjC3Vh1y7jg= X-Google-Smtp-Source: AA+uWPz5xrcy/GaMAafRRmBQQdCR3obyLnBVgNqUUoqKRB2l62UJzQ8f118p3ECW9+O/23HEGDMEDFYcxFOhi3aWx3g= X-Received: by 2002:a24:60d:: with SMTP id 13-v6mr13245423itv.1.1534207800317; Mon, 13 Aug 2018 17:50:00 -0700 (PDT) MIME-Version: 1.0 References: <05457c2b-b85c-a929-20e7-38ff1b2899d6@collabora.com> <87211ccd-bb2f-cd03-ecde-fd123d0c9ca5@collabora.com> In-Reply-To: <87211ccd-bb2f-cd03-ecde-fd123d0c9ca5@collabora.com> From: blubee blubeeme Date: Tue, 14 Aug 2018 08:50:08 +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: Tue, 14 Aug 2018 00:50:01 -0000 On Tue, Aug 14, 2018, 08:26 Helen Koike wrote: > > > On 08/13/2018 08:00 PM, blubee blubeeme wrote: > > > > > > 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 > > > > I am doing that, but there are some changes that I couldn't include in > upstream yet. > > Helen > Can you give an example of types of changes can't be upstream yet and their reasoning why not? Best, Owen >