From: kn <kn@openbsd.org>
Date: Sat, 21 Jan 2023 09:01:55 +0000 (+0000)
Subject: sync EXTRACT_CASES and PATCH_CASES with reality
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=efb076c278a5a4f20b2ad0532537b3ca9eb7cbf8;p=openbsd

sync EXTRACT_CASES and PATCH_CASES with reality

xz handles .lz now, we deal with zstd patches by default, bzip2 and gzip
have command variables.
---

diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index b33e67cf78f..a108d70aef5 100644
--- a/share/man/man5/bsd.port.mk.5
+++ b/share/man/man5/bsd.port.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.port.mk.5,v 1.573 2023/01/09 17:41:03 sthen Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.574 2023/01/21 09:01:55 kn Exp $
 .\"
 .\" Copyright (c) 2000-2008 Marc Espie
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 9 2023 $
+.Dd $Mdocdate: January 21 2023 $
 .Dt BSD.PORT.MK 5
 .Os
 .Sh NAME
@@ -1722,9 +1722,7 @@ tar
 .It archivers/bzip2
 tar.bz2, tbz2, tbz
 .It archivers/xz
-tar.xz, tar.lzma
-.It archivers/lzip/lunzip
-tar.lz
+tar.xz, tar.lzma, tar.lz
 .It archivers/unzip
 zip
 .It archivers/zstd
@@ -2446,11 +2444,11 @@ for patchfile in ${_LIST_PATCHFILES}
 do
     case $$patchfile in
 	*.bz2)
-	  bzip2 -dc $$patchfile | ${PATCH} ${PATCH_DIST_ARGS};;
-	*.lz)
-	  lunzip -c $$patchfile | ${PATCH} ${PATCH_DIST_ARGS};;
+	  ${BZIP2} -d <$$patchfile | ${PATCH} ${PATCH_DIST_ARGS};;
+	*.zst|*.zstd)
+	  zstdcat -c <$$patchfile | ${PATCH} ${PATCH_DIST_ARGS};;
 	*.Z|*.gz)
-	  gzcat $$patchfile | ${PATCH} ${PATCH_DIST_ARGS};;
+	  ${GZIP_CMD} -d <$$patchfile | ${PATCH} ${PATCH_DIST_ARGS};;
 	*)
 	  ${PATCH} ${PATCH_DIST_ARGS} <$$patchfile;;
     esac