From owner-freebsd-ports@freebsd.org Tue Nov 7 17:03:42 2017 Return-Path: Delivered-To: freebsd-ports@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 413A6E5E03D for ; Tue, 7 Nov 2017 17:03:42 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "plouf.absolight.net", Issuer "CAcert Class 3 Root" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id D721276C3B for ; Tue, 7 Nov 2017 17:03:41 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id CB3E3BDD2F; Tue, 7 Nov 2017 18:03:38 +0100 (CET) Received: from ogg.in.absolight.net (ogg.in.absolight.net [79.143.241.239]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by prod2.absolight.net (Postfix) with ESMTPSA id B166BBDD1E; Tue, 7 Nov 2017 18:03:38 +0100 (CET) Subject: Re: best way to maintain local ports tree changes To: Miroslav Lachman <000.fbsd@quip.cz>, FreeBSD Ports ML References: <5A01D736.40204@quip.cz> From: Mathieu Arnold Organization: Absolight / The FreeBSD Foundation Message-ID: <3bf0c6dc-51b9-9799-6608-53db1270bf4a@FreeBSD.org> Date: Tue, 7 Nov 2017 18:03:36 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <5A01D736.40204@quip.cz> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="VU8m9mdwLSQhwLRT6LU13QFQnMpKhPV93" X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Nov 2017 17:03:42 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --VU8m9mdwLSQhwLRT6LU13QFQnMpKhPV93 Content-Type: multipart/mixed; boundary="dFHOvHgev2oUFJCGmj9sxOodDGttXlR31"; protected-headers="v1" From: Mathieu Arnold To: Miroslav Lachman <000.fbsd@quip.cz>, FreeBSD Ports ML Message-ID: <3bf0c6dc-51b9-9799-6608-53db1270bf4a@FreeBSD.org> Subject: Re: best way to maintain local ports tree changes References: <5A01D736.40204@quip.cz> In-Reply-To: <5A01D736.40204@quip.cz> --dFHOvHgev2oUFJCGmj9sxOodDGttXlR31 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Language: fr Le 07/11/2017 =C3=A0 16:54, Miroslav Lachman a =C3=A9crit=C2=A0: > What is the best way to maintain local ports tree changes? > > I am building packages in poudriere, 4 different sets for 2 archs (8 > sets in total). > > I have some local ports and some changes to official ports. Now we are > planing to do some small changes in ports/Mk too. I would advise against patching the framework directly, most things are configurable, what problems do you have with ports/Mk ? Are you aware of the Mk/bsd.local.mk file that is there to allow you to not change the other files ? As for the ports, you can also add a Makefile.local that will be parsed after the main Makefile, it may help you depending on what you change in existing ports. > So what is the best way to get ports tree in sync with official ports > tree but keep our local changes without a need to apply patches > manually over and over? > > What are you guys using for this scenario? > > Kind regards > Miroslav Lachman > _______________________________________________ > 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= " > --=20 Mathieu Arnold --dFHOvHgev2oUFJCGmj9sxOodDGttXlR31-- --VU8m9mdwLSQhwLRT6LU13QFQnMpKhPV93 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQJ8BAEBCgBmBQJaAedpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzQUI2OTc4OUQyRUQxMjEwNjQ0MEJBNUIz QTQ1MTZGMzUxODNDRTQ4AAoJEDpFFvNRg85IwxQP/0yKsKoG6HNNIxIAqt/8TvqP 5Rjnr0qH2QUljLr32butPwMBvHAoIVPXlSy/NwYcAhyvSwSmkcSN/N6yKIpEU5oy WgHAicT9W166YV4OXGxnKl7QVRWjn61mbpnZeTLGN0/StBmrU8Ejflk4VUfiJkp0 f1URGpYPofuPTvkHUw1Wu10kjKpC8M5fw7oQFESiyBJODU57P+7w1jLmKebHXgjE SLADOb9eQOvFz9SqFQX0AE2AgqSRxJDAbUO8ewh7ARxOAx+VLnMrGH6OD+amfDhM neKK8wuuLr4mUIj7ghi0OLFmOpY9x93NYUns+4UqiABb5wfh69n5R1ddBwoxIKk4 zXb8G+YxXHnH1wl9cbqST56c+U7b9TZMS75GhJamfJOtc9q5gdtbhShLaS4CZatC WEB2HOKl/KTP9gHheg3nJuyvzegpab+yqLBBW6HIKTSnPGvTxyJjouYnneebJJ8l 0UG1RHn7gvwsEU2gXY2Lu3bCjCV7aH/jbA8KN8DMWxH+BAMUXjrd8CBp+On9QLQz BiRloZ5eAL6hK2gp25GCbVI/tJoWfrhcGH1jsJqcP3BiakYxaxidNHTAbeN+BwHX X0Nd02bEpsH/H2IxK0gwvyPrnmMbl4twR2sPDDI9auWmDhA2ZBKZDtdy+XQzml16 LzkZUa2n7jweiKNPteM4 =uXwX -----END PGP SIGNATURE----- --VU8m9mdwLSQhwLRT6LU13QFQnMpKhPV93--