Patch Debian_816638.diff

2 files changed, 21 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07dca6b15b11..afd0a02eaf95 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Sun Apr 10 22:00:48 UTC 2016
 pkgbase = mhonarc
-	pkgdesc = MHonArc is a Perl mail-to-HTML converter.
+	pkgdesc = a Perl mail-to-HTML converter
 	pkgver = 2.6.19
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.mhonarc.org/
 	arch = any
 	license = GPL
@@ -11,7 +13,9 @@ pkgbase = mhonarc
 	optdepends = perl-mime-base64: efficient base64 decoding
 	optdepends = perl-posix-strftime-compiler: improved time string formatting
 	source = http://www.mhonarc.org/release/MHonArc/tar/MHonArc-2.6.19.tar.bz2
+	source = Debian_816638.diff::https://bugs.debian.org/cgi-bin/bugreport.cgi?filename=816638.diff;att=1;msg=17;bug=816638
 	sha256sums = 08912eae8323997b940b94817c83149d2ee3ed11d44f29b3ef4ed2a39de7f480
+	sha256sums = 76b1c608a971bd090a3a0eb60ff98f40a141fb7535763dde55c714b92f183eb6
 
 pkgname = mhonarc
 
diff --git a/PKGBUILD b/PKGBUILD
index 5be95a600394..6f967e999231 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,14 @@
 # Contributor: Lukas Martini <hello@lutoma.org>
 
 set -u
-pkgname='mhonarc'
+_pkgnameu='MHonArc'
+pkgname="${_pkgnameu,,}"
 pkgver='2.6.19'
-pkgrel='1'
-pkgdesc='MHonArc is a Perl mail-to-HTML converter.'
-license=('GPL')
+pkgrel='2'
+pkgdesc="a Perl mail-to-HTML converter"
 arch=('any')
+url='http://www.mhonarc.org/'
+license=('GPL')
 depends=('perl>=5.6.1')
 optdepends=(
   'perl-digest-perl-md5: creating IDs for messages without message-ids.'
@@ -18,28 +20,31 @@ optdepends=(
   'perl-mime-base64: efficient base64 decoding'
   'perl-posix-strftime-compiler: improved time string formatting'
 )
-source=("http://www.mhonarc.org/release/MHonArc/tar/MHonArc-${pkgver}.tar.bz2")
-url='http://www.mhonarc.org/'
+_verwatch=("${url}release/${_pkgnameu}/tar/" "${_pkgnameu}-\([^-]*\)\.tar\.bz2" 'l')
+source=("${_verwatch[0]}${_pkgnameu}-${pkgver}.tar.bz2"
+  'Debian_816638.diff::https://bugs.debian.org/cgi-bin/bugreport.cgi?filename=816638.diff;att=1;msg=17;bug=816638') # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=816638#17
 
-sha256sums=('08912eae8323997b940b94817c83149d2ee3ed11d44f29b3ef4ed2a39de7f480')
+sha256sums=('08912eae8323997b940b94817c83149d2ee3ed11d44f29b3ef4ed2a39de7f480'
+            '76b1c608a971bd090a3a0eb60ff98f40a141fb7535763dde55c714b92f183eb6')
 
 prepare() {
   set -u
-  cd "${srcdir}/MHonArc-${pkgver}"
+  cd "MHonArc-${pkgver}"
+  patch -f -p1 < "${srcdir}/Debian_816638.diff" || :
   PERL_MM_USE_DEFAULT=1 perl 'Makefile.PL' INSTALLDIRS='vendor' PREFIX="${pkgdir}/usr/"
   set +u
 }
 
 build() {
   set -u
-  cd "${srcdir}/MHonArc-${pkgver}"
+  cd "MHonArc-${pkgver}"
   make
   set +u
 }
 
 package() {
   set -u
-  cd "${srcdir}/MHonArc-${pkgver}"
+  cd "MHonArc-${pkgver}"
   make install
 
   # move /usr/doc to /usr/share/doc for FHS-compliance.