aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authortmpfile <tmpfile@users.noreply.github.com>2017-07-07 16:43:16 -0300
committerNatanael Copa <ncopa@alpinelinux.org>2017-07-10 09:38:42 +0000
commit839800eb634c837d6889cc47d4544da845e6e1fb (patch)
tree8faf4f6b2dd158661b7386e56fe35b24801fe2e7 /main
parent7cbab367dd0e6467f9eb0699559629406c8586b5 (diff)
main/abcde: upgrade to 2.8.1
Diffstat (limited to 'main')
-rw-r--r--main/abcde/APKBUILD50
-rw-r--r--main/abcde/busybox-wget.patch4
-rw-r--r--main/abcde/fix-mp3-tagging.patch4
-rw-r--r--main/abcde/less.patch2
4 files changed, 23 insertions, 37 deletions
diff --git a/main/abcde/APKBUILD b/main/abcde/APKBUILD
index e021511f2b7..a15ca875178 100644
--- a/main/abcde/APKBUILD
+++ b/main/abcde/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Peter Bui <pnutzh4x0r@gmail.com>
pkgname=abcde
-pkgver=2.7.2
+pkgver=2.8.1
pkgrel=0
pkgdesc="A command line CD encoder that reads your CD, downloads the track information from a CDDB provider, and rips your CD"
url="http://abcde.einval.com/"
@@ -12,46 +12,32 @@ makedepends="$depends_dev"
install=""
subpackages="$pkgname-doc"
source="http://abcde.einval.com/download/abcde-${pkgver}.tar.gz
- busybox-wget.patch
- fix-mp3-tagging.patch
- less.patch
-"
+ busybox-wget.patch
+ fix-mp3-tagging.patch
+ less.patch
+ "
-_builddir="$srcdir"/$pkgname-$pkgver
+builddir="$srcdir"/$pkgname-$pkgver
prepare() {
- local i
- cd "$_builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
+ default_prepare
sed -e "s:normalize-audio:normalize:g" -i ${pkgname}
}
build() {
- cd "$_builddir"
- make || return 1
+ cd "$builddir"
+ make
}
package() {
- cd "$_builddir"
+ cd "$builddir"
make DESTDIR="${pkgdir}" \
- prefix=/usr \
- sysconfdir=/etc \
- docdir=/usr/share/doc/${pkgname} \
- install || return 1
+ prefix=/usr \
+ sysconfdir=/etc \
+ docdir=/usr/share/doc/${pkgname} \
+ install
}
-md5sums="f9455231436d80329eacedf32441d9be abcde-2.7.2.tar.gz
-44ceee10cdb97ef840e335bfd8004b6c busybox-wget.patch
-ad7864e932a297fa30f33707ed26f7fc fix-mp3-tagging.patch
-fe74a159830f7166222e772bd0677dd8 less.patch"
-sha256sums="aa39881682ac46eb9fc199d1343b97bc56a322b41a5c57013acda31948bc53dd abcde-2.7.2.tar.gz
-fb23ed7c4ae3f9ecdd4e6cdb06f4ac9788e35091b3cbc1b5999e40915f6a6ae2 busybox-wget.patch
-846268428d761e7faa6a4e0fb9587f2f94d3d5a266a6053fa8ce332cfc7d3cc0 fix-mp3-tagging.patch
-2ca978abccef9dacdb62466d9a25bcbc85deff332d0b5edfddfec7b131c63052 less.patch"
-sha512sums="b39af36d539de85b76e19da9fbe7ebb2dcbe69cc00a760eeaa163b402c9f7fbf399e28e6834904c12fc42706ab844522f3fc012bcd50a591b36f8c0b778af563 abcde-2.7.2.tar.gz
-a7f5170a343f57699b3b22b5f5769bfeb356bd8f1bcaa7277e7c611dba3dd3dbf2e76f30c3b8cc8449601e87dd3f2da6c7e470a7cdb84feb50ac120a51fe90be busybox-wget.patch
-7e7b3658cf0934b973cd019701ec732003e0c8d3c75b9d40e7ee01f31d3e2fe9368bad06a00ec9cc5faec0a9202e2b7275eb0314d6fc6b6c24d2054fcfb9e699 fix-mp3-tagging.patch
-fe89db2ac5eadd44e608a65c843bc35345d02cfc1b54fd10bf068c9a3b9ebf56b941051a008ae859f3979cd56f9eae904bb83ac73357d6dc89b8dcf2205c1c28 less.patch"
+sha512sums="18e9e46ec69d0b99fc5e2b71ec549e3961e5f6d7f88cef1a6c8da154689554a70cc8bc748c1ef78f81583a510f8b03906b8a4fec454aa0b06f0169d0bc4a7b36 abcde-2.8.1.tar.gz
+282eecc38064713e69705b2b5531822a44c74565fb2cea84f24c0210433d5cc4ec575f511d76b7f72d9af45c74e4722cd62e91c73145bfd06e1f5f0af2d44719 busybox-wget.patch
+ad96c5e061627e1259e3ae3c8b0c58821ba1e93b217b9e31c2b12e531bde862491355671c5b06cd74e39610f45ed4afe23097c148e07445c97289d0c781ea7f0 fix-mp3-tagging.patch
+24151ac9d6695f182f5b72db5a890ff97208a033b2c40b9868be931c417bcfc55b639c0578fdc805a924f0849ae6637f585d9348f0e093d218bf600c4c3fbc8a less.patch"
diff --git a/main/abcde/busybox-wget.patch b/main/abcde/busybox-wget.patch
index 9733fbcee43..ddec038139a 100644
--- a/main/abcde/busybox-wget.patch
+++ b/main/abcde/busybox-wget.patch
@@ -1,11 +1,11 @@
--- a/abcde 2014-09-28 19:01:23.465895247 +0500
+++ b/abcde 2014-09-28 19:02:01.292355035 +0500
-@@ -3359,7 +3359,7 @@
+@@ -3845,7 +3845,7 @@
if [ "$HTTPGETOPTS" = "" ] ; then
case $HTTPGET in
- wget) HTTPGETOPTS="-q -nv -e timestamping=off -O -";;
+ wget) HTTPGETOPTS="-q -O -";;
- curl) HTTPGETOPTS="-f -s";;
+ curl) HTTPGETOPTS="-f -s -L";;
fetch)HTTPGETOPTS="-q -o -";;
ftp) HTTPGETOPTS="-a -V -o - ";;
diff --git a/main/abcde/fix-mp3-tagging.patch b/main/abcde/fix-mp3-tagging.patch
index 8d43e524086..e7650c94941 100644
--- a/main/abcde/fix-mp3-tagging.patch
+++ b/main/abcde/fix-mp3-tagging.patch
@@ -1,7 +1,7 @@
*** ./abcde 2010-02-15 16:04:40.000000000 -0600
--- ./abcde 2010-02-15 14:41:25.000000000 -0600
***************
-*** 835,841 ****
+*** 836,842 ****
-A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" \
-y "$CDYEAR" -g "$GENREID" \
-T "${TRACKNUM:-$1}/$TRACKS" \
@@ -9,7 +9,7 @@
"$ABCDETEMPDIR/track$1.$OUTPUT"
;;
esac
---- 835,841 ----
+--- 836,842 ----
-A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" \
-y "$CDYEAR" -g "$GENREID" \
-T "${TRACKNUM:-$1}/$TRACKS" \
diff --git a/main/abcde/less.patch b/main/abcde/less.patch
index 9c516dd0431..49321c6eb47 100644
--- a/main/abcde/less.patch
+++ b/main/abcde/less.patch
@@ -1,6 +1,6 @@
--- a/abcde 2014-09-28 10:08:15.073608206 +0500
+++ b/abcde 2014-09-28 10:07:50.817072949 +0500
-@@ -233,7 +233,7 @@
+@@ -227,7 +227,7 @@
$PAGER "$PAGEFILE"
# If that fails, check for less
elif [ -x /usr/bin/less ]; then