- Update to 4.44

Approved by:	nox (maintainer, implicit)

4 files changed, 11 insertions, 86 deletions

diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index 8f355f1fd9bf..c4eb7db1b02c 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	p7zip
-PORTVERSION=	4.43
+PORTVERSION=	4.44
 CATEGORIES=	archivers
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src_all
@@ -24,8 +24,8 @@ MANCOMPRESSED=	no
 DLLDIR=		${PREFIX}/libexec/p7zip
 
 PLIST_SUB=	MODULES=""
-ALL_TARGET=	7z 7za 7zr sfx
-7ZBIN=		7z 7za 7zr 7zCon.sfx
+ALL_TARGET=	7z 7za 7zr Client7z sfx
+7ZBIN=		7z 7za 7zr Client7z 7zCon.sfx
 .if defined(WITHOUT_MODULES)
 PLIST_SUB=	MODULES="@comment "
 ALL_TARGET=	7za 7zr sfx
@@ -62,7 +62,7 @@ do-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/7z ${PREFIX}/bin/
 	${LN} -sf 7z ${PREFIX}/bin/7za
 	${LN} -sf 7z ${PREFIX}/bin/7zr
-	${INSTALL_SCRIPT} ${FILESDIR}/p7zip ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/gzip-like_CLI_wrapper_for_7z/p7zip ${PREFIX}/bin/
 .if !defined(WITHOUT_MODULES)
 .for f in Codecs Formats
 	${INSTALL} -d ${DLLDIR}/${f}
diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo
index d3f9827294a4..feb45ff9844b 100644
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,3 +1,3 @@
-MD5 (p7zip_4.43_src_all.tar.bz2) = 9fb8982262f66b4ec0377a67c171cfcb
-SHA256 (p7zip_4.43_src_all.tar.bz2) = 736a1c301d95ed2d5ce917a859d6fca3f378345e8253a1143bd26f7333a7fb5c
-SIZE (p7zip_4.43_src_all.tar.bz2) = 1482271
+MD5 (p7zip_4.44_src_all.tar.bz2) = 78b04bed16a1e7e91b5bf2f1f84ab811
+SHA256 (p7zip_4.44_src_all.tar.bz2) = cb87304f682e7176ab95ce73d3ce2b7b65384e051272fc34ef934e2427bbd3af
+SIZE (p7zip_4.44_src_all.tar.bz2) = 1518820
diff --git a/archivers/p7zip/files/p7zip b/archivers/p7zip/files/p7zip
deleted file mode 100644
index e360f3741f2d..000000000000
--- a/archivers/p7zip/files/p7zip
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-# gzip-like CLI wrapper for p7zip
-set -e
-
-compress=true
-file=
-
-usage ()
-{
-  echo "Usage: $0 [-d] [-h|--help] [file]"
-  exit 1
-}
-
-while [ "$#" != "0" ] ; do
-  case "$1" in
-    -d) compress=false ;;
-    -c) echo "$0: ignoring $1 option (not yet implemented)" ;;
-    -h|--help) usage ;;
-    *)
-      if [ "${file}" = "" ] ; then
-        file="$1"
-      else
-        usage
-      fi
-    ;;
-  esac
-  shift
-done
-
-# make sure they're present, before we screw up
-for i in mktemp 7z rm cat tty ; do
-  if ! which $i > /dev/null ; then
-    echo "$0: $i: command not found"
-    exit 1
-  fi
-done
-
-if [ "${file}" != "" ] ; then
-  if ${compress} ; then
-    7z a ${file}.7z ${file}
-    rm ${file}
-  else
-    case ${file} in
-      *.7z)
-        7z x ${file}
-        rm ${file}
-      ;;
-      *)
-        echo "$0: ${file}: unknown suffix -- ignored"
-      ;;
-    esac
-  fi
-  exit 0
-fi
-
-P7ZTMP=${TMP:-/tmp}
-tmp=`mktemp ${P7ZTMP}/p7z.XXXXXXXX`
-trap "rm -f ${tmp}" 0
-
-if ${compress} ; then
-  if tty > /dev/null ; then
-    echo "$0: compressed data not written to a terminal."
-    echo "For help, type: $0 -h"
-    exit 1
-  fi
-  rm -f ${tmp}
-  7z a ${tmp} -si >/dev/null
-  cat ${tmp}
-else
-  cat > ${tmp}
-  7z x ${tmp} -so 2>/dev/null | cat
-fi
-
-rm -f ${tmp}
diff --git a/archivers/p7zip/pkg-plist b/archivers/p7zip/pkg-plist
index 8eeb17f2f4c5..1aba1595ea0f 100644
--- a/archivers/p7zip/pkg-plist
+++ b/archivers/p7zip/pkg-plist
@@ -1,10 +1,9 @@
-@unexec /bin/rm -f %D/bin/7za
-@unexec /bin/rm -f %D/bin/7zr
 bin/7z
+bin/7za
+bin/7zr
 bin/p7zip
-@exec /bin/ln -sf 7z %D/bin/7za
-@exec /bin/ln -sf 7z %D/bin/7zr
 %%MODULES%%libexec/p7zip/7z
+%%MODULES%%libexec/p7zip/Client7z
 libexec/p7zip/7za
 libexec/p7zip/7zr
 libexec/p7zip/7zCon.sfx
@@ -14,12 +13,12 @@ libexec/p7zip/7zCon.sfx
 %%MODULES%%libexec/p7zip/Codecs/Branch.so
 %%MODULES%%libexec/p7zip/Codecs/Copy.so
 %%MODULES%%libexec/p7zip/Codecs/Deflate.so
-%%MODULES%%libexec/p7zip/Codecs/Implode.so
 %%MODULES%%libexec/p7zip/Codecs/LZMA.so
 %%MODULES%%libexec/p7zip/Codecs/PPMD.so
 %%MODULES%%libexec/p7zip/Codecs/Rar29.so
 %%MODULES%%libexec/p7zip/Codecs/Swap.so
 %%MODULES%%libexec/p7zip/Formats/7z.so
+%%MODULES%%libexec/p7zip/Formats/7za.so
 %%MODULES%%libexec/p7zip/Formats/chm.so
 %%MODULES%%libexec/p7zip/Formats/Rar.so
 %%MODULES%%libexec/p7zip/Formats/Tar.so