On 03/14/11 00:19, Josh Grosse wrote:
> On Sun, Mar 13, 2011 at 09:49:24PM +0000, Stuart Henderson wrote:
>
>> What happened with rar?
>
> Good catch! I hadn't noticed this.
>
Diff to add unrar support and to remove USE_GROFF (just a couple of
warnings).
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 15 Nov 2010 00:22:45 -0000 1.14
+++ Makefile 15 Mar 2011 07:52:43 -0000
@@ -5,7 +5,7 @@ SHARED_ONLY= Yes
COMMENT-main= file archiver with high compression ratio
COMMENT-rar= rar modules for p7zip
-V= 9.13
+V= 9.20
DISTNAME= p7zip_${V}_src_all
PKGNAME= p7zip-${V}
PKGNAME-main= p7zip-${V}
@@ -24,7 +24,7 @@ PERMIT_DISTFILES_CDROM= no fee
PERMIT_DISTFILES_FTP= Yes
WANTLIB-main= c m pthread stdc++
-WANTLIB-rar= pthread
+WANTLIB-rar= m stdc++ pthread
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=p7zip/}
EXTRACT_SUFX= .tar.bz2
@@ -36,7 +36,6 @@ RUN_DEPENDS-rar= ${BASE_PKGPATH},-main
WRKDIST= ${WRKDIR}/p7zip_${V}
USE_GMAKE= Yes
-USE_GROFF = Yes
MAKE_FILE= makefile
MAKE_FLAGS= MYCC="${CC}" MYCXX="${CXX}" \
MYCFLAGS="${CFLAGS}" MYCXXFLAGS="${CXXFLAGS}"
@@ -46,7 +45,6 @@ REGRESS_TARGET= all_test
do-configure:
cp ${WRKSRC}/makefile.openbsd ${WRKSRC}/makefile.machine
- cp ${WRKSRC}/makefile.parallel_jobs ${WRKSRC}/makefile
do-install:
@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} PREFIX=${TRUEPREFIX} \
Index: distinfo
===================================================================
RCS file: /cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 20 Jun 2010 15:54:35 -0000 1.11
+++ distinfo 15 Mar 2011 07:52:43 -0000
@@ -1,5 +1,5 @@
-MD5 (p7zip_9.13_src_all.tar.bz2) = jdtQU9s7HyaWQH0BvhRXeQ==
-RMD160 (p7zip_9.13_src_all.tar.bz2) = vrkYEzD036dapPRzxopGLHa3qxk=
-SHA1 (p7zip_9.13_src_all.tar.bz2) = gdoHKVYc4SPAqCZW7JagStW/pSI=
-SHA256 (p7zip_9.13_src_all.tar.bz2) =
/JwPouq9Nn1q28PqB7swXb3B9ocX7qNiyMB0uRwD2SM=
-SIZE (p7zip_9.13_src_all.tar.bz2) = 3753579
+MD5 (p7zip_9.20_src_all.tar.bz2) = t7e8YAO4Hq8ClJJ4bhef2g==
+RMD160 (p7zip_9.20_src_all.tar.bz2) = q3Z1xMqHzoVazAWFUygIHBs2XRw=
+SHA1 (p7zip_9.20_src_all.tar.bz2) = yXbfRUPqlGplvD9ePU6bqkF+XxI=
+SHA256 (p7zip_9.20_src_all.tar.bz2) =
Ysc78r2b6Cjhc8brEXIo0cnXxna893632ZAXGbyE6xM=
+SIZE (p7zip_9.20_src_all.tar.bz2) = 3836127
Index: patches/patch-install_sh
===================================================================
RCS file: /cvs/ports/archivers/p7zip/patches/patch-install_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-install_sh
--- patches/patch-install_sh 10 Jun 2008 03:24:38 -0000 1.2
+++ patches/patch-install_sh 15 Mar 2011 07:52:43 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-install_sh,v 1.2 2008/06/10 03:24:38 sthen Exp $
---- install.sh.orig Sun Mar 2 13:35:05 2008
-+++ install.sh Mon Jun 9 20:27:58 2008
-@@ -1,14 +1,14 @@
- #! /bin/sh
+--- install.sh.orig Wed Feb 23 21:00:34 2011
++++ install.sh Mon Mar 14 21:47:48 2011
+@@ -17,14 +17,14 @@ installShared()
+ }
# global install
-DEST_HOME=/usr/local
@@ -18,7 +18,21 @@ $OpenBSD: patch-install_sh,v 1.2 2008/06
[ "$1" ] && DEST_BIN="$1"
[ "$2" ] && DEST_SHARE="$2"
[ "$3" ] && DEST_MAN="$3"
-@@ -163,10 +163,10 @@ fi
+@@ -103,6 +103,13 @@ then
+ chmod 555 "${DEST_DIR}${DEST_SHARE}/7z.so"
+ fi
+
++ if [ -x bin/Codecs/Rar29.so ]
++ then
++ mkdir "${DEST_DIR}${DEST_SHARE}/Codecs"
++ cp bin/Codecs/Rar29.so "${DEST_DIR}${DEST_SHARE}/Codecs/Rar29.so"
++ chmod 555 "${DEST_DIR}${DEST_SHARE}/Codecs/Rar29.so"
++ fi
++
+ else
+ if [ -x bin/7za ]
+ then
+@@ -167,11 +174,11 @@ fi
if [ -d DOCS ]
then
@@ -33,3 +47,4 @@ $OpenBSD: patch-install_sh,v 1.2 2008/06
+ find "${DEST_DIR}${DEST_SHARE_DOC}" -type f -exec chmod 444 {} \;
fi
+ use_lang="n"
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST-main
--- pkg/PLIST-main 30 Nov 2008 22:24:54 -0000 1.6
+++ pkg/PLIST-main 15 Mar 2011 07:52:43 -0000
@@ -40,6 +40,7 @@ share/doc/p7zip/MANUAL/switches/charset.
share/doc/p7zip/MANUAL/switches/exclude.htm
share/doc/p7zip/MANUAL/switches/include.htm
share/doc/p7zip/MANUAL/switches/index.htm
+share/doc/p7zip/MANUAL/switches/large_pages.htm
share/doc/p7zip/MANUAL/switches/list_tech.htm
share/doc/p7zip/MANUAL/switches/method.htm
share/doc/p7zip/MANUAL/switches/output_dir.htm
