From c8b1e23a1567aea2f24f105081d8b699731d9a66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 5 Sep 2014 00:47:40 -0300 Subject: lesspipe: remove libre suffix and add complex pkgrel --- libre/lesspipe-libre/PKGBUILD | 53 ------------------ libre/lesspipe-libre/lesspipe.sh | 1 - libre/lesspipe-libre/libarchive.patch | 100 ---------------------------------- libre/lesspipe/PKGBUILD | 51 +++++++++++++++++ libre/lesspipe/lesspipe.sh | 1 + libre/lesspipe/libarchive.patch | 100 ++++++++++++++++++++++++++++++++++ 6 files changed, 152 insertions(+), 154 deletions(-) delete mode 100644 libre/lesspipe-libre/PKGBUILD delete mode 100644 libre/lesspipe-libre/lesspipe.sh delete mode 100644 libre/lesspipe-libre/libarchive.patch create mode 100644 libre/lesspipe/PKGBUILD create mode 100644 libre/lesspipe/lesspipe.sh create mode 100644 libre/lesspipe/libarchive.patch diff --git a/libre/lesspipe-libre/PKGBUILD b/libre/lesspipe-libre/PKGBUILD deleted file mode 100644 index 15e05e4a9..000000000 --- a/libre/lesspipe-libre/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 114038 2014-07-01 12:22:14Z spupykin $ -# Maintainer (Arch): Angel 'angvp' Velasquez -# Contributor (Arch): solsTiCe d'Hiver -# Maintainer: André Silva - -_pkgname=lesspipe -pkgname=lesspipe-libre -pkgver=1.82 -pkgrel=2 -pkgdesc='an input filter for the pager less, with libarchive support' -depends=('less') -arch=('any') -license=('GPL') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -optdepends=('perl' - 'rpmextract: support for rpm files' - 'fastjar: support for jar files' - 'unzip: support for zip files' - 'libarchive: support for rar files' - 'p7zip: support for 7za files' - 'cabextract: support for cab files' - 'cdrkit: support for iso files' - 'html2text: support for html files' - 'antiword: support for word file' - 'unrtf: support for rtf file' - 'imagemagick: support for some image file') -url="http://www-zeuthen.desy.de/~friebel/unix/lesspipe.html" -source=(http://downloads.sourceforge.net/project/lesspipe/lesspipe/$pkgver/lesspipe-$pkgver.tar.gz - lesspipe.sh - libarchive.patch) -md5sums=('dd6f7bc9b9f9afaf04c9aa0cdbe9fe56' - '675b56f560c600f43108adfd98222251' - 'ec452ea980d5c1e254e9775fd424c18c') - -prepare() { - cd $srcdir/$_pkgname-$pkgver - patch -Np1 -i ../libarchive.patch -} - -build() { - cd $srcdir/$_pkgname-$pkgver - ./configure --prefix=/usr --yes - make -} - -package() { - cd $srcdir/$_pkgname-$pkgver - mkdir -p $pkgdir/usr/share/man/man1 - make install PREFIX=$pkgdir/usr - install -D $srcdir/lesspipe.sh $pkgdir/etc/profile.d/lesspipe.sh -} diff --git a/libre/lesspipe-libre/lesspipe.sh b/libre/lesspipe-libre/lesspipe.sh deleted file mode 100644 index ae6076f6b..000000000 --- a/libre/lesspipe-libre/lesspipe.sh +++ /dev/null @@ -1 +0,0 @@ -export LESSOPEN='|/usr/bin/lesspipe.sh %s' diff --git a/libre/lesspipe-libre/libarchive.patch b/libre/lesspipe-libre/libarchive.patch deleted file mode 100644 index b4fb48788..000000000 --- a/libre/lesspipe-libre/libarchive.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/configure b/configure -index cbd34af..5df4a31 100755 ---- a/configure -+++ b/configure -@@ -405,8 +405,7 @@ LESS_ADVANCED_PREPROCESSOR N # always interpret textlike files (html, ...) - # compression programs - bzip2 Y # include bzip2 and unzip code, it is fairly essential - unzip Y --rar Y --unrar Y -+bsdtar Y # bsdtar is the best free as in freedom alternative for rar - lzip N # default for lzma, lzip, xz, 7za should probably be N - lzma Y - xz Y -diff --git a/lesspipe.sh b/lesspipe.sh -index c80c75b..262a47b 100755 ---- a/lesspipe.sh -+++ b/lesspipe.sh -@@ -276,12 +276,8 @@ get_cmd () { - cmd=(isrpm "$2" "$file2") - elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then - cmd=(istemp "unzip -avp" "$2" "$file2") -- elif [[ "$1" = *RAR\ archive* ]]; then -- if cmd_exist unrar; then -- cmd=(istemp "unrar p -inul" "$2" "$file2") -- elif cmd_exist rar; then -- cmd=(istemp "rar p -inul" "$2" "$file2") -- fi -+ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then -+ cmd=(bsdtar xOf "$2" "$file2") - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then - cmd=(istemp "7za e -so" "$2" "$file2") - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7zr; then -@@ -534,14 +530,9 @@ isfinal() { - elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then - msg "use zip_file${sep}contained_file to view a file in the archive" - istemp "unzip -lv" "$2" -- elif [[ "$1" = *RAR\ archive* ]]; then -- if cmd_exist unrar; then -- msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "unrar v" "$2" -- elif cmd_exist rar; then -- msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "rar v" "$2" -- fi -+ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then -+ msg "use rar_file${sep}contained_file to view a file in the archive" -+ bsdtar tf "$2" - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then - typeset res - res=$(istemp "7za l" "$2") -diff --git a/lesspipe.sh.in b/lesspipe.sh.in -index 407bc7d..753f3c5 100755 ---- a/lesspipe.sh.in -+++ b/lesspipe.sh.in -@@ -323,17 +323,10 @@ get_cmd () { - elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then - set -A cmd istemp "unzip -avp" "$2" "$file2" - #endif --#ifdef unrar -- elif [[ "$1" = *RAR\ archive* ]]; then -- if cmd_exist unrar; then -- set -A cmd istemp "unrar p -inul" "$2" "$file2" -- elif cmd_exist rar; then -- set -A cmd istemp "rar p -inul" "$2" "$file2" -- fi --#elif rar -- elif [[ "$1" = *RAR\ archive* ]] && cmd_exist rar; then -- set -A cmd istemp "rar p -inul" "$2" "$file2" --#endif -+#ifdef bsdtar -+ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then -+ set -A cmd bsdtar xOf "$2" "$file2" -+#endif - #ifdef 7za - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then - set -A cmd istemp "7za e -so" "$2" "$file2" -@@ -705,19 +698,10 @@ isfinal() { - msg "use zip_file${sep}contained_file to view a file in the archive" - istemp "unzip -lv" "$2" - #endif --#ifdef unrar -- elif [[ "$1" = *RAR\ archive* ]]; then -- if cmd_exist unrar; then -- msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "unrar v" "$2" -- elif cmd_exist rar; then -- msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "rar v" "$2" -- fi --#elif rar -- elif [[ "$1" = *RAR\ archive* ]] && cmd_exist rar; then -+#ifdef bsdtar -+ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then - msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "rar v" "$2" -+ bsdtar tf "$2" - #endif - #ifdef 7za - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then diff --git a/libre/lesspipe/PKGBUILD b/libre/lesspipe/PKGBUILD new file mode 100644 index 000000000..1bbc5a16d --- /dev/null +++ b/libre/lesspipe/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 114038 2014-07-01 12:22:14Z spupykin $ +# Maintainer (Arch): Angel 'angvp' Velasquez +# Contributor (Arch): solsTiCe d'Hiver +# Maintainer: André Silva + +pkgname=lesspipe +pkgver=1.82 +pkgrel=2.parabola1 +pkgdesc='an input filter for the pager less, with libarchive support' +depends=('less') +arch=('any') +license=('GPL') +replaces=(${pkgname}-libre) +conflicts=(${pkgname}-libre) +optdepends=('perl' + 'rpmextract: support for rpm files' + 'fastjar: support for jar files' + 'unzip: support for zip files' + 'libarchive: support for rar files' + 'p7zip: support for 7za files' + 'cabextract: support for cab files' + 'cdrkit: support for iso files' + 'html2text: support for html files' + 'antiword: support for word file' + 'unrtf: support for rtf file' + 'imagemagick: support for some image file') +url="http://www-zeuthen.desy.de/~friebel/unix/lesspipe.html" +source=(http://downloads.sourceforge.net/project/lesspipe/lesspipe/$pkgver/lesspipe-$pkgver.tar.gz + lesspipe.sh + libarchive.patch) +md5sums=('dd6f7bc9b9f9afaf04c9aa0cdbe9fe56' + '675b56f560c600f43108adfd98222251' + 'ec452ea980d5c1e254e9775fd424c18c') + +prepare() { + cd $srcdir/$pkgname-$pkgver + patch -Np1 -i ../libarchive.patch +} + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --yes + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + mkdir -p $pkgdir/usr/share/man/man1 + make install PREFIX=$pkgdir/usr + install -D $srcdir/lesspipe.sh $pkgdir/etc/profile.d/lesspipe.sh +} diff --git a/libre/lesspipe/lesspipe.sh b/libre/lesspipe/lesspipe.sh new file mode 100644 index 000000000..ae6076f6b --- /dev/null +++ b/libre/lesspipe/lesspipe.sh @@ -0,0 +1 @@ +export LESSOPEN='|/usr/bin/lesspipe.sh %s' diff --git a/libre/lesspipe/libarchive.patch b/libre/lesspipe/libarchive.patch new file mode 100644 index 000000000..b4fb48788 --- /dev/null +++ b/libre/lesspipe/libarchive.patch @@ -0,0 +1,100 @@ +diff --git a/configure b/configure +index cbd34af..5df4a31 100755 +--- a/configure ++++ b/configure +@@ -405,8 +405,7 @@ LESS_ADVANCED_PREPROCESSOR N # always interpret textlike files (html, ...) + # compression programs + bzip2 Y # include bzip2 and unzip code, it is fairly essential + unzip Y +-rar Y +-unrar Y ++bsdtar Y # bsdtar is the best free as in freedom alternative for rar + lzip N # default for lzma, lzip, xz, 7za should probably be N + lzma Y + xz Y +diff --git a/lesspipe.sh b/lesspipe.sh +index c80c75b..262a47b 100755 +--- a/lesspipe.sh ++++ b/lesspipe.sh +@@ -276,12 +276,8 @@ get_cmd () { + cmd=(isrpm "$2" "$file2") + elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then + cmd=(istemp "unzip -avp" "$2" "$file2") +- elif [[ "$1" = *RAR\ archive* ]]; then +- if cmd_exist unrar; then +- cmd=(istemp "unrar p -inul" "$2" "$file2") +- elif cmd_exist rar; then +- cmd=(istemp "rar p -inul" "$2" "$file2") +- fi ++ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then ++ cmd=(bsdtar xOf "$2" "$file2") + elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then + cmd=(istemp "7za e -so" "$2" "$file2") + elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7zr; then +@@ -534,14 +530,9 @@ isfinal() { + elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then + msg "use zip_file${sep}contained_file to view a file in the archive" + istemp "unzip -lv" "$2" +- elif [[ "$1" = *RAR\ archive* ]]; then +- if cmd_exist unrar; then +- msg "use rar_file${sep}contained_file to view a file in the archive" +- istemp "unrar v" "$2" +- elif cmd_exist rar; then +- msg "use rar_file${sep}contained_file to view a file in the archive" +- istemp "rar v" "$2" +- fi ++ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then ++ msg "use rar_file${sep}contained_file to view a file in the archive" ++ bsdtar tf "$2" + elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then + typeset res + res=$(istemp "7za l" "$2") +diff --git a/lesspipe.sh.in b/lesspipe.sh.in +index 407bc7d..753f3c5 100755 +--- a/lesspipe.sh.in ++++ b/lesspipe.sh.in +@@ -323,17 +323,10 @@ get_cmd () { + elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then + set -A cmd istemp "unzip -avp" "$2" "$file2" + #endif +-#ifdef unrar +- elif [[ "$1" = *RAR\ archive* ]]; then +- if cmd_exist unrar; then +- set -A cmd istemp "unrar p -inul" "$2" "$file2" +- elif cmd_exist rar; then +- set -A cmd istemp "rar p -inul" "$2" "$file2" +- fi +-#elif rar +- elif [[ "$1" = *RAR\ archive* ]] && cmd_exist rar; then +- set -A cmd istemp "rar p -inul" "$2" "$file2" +-#endif ++#ifdef bsdtar ++ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then ++ set -A cmd bsdtar xOf "$2" "$file2" ++#endif + #ifdef 7za + elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then + set -A cmd istemp "7za e -so" "$2" "$file2" +@@ -705,19 +698,10 @@ isfinal() { + msg "use zip_file${sep}contained_file to view a file in the archive" + istemp "unzip -lv" "$2" + #endif +-#ifdef unrar +- elif [[ "$1" = *RAR\ archive* ]]; then +- if cmd_exist unrar; then +- msg "use rar_file${sep}contained_file to view a file in the archive" +- istemp "unrar v" "$2" +- elif cmd_exist rar; then +- msg "use rar_file${sep}contained_file to view a file in the archive" +- istemp "rar v" "$2" +- fi +-#elif rar +- elif [[ "$1" = *RAR\ archive* ]] && cmd_exist rar; then ++#ifdef bsdtar ++ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then + msg "use rar_file${sep}contained_file to view a file in the archive" +- istemp "rar v" "$2" ++ bsdtar tf "$2" + #endif + #ifdef 7za + elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then -- cgit v1.2.3-2-g168b