On Tue, Oct 20, 2015 at 11:16:15PM +0100, Stuart Henderson wrote:
> On 2015/10/20 17:35, Josh Grosse wrote:
> > Updated to 15.09. Tested on amd64.
>
> update-plist moved rar.so to the main package; you'll probably need
> to reinstate the WANTLIBs after fixing that.
Thank you for catching that! I've repaired, and took the opportunity
to move the directory creation into the subpackage PLIST while I was
correcting the error.
The reissued diff follows.
Index: Makefile
===================================================================
RCS file: /systems/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile 16 Mar 2015 17:20:40 -0000 1.24
+++ Makefile 20 Oct 2015 23:59:31 -0000
@@ -5,7 +5,7 @@ SHARED_ONLY= Yes
COMMENT-main= file archiver with high compression ratio
COMMENT-rar= rar modules for p7zip
-V= 9.38.1
+V= 15.09
DISTNAME= p7zip_${V}_src_all
PKGNAME= p7zip-${V}
PKGNAME-main= p7zip-${V}
Index: distinfo
===================================================================
RCS file: /systems/cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo 16 Mar 2015 17:20:40 -0000 1.14
+++ distinfo 20 Oct 2015 21:10:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (p7zip_9.38.1_src_all.tar.bz2) =
/VAZEJyaG/NK0yV9N6aFPq6BUf9QNF8KP/un2MX9uZU=
-SIZE (p7zip_9.38.1_src_all.tar.bz2) = 3917925
+SHA256 (p7zip_15.09_src_all.tar.bz2) =
h4Os90fiEOABUPcxHMBsTNjs97DCe0rfIZQoTMSbTW8=
+SIZE (p7zip_15.09_src_all.tar.bz2) = 4048481
Index: patches/patch-install_sh
===================================================================
RCS file: /systems/cvs/ports/archivers/p7zip/patches/patch-install_sh,v
retrieving revision 1.3
diff -u -p -r1.3 patch-install_sh
--- patches/patch-install_sh 16 Mar 2015 17:20:40 -0000 1.3
+++ patches/patch-install_sh 20 Oct 2015 21:20:05 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-install_sh,v 1.3 2015/03/16 17:20:40 juanfra Exp $
---- install.sh.orig Tue Feb 10 13:46:49 2015
-+++ install.sh Fri Feb 27 17:16:12 2015
-@@ -17,14 +17,14 @@ installShared()
+--- install.sh.orig Tue Oct 20 17:17:32 2015
++++ install.sh Tue Oct 20 17:19:39 2015
+@@ -16,14 +16,14 @@ installShared()
}
# global install
@@ -18,16 +18,16 @@ $OpenBSD: patch-install_sh,v 1.3 2015/03
[ "$1" ] && DEST_BIN="$1"
[ "$2" ] && DEST_SHARE="$2"
[ "$3" ] && DEST_MAN="$3"
-@@ -175,11 +175,11 @@ fi
+@@ -177,11 +177,14 @@ fi
if [ -d DOC ]
then
- echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOC"
+ echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}"
mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}"
-- cp -r DOC "${DEST_DIR}${DEST_SHARE_DOC}/DOC"
-- find "${DEST_DIR}${DEST_SHARE_DOC}/DOC" -type d -exec chmod 555 {} \;
-- find "${DEST_DIR}${DEST_SHARE_DOC}/DOC" -type f -exec chmod 444 {} \;
+ cp -r DOC "${DEST_DIR}${DEST_SHARE_DOC}/DOC"
+ find "${DEST_DIR}${DEST_SHARE_DOC}/DOC" -type d -exec chmod 755 {} \;
+ find "${DEST_DIR}${DEST_SHARE_DOC}/DOC" -type f -exec chmod 644 {} \;
+ cp -r DOC "${DEST_DIR}${DEST_SHARE_DOC}"
+ find "${DEST_DIR}${DEST_SHARE_DOC}" -type d -exec chmod 555 {} \;
+ find "${DEST_DIR}${DEST_SHARE_DOC}" -type f -exec chmod 444 {} \;
Index: pkg/PLIST-main
===================================================================
RCS file: /systems/cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST-main
--- pkg/PLIST-main 16 Mar 2015 17:20:40 -0000 1.8
+++ pkg/PLIST-main 20 Oct 2015 23:57:57 -0000
@@ -8,7 +8,6 @@ lib/p7zip/7z.so
@bin lib/p7zip/7zCon.sfx
@bin lib/p7zip/7za
@bin lib/p7zip/7zr
-lib/p7zip/Codecs/
@man man/man1/7z.1
@man man/man1/7za.1
@man man/man1/7zr.1
@@ -19,56 +18,86 @@ share/doc/p7zip/DOC/7zC.txt
share/doc/p7zip/DOC/7zFormat.txt
share/doc/p7zip/DOC/License.txt
share/doc/p7zip/DOC/MANUAL/
-share/doc/p7zip/DOC/MANUAL/commands/
-share/doc/p7zip/DOC/MANUAL/commands/add.htm
-share/doc/p7zip/DOC/MANUAL/commands/bench.htm
-share/doc/p7zip/DOC/MANUAL/commands/delete.htm
-share/doc/p7zip/DOC/MANUAL/commands/extract.htm
-share/doc/p7zip/DOC/MANUAL/commands/extract_full.htm
-share/doc/p7zip/DOC/MANUAL/commands/hash.htm
-share/doc/p7zip/DOC/MANUAL/commands/index.htm
-share/doc/p7zip/DOC/MANUAL/commands/list.htm
-share/doc/p7zip/DOC/MANUAL/commands/rename.htm
-share/doc/p7zip/DOC/MANUAL/commands/style.css
-share/doc/p7zip/DOC/MANUAL/commands/test.htm
-share/doc/p7zip/DOC/MANUAL/commands/update.htm
-share/doc/p7zip/DOC/MANUAL/exit_codes.htm
-share/doc/p7zip/DOC/MANUAL/index.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/add.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/bench.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/delete.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract_full.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/hash.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/index.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/list.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/rename.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/style.css
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/test.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/update.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/exit_codes.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/index.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/style.css
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_exclude.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_include.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_no.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/charset.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/email.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/exclude.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/include.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/index.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/large_pages.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/list_tech.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/method.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/output_dir.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/overwrite.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/password.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/recurse.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/sa.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/scc.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/scrc.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/sdel.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/sfx.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/shared.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/sni.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/sns.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/spf.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/ssc.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/stdin.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/stdout.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/stl.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/stop_switch.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/style.css
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/type.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/update.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/volume.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/working_dir.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/switches/yes.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/syntax.htm
+share/doc/p7zip/DOC/MANUAL/fm/
+share/doc/p7zip/DOC/MANUAL/fm/about.htm
+share/doc/p7zip/DOC/MANUAL/fm/benchmark.htm
+share/doc/p7zip/DOC/MANUAL/fm/index.htm
+share/doc/p7zip/DOC/MANUAL/fm/menu.htm
+share/doc/p7zip/DOC/MANUAL/fm/options.htm
+share/doc/p7zip/DOC/MANUAL/fm/plugins/
+share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/
+share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/add.htm
+share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/extract.htm
+share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/index.htm
+share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/style.css
+share/doc/p7zip/DOC/MANUAL/fm/plugins/index.htm
+share/doc/p7zip/DOC/MANUAL/fm/plugins/style.css
+share/doc/p7zip/DOC/MANUAL/fm/style.css
+share/doc/p7zip/DOC/MANUAL/general/
+share/doc/p7zip/DOC/MANUAL/general/7z.htm
+share/doc/p7zip/DOC/MANUAL/general/faq.htm
+share/doc/p7zip/DOC/MANUAL/general/formats.htm
+share/doc/p7zip/DOC/MANUAL/general/index.htm
+share/doc/p7zip/DOC/MANUAL/general/license.htm
+share/doc/p7zip/DOC/MANUAL/general/performance.htm
+share/doc/p7zip/DOC/MANUAL/general/style.css
+share/doc/p7zip/DOC/MANUAL/general/thanks.htm
+share/doc/p7zip/DOC/MANUAL/start.htm
share/doc/p7zip/DOC/MANUAL/style.css
-share/doc/p7zip/DOC/MANUAL/switches/
-share/doc/p7zip/DOC/MANUAL/switches/ar_exclude.htm
-share/doc/p7zip/DOC/MANUAL/switches/ar_include.htm
-share/doc/p7zip/DOC/MANUAL/switches/ar_no.htm
-share/doc/p7zip/DOC/MANUAL/switches/charset.htm
-share/doc/p7zip/DOC/MANUAL/switches/exclude.htm
-share/doc/p7zip/DOC/MANUAL/switches/include.htm
-share/doc/p7zip/DOC/MANUAL/switches/index.htm
-share/doc/p7zip/DOC/MANUAL/switches/large_pages.htm
-share/doc/p7zip/DOC/MANUAL/switches/list_tech.htm
-share/doc/p7zip/DOC/MANUAL/switches/method.htm
-share/doc/p7zip/DOC/MANUAL/switches/output_dir.htm
-share/doc/p7zip/DOC/MANUAL/switches/overwrite.htm
-share/doc/p7zip/DOC/MANUAL/switches/password.htm
-share/doc/p7zip/DOC/MANUAL/switches/recurse.htm
-share/doc/p7zip/DOC/MANUAL/switches/sa.htm
-share/doc/p7zip/DOC/MANUAL/switches/scrc.htm
-share/doc/p7zip/DOC/MANUAL/switches/sdel.htm
-share/doc/p7zip/DOC/MANUAL/switches/sfx.htm
-share/doc/p7zip/DOC/MANUAL/switches/sni.htm
-share/doc/p7zip/DOC/MANUAL/switches/sns.htm
-share/doc/p7zip/DOC/MANUAL/switches/spf.htm
-share/doc/p7zip/DOC/MANUAL/switches/ssc.htm
-share/doc/p7zip/DOC/MANUAL/switches/stdin.htm
-share/doc/p7zip/DOC/MANUAL/switches/stdout.htm
-share/doc/p7zip/DOC/MANUAL/switches/stl.htm
-share/doc/p7zip/DOC/MANUAL/switches/stop_switch.htm
-share/doc/p7zip/DOC/MANUAL/switches/style.css
-share/doc/p7zip/DOC/MANUAL/switches/type.htm
-share/doc/p7zip/DOC/MANUAL/switches/update.htm
-share/doc/p7zip/DOC/MANUAL/switches/volume.htm
-share/doc/p7zip/DOC/MANUAL/switches/working_dir.htm
-share/doc/p7zip/DOC/MANUAL/switches/yes.htm
-share/doc/p7zip/DOC/MANUAL/syntax.htm
share/doc/p7zip/DOC/Methods.txt
share/doc/p7zip/DOC/copying.txt
share/doc/p7zip/DOC/lzma.txt
Index: pkg/PLIST-rar
===================================================================
RCS file: /systems/cvs/ports/archivers/p7zip/pkg/PLIST-rar,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-rar
--- pkg/PLIST-rar 16 Mar 2015 17:20:40 -0000 1.3
+++ pkg/PLIST-rar 20 Oct 2015 23:57:45 -0000
@@ -1,2 +1,3 @@
@comment $OpenBSD: PLIST-rar,v 1.3 2015/03/16 17:20:40 juanfra Exp $
-lib/p7zip/Codecs/Rar29.so
+lib/p7zip/Codecs/
+lib/p7zip/Codecs/Rar.so
