This folder contains my patches for various pkgsrc packages as well as the NetBDS distribution. This README describes how to create and apply them. = pkgsrc patches = == Modifying a package == cd /usr/pkgsrc/path-to/package make fetch cd /usr/pkgsrc/distfiles tar xf archived-package.tgz cd extracted-package/ At this point, you can either decide to track your changes by initializing a Git repository git init git commit . or by using pkgvi and pkgdiff: pkgvi file.c pkgdiff file.c > ~/patches/path-to/package/patch-name == Generating a patch from Git == cd /path-to/extracted-package/ git diff ... | conv -i The resulting patch will be placed in ~/patches. == Applying a patch == Be sure to set the LOCALPATCHES variable in mk.conf: echo LOCALPATCHES = $HOME/patches >> /etc/mk.conf After that, local patches will be applied automatically, assuming they are formatted correctly and placed in the correct directory. == Undoing patches == In order to undo all patches, you need to extract the original files from the downloaded archive. cd /usr/pkgsrc/path-to/package w=/usr/pkgsrc/distfiles/$(sed -n '/.*(\(.*\)).*/{s//\1/;p;q}' distinfo) cd $(dirname $w) tar xf $w cd - find . -name '*.orig' | while read f; do f=${f%.orig} cp $w/${f#./work/} $f done It is not reliable to restore the original files using the .orig files, as multiple patches may have been applied to the same file. You can use the undopatch script to automate this. == Rebuilding with new patch == undopatch make do-patch make do-build make do-install # pkg_delete PACKAGE make reinstall # or make replace --- = NetBSD patches = The usr/ directory contains patches for the NetBSD distribution. == Applying a patch == cd /usr/*src/... pkgpatch <~/patches/usr/*src/.../patch-name