X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 1F847DC23A3 for ; Wed, 27 May 2015 14:04:47 +0000 (UTC) Received: from ataiki.ednos.net (ednos.dserver.softronics.ch [91.214.168.83]) by mail.alpinelinux.org (Postfix) with ESMTP id C943BDC1D8E for ; Wed, 27 May 2015 14:04:41 +0000 (UTC) Received: from amherst.ednos.net (209-6-89-248.c3-0.smr-ubr1.sbo-smr.ma.cable.rcn.com [209.6.89.248]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by ataiki.ednos.net (Postfix) with ESMTPSA id 9EC551AEB; Wed, 27 May 2015 14:06:05 +0000 (GMT) From: Andrew Hills To: alpine-aports@lists.alpinelinux.org Cc: Andrew Hills Subject: [alpine-aports] [PATCH 1/2] main/git: minor cleanup (spacing, noarch for subpackages) Date: Fri, 29 May 2015 14:04:22 -0400 Message-Id: <1432922663-15777-1-git-send-email-ahills@ednos.net> X-Mailer: git-send-email 2.4.2 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/git/APKBUILD | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 59d6cc5..5ab057b 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -75,6 +75,7 @@ package() { _perl_git_svn() { pkgdesc="Perl interface to Git::SVN" depends="git=$pkgver-r$pkgrel" + arch="noarch" replaces="git-perl" eval local `perl -V:vendorlib` mkdir -p "$subpkgdir"/$vendorlib/Git @@ -84,6 +85,7 @@ _perl_git_svn() { _perl_git() { pkgdesc="Perl interface to Git" depends="git=$pkgver-r$pkgrel perl-error" + arch="noarch" replaces="git-perl" eval local `perl -V:vendorlib` eval local `perl -V:vendorarch` @@ -97,6 +99,7 @@ email() { depends="perl perl-git=$pkgver-r$pkgrel perl-net-smtp-ssl perl-authen-sasl" pkgdesc="Git tools for sending email" + arch="noarch" replaces="git" mkdir -p "$subpkgdir"/$_gitcoredir mv "$pkgdir"/$_gitcoredir/*email* "$subpkgdir"/$_gitcoredir @@ -104,19 +107,20 @@ email() { svn() { - depends="perl perl-git-svn=$pkgver-r$pkgrel perl-subversion + depends="perl perl-git-svn=$pkgver-r$pkgrel perl-subversion perl-term-readkey" - pkgdesc="Subversion support for git" - arch="noarch" - replaces="" + pkgdesc="Subversion support for git" + arch="noarch" + replaces="" - mkdir -p "$subpkgdir"/$_gitcoredir - mv "$pkgdir"/$_gitcoredir/git-svn "$subpkgdir"/$_gitcoredir/ + mkdir -p "$subpkgdir"/$_gitcoredir + mv "$pkgdir"/$_gitcoredir/git-svn "$subpkgdir"/$_gitcoredir/ } cvs() { pkgdesc="Git tools for importing CVS repositories" depends="perl perl-git=$pkgver-r$pkgrel cvs perl-dbd-sqlite" + arch="noarch" replaces="git-perl" mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/$_gitcoredir mv "$pkgdir"/usr/bin/git-cvs* "$subpkgdir"/usr/bin/ || return 1 @@ -127,6 +131,7 @@ cvs() { p4() { pkgdesc="Git tools for working with Perforce depots" depends="git=$pkgver-r$pkgrel" + arch="noarch" replaces="git" mkdir -p "$subpkgdir"/$_gitcoredir/mergetools mv "$pkgdir"/$_gitcoredir/*p4* "$subpkgdir"/$_gitcoredir/ || return 1 @@ -137,7 +142,7 @@ p4() { daemon() { pkgdesc="Git protocol daemon" depends="git=$pkgver-r$pkgrel" - replaces="git" + replaces="git" mkdir -p "$subpkgdir"/$_gitcoredir mv "$pkgdir"/$_gitcoredir/git-daemon "$subpkgdir"/$_gitcoredir \ || return 1 @@ -147,6 +152,7 @@ daemon() { gitweb() { pkgdesc="Simple web interface to git repositories" depends="git=$pkgver-r$pkgrel perl" + arch="noarch" replaces="git" mkdir -p "$subpkgdir"/usr/share mv "$pkgdir"/usr/share/gitweb "$subpkgdir"/usr/share/ -- 2.4.2 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---