From owner-freebsd-ports@freebsd.org Sun Jul 5 14:42:35 2020 Return-Path: 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 352D436D427 for ; Sun, 5 Jul 2020 14:42:35 +0000 (UTC) (envelope-from brandon.helsley@hotmail.com) Received: from NAM04-SN1-obe.outbound.protection.outlook.com (mail-oln040092011065.outbound.protection.outlook.com [40.92.11.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "GlobalSign Organization Validation CA - SHA256 - G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B0BHt1Cdmz422K for ; Sun, 5 Jul 2020 14:42:34 +0000 (UTC) (envelope-from brandon.helsley@hotmail.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KcdJfWPBZsNfVztqM7aaNwuvTJFCA9vhGJrn4XpOoC8/Bcs49Uz8n66wRBgZR12z635x254nKZbYZm/89ceU8FWSj+c80NAAdj50TE9PEdfJ8ThaOTO4mHe1QMbP+p0BXmfGS8bqiQwdjK4lFDfBQ5wF7l0HN4frFukTRq0BGhDlXOC6pfi48Xw16Fy1NwqEa0P7ntKqr9Kb5Z4VtV7Oel/h+wV/Xww7nPSUTSx+lgwaNgvP2CmFw1/z+TK6a5Aj7bGWcQNiAsdx8f6oJE1OT5w2sw2Rx6nOD+eLZNTMg/aXccEqWqep8n/cZE0Q9ZBgLt0ScOfPnnOi5BZs3wHTTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5XObt5dC+Vja6gZEExk+NT6PT4dGC4F0Z7Y1YBoCE3Q=; b=UTEtBG7JZrwuR9necjwSln5Ae2uDvX0hf3aIW8S2K/9LAnUsyIAcmCstL7xBRhFZ8LnufGUOMOfj3CZPaX8RVllPsGnceiWQtEimooHiqWdnGHmd9Y/DxttuzIZ5NIHeNfbK8oPWa9G6PLM3aG6SI380uGIh5kFgMLwdvJA3yl3Cmj6izNMIjM0sjQgw97/pnnbdF5D+juILshSnbLJ0V0Tz1iSQ1yiDPLAmoOV6l2bsV3WS8SXXsAniL9FFuY6qqcaZv3SQQi9ckeH533q3jHAwv3SyyQbAZan5rxreOMPwn3uneMVfj3g5hMecOzi7Z7+lBOv6m5Q5PirVBDAi7Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5XObt5dC+Vja6gZEExk+NT6PT4dGC4F0Z7Y1YBoCE3Q=; b=rAqjhxeVcpt27TACPGzbODz7OpNHc3Jd5wxsPhwMbBm8O3IBXmFHkrX0qd/gbtnXjblhlwrHSgPnxqiD5kQYttieZvCqQkVmb0LFCfN6d+tZXfCq8kq7URRoK3yZJsZTL3vxDoygDI7nIbFfNx6kZWDgbXBfw8UptjVom8uVBbcmC/q9HHNVfCooBFvSojg2dQfEP838u232S5Wzi1NQg7skh7qLwkUolBxVMRplivyHLNY4hd8+ensPhTfq5VW3wUi8C6zEZhoVx0J1oc6TmYvq+BnkK3oz1SDRhErao+xcu0psJlz6Jb9qqs3gi5vZ20tT4O2zLaOMmj1b3X2Rbw== Received: from CO1NAM04FT051.eop-NAM04.prod.protection.outlook.com (10.152.90.55) by CO1NAM04HT097.eop-NAM04.prod.protection.outlook.com (10.152.91.179) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.28; Sun, 5 Jul 2020 14:42:32 +0000 Received: from CY4PR19MB0104.namprd19.prod.outlook.com (2a01:111:e400:7e4d::53) by CO1NAM04FT051.mail.protection.outlook.com (2a01:111:e400:7e4d::255) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.28 via Frontend Transport; Sun, 5 Jul 2020 14:42:32 +0000 Received: from CY4PR19MB0104.namprd19.prod.outlook.com ([fe80::3cba:126c:494b:642e]) by CY4PR19MB0104.namprd19.prod.outlook.com ([fe80::3cba:126c:494b:642e%3]) with mapi id 15.20.3153.029; Sun, 5 Jul 2020 14:42:32 +0000 From: Brandon helsley To: Vidar Karlsen CC: freebsd-ports Subject: RE: Porting Practice Thread-Topic: Porting Practice Thread-Index: AQHWUmKWxKU91Dk26kmDWx70JXV5aqj4pN4AgABpyWw= Date: Sun, 5 Jul 2020 14:42:32 +0000 Message-ID: References: , <4B33F770-AE87-4374-9FB8-A83C1F13C259@karlsen.tech> In-Reply-To: <4B33F770-AE87-4374-9FB8-A83C1F13C259@karlsen.tech> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:AE4071A5228404A615AB2011343AE66FC2C08E84FCF75B3D0E10EC0A0C24B68B; UpperCasedChecksum:303F666F8F711A9B73FF27B7614DF08E9FACF3C288E1DF9CC2E86EB88DE871EF; SizeAsReceived:6910; Count:45 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [Q6vwqI76qM7TyRPQ/pVPyoLdC7jwu3ev] x-ms-publictraffictype: Email x-incomingheadercount: 45 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: d18fafaf-e7ad-4107-5fad-08d820f1a665 x-ms-traffictypediagnostic: CO1NAM04HT097: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: CE6vbqmStWy67dkZEUUfUmFUXHKtQfuwXY1GTgh38jvzIGTDihXEDLsc/om8XqAYh7D0XK4rQkh57+rqDLZc0dgcNOv8or15v29g7OGXD+eZcIx/5TgiriP7zXO+4SdYbPkg4kG6YUjictupJLf7osNxPiHOW1BoZAI0BULpsVqUwRLa49bQobc0E8ZpY9OA6I8p3lqQgfbs/IRAoaPZYKbK04xVUJFDhpu8h3G9SJp81Fxt+U9q7x70Bj9qFiBS x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:0; SRV:; IPV:NLI; SFV:NSPM; H:CY4PR19MB0104.namprd19.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:; DIR:OUT; SFP:1901; x-ms-exchange-antispam-messagedata: SkigrrmcdS1jV/cqVbZjlvJYVYFeS8dDUExuptqBUezaiwz/qa1u8ChGbyV6qhoUv81+IQvG0S2v6QNbjBTjtTEt8Ux5ZhV/tzBAZ1lrwxCMo6wvexON5Igd8qfBydTMipFBmOB4xs7Nvs/xkB9kCA== x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-AuthSource: CO1NAM04FT051.eop-NAM04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: d18fafaf-e7ad-4107-5fad-08d820f1a665 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Jul 2020 14:42:32.2581 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1NAM04HT097 X-Rspamd-Queue-Id: 4B0BHt1Cdmz422K X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=hotmail.com header.s=selector1 header.b=rAqjhxeV; dmarc=pass (policy=none) header.from=hotmail.com; spf=pass (mx1.freebsd.org: domain of brandon.helsley@hotmail.com designates 40.92.11.65 as permitted sender) smtp.mailfrom=brandon.helsley@hotmail.com X-Spamd-Result: default: False [-5.22 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.004]; R_DKIM_ALLOW(-0.20)[hotmail.com:s=selector1]; RWL_MAILSPIKE_POSSIBLE(0.00)[40.92.11.65:from]; FROM_HAS_DN(0.00)[]; FREEMAIL_FROM(0.00)[hotmail.com]; R_SPF_ALLOW(-0.20)[+ip4:40.92.0.0/15]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-0.99)[-0.993]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector9901:i=1]; RCVD_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[hotmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[40.92.11.65:from]; NEURAL_HAM_SHORT(-1.22)[-1.221]; DMARC_POLICY_ALLOW(-0.50)[hotmail.com,none]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[hotmail.com]; ASN(0.00)[asn:8075, ipnet:40.80.0.0/12, country:US]; RCVD_TLS_LAST(0.00)[]; DWL_DNSWL_NONE(0.00)[hotmail.com:dkim] X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Jul 2020 14:42:35 -0000 For making changes to a port, I find =92svn diff=92 to be the easiest way b= y 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 thecategory/theport > /portpatches/thecategory_thepo= rt_version.diff (change 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 tracking the changes so I don= =92t 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 FreeBSD. I p= ersonally do that in the port=92s =91work=92 dir and create the patches wit= h =91make makepatch=92, and there I need to create .orig files (cp file.c f= ile.c.orig before making changes). Could you please go into more detail about what you mean in step one and th= ree, I am getting really close to figuring out how this works. In step thre= e I don't understand "cd /ports" or "portpatches/thecategory_theport_versio= n.diff" ________________________________________ From: owner-freebsd-ports@freebsd.org [owner-freebsd-ports@freebsd.org] on = behalf of Vidar Karlsen [vidar@karlsen.tech] Sent: Sunday, July 5, 2020 2:18 AM To: Brandon helsley Cc: freebsd-ports Subject: Re: Porting Practice > On 5 Jul 2020, at 02:46, Brandon helsley wr= ote: [=85] > The documentation for (diff -u) says "To create a suitable diff for a sin= gle patch, copy the file that needs patching to something.orig, save the ch= anges to something and then create the patch:" > % diff -u something.orig something > something.diff > > Im not sure really the meaning of this documentation. What file needs pat= ching, which file to copy, where to save changes to exactly, and how and wh= y the svn method is different. Which method should I choose? I know it says= that unified diff and svn are preffered but since I am new maybe the (diff= -u) command would be easier to begin with? Please help and include anythin= g that's relevant even if i didn't mention it. I'm really excited to get st= arted and will absorb like a sponge any know how that's offered!!! For making changes to a port, I find =92svn diff=92 to be the easiest way b= y 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 thecategory/theport > /portpatches/thecategory_thepo= rt_version.diff (change 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 tracking the changes so I don= =92t 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 FreeBSD. I p= ersonally do that in the port=92s =91work=92 dir and create the patches wit= h =91make makepatch=92, and there I need to create .orig files (cp file.c f= ile.c.orig before making changes). Hope this helps, Vidar Karlsen _______________________________________________ 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"