X-Original-To: alpine-aports@lists.alpinelinux.org
Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196])
	by lists.alpinelinux.org (Postfix) with ESMTP id 68AD65C4BF8
	for <alpine-aports@lists.alpinelinux.org>; Tue,  1 Aug 2017 20:17:45 +0000 (GMT)
Received: by mail-qk0-f196.google.com with SMTP id d145so2712311qkc.0
        for <alpine-aports@lists.alpinelinux.org>; Tue, 01 Aug 2017 13:17:45 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20161025;
        h=from:to:cc:subject:date:message-id;
        bh=rmBMUhZck0wycnIEWIoOuqNHwTmLrVJzRueOnkGDMOI=;
        b=EBEIUDe5seK1MMPyS7g7cWIMjqTSx6f2m2/gou5ip939JwlIxI5WG20hSnTL0faeig
         vPJ92VrVNjoD5g84jfQ0Zg4noBg8dchLm20J8//MN4ju6qqjp4RtZHKVKT1Q/5Nltctw
         y5xVzmepW9KA6RsJ7OxcTJuHHDKHuAl2PNVmHRLCenYdasAg1lveAIkuJb44z0snOm+H
         E8ItDgx61GThFOEuzCxWlqkvXw0t4lV1SjZNY823QsiRl0uR6A+CXEFGCjThuyQSN4mb
         KOYRls8wgmscij7xyp2bg7/2YByGFDsV4CXtMG+wibOOA20Uz5ujaYOOeSlSLv2rEPAi
         zunw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:from:to:cc:subject:date:message-id;
        bh=rmBMUhZck0wycnIEWIoOuqNHwTmLrVJzRueOnkGDMOI=;
        b=F0PIsOsT9I9AUpKa2NLVxVt1dGwasYjLod1G8vj8nw5SzBB/Yv2CKYQenDPaJkvZrQ
         yRqXhHKfjXCpGMJJaJC1x4RbwXgp6OP9qHttIlV2fDIyRiCkkhR94uT5x2OwNhv1v/4I
         Y/AyNwfZUzANrvfn8LLn6vyP0+nciUqWOsRUEt1ZyFXfxyNdtE/NYAn6fD5QUyTvu8Ip
         Ga667oChfoGvJRqdJOaKdcobOj/RXTXpe9NkYGrmhIe44AtpZEe2ffW+nSslyd8aGEi1
         hev7uD9vCxlku+kztKYZcwcT7KogZxVLRZYw7JgISC7fTX5MnZdnLuxbYN1rJptMjD/m
         L1iA==
X-Gm-Message-State: AIVw1136N0iKbgKO+uEuFJhqNcL7ene7NQP0pGQqckXJl1OsI88VS88m
	d3MlhZgiWzXXcdXw
X-Received: by 10.55.24.160 with SMTP id 32mr29082200qky.297.1501618664670;
        Tue, 01 Aug 2017 13:17:44 -0700 (PDT)
Received: from localhost.localdomain (c-71-60-35-21.hsd1.pa.comcast.net. [71.60.35.21])
        by smtp.googlemail.com with ESMTPSA id q1sm5993496qtb.3.2017.08.01.13.17.43
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Tue, 01 Aug 2017 13:17:44 -0700 (PDT)
From: Daniel Sabogal <dsabogalcc@gmail.com>
To: alpine-aports@lists.alpinelinux.org
Cc: soeren@soeren-tempel.net
Subject: [alpine-aports] [PATCH 1/3] main/mdocml: modernize abuild and explicitly set UTF8_LOCALE
Date: Tue,  1 Aug 2017 16:18:40 -0400
Message-Id: <20170801201842.19837-1-dsabogalcc@gmail.com>
X-Mailer: git-send-email 2.13.3
X-Mailinglist: alpine-aports
Precedence: list
List-Id: Alpine Development <alpine-aports.lists.alpinelinux.org>
List-Unsubscribe: 
	<mailto:alpine-aports+unsubscribe@lists.alpinelinux.org?subject=unsubscribe>
