X-Original-To: alpine-aports@lists.alpinelinux.org Received: from sender153-mail.zoho.com (sender153-mail.zoho.com [74.201.84.153]) by lists.alpinelinux.org (Postfix) with ESMTP id B638A5C47B9 for ; Fri, 26 Aug 2016 22:06:52 +0000 (GMT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=from:to:cc:subject:date:message-id:in-reply-to:references; b=XR09Fnf8fI+E660cHlRqAeIW4AJ5oVS4+prdvwvcCfTnX9Ioa7Le9HqLLqfTadrGcojeiLRLDqKI uTXbMqh/esbCHOeBNeBgL2QdCosn6uuhSplWYDqnSiuc35rf7NMw Received: from localhost (89-76-69-26.dynamic.chello.pl [89.76.69.26]) by mx.zohomail.com with SMTPS id 1472249212381447.58656222256616; Fri, 26 Aug 2016 15:06:52 -0700 (PDT) From: Przemyslaw Pawelczyk To: alpine-aports@lists.alpinelinux.org Cc: fcolista@alpinelinux.org Subject: [alpine-aports] [PATCH 1/2] testing/html-xml-utils: Modernize APKBUILD. Date: Sat, 27 Aug 2016 00:06:36 +0200 Message-Id: <20160826220637.23154-2-przemoc@zoho.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20160826220637.23154-1-przemoc@zoho.com> References: <20160826220637.23154-1-przemoc@zoho.com> X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: * APKBUILD: - Use builddir (no _). - Leverage default_prepare. - Reformat prepare(), build(), package() to make them more readable. - Update URL (use https instead of http). - Bump pkgrel. --- testing/html-xml-utils/APKBUILD | 44 +++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/testing/html-xml-utils/APKBUILD b/testing/html-xml-utils/APKBUILD index 4bc8ceb84460..bbd7c3300631 100644 --- a/testing/html-xml-utils/APKBUILD +++ b/testing/html-xml-utils/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: Francesco Colista pkgname=html-xml-utils pkgver=7.0 -pkgrel=0 +pkgrel=1 pkgdesc="A number of simple utilities for manipulating HTML and XML files." -url="http://www.w3.org/Tools/HTML-XML-utils/" +url="https://www.w3.org/Tools/HTML-XML-utils/" arch="all" license="Custom" depends="" @@ -12,33 +12,39 @@ depends_dev="" makedepends="$depends_dev" install="" subpackages="$pkgname-doc" -source="http://www.w3.org/Tools/HTML-XML-utils/$pkgname-$pkgver.tar.gz +source="$url/$pkgname-$pkgver.tar.gz getopt-musl-fix.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 - sed -e "/doc_DATA = COPYING/d" -i Makefile.in || return 1 + default_prepare || return 1 + sed \ + -e "/doc_DATA = COPYING/d" \ + -i Makefile.in \ + || return 1 } build() { - cd "$_builddir" + cd "$builddir" ./configure \ - --prefix=/usr \ - --disable-dependency-tracking - make || return 1 + --prefix=/usr \ + --disable-dependency-tracking \ + || return 1 + + make \ + || return 1 } package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + cd "$builddir" + make install \ + DESTDIR="$pkgdir" \ + || return 1 + install -D -m 644 \ + COPYING \ + "$pkgdir"/usr/share/licenses/$pkgname/COPYING \ + || return 1 } md5sums="b513432f7f084c158495815cc5118f0f html-xml-utils-7.0.tar.gz -- 2.8.3 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---