main/hylafax: default to iso-8859-1 charset for better compatibility

Fix install of other languages into subpkg

(cherry picked from commit 3086ef262eb572a254697a18f343a601ce78a3bd)

2 files changed, 34 insertions, 20 deletions

diff --git a/main/hylafax/APKBUILD b/main/hylafax/APKBUILD
index e22046d120..fd973d3540 100644
--- a/main/hylafax/APKBUILD
+++ b/main/hylafax/APKBUILD
@@ -2,25 +2,26 @@
 # Maintainer: Cameron Banta <cbanta@gmail.com>
 pkgname=hylafax
 pkgver=6.0.6
-pkgrel=3
+pkgrel=4
 pkgdesc="Sends and receives faxes"
 url="http://www.hylafax.org/"
 arch="all"
 license="MIT"
 #depends on gcc for libgcc_s.so, it's scripts are hardcoded to bash
 depends="ghostscript bash tiff-tools"
-makedepends="zlib-dev tiff-dev"
+makedepends="zlib-dev tiff-dev gettext-dev"
 install=""
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-lang"
 source="ftp://ftp.hylafax.org/source/$pkgname-$pkgver.tar.gz
         $pkgname.initd
-        $pkgname.confd"
-
+        $pkgname.confd
+        hylafax-charset.patch
+        "
 builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
-        default_prepare || return 1
-        update_config_guess || return 1
+        default_prepare
+        update_config_guess
 }
 
 build() {
@@ -36,6 +37,7 @@ build() {
                 --with-DIR_LIB=/usr/lib \
                 --with-DIR_LIBEXEC=/usr/sbin \
                 --with-DIR_LIBDATA=/var/spool/"$pkgname"/lib \
+                --with-DIR_LOCALE=/usr/share/locale/"$pkgname" \
                 --with-DIR_LOCKS=/var/lock \
                 --with-DIR_MAN=/usr/share/man \
                 --with-DIR_SPOOL=/var/spool/"$pkgname" \
@@ -44,11 +46,11 @@ build() {
                 --with-SYSVINIT=no \
                 --with-REGEX=yes \
                 --with-LIBTIFF="-ltiff -lz" \
+                --with-LIBINTL="-lintl" \
                 --with-DSO=auto \
                 --with-PATH_EGETTY=/bin/false \
-                --with-PATH_VGETTY=/bin/false \
-                || return 1
-        make || return 1
+                --with-PATH_VGETTY=/bin/false
+        make
 }
 
 package(){
@@ -57,6 +59,7 @@ package(){
         #   install - but the following seems to work
         mkdir -p "${pkgdir}"/usr/bin "${pkgdir}"/usr/sbin
         mkdir -p "${pkgdir}"/usr/lib/"$pkgname" "${pkgdir}"/usr/share/man
+        mkdir -p "${pkgdir}"/usr/share/locale/$pkgname
         mkdir -p "${pkgdir}"/var/spool/"$pkgname"
         mkdir -p "${pkgdir}"/var/spool/"$pkgname"/lib
         touch "${pkgdir}"/var/spool/"$pkgname"/lib/pagesizes
@@ -71,9 +74,10 @@ package(){
                 LIBEXEC="${pkgdir}/usr/sbin" \
                 LIBDATA="${pkgdir}/var/spool/$pkgname"/lib \
                 MAN="${pkgdir}/usr/share/man" \
+                LOCALEDIR="${pkgdir}/usr/share/locale/$pkgname" \
                 SPOOL="${pkgdir}/var/spool/$pkgname" \
                 HTMLDIR="${pkgdir}/usr/share/doc/$pkgname/html" \
-                install || return 1
+                install
 
         install -m644 -D "$srcdir/$pkgname-$pkgver/COPYRIGHT" \
                 "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
@@ -81,18 +85,13 @@ package(){
                 "$pkgdir"/usr/share/doc/$pkgname/README
 
         install -D -m755 "$srcdir"/$pkgname.initd \
-                "$pkgdir"/etc/init.d/$pkgname || return 1
+                "$pkgdir"/etc/init.d/$pkgname
         install -D -m644 "$srcdir"/$pkgname.confd \
-                "$pkgdir"/etc/conf.d/$pkgname || return 1
+                "$pkgdir"/etc/conf.d/$pkgname
 
 }
 
-md5sums="d063d45049c8fcbabefe09d662313067  hylafax-6.0.6.tar.gz
-5acf25e0cf07ae2515214e79fa1d8812  hylafax.initd
-af73e1f25dd8f84fa377f6bf44e2a422  hylafax.confd"
-sha256sums="28926915b23ce7f5b4896de8ac5f58389c2c6e6bb73b4eee5bbd5129603bf7c0  hylafax-6.0.6.tar.gz
-77a16cf3715441c43116da4c4231abc5bcc2f30271075ed2a0d1382d74f31165  hylafax.initd
-3748b6eabdd0a630607286a59a7c175e09cd9cc933749e874ac2379d662c5761  hylafax.confd"
 sha512sums="be7e0533a24391c87deac6af35e01c81a79c99977c7f7a931e336d7c737b388d2a7c147faab3bf5eda196b1fa1c8671bee53c05dab2338f2f519010532f7d773  hylafax-6.0.6.tar.gz
 3862cefcd26092000e4489c097537e5e0e2ae1f7c2a7a16b1e933b3bb78d136b6d8a65fb712ae245dd8ca881900408d0d9788bd2e0b859a9569fc6f4ede8cc7c  hylafax.initd
-3c07726cc9d7351dceb80a46354c6626e54b033b0f434c1db01db2a3b3ab5e9084d551dd23cae3ab40806f27aa5fa0a5b70c43a6b7802356871c0b343baa2376  hylafax.confd"
+3c07726cc9d7351dceb80a46354c6626e54b033b0f434c1db01db2a3b3ab5e9084d551dd23cae3ab40806f27aa5fa0a5b70c43a6b7802356871c0b343baa2376  hylafax.confd
+f97c805a62dfcb57f85f614b6eb28bd6b58e0582ce4f9aa5166337a46d453ea038a098223d879d120f51454008a5e8ed2fa60ba6e8be12af7b7d5a4927c51471  hylafax-charset.patch"
diff --git a/main/hylafax/hylafax-charset.patch b/main/hylafax/hylafax-charset.patch
new file mode 100644
index 0000000000..e9d6a93a3c
--- /dev/null
+++ b/main/hylafax/hylafax-charset.patch
@@ -0,0 +1,15 @@
+diff -ru hylafax-6.0.6.orig/faxmail/faxmail.c++ hylafax-6.0.6/faxmail/faxmail.c++

+--- hylafax-6.0.6.orig/faxmail/faxmail.c++      2012-06-06 03:58:38.000000000 +0300

++++ hylafax-6.0.6/faxmail/faxmail.c++   2018-01-09 09:11:28.918140061 +0200

+@@ -475,8 +475,8 @@

+     if (mime.parse(msg, emsg)) {

+        if (verbose)

+            mime.trace(stderr);

+-       // XXX anything but us-ascii is treated as ISO-8859-1

+-       setISO8859(mime.getCharset() != CS_USASCII);

++       // XXX treat everything as ISO-8859-1

++       setISO8859(true);

+ 

+        /*

+         * Check first for any external script/command to

+