List-Post: <mailto:alpine-aports@lists.alpinelinux.org>
List-Help: <mailto:alpine-aports+help@lists.alpinelinux.org?subject=help>
List-Subscribe: 
	<mailto:alpine-aports+subscribe@lists.alpinelinux.org?subject=subscribe>

The configure script depends on the locale(1) utility to select a
UTF-8 encoding to test. This utility is not available.
---
 main/mdocml/APKBUILD | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/main/mdocml/APKBUILD b/main/mdocml/APKBUILD
index 9e5537a6dc..facc8a0eaf 100644
--- a/main/mdocml/APKBUILD
+++ b/main/mdocml/APKBUILD
@@ -1,13 +1,14 @@
 # Maintainer:  Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mdocml
 pkgver=1.14.1
-pkgrel=0
+pkgrel=1
 pkgdesc="mdoc/man compiler"
 url="http://mdocml.bsd.lv/"
 arch="all"
 license="BSD"
 depends=""
 makedepends="zlib-dev"
+checkdepends="perl"
 install="$pkgname.post-deinstall"
 triggers="$pkgname-apropos.trigger=/usr/share/man/*"
 subpackages="$pkgname-doc $pkgname-dev man::noarch $pkgname-apropos $pkgname-soelim"
@@ -18,32 +19,39 @@ source="http://mdocml.bsd.lv/snapshots/$pkgname-$pkgver.tar.gz
 	man.conf
 	"
 
-builddir="$srcdir"/$pkgname-$pkgver
+builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
-	default_prepare || return 1
+	default_prepare
+
 	cd "$builddir"
 	cat >configure.local<<EOF
 PREFIX=/usr
 MANDIR=/usr/share/man
 LIBDIR=/usr/lib
 CFLAGS="$CFLAGS"
+UTF8_LOCALE="en_US.UTF-8"
 EOF
 }
 
 build() {
 	cd "$builddir"
-	./configure || return 1
-	make || return 1
+	./configure
+	make
+}
+
+check() {
+	cd "$builddir"
+	LD_LIBRARY_PATH="$builddir" make regress
 }
 
 package() {
 	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" base-install lib-install || return 1
-	install -Dm644 "$srcdir"/man.conf "$pkgdir"/etc/man.conf || return 1
+	make -j1 DESTDIR="$pkgdir" base-install lib-install
+	install -Dm644 "$srcdir"/man.conf "$pkgdir"/etc/man.conf
 	for X in usr/bin/apropos usr/bin/whatis usr/bin/man usr/sbin/makewhatis
 		do
-			rm -f "$pkgdir/$X" || return 1
-			ln -s /usr/bin/mandoc "$pkgdir/$X" || return 1
+			rm -f "$pkgdir/$X"
+			ln -s /usr/bin/mandoc "$pkgdir/$X"
 		done
 }
 
@@ -58,9 +66,9 @@ apropos() {
 	mkdir -p "$subpkgdir"/usr/sbin "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/apropos \
 		"$pkgdir"/usr/bin/whatis \
-		"$subpkgdir"/usr/bin/ || return 1
+		"$subpkgdir"/usr/bin/
 	mv "$pkgdir"/usr/sbin/makewhatis \
-		"$subpkgdir"/usr/sbin/ || return 1
+		"$subpkgdir"/usr/sbin/
 }
 
 soelim() {
@@ -68,7 +76,7 @@ soelim() {
 	depends=""
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/soelim \
-		"$subpkgdir"/usr/bin/ || return 1
+		"$subpkgdir"/usr/bin/
 }
 
 sha512sums="90f00297d162faa404fe4e530f95422c210b8d23a0be5a115c2c8c17255d366e224444901842affb06ed8aaf8febd3e5c79966ff713fa7daf00e8c48b7a857c6  mdocml-1.14.1.tar.gz
-- 
2.13.3



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---