Date: Sun, 5 Jul 2020 09:13:44 -0600 From: Brandon helsley <brandon.helsley@hotmail.com> To: Vidar Karlsen <vidar@karlsen.tech> Cc: freebsd-ports <freebsd-ports@freebsd.org> Subject: Re: Porting Practice Message-ID: <CY4PR19MB010443247BBB3B62B44F95AAF9680@CY4PR19MB0104.namprd19.prod.outlook.com> In-Reply-To: <CY4PR19MB01049D0E0EBEC60E982C1728F9680@CY4PR19MB0104.namprd19.prod.outlook.com> References: <CY4PR19MB01049D0E0EBEC60E982C1728F9680@CY4PR19MB0104.namprd19.prod.outlook.com> <CY4PR19MB0104E2513B1A1B57CE4CFB22F9680@CY4PR19MB0104.namprd19.prod.outlook.com> <4B33F770-AE87-4374-9FB8-A83C1F13C259@karlsen.tech> <CY4PR19MB01049D0E0EBEC60E982C1728F9680@CY4PR19MB0104.namprd19.prod.outlook.com>
next in thread | previous in thread | raw e-mail | index | archive | help
=20 =20 =20 =23 svn diff sysutils/toybox > /home/vidar/portdiffs/sysutils=5Ftoybox-= 0.8.4.diff =20 =20 Yes the whole message cleared it up. But right here now I see /home/vidar= /portdiffs/sysutils=5Ftoybox-0.8.4.diff is where you keep the diff before= submiting it. =20 =20 =20 =20 =20 =20 =20 =20 > =20 > On Jul 5, 2020 at 9:09 AM, Vidar Karlsen <vidar=40karlsen.tech> wrote= : > =20 > =20 > > On 5 Jul 2020, at 16:42, Brandon helsley <brandon.helsley=40hotma= il.com> wrote: > >> =46or making changes to a port, I find =E2=80=99= svn diff=E2=80=99 to be the easiest way by far. I tend to do this: >> 1= . svn up my work-in-progress ports tree >> 2. Make the changes and run = tests (portlint, poudriere testport etc) >> 3. cd /ports; svn diff thec= ategory/theport > /portpatches/thecategory=5Ftheport=5Fversion.diff (c= hange the paths to the dirs of your choice) >> 4. Upload the .diff file= to Bugzilla >> >> Since I use svn in step 1, svn takes care of track= ing the changes so I don=E2=80=99t need to keep .orig files and run diff = by hand. >> >> The diffing that Jonathan mentioned is more applicable= if you have to make changes to the upstream code itself in order for it = to work on =46reeBSD. I personally do that in the port=E2=80=99s =E2=80=98= work=E2=80=99 dir and create the patches with =E2=80=98make makepatch=E2=80= =99, and there I need to create .orig files (cp file.c file.c.orig be= fore making changes). > > > Could you please go into more detail ab= out what you mean in step one and three, I am getting really close to fig= uring out how this works. In step three I don't understand =22cd /ports=22= or =22portpatches/thecategory=5Ftheport=5Fversion.diff=22 Absolutely=21 = In step 1 I use svn to download the latest revision of the ports tree int= o a location I use for this purpose. In many cases for me this has been /= ports because I like to keep /usr/ports =E2=80=9Cclean=E2=80=9D/unclutter= ed by my own fiddling. I=E2=80=99m not sure if you have been doing it thi= s way. In case not, it=E2=80=99s as simple as doing: =23 mkdir /ports =23= svn co https://svn.freebsd.org/ports/head /ports To update this copy o= f the tree later on (next time), run =E2=80=99svn up=E2=80=99 in the same= dir. =46or a real-ish example for step 3, let=E2=80=99s assume I=E2=80=99= m upgrading sysutils/toybox. When it=E2=80=99s ready to be submitted, I w= ould do this: =23 cd /ports (or whichever dir you choose to checkout the = ports tree) =23 svn diff sysutils/toybox > /home/vidar/portdiffs/sysuti= ls=5Ftoybox-0.8.4.diff And then create a PR and upload the diff file. Yo= u don=E2=80=99t have to specify the category/port for 'svn diff', but it = makes it go faster as it won=E2=80=99t have to scan for changes in any ot= her places than what you specify. Hope this cleared it up, Vidar Karlsen = =5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F= =5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F=5F freebs= d-ports=40freebsd.org mailing list https://lists.freebsd.org/mailman/li= stinfo/freebsd-ports To unsubscribe, send any mail to =22freebsd-ports-u= nsubscribe=40freebsd.org=22 =20 > =20 From owner-freebsd-ports@freebsd.org Sun Jul 5 22:25:37 2020 Return-Path: <owner-freebsd-ports@freebsd.org> Delivered-To: freebsd-ports@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4028134F519 for <freebsd-ports@mailman.nyi.freebsd.org>; Sun, 5 Jul 2020 22:25:37 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from gate.utahime.jp (gate.utahime.jp [183.180.29.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4B0NZ76SCkz4SLs for <freebsd-ports@FreeBSD.org>; Sun, 5 Jul 2020 22:25:35 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by gate.utahime.jp (Postfix) with ESMTPS id A1B6427811; Mon, 6 Jul 2020 07:25:26 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=utahime.org; s=maybe2019112701; t=1593987926; bh=gviWRyBZGYfbri0bQ3br5hY1lclI9ihlHkBa+NmLEsg=; h=Date:To:Cc:Subject:From:In-Reply-To:References; b=sRKXDyVlkW1G2bTpR0aBdn23MiJx6e9ZdQcWCCPucw/ux+E3aV3RgYm3wRDi+0TB7 QE6UUQm+He7j0pAwCFhxXil/lIifqafAE0KzmM2YrYCX6G43gpu2u0vSR+3fNMPMxU CG7QctdMuF9o14Snh7Ag30AcVGC3TShs2DVT3T1t76zIW1UQ2RwP3Z7uePE3/Ct/sH WT/3/ryfrtSBq+9nIBrFE+F89Eu1yBDCA6s7/DJH5J2a9ucQjmc6Z4bgt0ZUPpBk9g Rie+ri/pTpHPPt+JzTyvVmxQeE1EFLi3JYugUFnLBy9FQwda1CKspLWrVVYENqSekw 6OleIi7tGpaPA== Received: from localhost (rolling.home.utahime.org [192.168.174.11]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by eastasia.home.utahime.org (Postfix) with ESMTPSA id D99F12F3AB; Mon, 6 Jul 2020 07:25:25 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.102.3 at eastasia.home.utahime.org Date: Mon, 06 Jul 2020 07:24:30 +0900 (JST) Message-Id: <20200706.072430.29703653253627830.yasu@utahime.org> To: trashcan@ellael.org Cc: freebsd-ports@FreeBSD.org Subject: Re: latest Makefile breaks compilation of security/clamav if base is lacking sendmail From: Yasuhiro KIMURA <yasu@utahime.org> In-Reply-To: <AC94930A-311A-485B-A7FF-B823890924F8@ellael.org> References: <AC94930A-311A-485B-A7FF-B823890924F8@ellael.org> X-Mailer: Mew version 6.8 on Emacs 26.3 Mime-Version: 1.0 Content-Type: Text/Plain; charset=utf-8 Content-Transfer-Encoding: base64 X-Rspamd-Queue-Id: 4B0NZ76SCkz4SLs X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=utahime.org header.s=maybe2019112701 header.b=sRKXDyVl; dmarc=none; spf=pass (mx1.freebsd.org: domain of yasu@utahime.org designates 183.180.29.210 as permitted sender) smtp.mailfrom=yasu@utahime.org X-Spamd-Result: default: False [-1.40 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[utahime.org:s=maybe2019112701]; NEURAL_HAM_MEDIUM(-1.01)[-1.010]; FROM_HAS_DN(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+a:spf-authorized.utahime.org]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; DMARC_NA(0.00)[utahime.org]; NEURAL_HAM_LONG(-1.03)[-1.026]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[utahime.org:+]; MIME_BASE64_TEXT(0.10)[]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_SHORT(-0.47)[-0.466]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:2519, ipnet:183.180.0.0/16, country:JP]; RCVD_TLS_ALL(0.00)[] X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org> List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/freebsd-ports>, <mailto:freebsd-ports-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 05 Jul 2020 22:25:37 -0000 SGVsbG8gTWljaGFlbCwNCg0KVGhhbmsgeW91IGZvciBidWcgcmVwb3J0IGFuZCBwYXRjaC4gSSBj b25maXJtZWQgeW91ciBwYXRjaCBmaXhlcyB0aGUNCnByb2JsZW0gd2l0aCAxMi4xLVJFTEVBU0Uu DQoNCkZyb206IE1pY2hhZWwgR3JpbW0gPHRyYXNoY2FuQGVsbGFlbC5vcmc+DQpTdWJqZWN0OiBs YXRlc3QgTWFrZWZpbGUgYnJlYWtzIGNvbXBpbGF0aW9uIG9mIHNlY3VyaXR5L2NsYW1hdiBpZiBi YXNlIGlzIGxhY2tpbmcgc2VuZG1haWwNCkRhdGU6IFN1biwgNSBKdWwgMjAyMCAxNTozNzoxMyAr MDIwMA0KDQo+IEkgbWFuYWdlZCB0byBnZXQgY29tcGlsYXRpb24gd29ya2luZyB3aXRoIHRoZSBh dHRhY2hlZCwgc3VyZWx5IGNydWRlIGFuZCBkaXJ0eSBoYWNrIChkdWUgdG8gbXkgbGFjayBvZiBr bm93bGVkZ2UgcmVnYXJkaW5nIHBvcnRzIE1ha2VmaWxlcyksIGJ5IGFkZGluZyAnTUlMVEVSX0xE RkxBR1M9IC1MJHtMT0NBTEJBU0V9L2xpYicgYW5kICdNSUxURVJfQ0ZMQUdTPSAtSSR7TE9DQUxC QVNFfS9pbmNsdWRlJyAgaW4gb3JkZXIgdG8gaGVscCBmaW5kaW5nIHJlbGV2YW50IGZpbGVzIGZy b20gcG9ydCBtYWlsL2xpYm1pbHRlci4NCj4gDQo+IFdoYXQgd29ycmllcyBteSBzb21laG93LCBh bHRob3VnaCBjbGFtYXYgaXMgd29ya2luZyBhcyB1c3VhbCwgaXMgdGhlIGZvbGxvd2luZyBwYXJ0 IGluIHBvdWRyaWVyJ3MgbG9nOg0KPiANCj4gCWNoZWNraW5nIGZvciBtaV9zdG9wIGluIC1sbWls dGVy4oCmIHllcw0KPiAJY2hlY2tpbmcgbGlibWlsdGVyL21mYXBpLmggdXNhYmlsaXR54oCmIHll cw0KPiAJY2hlY2tpbmcgbGlibWlsdGVyL21mYXBpLmggcHJlc2VuY2XigKYgbm8NCj4gCWNvbmZp Z3VyZTogV0FSTklORzogbGlibWlsdGVyL21mYXBpLmg6IGFjY2VwdGVkIGJ5IHRoZSBjb21waWxl ciwgcmVqZWN0ZWQgYnkgdGhlIHByZXByb2Nlc3NvciENCj4gCWNvbmZpZ3VyZTogV0FSTklORzog bGlibWlsdGVyL21mYXBpLmg6IHByb2NlZWRpbmcgd2l0aCB0aGUgY29tcGlsZXIncyByZXN1bHQN Cj4gCWNoZWNraW5nIGZvciBsaWJtaWx0ZXIvbWZhcGkuaC4uLiB5ZXMNCj4gDQo+IA0KPiBIZXJl IG15IHF1ZXN0aW9uOiBJcyB0aGlzIHRoZSByaWdodCB3YXkgdG8gZml4IHRoaXMgaXNzdWU/DQoN CkknbSBub3Qgc3VyZSB3aHkgY29uZmlndXJlIHNjcmlwdCBwcm9kdWNlcyBzdWNoIHdhcm5pbmcg bWVzc2FnZXMuIEJ1dA0KbWFpbC9saWJtaWx0ZXIgc3VyZWx5IGluc3RhbGxzICR7UFJFRklYfS9s aWIvbGlibWlsdGVyL21mYXBpLmggYW5kDQpjb25maWd1cmUgc2NyaXB0IGNvcnJlY3RseSBkZXRl Y3RzIGl0IGFueXdheS4gVGhlcmVmb3JlIEkgZG9uJ3QgdGhpbmsNCnRoaXMgd2FybmluZyBtZXNz YWdlIGlzIG9mIG11Y2ggY29uY2Vybi4NCg0KQW5kIEkgc3VibWl0dGVkIGEgYml0IG1vZGlmaWVk IHBhdGNoIGFzIGZvbGxvd2luZyBidWcgcmVwb3J0Lg0KDQpzZWN1cml0eS9jbGFtYXY6IEZpeCBi dWlsZCBhZnRlciByNTQxMTE1IHdoZW4gYmFzZSBzeXN0ZW0gaXMgYnVpbGQNCndpdGggJ1dJVEhP VVRfU0VORE1BSUw9eWVzJw0KaHR0cHM6Ly9idWdzLmZyZWVic2Qub3JnL2J1Z3ppbGxhL3Nob3df YnVnLmNnaT9pZD0yNDc3OTINCg0KQmVzdCBSZWdhcmRzLg0KDQotLS0NCllhc3VoaXJvIEtJTVVS QQ0K
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CY4PR19MB010443247BBB3B62B44F95AAF9680>