aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ankarström <john@ankarstrom.se>2021-07-18 19:08:13 +0200
committerJohn Ankarström <john@ankarstrom.se>2021-07-18 19:09:58 +0200
commit2deabc98f6ca8fd36165bbcb800affea8d990b63 (patch)
treee8fae1ab5cb3c4c97132ec458d25ffa8d4b91d0c
parent0ff0d2c368c153ff4e24ae4662db60a5485b4586 (diff)
downloadpatches-2deabc98f6ca8fd36165bbcb800affea8d990b63.tar.gz
Rename undopatch to psu, xpkg to psx
-rw-r--r--README8
-rwxr-xr-xpsu (renamed from undopatch)4
-rwxr-xr-xpsx (renamed from xpkg)2
3 files changed, 7 insertions, 7 deletions
diff --git a/README b/README
index 8092d6a..332ef8d 100644
--- a/README
+++ b/README
@@ -16,10 +16,10 @@ The other scripts have no special relation to pkgtools/pkgdiff.
Use `convpatch' to make a patch from `git diff' output.
Use `savepatch' to save a patch in ~/patches.
- Use `undopatch' to undo all patches applied to a pkgsrc build.
- Use `xpkg' to fetch and extract a pkgsrc package.
+ Use `psu' to undo all patches applied to a pkgsrc build.
+ Use `psx' to fetch and extract a pkgsrc package.
-The `undopatch' and `xpkg' scripts are only to be used within pkgsrc
+The `psu' and `psx' scripts are only to be used within pkgsrc
package directories. They do nothing within the NetBSD source tree.
Applying pkgsrc patches
@@ -32,7 +32,7 @@ LOCALPATCHES variable in mk.conf:
To rebuild a package with new patches, something along the following
lines should be performed:
- undopatch
+ psu -x
make do-patch
make do-build
make do-install
diff --git a/undopatch b/psu
index 82a6ae8..3f192bd 100755
--- a/undopatch
+++ b/psu
@@ -1,8 +1,8 @@
#!/bin/sh -e
-# undopatch -- undo patches applied to pkgsrc build
+# psu -- undo patches applied to pkgsrc build
-d=$(xpkg)
+d=$(psx)
echo=echo
echo "${0##*/}: undoing patches..." 1>&2
[ x"$1" = x"-x" ] && echo= || echo '(preview, no -x)' 1>&2
diff --git a/xpkg b/psx
index c63962b..c0df08f 100755
--- a/xpkg
+++ b/psx
@@ -1,6 +1,6 @@
#!/bin/sh -e
-# xpkg -- fetch and extract pkgsrc archive
+# psx -- fetch and extract pkgsrc archive
case "$PWD" in
/usr/pkgsrc/*/*) ;;