diff options
| -rw-r--r-- | system/p7zip/README | 4 | ||||
| -rw-r--r-- | system/p7zip/doinst.sh | 6 | ||||
| -rw-r--r-- | system/p7zip/p7zip.SlackBuild | 20 | ||||
| -rw-r--r-- | system/p7zip/p7zip.info | 12 |
4 files changed, 26 insertions, 16 deletions
diff --git a/system/p7zip/README b/system/p7zip/README index a189598307..f87bda2d62 100644 --- a/system/p7zip/README +++ b/system/p7zip/README @@ -1,5 +1,5 @@ 7-Zip is a well-known file compression utility for windows. p7zip is a ported version for linux with nearly the same capabilities. -If you want to build the new GUI you have to pass GUI=yes to the script. -This required either wxGTK or wxPython.
\ No newline at end of file +If you want to build the new GUI, you have to pass GUI=yes to the script. +This requires either wxGTK or wxPython. diff --git a/system/p7zip/doinst.sh b/system/p7zip/doinst.sh index f72fb66224..30eb690936 100644 --- a/system/p7zip/doinst.sh +++ b/system/p7zip/doinst.sh @@ -1,4 +1,6 @@ -if [ -x /usr/bin/gtk-update-icon-cache ]; then - ./usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi fi diff --git a/system/p7zip/p7zip.SlackBuild b/system/p7zip/p7zip.SlackBuild index d77fc9b902..02abd0bb18 100644 --- a/system/p7zip/p7zip.SlackBuild +++ b/system/p7zip/p7zip.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for p7zip -# Copyright 2007-2009 Heinz Wiesinger <pprkut@liwjatan.at> +# Copyright 2007-2009 Heinz Wiesinger, Amsterdam, Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=p7zip -VERSION=4.65 +VERSION=9.04 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -58,17 +58,17 @@ cd ${PRGNAM}_${VERSION} chown -R root:root . chmod -R u+w,go+r-w,a-s . -# Modify CFLAGS directly in the makefile -sed -i "s/OPTFLAGS=-O/OPTFLAGS=$SLKCFLAGS/" makefile.machine - make all3 \ + OPTFLAGS="$SLKCFLAGS" \ DEST_HOME=/usr \ DEST_SHARE_DOC=/usr/doc/$PRGNAM-$VERSION \ DEST_SHARE=/usr/lib$LIBDIRSUFFIX/p7zip \ DEST_DIR=$PKG if ! [ "$GUI" = "no" ]; then + sed -i "s|/usr/lib/|/usr/lib$LIBDIRSUFFIX/|g" CPP/7zip/UI/GUI/makefile.depend make 7zG \ + OPTFLAGS="$SLKCFLAGS" \ DEST_HOME=/usr \ DEST_SHARE_DOC=/usr/doc/$PRGNAM-$VERSION \ DEST_SHARE=/usr/lib$LIBDIRSUFFIX/p7zip \ @@ -76,11 +76,16 @@ if ! [ "$GUI" = "no" ]; then fi make install \ + OPTFLAGS="$SLKCFLAGS" \ DEST_HOME=/usr \ DEST_SHARE_DOC=/usr/doc/$PRGNAM-$VERSION \ DEST_SHARE=/usr/lib$LIBDIRSUFFIX/p7zip \ DEST_DIR=$PKG +# install gzip like wrapper +install -m 0755 contrib/gzip-like_CLI_wrapper_for_7z/p7zip $PKG/usr/bin/ +install -m 0644 contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1 $PKG/usr/man/man1/ + if ! [ "$GUI" = "no" ]; then # Unfortunately we have to install 7zG by hand install -m 555 $PKG/usr/bin/7z $PKG/usr/bin/7zG @@ -111,7 +116,8 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done ) -cp -a TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp contrib/gzip-like_CLI_wrapper_for_7z/README $PKG/usr/doc/$PRGNAM-$VERSION/README.p7zip cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install @@ -119,4 +125,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/p7zip/p7zip.info b/system/p7zip/p7zip.info index 51d1fa2ec1..e92796aaa1 100644 --- a/system/p7zip/p7zip.info +++ b/system/p7zip/p7zip.info @@ -1,8 +1,10 @@ PRGNAM="p7zip" -VERSION="4.65" +VERSION="9.04" HOMEPAGE="http://p7zip.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/p7zip/p7zip_4.65_src_all.tar.bz2" -MD5SUM="f78ed232436dc8f8be25a2f95d4e5f9a" -MAINTAINER="ppr:kut" +DOWNLOAD="http://downloads.sourceforge.net/p7zip/p7zip_9.04_src_all.tar.bz2" +MD5SUM="9194ebf9a2b3735d236aed001de5f6f8" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" -APPROVED="dsomero" +APPROVED="rworkman" |