Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 29 May 2009 10:06:22 -0400
From:      Steve Bertrand <steve@ibctech.ca>
To:        Kurt Buff <kurt.buff@gmail.com>
Cc:        FreeBSD Questions <questions@freebsd.org>, freebsd-questions@freebsd.org
Subject:   Re: Patching? Probably a trivial question, but...
Message-ID:  <4A1FEBDE.90009@ibctech.ca>
In-Reply-To: <a9f4a3860905271228sf2860e2r478ea61fd5a64218@mail.gmail.com>
References:  <a9f4a3860905270821h31c36b9fh25389f79ee33c29@mail.gmail.com>	<200905272036.04272.mel.flynn%2Bfbsd.questions@mailing.thruhere.net> <a9f4a3860905271228sf2860e2r478ea61fd5a64218@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
This is a cryptographically signed message in MIME format.

--------------ms040306000109080508070509
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

Kurt Buff wrote:
> On Wed, May 27, 2009 at 11:36, Mel Flynn
> <mel.flynn+fbsd.questions@mailing.thruhere.net> wrote:
>> On Wednesday 27 May 2009 17:21:42 Kurt Buff wrote:
>>> All,
>>>
>>> I've gotten a patch for a program in the ports tree from one of the
>>> authors of the program - not the port maintainer - to fix a small
>>> problem, but don't know how to install the updated port.
>>>
>>> I cd'ed into the
>>> /usr/ports/%CATEGORY%/%PROGRAM%/work/%PROGRAM-VERSION% directory, the=
n
>>> performed 'patch <patch-name' successfully, AFAICT.
>>>
>>> Then I did a make, but got no output.
>>>
>>> So - I'm obviously lacking clue here. Anyone have a spare set?
>> Don't feel like reading the entire thread atm, but for reference:
>> - Patches need to have relative paths, where the root of the path corr=
esponds
>> to the port's notion of $PATCH_WRKSRC
>> - You can find out this directory by running:
>> =C2  =C2  =C2  =C2 % make -C /usr/ports/category/portname -V PATCH_WRK=
SRC
>> =C2 The default is $WRKSRC which is $WRKDIR/$DISTNAME by default.
>> =C2 Example:
>> =C2  =C2  =C2  =C2 % make -C /usr/ports/sysutils/nagios-statd -V PATCH=
_WRKSRC
>> =C2  =C2  =C2  =C2 /stable/usr/obj/usr/ports/sysutils/nagios-statd/wor=
k/nagios-statd-3.12
>>
>> - Patches are automatically applied if they reside in the port's notio=
n of
>> PATCHDIR and are named patch-*
>> - You can find out this directory by running:
>> =C2  =C2  =C2  =C2 %make -C /usr/ports/category/portname -V PATCHDIR
>> =C2 The default is $.CURDIR/files.
>> =C2 Example:
>> =C2  =C2  =C2  =C2 % make -C /usr/ports/sysutils/nagios-statd -V PATCH=
DIR
>> =C2  =C2  =C2  =C2 /usr/ports/sysutils/nagios-statd/files
>>
>> - In order to apply a new patch after you have previously gone past th=
e patch
>> stage (configure, build, install), either run make clean or:
>> =C2  =C2  =C2  =C2 % rm $(make -C /usr/ports/category/portname -V PATC=
H_COOKIE)
>> =C2 The above can cause problems, with the build. The normal course of=
 action is
>> to make clean.
>=20
> Excellent. I will be trying this tomorrow - I'm leaving work early
> today to get some things taken care of.

Kurt,

I had to leave rather hastily the other day, but I did test the patch,
and it worked ok. If this is a one-off thing, here is how I did it:

# cd /usr/ports/category/program
# make clean
# ee source.patch (pasted the patch in)
# make configure (which preps the source)
# cd work/progname
# patch < ../../source.patch
# cd ../..
# make
# make install

All worked well.

Steve


--------------ms040306000109080508070509
Content-Type: application/x-pkcs7-signature; name="smime.p7s"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="smime.p7s"
Content-Description: S/MIME Cryptographic Signature

MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIII/zCC
AtowggJDoAMCAQICEEs5xg/J3t77QWJ4SatV1HcwDQYJKoZIhvcNAQEFBQAwYjELMAkGA1UE
BhMCWkExJTAjBgNVBAoTHFRoYXd0ZSBDb25zdWx0aW5nIChQdHkpIEx0ZC4xLDAqBgNVBAMT
I1RoYXd0ZSBQZXJzb25hbCBGcmVlbWFpbCBJc3N1aW5nIENBMB4XDTA5MDUwNzIzMTYxMFoX
DTEwMDUwNzIzMTYxMFowQjEfMB0GA1UEAxMWVGhhd3RlIEZyZWVtYWlsIE1lbWJlcjEfMB0G
CSqGSIb3DQEJARYQc3RldmVAaWJjdGVjaC5jYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
AQoCggEBAJSTRAjP1RVa87/mnZn+PBTbENgyhhBJ4rWApmaNcthzRdk2DB/49KrXx3EQP60w
Lj4KU0DFkiGNVj9BnVxRAx/WDXKxGC3uGGEG6gjyWv8KFMWMsH9mL7y7uNow1HueT6pZUf9o
yY8Ewd+01QpGi7FfXOae7lGHhbEwnEJGwz08ytRfLmH0KtEzlZanZZhwDGX5s1kIHnyxdACh
3byXY6Z2bOrx0rcrQHCnHJppxddR60F7igjaMuBFstE51h9XTgXDNKJbglqTug5ghGihNuP6
VsBN7ue62y96UGIE22TvKEcAQ665vQGjHqZeSzZYy+hWNOa27pWFmhlqFjx0x8MCAwEAAaMt
MCswGwYDVR0RBBQwEoEQc3RldmVAaWJjdGVjaC5jYTAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
DQEBBQUAA4GBAMOmjxjp2Xzk6ZHLwTgFDzVhm98RjRT3UXotKjNIR7SgwfWF5wkJrx4I+dXu
ui5ztMEq4bTTRgJ344MqE6uZiZlg+tBIFHZGCJfKdzsX4QuV2jmw0sR5dMaYxG6tlDB0YUMv
gTqzV7ZDpiusTMOZe9pP1PdxFhOcIJXtMQDj5LhuMIIC2jCCAkOgAwIBAgIQSznGD8ne3vtB
YnhJq1XUdzANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJaQTElMCMGA1UEChMcVGhhd3Rl
IENvbnN1bHRpbmcgKFB0eSkgTHRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVt
YWlsIElzc3VpbmcgQ0EwHhcNMDkwNTA3MjMxNjEwWhcNMTAwNTA3MjMxNjEwWjBCMR8wHQYD
VQQDExZUaGF3dGUgRnJlZW1haWwgTWVtYmVyMR8wHQYJKoZIhvcNAQkBFhBzdGV2ZUBpYmN0
ZWNoLmNhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlJNECM/VFVrzv+admf48
FNsQ2DKGEEnitYCmZo1y2HNF2TYMH/j0qtfHcRA/rTAuPgpTQMWSIY1WP0GdXFEDH9YNcrEY
Le4YYQbqCPJa/woUxYywf2YvvLu42jDUe55PqllR/2jJjwTB37TVCkaLsV9c5p7uUYeFsTCc
QkbDPTzK1F8uYfQq0TOVlqdlmHAMZfmzWQgefLF0AKHdvJdjpnZs6vHStytAcKccmmnF11Hr
QXuKCNoy4EWy0TnWH1dOBcM0oluCWpO6DmCEaKE24/pWwE3u57rbL3pQYgTbZO8oRwBDrrm9
AaMepl5LNljL6FY05rbulYWaGWoWPHTHwwIDAQABoy0wKzAbBgNVHREEFDASgRBzdGV2ZUBp
YmN0ZWNoLmNhMAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADgYEAw6aPGOnZfOTpkcvB
OAUPNWGb3xGNFPdRei0qM0hHtKDB9YXnCQmvHgj51e66LnO0wSrhtNNGAnfjgyoTq5mJmWD6
0EgUdkYIl8p3OxfhC5XaObDSxHl0xpjEbq2UMHRhQy+BOrNXtkOmK6xMw5l72k/U93EWE5wg
le0xAOPkuG4wggM/MIICqKADAgECAgENMA0GCSqGSIb3DQEBBQUAMIHRMQswCQYDVQQGEwJa
QTEVMBMGA1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQHEwlDYXBlIFRvd24xGjAYBgNVBAoT
EVRoYXd0ZSBDb25zdWx0aW5nMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERp
dmlzaW9uMSQwIgYDVQQDExtUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgQ0ExKzApBgkqhkiG
9w0BCQEWHHBlcnNvbmFsLWZyZWVtYWlsQHRoYXd0ZS5jb20wHhcNMDMwNzE3MDAwMDAwWhcN
MTMwNzE2MjM1OTU5WjBiMQswCQYDVQQGEwJaQTElMCMGA1UEChMcVGhhd3RlIENvbnN1bHRp
bmcgKFB0eSkgTHRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVtYWlsIElzc3Vp
bmcgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMSmPFVzVftOucqZWh5owHUEcJ3f
6f+jHuy9zfVb8hp2vX8MOmHyv1HOAdTlUAow1wJjWiyJFXCO3cnwK4Vaqj9xVsuvPAsH5/Ef
kTYkKhPPK9Xzgnc9A74r/rsYPge/QIACZNenprufZdHFKlSFD0gEf6e20TxhBEAeZBlyYLf7
AgMBAAGjgZQwgZEwEgYDVR0TAQH/BAgwBgEB/wIBADBDBgNVHR8EPDA6MDigNqA0hjJodHRw
Oi8vY3JsLnRoYXd0ZS5jb20vVGhhd3RlUGVyc29uYWxGcmVlbWFpbENBLmNybDALBgNVHQ8E
BAMCAQYwKQYDVR0RBCIwIKQeMBwxGjAYBgNVBAMTEVByaXZhdGVMYWJlbDItMTM4MA0GCSqG
SIb3DQEBBQUAA4GBAEiM0VCD6gsuzA2jZqxnD3+vrL7CF6FDlpSdf0whuPg2H6otnzYvwPQc
UCCTcDz9reFhYsPZOhl+hLGZGwDFGguCdJ4lUJRix9sncVcljd2pnDmOjCBPZV+V2vf3h9bG
CE6u9uo05RAaWzVNd+NWIXiC3CEZNd4ksdMdRv9dX2VPMYIDZDCCA2ACAQEwdjBiMQswCQYD
VQQGEwJaQTElMCMGA1UEChMcVGhhd3RlIENvbnN1bHRpbmcgKFB0eSkgTHRkLjEsMCoGA1UE
AxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVtYWlsIElzc3VpbmcgQ0ECEEs5xg/J3t77QWJ4SatV
1HcwCQYFKw4DAhoFAKCCAcMwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0B
CQUxDxcNMDkwNTI5MTQwNjIyWjAjBgkqhkiG9w0BCQQxFgQULHNHNeilnRxMQumTrYewUzpm
fJUwUgYJKoZIhvcNAQkPMUUwQzAKBggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZI
hvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwgYUGCSsGAQQBgjcQBDF4MHYwYjEL
MAkGA1UEBhMCWkExJTAjBgNVBAoTHFRoYXd0ZSBDb25zdWx0aW5nIChQdHkpIEx0ZC4xLDAq
BgNVBAMTI1RoYXd0ZSBQZXJzb25hbCBGcmVlbWFpbCBJc3N1aW5nIENBAhBLOcYPyd7e+0Fi
eEmrVdR3MIGHBgsqhkiG9w0BCRACCzF4oHYwYjELMAkGA1UEBhMCWkExJTAjBgNVBAoTHFRo
YXd0ZSBDb25zdWx0aW5nIChQdHkpIEx0ZC4xLDAqBgNVBAMTI1RoYXd0ZSBQZXJzb25hbCBG
cmVlbWFpbCBJc3N1aW5nIENBAhBLOcYPyd7e+0FieEmrVdR3MA0GCSqGSIb3DQEBAQUABIIB
AGoR+CysVxSl/dMOm9qNZUkP6bGxqCIdKkbHVAa0ow38ZpmEj0R/PSeVMxMa15K1fRn+rEVV
0qkcx8Rt6wx4d4vdV8RbDuoIzPXiSxb1CwBLqcPku7Az42l1aydNbOZuv8Wh7DorYdnCKp2F
RDQFmd6p/1Pg37hs7m1vsrhr+rEx+bvGfd5Fbl+zVapIVgNr9eBakyBktV442qmZVRZu0Kdz
QkwTpU7XKnlQBka4KAEawsCADncY02lZepfqanxbt+aJzC7JOpxOQSW7s6jJhS6jhutHsEdh
3AUrYW6R2GABBDlIVna+05UYBpN85CiNUfzHaQjLNWSTxRdEw32fu8YAAAAAAAA=
--------------ms040306000109080508070509--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A1FEBDE.90009>