diff options
Diffstat (limited to 'main')
72 files changed, 31 insertions, 153 deletions
diff --git a/main/alsa-utils/APKBUILD b/main/alsa-utils/APKBUILD index b21d8a60c2..b2029c76b0 100644 --- a/main/alsa-utils/APKBUILD +++ b/main/alsa-utils/APKBUILD @@ -48,7 +48,6 @@ package() { } alsaconf() { - arch="noarch" depends="alsa-utils bash" cd "$_builddir" mkdir -p "$subpkgdir"/usr/sbin diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD index 042dec0895..f9d3d46770 100644 --- a/main/apache2/APKBUILD +++ b/main/apache2/APKBUILD @@ -167,7 +167,6 @@ dev() { local _file default_dev depends="$depends perl apr-util-dev" - arch="noarch" # install apxs utility install -d "$subpkgdir"/usr/bin @@ -185,7 +184,6 @@ doc() { } _error() { - arch="noarch" pkgdesc="Apache Multi Language Custom Error Documents" install -d "$subpkgdir"/usr/share/apache2 mv "$pkgdir"/usr/share/apache2/error \ @@ -203,7 +201,6 @@ http2() { } icons() { - arch="noarch" pkgdesc="Apache Public Domain Icons" install -d "$subpkgdir"/usr/share/apache2 mv "$pkgdir"/usr/share/apache2/icons \ diff --git a/main/aria2/APKBUILD b/main/aria2/APKBUILD index 680934a92e..86b1061ac7 100644 --- a/main/aria2/APKBUILD +++ b/main/aria2/APKBUILD @@ -41,7 +41,6 @@ bashcomp() { depends="" pkgdesc="Bash completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - arch="noarch" install -Dm644 "$_builddir"/doc/bash_completion/aria2c \ "$subpkgdir"/usr/share/bash-completion/completions/_aria2c || return 1 diff --git a/main/asciidoc/APKBUILD b/main/asciidoc/APKBUILD index 2fd8c070d5..51ec7e2821 100644 --- a/main/asciidoc/APKBUILD +++ b/main/asciidoc/APKBUILD @@ -43,7 +43,6 @@ package() { vim() { depends="" pkgdesc="Vim syntax for $pkgname" - arch="noarch" install -Dm644 "$_builddir"/vim/syntax/$pkgname.vim \ "$subpkgdir"/usr/share/vim/vimfiles/syntax/$pkgname.vim diff --git a/main/aspell/APKBUILD b/main/aspell/APKBUILD index 8c484a26e0..06852e0f20 100644 --- a/main/aspell/APKBUILD +++ b/main/aspell/APKBUILD @@ -48,7 +48,6 @@ package() { compat() { pkgdesc="aspell compatibility scripts for ispell and unix spell" depends="aspell" - arch="noarch" install -d "$subpkgdir"/usr/bin cd "$pkgdir"/usr/share/$pkgname mv spell ispell "$subpkgdir"/usr/bin/ @@ -57,7 +56,6 @@ compat() { utils() { pkgdesc="aspell misc utils" depends="aspell perl" - arch="all" install -d "$subpkgdir"/usr/bin cd "$pkgdir"/usr/bin mv pre* aspell-import run-with-aspell word-list-compress "$subpkgdir"/usr/bin/ diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index 834ea19f6b..7f76e5333c 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD @@ -204,7 +204,6 @@ speex() { _find_and_move '*_speex*'; } alsa() { _find_and_move '*_alsa*'; } sample() { - arch="noarch" pkgdesc="Sample configuration files for asterisk" cd "$_builddir" mkdir -p "$subpkgdir"/var/lib/asterisk/phoneprov @@ -216,7 +215,6 @@ sample() { } sound_moh() { - arch="noarch" pkgdesc="Default on-hold music files for asterisk" depends= install= @@ -225,7 +223,6 @@ sound_moh() { } sound_en() { - arch="noarch" pkgdesc="English sound files for asterisk" depends= install= diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD index a45673b72f..8881e61d2f 100644 --- a/main/augeas/APKBUILD +++ b/main/augeas/APKBUILD @@ -38,7 +38,6 @@ package() { tests() { pkgdesc="Tests for Augeas lenses" - arch="noarch" mkdir -p "$subpkgdir"/usr/share/augeas/lenses/dist/ mv "$pkgdir"/usr/share/augeas/lenses/dist/tests \ diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD index 785df6ca32..31498e2794 100644 --- a/main/btrfs-progs/APKBUILD +++ b/main/btrfs-progs/APKBUILD @@ -54,7 +54,6 @@ package() { completion() { pkgdesc="Bash completion script for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - arch="noarch" install -Dm644 "$builddir"/btrfs-completion \ "$subpkgdir"/usr/share/bash-completion/completions/btrfs diff --git a/main/collectd/APKBUILD b/main/collectd/APKBUILD index bad307eee3..4af5d4eac7 100644 --- a/main/collectd/APKBUILD +++ b/main/collectd/APKBUILD @@ -76,7 +76,6 @@ package() { perl() { pkgdesc="perl bindings to collectd" depends="perl" - arch="noarch" install -d "$subpkgdir"/usr/lib/ "$subpkgdir"/usr/share mv "$pkgdir"/usr/lib/perl* "$subpkgdir"/usr/lib/ # mv "$pkgdir"/usr/share/perl* "$subpkgdir"/usr/share/ diff --git a/main/drbd-utils/APKBUILD b/main/drbd-utils/APKBUILD index fa464728ae..45b0563332 100644 --- a/main/drbd-utils/APKBUILD +++ b/main/drbd-utils/APKBUILD @@ -55,7 +55,6 @@ package() { } pacemaker() { - arch="noarch" depends="drbd" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/ocf "$subpkgdir"/usr/lib diff --git a/main/eudev/APKBUILD b/main/eudev/APKBUILD index 80ff36aa11..448d995fd8 100644 --- a/main/eudev/APKBUILD +++ b/main/eudev/APKBUILD @@ -70,7 +70,6 @@ libs() { } netifnames() { - arch="noarch" pkgdesc="udev rules for systemd-style interface names" mkdir -p "$subpkgdir"/lib/udev/rules.d mv "$pkgdir"/lib/udev/rules.d/80-net-name-slot.rules \ diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD index 31db987233..bb4efd005f 100644 --- a/main/freeradius/APKBUILD +++ b/main/freeradius/APKBUILD @@ -200,7 +200,6 @@ mssql() { depends="freeradius-sql=$pkgver-r$pkgrel" provides="freeradius3-mssql=$pkgver-r$pkgrel" pkgdesc="MSSQL module for FreeRADIUS server" - arch="noarch" mkdir -p "${subpkgdir}"${radmodsconfdir}/sql/main mv "${pkgdir}"${radmodsconfdir}/sql/main/mssql \ "${subpkgdir}"${radmodsconfdir}/sql/main || return 1 diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD index 662d91c1f8..4cbdc3ac0f 100644 --- a/main/freeswitch/APKBUILD +++ b/main/freeswitch/APKBUILD @@ -183,7 +183,6 @@ sangoma() { timezones() { pkgdesc="Freeswitch timezone configuration" - arch="noarch" install= replaces="freeswitch-sample-config" mkdir -p "$subpkgdir"/etc/freeswitch/autoload_configs @@ -218,7 +217,6 @@ perlesl() { conf() { pkgdesc="Freeswitch sample configureation" - arch="noarch" depends="freeswitch-timezones" install= mkdir -p "$subpkgdir"/etc/freeswitch diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 84f00a35c9..86ce63c870 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -70,7 +70,6 @@ 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 @@ -80,7 +79,6 @@ _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` @@ -94,7 +92,6 @@ 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,7 +101,6 @@ svn() { depends="perl perl-git-svn=$pkgver-r$pkgrel perl-subversion perl-term-readkey" pkgdesc="Subversion support for git" - arch="noarch" replaces="" mkdir -p "$subpkgdir"/$_gitcoredir @@ -114,7 +110,6 @@ svn() { 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 @@ -125,7 +120,6 @@ 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 @@ -146,7 +140,6 @@ 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/ @@ -155,7 +148,6 @@ gitweb() { completion() { pkgdesc="Bash completion for $pkgname" depends="" - arch="noarch" replaces="" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" @@ -166,7 +158,6 @@ completion() { subtree() { depends="git=$pkgver-r$pkgrel" pkgdesc="Split git repository into subtrees" - arch="noarch" replaces="" cd "$_builddir"/contrib/subtree @@ -177,7 +168,6 @@ subtree() { subtree_doc() { depends="" pkgdesc="Split git repository into subtrees (documentation)" - arch="noarch" replaces="" cd "$_builddir"/contrib/subtree @@ -188,7 +178,6 @@ subtree_doc() { gui() { depends="git=$pkgver-r$pkgrel tcl tk" pkgdesc="GUI interface for git" - arch="noarch" replaces="" mkdir -p "$subpkgdir"/usr/share "$subpkgdir"/usr/libexec/git-core @@ -202,7 +191,6 @@ gui() { gitk() { depends="git=$pkgver-r$pkgrel tcl tk" pkgdesc="Gitk interface for git" - arch="noarch" replaces="" mkdir -p "$subpkgdir"/usr/share "$subpkgdir"/usr/bin @@ -214,7 +202,6 @@ gitk() { _git_perl() { depends="git=$pkgver-r$pkgrel perl-git=$pkgver-r$pkgrel perl" pkgdesc="Additional Git commands that requires perl" - arch="noarch" replaces="" mkdir -p "$subpkgdir"/usr/lib diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD index e2b5211b2d..67357c3680 100644 --- a/main/glib/APKBUILD +++ b/main/glib/APKBUILD @@ -67,7 +67,6 @@ dev() { bashcomp() { pkgdesc="Bash completion for $pkgname" - arch="noarch" depends= install_if="$pkgname=$pkgver-r$pkgrel bash-completion" mkdir -p "$subpkgdir"/usr/share diff --git a/main/herbstluftwm/APKBUILD b/main/herbstluftwm/APKBUILD index 6ce888d549..259de309f8 100644 --- a/main/herbstluftwm/APKBUILD +++ b/main/herbstluftwm/APKBUILD @@ -40,7 +40,6 @@ package() { bashcomp() { pkgdesc="Bash completion for $pkgname" - arch="noarch" depends="" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" @@ -50,7 +49,6 @@ bashcomp() { zshcomp() { pkgdesc="Zsh completion for $pkgname" - arch="noarch" depends="" install_if="$pkgname=$pkgver-r$pkgrel zsh" diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD index a2b33853b3..98ac1c0ebe 100644 --- a/main/iproute2/APKBUILD +++ b/main/iproute2/APKBUILD @@ -52,7 +52,6 @@ bashcomp() { depends="" pkgdesc="Bash completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - arch="noarch" mkdir -p "$subpkgdir"/usr/share/ mv "$pkgdir"/usr/share/bash-completion \ diff --git a/main/kbd/APKBUILD b/main/kbd/APKBUILD index bb64776d43..ae39fa5eb0 100644 --- a/main/kbd/APKBUILD +++ b/main/kbd/APKBUILD @@ -96,7 +96,6 @@ vlock() { misc() { pkgdesc="Data for kbd package" - arch="noarch" depends= mkdir -p "$subpkgdir"${_datadir} diff --git a/main/kmod/APKBUILD b/main/kmod/APKBUILD index a8ea49f687..975232d4fc 100644 --- a/main/kmod/APKBUILD +++ b/main/kmod/APKBUILD @@ -71,7 +71,6 @@ libs() { bashcomp() { pkgdesc="Bash completion for $pkgname" - arch="noarch" depends="" install_if="bash-completion $pkgname=$pkgver-r$pkgrel" diff --git a/main/lua-cqueues/APKBUILD b/main/lua-cqueues/APKBUILD index 1e46d5bc5c..7dc245c170 100644 --- a/main/lua-cqueues/APKBUILD +++ b/main/lua-cqueues/APKBUILD @@ -38,7 +38,6 @@ package() { _package() { local lver=${subpkgname:3:3} pkgdesc="$pkgdesc - for Lua $lver" - arch="all" depends="lua$lver" install_if="lua$lver $pkgname=$pkgver-r$pkgrel" diff --git a/main/lua-curl/APKBUILD b/main/lua-curl/APKBUILD index f56b10d903..bc924448b8 100644 --- a/main/lua-curl/APKBUILD +++ b/main/lua-curl/APKBUILD @@ -44,7 +44,6 @@ package() { _subpackage() { local lver="${subpkgname:3:3}" pkgdesc="$pkgdesc (for Lua $lver)" - arch="all" depends="lua$lver" install_if="$pkgname=$pkgver-r$pkgrel lua$lver" diff --git a/main/lua-evdev/APKBUILD b/main/lua-evdev/APKBUILD index 50183bf4eb..931672074f 100644 --- a/main/lua-evdev/APKBUILD +++ b/main/lua-evdev/APKBUILD @@ -5,7 +5,7 @@ pkgver=2.2.1 pkgrel=0 pkgdesc="Lua module for reading input events" url="https://github.com/Tangent128/lua-evdev" -arch="noarch" +arch="all" license="MIT" depends="" makedepends="linux-headers" @@ -41,7 +41,6 @@ package() { _package() { local lver="${subpkgname:3:3}" pkgdesc="$pkgdesc (for Lua $lver)" - arch="all" depends="$depends lua$lver" install_if="$pkgname=$pkgver-r$pkgrel lua$lver" diff --git a/main/lua-ldap/APKBUILD b/main/lua-ldap/APKBUILD index 00611de5ea..d85d87eeb7 100644 --- a/main/lua-ldap/APKBUILD +++ b/main/lua-ldap/APKBUILD @@ -7,7 +7,7 @@ pkgver=1.2.3 pkgrel=0 pkgdesc="Lua binding to LDAP" url="https://github.com/bdellegrazie/lualdap" -arch="noarch" +arch="all" license="MIT" depends="" makedepends="openldap-dev" @@ -49,7 +49,6 @@ package() { _package() { local lver="${subpkgname:3:3}" pkgdesc="$pkgdesc (for Lua $lver)" - arch="all" depends="lua$lver" install_if="$pkgname=$pkgver-r$pkgrel lua$lver" [ "$lver" = "5.1" ] && replaces="$pkgname" diff --git a/main/lua-lzmq/APKBUILD b/main/lua-lzmq/APKBUILD index e9e670a649..0ac34105ef 100644 --- a/main/lua-lzmq/APKBUILD +++ b/main/lua-lzmq/APKBUILD @@ -7,7 +7,7 @@ pkgver=0.4.3 pkgrel=0 pkgdesc="Lua bindings to ZeroMQ" url="https://github.com/zeromq/lzmq" -arch="noarch" +arch="all" license="MIT" depends="" makedepends="cmake zeromq-dev" @@ -45,7 +45,6 @@ package() { _package() { local lver="${subpkgname:3:3}" pkgdesc="$pkgdesc $lver" - arch="all" install_if="lua$lver $pkgname=$pkgver-r$pkgrel" cd "$builddir"/build/$lver diff --git a/main/lua-mosquitto/APKBUILD b/main/lua-mosquitto/APKBUILD index c7b9ccc98b..031591e31d 100644 --- a/main/lua-mosquitto/APKBUILD +++ b/main/lua-mosquitto/APKBUILD @@ -4,7 +4,7 @@ pkgver=0.2 pkgrel=0 pkgdesc="Bindingd to libmosquitto for Lua" url="https://github.com/flukso/lua-mosquitto" -arch="noarch" +arch="all" license="MIT" depends="" makedepends="mosquitto-dev" @@ -40,7 +40,6 @@ package() { _package() { local lver="${subpkgname:3:3}" pkgdesc="$pkgdesc $lver" - arch="all" depends="lua$lver" install_if="$pkgname=$pkgver-r$pkgrel lua$lver" diff --git a/main/lua-ossl/APKBUILD b/main/lua-ossl/APKBUILD index 2e25b61af6..2a44106218 100644 --- a/main/lua-ossl/APKBUILD +++ b/main/lua-ossl/APKBUILD @@ -9,7 +9,7 @@ _ver=${pkgver%_git*} pkgrel=1 pkgdesc="A comprehensive OpenSSL Lua module" url="http://25thandclement.com/~william/projects/luaossl.html" -arch="noarch" +arch="all" license="MIT" depends="" makedepends="libressl-dev" @@ -38,7 +38,6 @@ package() { _package() { local lver="${subpkgname:3:3}" pkgdesc="$pkgdesc for Lua $lver" - arch="all" depends="lua$lver" install_if="lua$lver $pkgname=$pkgver-r$pkgrel" diff --git a/main/lua-pty/APKBUILD b/main/lua-pty/APKBUILD index 12134b2185..e116ac266a 100644 --- a/main/lua-pty/APKBUILD +++ b/main/lua-pty/APKBUILD @@ -6,7 +6,7 @@ _rockver=1 pkgrel=0 pkgdesc="Lua module to control other programs via PTYs." url="http://www.tset.de/lpty/" -arch="noarch" +arch="" license="MIT/X11" depends="" makedepends="" @@ -46,7 +46,6 @@ package() { _subpackage() { local lver="${subpkgname:3:3}" pkgdesc="$pkgdesc (for Lua $lver)" - arch="all" depends="lua$lver" install_if="$pkgname=$pkgver-r$pkgrel lua$lver" [ "$lver" = 5.1 ] && replaces="$pkgname" diff --git a/main/lua-yaml/APKBUILD b/main/lua-yaml/APKBUILD index 0e7cdb00c5..7c22c2c49e 100644 --- a/main/lua-yaml/APKBUILD +++ b/main/lua-yaml/APKBUILD @@ -7,7 +7,7 @@ pkgver=1.1.2 pkgrel=0 pkgdesc="LibYaml binding for Lua" url="http://yaml.luaforge.net" -arch="noarch" +arch="all" license="MIT" depends="" makedepends="cmake yaml-dev" @@ -48,7 +48,6 @@ package() { _subpackage() { local lver="${subpkgname:3:3}" pkgdesc="$pkgdesc $lver" - arch="all" depends="$depends lua$lver lua$lver-lub" install_if="$pkgname=$pkgver-r$pkgrel lua$lver" [ "$lver" = 5.1 ] && replaces="$pkgname" diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index 4ed40c302f..d7cf267042 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD @@ -71,7 +71,6 @@ package() { lvm() { pkgdesc="LVM support for LXC" depends="lvm2 util-linux lxc" - arch="noarch" mkdir "$subpkgdir" } @@ -87,7 +86,6 @@ _lua52() { _download() { pkgdesc="LXC container image downloader template" - arch="noarch" depends="$pkgname gnupg tar xz" mkdir -p "$subpkgdir"/$_tmpldir @@ -96,7 +94,6 @@ _download() { templates() { pkgdesc="Templates for LXC (except alpine and download)" - arch="noarch" depends="bash tar" mkdir -p "$subpkgdir"/$_tmpldir diff --git a/main/mcabber/APKBUILD b/main/mcabber/APKBUILD index 317ff9ccac..4185f58fe6 100644 --- a/main/mcabber/APKBUILD +++ b/main/mcabber/APKBUILD @@ -41,7 +41,6 @@ package() { example() { pkgdesc="$pkgdesc (examples)" - arch="noarch" # Put the example file into a seperate package mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/example || return 1 mv "$builddir"/mcabberrc.example \ diff --git a/main/mdocml/APKBUILD b/main/mdocml/APKBUILD index fbe2b8325a..6bbdaaf133 100644 --- a/main/mdocml/APKBUILD +++ b/main/mdocml/APKBUILD @@ -49,7 +49,6 @@ package() { } man() { - arch="noarch" pkgdesc="dummy package for upgrade compatibility. this can safely be removed" depends="mdocml" mkdir -p "$subpkgdir" diff --git a/main/mercurial/APKBUILD b/main/mercurial/APKBUILD index 5de9f1436a..72ff3d2155 100644 --- a/main/mercurial/APKBUILD +++ b/main/mercurial/APKBUILD @@ -22,7 +22,7 @@ build() { python2 setup.py build || return 1 } -package() { +package() { cd "$_builddir" python2 setup.py install --root="$pkgdir" || return 1 install -m755 contrib/hgk hgeditor "$pkgdir"/usr/bin || return 1 @@ -37,7 +37,6 @@ vim() { depends="" pkgdesc="Vim syntax for $pkgname" install_if="vim $pkgname=$pkgver-r$pkgrel" - arch="noarch" cd "$_builddir"/contrib/vim/ mkdir -p "$subpkgdir"/usr/share/vim/vimfiles/syntax/ @@ -49,7 +48,6 @@ zshcomp() { depends="" pkgdesc="Zsh completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel zsh" - arch="noarch" install -Dm644 "$_builddir"/contrib/zsh_completion \ "$subpkgdir"/usr/share/zsh/site-functions/_${pkgname} || return 1 @@ -59,7 +57,6 @@ bashcomp() { depends="" pkgdesc="Bash completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - arch="noarch" install -Dm644 "$_builddir"/contrib/bash_completion \ "$subpkgdir"/usr/share/bash-completion/completions/${pkgname} || return 1 diff --git a/main/mosh/APKBUILD b/main/mosh/APKBUILD index 801951d4a9..2f97393227 100644 --- a/main/mosh/APKBUILD +++ b/main/mosh/APKBUILD @@ -5,7 +5,7 @@ pkgver=1.2.6 pkgrel=1 pkgdesc="Mobile shell surviving disconnects with local echo and line editing" url="http://mosh.mit.edu" -arch="noarch" +arch="all" license="GPL3+" depends="$pkgname-client $pkgname-server" makedepends="ncurses-dev zlib-dev libressl-dev perl-dev perl-io-tty protobuf-dev @@ -35,7 +35,6 @@ package() { } server() { - arch="all" replaces="mosh" pkgdesc="Mosh server" depends= @@ -45,7 +44,6 @@ server() { } client() { - arch="all" replaces="mosh" pkgdesc="Mosh client" depends="openssh-client perl-io-tty" diff --git a/main/mpc/APKBUILD b/main/mpc/APKBUILD index 4818cdc848..2c7e144d6b 100644 --- a/main/mpc/APKBUILD +++ b/main/mpc/APKBUILD @@ -36,7 +36,6 @@ bashcomp() { depends="" pkgdesc="Bash completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - arch="noarch" mkdir -p "$subpkgdir"/usr/share/bash-completion/completions mv "$pkgdir"/usr/share/doc/$pkgname/$pkgname-completion.bash \ diff --git a/main/msmtp/APKBUILD b/main/msmtp/APKBUILD index 1f79c77596..af67f097ad 100644 --- a/main/msmtp/APKBUILD +++ b/main/msmtp/APKBUILD @@ -46,7 +46,6 @@ package() { vim() { depends="" pkgdesc="Vim syntax for $pkgname" - arch="noarch" install -Dm644 "$_builddir"/scripts/vim/$pkgname.vim \ "$subpkgdir"/usr/share/vim/vimfiles/syntax/$pkgname.vim diff --git a/main/nagios-plugins/APKBUILD b/main/nagios-plugins/APKBUILD index b9acd46b17..e7bf41433a 100644 --- a/main/nagios-plugins/APKBUILD +++ b/main/nagios-plugins/APKBUILD @@ -110,15 +110,14 @@ _plugin() { if file -bi "$destdir"/* | grep -qw text/x-perl; then depends="$depends perl" fi - if ! file -bi "$destdir"/* | grep -qw application/x-sharedlib; then - arch="noarch" - fi +# if ! file -bi "$destdir"/* | grep -qw application/x-sharedlib; then +# arch="noarch" +# fi } _all() { pkgdesc="Metapackage that installs *all* Nagios plugins from the nagios-plugins package" depends="${subpackages% all}" - arch="noarch" mkdir -p "$subpkgdir" diff --git a/main/nagios/APKBUILD b/main/nagios/APKBUILD index dfdf781ac3..6a9f06ddd7 100644 --- a/main/nagios/APKBUILD +++ b/main/nagios/APKBUILD @@ -62,7 +62,6 @@ package() { web() { #depends="php lighttpd" - arch="noarch" mkdir -p "$subpkgdir"/usr mv "$pkgdir"/usr/share "$subpkgdir"/usr/ install -m644 -D "$srcdir"/lighttpd-nagios.conf "$subpkgdir"/etc/lighttpd/nagios.conf diff --git a/main/nano/APKBUILD b/main/nano/APKBUILD index e1924b1f55..716db797a5 100644 --- a/main/nano/APKBUILD +++ b/main/nano/APKBUILD @@ -41,7 +41,6 @@ package() { syntax() { pkgdesc="Syntax highlighting definitions for $pkgname" - arch="noarch" depends="" mkdir -p "$subpkgdir"/usr/share/$pkgname/ diff --git a/main/nextcloud/APKBUILD b/main/nextcloud/APKBUILD index b61790f87c..81a6ebd493 100644 --- a/main/nextcloud/APKBUILD +++ b/main/nextcloud/APKBUILD @@ -69,7 +69,6 @@ package() { } doc() { - arch="noarch" pkgdesc="Nextcloud documentation" depends="nextcloud" mkdir -p "$subpkgdir"/usr/share/doc/nextcloud/core @@ -78,21 +77,18 @@ doc() { } pgsql() { - arch="noarch" pkgdesc="Nextcloud PostgreSQL support" depends="nextcloud ${_php}-pgsql ${_php}-pdo_pgsql ${_php}-pear-mdb2-driver-pgsql" mkdir -p "$subpkgdir"${_ncwwwdir} } sqlite() { - arch="noarch" pkgdesc="Nextcloud SQLite support" depends="nextcloud ${_php}-sqlite3 ${_php}-pdo_sqlite" mkdir -p "$subpkgdir"${_ncwwwdir} } mysql() { - arch="noarch" pkgdesc="Nextcloud MySQL support" depends="nextcloud ${_php}-mysql ${_php}-pdo_mysql ${_php}-pear-mdb2-driver-mysql" mkdir -p "$subpkgdir"${_ncwwwdir} @@ -111,28 +107,24 @@ _mv_app() { } activity() { - arch="noarch" pkgdesc="Nextcloud Activity app" depends="$pkgname" _mv_app pkg activity } firstrunwizard() { - arch="noarch" pkgdesc="Nextcloud Firstrunwizard app" depends="$pkgname" _mv_app pkg firstrunwizard } gallery() { - arch="noarch" pkgdesc="Nextcloud integrated gallery application" depends="nextcloud" _mv_app pkg gallery } notifications() { - arch="noarch" pkgdesc="Nextcloud Email notification support" depends="$pkgname" _mv_app pkg notifications @@ -140,28 +132,24 @@ notifications() { templateeditor() { - arch="noarch" pkgdesc="Nextcloud Email template editor app" depends="$pkgname" _mv_app pkg templateeditor } pdfviewer() { - arch="noarch" pkgdesc="Nextcloud integrated PDF viewer" depends="nextcloud" _mv_app pkg files_pdfviewer } texteditor() { - arch="noarch" pkgdesc="Nextcloud integrated text editor" depends="nextcloud" _mv_app pkg files_texteditor } videoplayer() { - arch="noarch" pkgdesc="Nextcloud integrated video viewer" depends="nextcloud" provides="$pkgname-videoviewer" diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD index 3430569cb4..4f6a928af3 100644 --- a/main/nginx/APKBUILD +++ b/main/nginx/APKBUILD @@ -209,7 +209,6 @@ package() { vim() { pkgdesc="$pkgdesc (vim syntax)" depends= - arch="noarch" mkdir -p "$subpkgdir"/usr/share/vim cp -r "$builddir"/contrib/vim "$subpkgdir"/usr/share/vim/vimfiles diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD index 598d1cd695..d2f70cf4ef 100644 --- a/main/nmap/APKBUILD +++ b/main/nmap/APKBUILD @@ -46,7 +46,6 @@ package() { scripts() { depends="$pkgname-nselibs" pkgdesc="$pkgdesc (scripts)" - arch="noarch" mkdir -p "$subpkgdir"/usr/share/nmap/ mv "$pkgdir"/usr/share/nmap/scripts \ @@ -55,7 +54,6 @@ scripts() { nselibs() { pkgdesc="$pkgdesc (nselibs)" - arch="noarch" mkdir -p "$subpkgdir"/usr/share/nmap/ mv "$pkgdir"/usr/share/nmap/nse_main.lua \ diff --git a/main/openvswitch/APKBUILD b/main/openvswitch/APKBUILD index 1c1f2baa76..37f54fa811 100644 --- a/main/openvswitch/APKBUILD +++ b/main/openvswitch/APKBUILD @@ -39,7 +39,6 @@ build() { monitor() { depends="openvswitch py-twisted py-twisted-web2 py-qt" - arch="noarch" mkdir -p "$subpkgdir"/usr/share/openvswitch mv "$pkgdir"/usr/share/openvswitch/python \ "$subpkgdir"/usr/share/openvswitch/python @@ -75,7 +74,6 @@ bashcomp() { depends="" pkgdesc="Bash completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - arch="noarch" mkdir -p "$subpkgdir"/usr/share/bash-completion/completions/$pkgname mv "$builddir"/utilities/*-bashcomp.bash \ diff --git a/main/pdnsd/APKBUILD b/main/pdnsd/APKBUILD index ab0bf3a6b0..6f1db86eb5 100644 --- a/main/pdnsd/APKBUILD +++ b/main/pdnsd/APKBUILD @@ -68,8 +68,6 @@ package() { } doc() { - arch="noarch" - mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/html || return 1 mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/txt || return 1 mkdir -p "$subpkgdir"/usr/share/$pkgname/contrib || return 1 diff --git a/main/php5-pear-mdb2/APKBUILD b/main/php5-pear-mdb2/APKBUILD index dad6692ebc..895eebe05a 100644 --- a/main/php5-pear-mdb2/APKBUILD +++ b/main/php5-pear-mdb2/APKBUILD @@ -24,10 +24,10 @@ source="" build() { return 0; } package() { _pear_install $_pkgname-$pkgver "$pkgdir" || return 1; } -driver_mysql() { _do_driver mysql "mysql ${_php}-mysql" noarch; } -driver_mysqli() { _do_driver mysqli "mysql ${_php}-mysqli" noarch; } -driver_pgsql() { _do_driver pgsql "postgresql ${_php}-pgsql" noarch; } -driver_sqlite() { _do_driver sqlite "${_php}-sqlite3" noarch; } +driver_mysql() { _do_driver mysql "mysql ${_php}-mysql" ; } +driver_mysqli() { _do_driver mysqli "mysql ${_php}-mysqli" ; } +driver_pgsql() { _do_driver pgsql "postgresql ${_php}-pgsql" ; } +driver_sqlite() { _do_driver sqlite "${_php}-sqlite3" ; } _pear_install() { @@ -60,7 +60,6 @@ _do_driver() { depends="${2-}" fi depends="${pkgname} ${depends}" - arch="${3-noarch}" _pear_install ${_pkgname}_Driver_${_driver_name}-${_driver_ver} \ "$subpkgdir" || return 1 diff --git a/main/php5/APKBUILD b/main/php5/APKBUILD index 98d038af9b..411fb2596f 100644 --- a/main/php5/APKBUILD +++ b/main/php5/APKBUILD @@ -335,7 +335,6 @@ doc() { common() { pkgdesc="PHP Common Files" depends="" - arch="noarch" cd "$srcdir"/php-$pkgver install -D -m644 php.ini-production "$subpkgdir"$_confdir/php.ini sed -i -e "s:^; extension_dir = \"./\":extension_dir = \"$_extdir\":" "$subpkgdir"/etc/php/php.ini @@ -398,7 +397,6 @@ embed() { pear() { pkgdesc="PHP Extension and Application Repository (PEAR)" depends="$pkgname-cli $pkgname-xml" - arch="noarch" mkdir -p "$subpkgdir"/usr/share "$subpkgdir"$_confdir \ "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/pecl \ diff --git a/main/protobuf/APKBUILD b/main/protobuf/APKBUILD index 2505919d0a..7507d8520a 100644 --- a/main/protobuf/APKBUILD +++ b/main/protobuf/APKBUILD @@ -44,7 +44,6 @@ vim() { pkgdesc="Vim syntax for $pkgname" depends="" install_if="$pkgname=$pkgver-r$pkgrel vim" - arch="noarch" install -Dm644 "$builddir"/editors/proto.vim \ "$subpkgdir"/usr/share/vim/vimfiles/syntax/proto.vim diff --git a/main/py-cffi/APKBUILD b/main/py-cffi/APKBUILD index 2f8b697404..e29053db45 100644 --- a/main/py-cffi/APKBUILD +++ b/main/py-cffi/APKBUILD @@ -17,7 +17,7 @@ builddir="$srcdir/$_pkgname-$pkgver" build() { cd "$builddir" python2 setup.py build || return 1 - python3 setup.py build || return 1 + python3 setup.py build || return 1 } package() { @@ -27,7 +27,6 @@ package() { _py() { local python="$1" pkgdesc="$pkgdesc ${python#python}" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/main/py-crypto/APKBUILD b/main/py-crypto/APKBUILD index ac0e09fde6..ea61c08765 100644 --- a/main/py-crypto/APKBUILD +++ b/main/py-crypto/APKBUILD @@ -6,7 +6,7 @@ pkgver=2.6.1 pkgrel=1 pkgdesc="A Python collection of cryptographic algorithms and protocols" url="https://www.dlitz.net/software/pycrypto/" -arch="noarch" +arch="all" license="BSD" depends="" makedepends="gmp-dev python2-dev python3-dev" @@ -31,7 +31,6 @@ package() { _py() { local python="$1" pkgdesc="$pkgdesc (for $python)" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/main/py-cryptography/APKBUILD b/main/py-cryptography/APKBUILD index d04ca0c10e..b63e02acbd 100644 --- a/main/py-cryptography/APKBUILD +++ b/main/py-cryptography/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.5.2 pkgrel=1 pkgdesc="A package which provides cryptographic recipes and primitives" url="http://pypi.python.org/pypi/cryptography" -arch="noarch" +arch="all" license="ASL-2.0" depends="py-cffi py-idna py-asn1 py-six" makedepends="python2-dev python3-dev py-setuptools libffi-dev libressl-dev" @@ -27,7 +27,6 @@ package() { _py() { local python="$1" pkgdesc="$pkgdesc (for $python)" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/main/py-curl/APKBUILD b/main/py-curl/APKBUILD index 9329e6aaa3..cec1ad6ba6 100644 --- a/main/py-curl/APKBUILD +++ b/main/py-curl/APKBUILD @@ -6,7 +6,7 @@ pkgver=7.43.0 pkgrel=0 pkgdesc="A Python interface to libcurl" url="http://pycurl.io/" -arch="noarch" +arch="all" license="LGPLv2+ MIT" depends="" makedepends="curl-dev python2-dev python3-dev py-setuptools" @@ -37,7 +37,6 @@ _py3() { _py() { local python="$1" pkgdesc="$pkgdesc (for $python)" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/main/py-ecdsa/APKBUILD b/main/py-ecdsa/APKBUILD index 61879d2fe0..c07aefb575 100644 --- a/main/py-ecdsa/APKBUILD +++ b/main/py-ecdsa/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.13 pkgrel=4 pkgdesc="A Python cryptographic signature library" url="http://github.com/warner/python-ecdsa" -arch="noarch" +arch="all" license="MIT" depends="" makedepends="python2-dev python3-dev py-setuptools" @@ -27,7 +27,6 @@ package() { _py() { local python="$1" pkgdesc="$pkgdesc (for $python)" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/main/py-gnome/APKBUILD b/main/py-gnome/APKBUILD index 941c1e0c0a..df2cb5a6ca 100644 --- a/main/py-gnome/APKBUILD +++ b/main/py-gnome/APKBUILD @@ -7,7 +7,7 @@ _basever=2.28 pkgrel=5 pkgdesc="Python interface to GNOME libraries" url="http://pygtk.org" -arch="noarch" +arch="all" license="LGPL" depends="$pkgname-bonobo $pkgname-gconf $pkgname-libgnome $pkgname-gnomevfs" depends_dev="gtk+2.0-dev libgnome-dev py-gobject-dev py-gtk-dev python2-dev" @@ -45,7 +45,6 @@ package() { bonobo() { pkgdesc="Python bindings for interfacing with Bonobo" - arch="noarch" depends="py-gtk $pkgname-gnomecanvas" cd "$_builddir" make -C bonobo DESTDIR="$subpkgdir" install || return 1 @@ -53,7 +52,6 @@ bonobo() { gconf() { pkgdesc="Python bindings for interfacing with GConf" - arch="all" depends="gconf py-gtk" cd "$_builddir" make -C gconf DESTDIR="$subpkgdir" install || return 1 @@ -68,7 +66,6 @@ gconf() { gnomevfs() { pkgdesc="Python bindings for interacting with gnome-vfs" - arch="all" depends="gnome-vfs" cd "$_builddir" make -C gnomevfs DESTDIR="$subpkgdir" install || return 1 @@ -76,7 +73,6 @@ gnomevfs() { libgnome() { pkgdesc="Python bindings for libgnome" - arch="all" depends="py-gtk $pkgname-bonobo $pkgname-gnomecanvas $pkgname-gnomevfs" cd "$_builddir" make -C gnome DESTDIR="$subpkgdir" install || return 1 diff --git a/main/py-libvirt/APKBUILD b/main/py-libvirt/APKBUILD index 432a5057ee..c1ff1245f8 100644 --- a/main/py-libvirt/APKBUILD +++ b/main/py-libvirt/APKBUILD @@ -5,7 +5,7 @@ pkgver=2.2.0 pkgrel=0 pkgdesc="The libvirt virtualization API python binding" url="http://libvirt.org" -arch="noarch" +arch="" license="LGPLv2+" depends="" makedepends="python2-dev python3-dev libvirt-dev" @@ -28,7 +28,6 @@ package() { _py() { local python="$1" pkgdesc="$pkgdesc (for $python)" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/main/py-lxml/APKBUILD b/main/py-lxml/APKBUILD index e44f828bf7..e6f3a06454 100644 --- a/main/py-lxml/APKBUILD +++ b/main/py-lxml/APKBUILD @@ -7,7 +7,7 @@ pkgver=3.6.4 pkgrel=0 pkgdesc="Python LXML Library" url="http://lxml.de/" -arch="noarch" +arch="all" license="BSD" depends="" makedepends="python2-dev python3-dev libxml2-dev libxslt-dev py-setuptools" @@ -37,7 +37,6 @@ _py3() { _py() { local python="$1" pkgdesc="$pkgdesc (for $python)" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/main/py-markupsafe/APKBUILD b/main/py-markupsafe/APKBUILD index 83be40c134..4790eb901c 100644 --- a/main/py-markupsafe/APKBUILD +++ b/main/py-markupsafe/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.23 pkgrel=3 pkgdesc="Implements a XML/HTML/XHTML Markup safe string" url="https://github.com/mitsuhiko/markupsafe" -arch="noarch" +arch="all" license="BSD" depends="" makedepends="python2-dev python3-dev py-setuptools" @@ -27,7 +27,6 @@ package() { _py() { local python="$1" pkgdesc="$pkgdesc (for $python)" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/main/py-psycopg2/APKBUILD b/main/py-psycopg2/APKBUILD index 397f759a33..2ce7811354 100644 --- a/main/py-psycopg2/APKBUILD +++ b/main/py-psycopg2/APKBUILD @@ -6,7 +6,7 @@ pkgver=2.6.2 pkgrel=1 pkgdesc="A Python-PostgreSQL Database Adapter" url="http://initd.org/psycopg/" -arch="noarch" +arch="all" license="LGPL2+" depends="" makedepends="postgresql-dev python2-dev python3-dev py-egenix-mx-base-dev" @@ -38,7 +38,6 @@ _py3() { _py() { local python="$1" pkgdesc="$pkgdesc (for $python)" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/main/py-simplejson/APKBUILD b/main/py-simplejson/APKBUILD index 3a8b94b380..1a43bfee7c 100644 --- a/main/py-simplejson/APKBUILD +++ b/main/py-simplejson/APKBUILD @@ -6,7 +6,7 @@ pkgver=3.8.2 pkgrel=1 pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python" url="http://pypi.python.org/pypi/simplejson/" -arch="noarch" +arch="all" license="MIT" depends="" makedepends="python2-dev python3-dev py-setuptools" @@ -40,7 +40,6 @@ _py3() { _py() { local python="$1" pkgdesc="$pkgdesc (for $python)" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/main/py-tornado/APKBUILD b/main/py-tornado/APKBUILD index 6099e29936..8cea067ce0 100644 --- a/main/py-tornado/APKBUILD +++ b/main/py-tornado/APKBUILD @@ -5,7 +5,7 @@ pkgver=4.4.2 pkgrel=0 pkgdesc="Python web framework and asynchronous networking library" url="http://www.tornadoweb.org/" -arch="noarch" +arch="all" license="ASL-2.0" depends="" makedepends="python2-dev python3-dev py-setuptools" @@ -36,7 +36,6 @@ _py3() { _py() { local python="$1" pkgdesc="$pkgdesc (for $python)" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/main/py-urwid/APKBUILD b/main/py-urwid/APKBUILD index aceb3203fa..5249abe687 100644 --- a/main/py-urwid/APKBUILD +++ b/main/py-urwid/APKBUILD @@ -32,14 +32,12 @@ package() { } examples() { - arch="noarch" # Put the examples into a seperate package mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/examples || return 1 mv "$_builddir"/examples "$subpkgdir"/usr/share/doc/"$pkgname"/examples || return 1 } doc() { - arch="noarch" cd "$_builddir" mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/ || return 1 mv "$_builddir"/docs_tmp "$subpkgdir"/usr/share/doc/"$pkgname"/manual || return 1 diff --git a/main/py-yaml/APKBUILD b/main/py-yaml/APKBUILD index ec095a56ac..3544756797 100644 --- a/main/py-yaml/APKBUILD +++ b/main/py-yaml/APKBUILD @@ -7,7 +7,7 @@ pkgver=3.12 pkgrel=0 pkgdesc="Python bindings for YAML" url="http://pyyaml.org" -arch="noarch" +arch="all" license="MIT" depends="" makedepends="python2-dev python3-dev yaml-dev" @@ -38,7 +38,6 @@ _py3() { _py() { local python="$1" pkgdesc="$pkgdesc (for $python)" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/main/py-zope-interface/APKBUILD b/main/py-zope-interface/APKBUILD index 6425b740cd..837b847bcd 100644 --- a/main/py-zope-interface/APKBUILD +++ b/main/py-zope-interface/APKBUILD @@ -5,7 +5,7 @@ pkgver=4.3.2 pkgrel=0 pkgdesc="Separate distribution of the zope.interface package used in Zope" url="http://www.zope.org/Products/ZopeInterface/" -arch="noarch" +arch="all" license="ZPL-2.1" depends="" makedepends="python2-dev python3-dev py-setuptools" @@ -39,7 +39,6 @@ _py3() { _py() { local python="$1" pkgdesc="$pkgdesc (for $python)" - arch="all" depends="$depends $python" install_if="$pkgname=$pkgver-r$pkgrel $python" diff --git a/main/python2-tkinter/APKBUILD b/main/python2-tkinter/APKBUILD index b642cc3b69..09fed5dd61 100644 --- a/main/python2-tkinter/APKBUILD +++ b/main/python2-tkinter/APKBUILD @@ -91,7 +91,6 @@ tests() { _idle() { pkgdesc="IDE for Python2 using Tkinter" - arch=noarch depends="$pkgname=$pkgver-r$pkgrel" cd "$pkgdir" _mv_files usr/bin diff --git a/main/python3/APKBUILD b/main/python3/APKBUILD index 27e3440047..a133f325e3 100644 --- a/main/python3/APKBUILD +++ b/main/python3/APKBUILD @@ -70,7 +70,6 @@ dev() { tests() { pkgdesc="The test modules from the main python package" - arch="noarch" cd "$pkgdir"/usr/lib/python$_basever local i; for i in */test */tests; do diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD index c386ec5bde..55980c6025 100644 --- a/main/ruby/APKBUILD +++ b/main/ruby/APKBUILD @@ -140,7 +140,6 @@ _rmgem() { rake() { pkgdesc="Ruby based make-like utility" depends="ruby" - arch="noarch" _mvgem rake || return 1 _mv usr/bin/rake } @@ -149,7 +148,6 @@ irb() { pkgdesc="The Interactive Ruby" replaces="ruby" depends="ruby" - arch="noarch" cd "$pkgdir" _mv usr/bin/irb \ usr/lib/ruby/$_abi/irb* @@ -158,7 +156,6 @@ irb() { rdoc() { pkgdesc="Ruby documentation tool" depends="ruby ruby-json" - arch="noarch" _mvgem rdoc || return 1 _mv usr/bin/ri \ usr/bin/rdoc @@ -167,7 +164,6 @@ rdoc() { bigdecimal() { pkgdesc="Ruby arbitrary-precision floating point decimal arithmetic" depends="ruby" - arch="noarch" _mvgem bigdecimal } @@ -182,7 +178,6 @@ io_console() { minitest() { pkgdesc="Ruby suite of testing facilities" depends="ruby" - arch="noarch" _mvgem minitest } diff --git a/main/spamassassin/APKBUILD b/main/spamassassin/APKBUILD index 31c3ffb390..e3fb27c572 100644 --- a/main/spamassassin/APKBUILD +++ b/main/spamassassin/APKBUILD @@ -6,7 +6,7 @@ pkgver=3.4.1 pkgrel=3 pkgdesc="The Powerful #1 Open-Source Spam Filter" url="http://search.cpan.org/dist/Mail-SpamAssassin/" -arch="noarch" +arch="all" license="apache_2_0" cpandepends="perl-html-parser perl-digest-sha1 perl-netaddr-ip perl-net-dns perl-mail-dkim perl-mime-base64 perl-db_file perl-time-hires perl-libwww" @@ -47,7 +47,6 @@ package() { } client() { - arch="all" depends="" pkgdesc="SpamAssassin client" mkdir -p "$subpkgdir"/usr/bin diff --git a/main/teeworlds/APKBUILD b/main/teeworlds/APKBUILD index 2e939240a1..7978f9ac53 100644 --- a/main/teeworlds/APKBUILD +++ b/main/teeworlds/APKBUILD @@ -33,7 +33,6 @@ server() { } common() { - arch=noarch cd $_builddir install -Dm644 license.txt \ "$subpkgdir"/usr/share/licenses/teeworlds/LICENSE || return 1 diff --git a/main/unbound/APKBUILD b/main/unbound/APKBUILD index 220ba24967..d42f2d120c 100644 --- a/main/unbound/APKBUILD +++ b/main/unbound/APKBUILD @@ -89,7 +89,6 @@ py() { migrate() { pkgdesc="Simple tool to migrate from dnscache to unbound" - arch="noarch" mkdir -p "$subpkgdir"/usr/bin/ install -m755 "$srcdir"/migrate-dnscache-to-unbound \ "$subpkgdir"/usr/bin/ diff --git a/main/util-linux/APKBUILD b/main/util-linux/APKBUILD index b5c5b6af58..be7cc9809c 100644 --- a/main/util-linux/APKBUILD +++ b/main/util-linux/APKBUILD @@ -85,7 +85,6 @@ bashcomp() { depends="" pkgdesc="Bash completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - arch="noarch" mkdir -p "$subpkgdir"/usr/share/ mv "$pkgdir"/usr/share/bash-completion \ diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD index fb10205758..daf40d63f2 100644 --- a/main/vim/APKBUILD +++ b/main/vim/APKBUILD @@ -51,7 +51,6 @@ package() { vimdiff() { pkgdesc="view file diffs in vim" - arch="noarch" depends="diffutils" install -d "$subpkgdir"/usr/bin || return 1 diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD index 412e4d03e4..e6db955624 100644 --- a/main/vlc/APKBUILD +++ b/main/vlc/APKBUILD @@ -273,7 +273,6 @@ xorg() { daemon() { pkgdesc="Support for running VLC as a daemon" install="vlc-daemon.pre-install" - arch="noarch" depends="vlc=$pkgver-r$pkgrel" mkdir -p "$subpkgdir" diff --git a/main/zabbix/APKBUILD b/main/zabbix/APKBUILD index 20618257ff..1d409daa60 100644 --- a/main/zabbix/APKBUILD +++ b/main/zabbix/APKBUILD @@ -128,7 +128,6 @@ package() { } setup() { - arch="noarch" pkgdesc="Zabbix images and sql files" depends= mkdir -p "$subpkgdir"/usr/share/zabbix/ || return 1 @@ -170,7 +169,6 @@ utils() { } webif() { - arch="noarch" pkgdesc="Zabbix web-interface" depends="$_php_depends" _wwwdir="$subpkgdir"/usr/share/webapps/zabbix diff --git a/main/zsh/APKBUILD b/main/zsh/APKBUILD index db8bcd3764..65f80ffb79 100644 --- a/main/zsh/APKBUILD +++ b/main/zsh/APKBUILD @@ -103,7 +103,6 @@ doc() { calendar() { pkgdesc="Calendar Function System for ZSH" - arch="noarch" depends="$pkgname" _submv $_sharedir/functions/Calendar @@ -111,7 +110,6 @@ calendar() { vcs() { pkgdesc="Version Control Information module for ZSH (vcs_info)" - arch="noarch" depends="$pkgname" _submv $_sharedir/functions/VCS_Info @@ -128,7 +126,6 @@ zftp() { _completion() { local name="${subpkgname%-zsh-completion}" pkgdesc="Zsh completions for $name" - arch="noarch" depends="$pkgname" install_if="$pkgname=$pkgver-r$pkgrel $name" |