X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.infogroup.kiev.ua (tera.infogroup.kiev.ua [195.144.25.26]) by lists.alpinelinux.org (Postfix) with ESMTP id 3E0265C2FFE for ; Sat, 3 Dec 2016 15:15:22 +0000 (GMT) Received: from ost.org.ua ([195.144.25.230] helo=alpine.ost.org.ua) by mail.infogroup.kiev.ua with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1cDC26-0005D9-6W for alpine-aports@lists.alpinelinux.org; Sat, 03 Dec 2016 17:15:22 +0200 From: Valery Kartel To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] main/aspell: fixes in APKBUILD Date: Sat, 3 Dec 2016 17:15:21 +0200 Message-Id: <20161203151521.20792-1-valery.kartel@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: droid@infogroup.kiev.ua X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/aspell/APKBUILD | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/main/aspell/APKBUILD b/main/aspell/APKBUILD index a7f3c411f4..65d1daa4c2 100644 --- a/main/aspell/APKBUILD +++ b/main/aspell/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Valery Kartel pkgname=aspell pkgver=0.60.6.1 -pkgrel=10 +pkgrel=11 pkgdesc="A spell checker designed to eventually replace Ispell" url="http://aspell.net/" arch="all" @@ -10,24 +10,19 @@ license="LGPL2+" subpackages="$pkgname-compat::noarch $pkgname-utils $pkgname-dev $pkgname-doc $pkgname-libs" depends= +depends_dev="$pkgname-utils" makedepends="ncurses-dev perl" install= source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" - -_builddir="$srcdir/$pkgname-$pkgver" +builddir="$srcdir"/$pkgname-$pkgver prepare() { - cd "$_builddir" + default_prepare || return 1 update_config_sub || return 1 - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done } build() { - cd "$_builddir" + cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -41,13 +36,13 @@ build() { } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 } compat() { pkgdesc="aspell compatibility scripts for ispell and unix spell" - depends="aspell" + depends="$pkgname" install -d "$subpkgdir"/usr/bin cd "$pkgdir"/usr/share/$pkgname mv spell ispell "$subpkgdir"/usr/bin/ @@ -55,20 +50,16 @@ compat() { utils() { pkgdesc="aspell misc utils" - depends="aspell perl" + depends="$pkgname perl" install -d "$subpkgdir"/usr/bin cd "$pkgdir"/usr/bin mv pre* aspell-import run-with-aspell word-list-compress "$subpkgdir"/usr/bin/ } -dev() { - default_dev - depends="aspell-utils" -} - libs() { default_libs mv "$pkgdir"/usr/share "$subpkgdir"/usr + rm -fr "$pkgdir"/usr/lib } md5sums="e66a9c9af6a60dc46134fdacf6ce97d7 aspell-0.60.6.1.tar.gz" -- 2.11.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---