community/html2text: upgrade to 2.0.0

2 files changed, 22 insertions, 27 deletions

diff --git a/community/html2text/APKBUILD b/community/html2text/APKBUILD
index 6b122d6103..8be7108085 100644
--- a/community/html2text/APKBUILD
+++ b/community/html2text/APKBUILD
@@ -1,34 +1,31 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=html2text
-pkgver=1.3.2a
+pkgver=2.0.0
 pkgrel=0
 pkgdesc="html2text is a command line utility, written in C++, that converts HTML documents into plain text."
 url="http://www.mbayer.de/html2text/"
 arch="all"
 license="GPL"
-depends=""
-depends_dev=""
-makedepends="$depends_dev bison"
-install=""
+makedepends="bison bash"
 subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/marado/$pkgname/archive/${pkgver}-17.tar.gz
-        path-config.patch"
-
-builddir="$srcdir"/$pkgname-${pkgver}-17
+source="$pkgname-$pkgver.tar.gz::https://github.com/grobian/html2text/archive/v$pkgver.tar.gz
+path-config.patch"
 
 build() {
-        cd "$builddir"
         ./configure --prefix=/usr
-        make || return 1
+        make
+}
+
+check() {
+        make check
 }
 
 package() {
-        cd "$builddir"
-        install -Dpm755 'html2text' "${pkgdir}/usr/bin/html2text"
-        install -Dpm644 'html2text.1.gz' "${pkgdir}/usr/share/man/man1/html2text.1.gz"
-        install -Dpm644 'html2textrc.5.gz' "${pkgdir}/usr/share/man/man5/html2textrc.5.gz"
+        install -Dm755 "html2text" "$pkgdir"/usr/bin/html2text
+        install -Dm644 "html2text.1" "$pkgdir"/usr/share/man/man1/html2text.1
+        install -Dm644 "html2textrc.5" "$pkgdir"/usr/share/man/man5/html2textrc.5
 }
 
-sha512sums="fac0e06211f699ea69cd9c9ea9347758e57402e56aba64cfa3a46446f1278e4ffc6953c7b3fef5ed5617200fda7c57a81d26dec9eb6f3e58d8223a1631b28dd9  html2text-1.3.2a.tar.gz
-bf4387d12727016c40d9cbad3b4896443f1253071eba6b2f929435164b1d3cb4adbd3d5b8db3f0905a7b7b7e4468be274e950b704179ef6f083810903fb1aa84  path-config.patch"
+sha512sums="94f2cf3f5085307cc2cf5e264b35621029e57142d6e4d832eee2c447860338c947687be5e8c81367696b0b04432a44537a1545a820991c621b4036393ad6f4e8  html2text-2.0.0.tar.gz
+940d8cd8247250ad01d604e2ef44b95352a8114247c473ec8472485c5360143ac2218b6deebfedf85d065a23865ae5028eaaf4bd5ac61090643af813515bff99  path-config.patch"
diff --git a/community/html2text/path-config.patch b/community/html2text/path-config.patch
index 6c88ef3d56..72fec7c28a 100644
--- a/community/html2text/path-config.patch
+++ b/community/html2text/path-config.patch
@@ -1,15 +1,13 @@
 diff --git a/Makefile.in b/Makefile.in
-index e1a9f27..1feb56f 100644
+index 57e1ff8..bc07770 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -29,8 +29,8 @@ BISONXX  = bison++
- YFLAGS   =
+@@ -32,7 +32,7 @@ BISON  = bison
+ YFLAGS =
  
  INSTALLER = install
--BINDIR    = /usr/local/bin
--MANDIR    = /usr/local/man
-+BINDIR    = /usr/bin
-+MANDIR    = /usr/share/man
- DOCDIR    = /usr/share/doc/html2text
- 
- CXX                 = @CXX@
+-PREFIX    = /usr/local
++PREFIX    = /usr
+ BINDIR    = $(PREFIX)/bin
+ MANDIR    = $(PREFIX)/man
+ DOCDIR    = $(PREFIX)/share/doc/html2text