aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2015-09-30 16:28:24 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2015-10-03 13:19:51 +0200
commit53679caf4fa9cfa393975176fe5d544dfd4e5ce6 (patch)
tree4cdd26b350b65184584140710439cb89403ef51f
parent4ef580f1c1122584303ea30ff9e5725efe426fa9 (diff)
downloadaports-53679caf4fa9cfa393975176fe5d544dfd4e5ce6.tar.bz2
aports-53679caf4fa9cfa393975176fe5d544dfd4e5ce6.tar.xz
don't prefix GPL version number with a dash
This conforms to wiki documentation regarding package creation: http://wiki.alpinelinux.org/wiki/Creating_an_Alpine_package#license
-rw-r--r--main/acf-alpine-baselayout/APKBUILD2
-rw-r--r--main/acf-alpine-conf/APKBUILD2
-rw-r--r--main/acf-amavisd-new/APKBUILD2
-rw-r--r--main/acf-apk-tools/APKBUILD2
-rw-r--r--main/acf-asterisk/APKBUILD2
-rw-r--r--main/acf-awall/APKBUILD2
-rw-r--r--main/acf-chrony/APKBUILD2
-rw-r--r--main/acf-clamav/APKBUILD2
-rw-r--r--main/acf-clamsmtp/APKBUILD2
-rw-r--r--main/acf-core/APKBUILD2
-rw-r--r--main/acf-dansguardian/APKBUILD2
-rw-r--r--main/acf-db/APKBUILD2
-rw-r--r--main/acf-dhcp/APKBUILD2
-rw-r--r--main/acf-dnscache/APKBUILD2
-rw-r--r--main/acf-dnsmasq/APKBUILD2
-rw-r--r--main/acf-dovecot/APKBUILD2
-rw-r--r--main/acf-fetchmail/APKBUILD2
-rw-r--r--main/acf-freeradius3/APKBUILD2
-rw-r--r--main/acf-freeswitch-vmail/APKBUILD2
-rw-r--r--main/acf-freeswitch/APKBUILD2
-rw-r--r--main/acf-gross/APKBUILD2
-rw-r--r--main/acf-heimdal/APKBUILD2
-rw-r--r--main/acf-iproute2-qos/APKBUILD2
-rw-r--r--main/acf-ipsec-tools/APKBUILD2
-rw-r--r--main/acf-iptables/APKBUILD2
-rw-r--r--main/acf-jquery/APKBUILD2
-rw-r--r--main/acf-kamailio/APKBUILD2
-rw-r--r--main/acf-lib/APKBUILD2
-rw-r--r--main/acf-lighttpd/APKBUILD2
-rw-r--r--main/acf-lvm2/APKBUILD2
-rw-r--r--main/acf-mariadb/APKBUILD2
-rw-r--r--main/acf-mdadm/APKBUILD2
-rw-r--r--main/acf-openldap/APKBUILD2
-rw-r--r--main/acf-opennhrp/APKBUILD2
-rw-r--r--main/acf-openntpd/APKBUILD2
-rw-r--r--main/acf-openssh/APKBUILD2
-rw-r--r--main/acf-openssl/APKBUILD2
-rw-r--r--main/acf-openvpn/APKBUILD2
-rw-r--r--main/acf-pingu/APKBUILD2
-rw-r--r--main/acf-postfix/APKBUILD2
-rw-r--r--main/acf-postgresql/APKBUILD2
-rw-r--r--main/acf-ppp/APKBUILD2
-rw-r--r--main/acf-provisioning/APKBUILD2
-rw-r--r--main/acf-quagga/APKBUILD2
-rw-r--r--main/acf-samba/APKBUILD2
-rw-r--r--main/acf-skins/APKBUILD2
-rw-r--r--main/acf-snort/APKBUILD2
-rw-r--r--main/acf-squid/APKBUILD2
-rw-r--r--main/acf-tcpproxy/APKBUILD2
-rw-r--r--main/acf-tinydns/APKBUILD2
-rw-r--r--main/acf-unbound/APKBUILD2
-rw-r--r--main/acf-vlc-daemon/APKBUILD2
-rw-r--r--main/acf-weblog/APKBUILD2
-rw-r--r--main/apk-cron/APKBUILD2
-rw-r--r--main/apk-tools/APKBUILD2
-rw-r--r--main/busybox-initscripts/APKBUILD2
-rw-r--r--main/busybox/APKBUILD2
-rw-r--r--main/daq/APKBUILD2
-rw-r--r--main/distcc/APKBUILD2
-rw-r--r--main/dnsmasq/APKBUILD2
-rw-r--r--main/eggdrop/APKBUILD2
-rw-r--r--main/espeak/APKBUILD2
-rw-r--r--main/exo/APKBUILD2
-rw-r--r--main/fastjar/APKBUILD2
-rw-r--r--main/garcon/APKBUILD2
-rw-r--r--main/gdnsd/APKBUILD2
-rw-r--r--main/gpicview/APKBUILD2
-rw-r--r--main/gtk-xfce-engine/APKBUILD2
-rw-r--r--main/installkernel/APKBUILD2
-rw-r--r--main/libaio/APKBUILD2
-rw-r--r--main/libc0.9.32/APKBUILD2
-rw-r--r--main/libfprint/APKBUILD2
-rw-r--r--main/libnetfilter_acct/APKBUILD2
-rw-r--r--main/libnetfilter_conntrack/APKBUILD2
-rw-r--r--main/libnetfilter_log/APKBUILD2
-rw-r--r--main/libnfnetlink/APKBUILD2
-rw-r--r--main/libnftnl/APKBUILD2
-rw-r--r--main/libspf2/APKBUILD2
-rw-r--r--main/libxfce4util/APKBUILD2
-rw-r--r--main/linux-grsec/APKBUILD2
-rw-r--r--main/linux-headers/APKBUILD2
-rw-r--r--main/linux-rpi/APKBUILD2
-rw-r--r--main/linux-vanilla/APKBUILD2
-rw-r--r--main/lua-json4/APKBUILD2
-rw-r--r--main/lua-xctrl/APKBUILD2
-rw-r--r--main/mdadm/APKBUILD2
-rw-r--r--main/mkinitfs/APKBUILD2
-rw-r--r--main/mpc1/APKBUILD2
-rw-r--r--main/multisort/APKBUILD2
-rw-r--r--main/nagios-plugins/APKBUILD2
-rw-r--r--main/nagios/APKBUILD2
-rw-r--r--main/newt/APKBUILD2
-rw-r--r--main/nftables/APKBUILD2
-rw-r--r--main/nspr/APKBUILD2
-rw-r--r--main/open-iscsi/APKBUILD2
-rw-r--r--main/openjdk7/APKBUILD2
-rw-r--r--main/opennhrp/APKBUILD2
-rw-r--r--main/orage/APKBUILD2
-rw-r--r--main/paxctl/APKBUILD2
-rw-r--r--main/perl/APKBUILD2
-rw-r--r--main/pflogsumm/APKBUILD2
-rw-r--r--main/pth/APKBUILD2
-rw-r--r--main/qemu/APKBUILD2
-rw-r--r--main/quagga-nhrp/APKBUILD2
-rw-r--r--main/quagga/APKBUILD2
-rw-r--r--main/racktables/APKBUILD2
-rw-r--r--main/ristretto/APKBUILD2
-rw-r--r--main/rsyslog/APKBUILD2
-rw-r--r--main/scstadmin/APKBUILD2
-rw-r--r--main/shorewall-core/APKBUILD2
-rw-r--r--main/shorewall/APKBUILD2
-rw-r--r--main/shorewall6/APKBUILD2
-rw-r--r--main/sircbot/APKBUILD2
-rw-r--r--main/slim/APKBUILD2
-rw-r--r--main/sntpc/APKBUILD2
-rw-r--r--main/squark/APKBUILD2
-rw-r--r--main/squid/APKBUILD2
-rw-r--r--main/ssmtp/APKBUILD2
-rw-r--r--main/strongswan/APKBUILD2
-rw-r--r--main/uwsgi/APKBUILD2
-rw-r--r--main/xfce4-appfinder/APKBUILD2
-rw-r--r--main/xfce4-battery-plugin/APKBUILD2
-rw-r--r--main/xfce4-panel/APKBUILD2
-rw-r--r--main/xfce4-settings/APKBUILD2
-rw-r--r--main/xfce4-taskmanager/APKBUILD2
-rw-r--r--main/xfce4-terminal/APKBUILD2
-rw-r--r--main/xfconf/APKBUILD2
-rw-r--r--main/xfdesktop/APKBUILD2
-rw-r--r--main/xfwm4/APKBUILD2
-rw-r--r--testing/acf-jquery-mobile/APKBUILD2
-rw-r--r--testing/acf-skins-jqmobile/APKBUILD2
-rw-r--r--testing/apts/APKBUILD2
-rw-r--r--testing/buildbot-slave/APKBUILD2
-rw-r--r--testing/dspam/APKBUILD2
-rw-r--r--testing/gnump3d/APKBUILD2
-rw-r--r--testing/hardinfo/APKBUILD2
-rw-r--r--testing/kbuild/APKBUILD2
-rw-r--r--testing/lightdm/APKBUILD2
-rw-r--r--testing/lua5.2-json4/APKBUILD2
-rw-r--r--testing/lua5.2-xctrl/APKBUILD2
-rw-r--r--testing/lusca/APKBUILD2
-rw-r--r--testing/madwimax/APKBUILD2
-rw-r--r--testing/postler/APKBUILD2
-rw-r--r--testing/ruby-mime-types/APKBUILD2
-rw-r--r--testing/scummvm/APKBUILD2
-rw-r--r--unmaintained/fotoxx/APKBUILD2
-rw-r--r--unmaintained/libsyncml/APKBUILD2
-rw-r--r--unmaintained/wifidog/APKBUILD2
148 files changed, 148 insertions, 148 deletions
diff --git a/main/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD
index 17536e76cb..8282927dfb 100644
--- a/main/acf-alpine-baselayout/APKBUILD
+++ b/main/acf-alpine-baselayout/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for alpine-baselayout"
url="http://git.alpinelinux.org/cgit/acf-alpine-baselayout"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua lua-json4 lua-posix"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-alpine-conf/APKBUILD b/main/acf-alpine-conf/APKBUILD
index 3c27241b43..87cfe0bbf5 100644
--- a/main/acf-alpine-conf/APKBUILD
+++ b/main/acf-alpine-conf/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for alpine-conf"
url="http://git.alpinelinux.org/cgit/acf-alpine-conf"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua lua-posix openssl"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-amavisd-new/APKBUILD b/main/acf-amavisd-new/APKBUILD
index 7902891fcc..5d47dcff3a 100644
--- a/main/acf-amavisd-new/APKBUILD
+++ b/main/acf-amavisd-new/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="ACF module for amavis"
url="http://git.alpinelinux.org/cgit/acf-amavisd-new"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua amavisd-new"
makedepends=""
install=
diff --git a/main/acf-apk-tools/APKBUILD b/main/acf-apk-tools/APKBUILD
index a39a7838ae..4d7796b98a 100644
--- a/main/acf-apk-tools/APKBUILD
+++ b/main/acf-apk-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="ACF module for apk"
url="http://git.alpinelinux.org/cgit/acf-apk-tools"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua lua-posix apk-tools"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-asterisk/APKBUILD b/main/acf-asterisk/APKBUILD
index 91ab744519..9360b98b7f 100644
--- a/main/acf-asterisk/APKBUILD
+++ b/main/acf-asterisk/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for asterisk"
url="http://git.alpinelinux.org/cgit/acf-asterisk"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua asterisk"
makedepends=""
install=
diff --git a/main/acf-awall/APKBUILD b/main/acf-awall/APKBUILD
index b186e3dcf1..b52b7378ec 100644
--- a/main/acf-awall/APKBUILD
+++ b/main/acf-awall/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="ACF for Alpine Wall"
url="http://git.alpinelinux.org/cgit/acf-awall"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua awall"
makedepends=""
install=
diff --git a/main/acf-chrony/APKBUILD b/main/acf-chrony/APKBUILD
index 247f48f250..b3f9a7bf7a 100644
--- a/main/acf-chrony/APKBUILD
+++ b/main/acf-chrony/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for chrony"
url="http://git.alpinelinux.org/cgit/acf-chrony"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua lua-posix chrony"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-clamav/APKBUILD b/main/acf-clamav/APKBUILD
index b4e14a439f..2ddd320dfe 100644
--- a/main/acf-clamav/APKBUILD
+++ b/main/acf-clamav/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for clamav"
url="http://git.alpinelinux.org/cgit/acf-clamav"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua clamav"
makedepends=""
install=
diff --git a/main/acf-clamsmtp/APKBUILD b/main/acf-clamsmtp/APKBUILD
index b3db2c1e3e..caf37f5fe4 100644
--- a/main/acf-clamsmtp/APKBUILD
+++ b/main/acf-clamsmtp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for clamsmtp"
url="http://git.alpinelinux.org/cgit/acf-clamsmtp"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua clamsmtp"
makedepends=""
install=
diff --git a/main/acf-core/APKBUILD b/main/acf-core/APKBUILD
index 1a21e016b1..ae22cd0683 100644
--- a/main/acf-core/APKBUILD
+++ b/main/acf-core/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface framework"
url="http://git.alpinelinux.org/cgit/acf-core"
arch="noarch"
-license="GPL-2"
+license="GPL2"
install="$pkgname.post-upgrade"
depends="acf-jquery acf-lib acf-skins haserl-lua$_luaversion lua$_luaversion
lua$_luaversion-posix lua$_luaversion-md5 lua$_luaversion-json4
diff --git a/main/acf-dansguardian/APKBUILD b/main/acf-dansguardian/APKBUILD
index 371d38403d..43abc3ca48 100644
--- a/main/acf-dansguardian/APKBUILD
+++ b/main/acf-dansguardian/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for dansguardian"
url="http://git.alpinelinux.org/cgit/acf-dansguardian"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua dansguardian"
makedepends=""
install=
diff --git a/main/acf-db/APKBUILD b/main/acf-db/APKBUILD
index a80706f61d..9155a22dd6 100644
--- a/main/acf-db/APKBUILD
+++ b/main/acf-db/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for databases"
url="http://git.alpinelinux.org/cgit/acf-db"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua acf-db-lib"
makedepends=""
install=
diff --git a/main/acf-dhcp/APKBUILD b/main/acf-dhcp/APKBUILD
index 988256dc11..d49630b91c 100644
--- a/main/acf-dhcp/APKBUILD
+++ b/main/acf-dhcp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for dhcp"
url="http://git.alpinelinux.org/cgit/acf-dhcp"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua dhcp"
makedepends=""
install=
diff --git a/main/acf-dnscache/APKBUILD b/main/acf-dnscache/APKBUILD
index 45a6dbe7f4..2e2fc63e1d 100644
--- a/main/acf-dnscache/APKBUILD
+++ b/main/acf-dnscache/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for dnscache"
url="http://git.alpinelinux.org/cgit/acf-dnscache"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua lua-posix dnscache"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-dnsmasq/APKBUILD b/main/acf-dnsmasq/APKBUILD
index 0ee3f940ab..02cbc23498 100644
--- a/main/acf-dnsmasq/APKBUILD
+++ b/main/acf-dnsmasq/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for dnsmasq"
url="http://git.alpinelinux.org/cgit/acf-dnsmasq"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua dnsmasq"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-dovecot/APKBUILD b/main/acf-dovecot/APKBUILD
index af4b0b7c7f..88f7ee5804 100644
--- a/main/acf-dovecot/APKBUILD
+++ b/main/acf-dovecot/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for dovecot"
url="http://git.alpinelinux.org/cgit/acf-dovecot"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua dovecot"
makedepends=""
install=
diff --git a/main/acf-fetchmail/APKBUILD b/main/acf-fetchmail/APKBUILD
index 6a1fdef71d..e5ad60bda5 100644
--- a/main/acf-fetchmail/APKBUILD
+++ b/main/acf-fetchmail/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for fetchmail"
url="http://git.alpinelinux.org/cgit/acf-fetchmail"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua fetchmail"
makedepends=""
install=
diff --git a/main/acf-freeradius3/APKBUILD b/main/acf-freeradius3/APKBUILD
index 38c83f22b5..b5a66bf612 100644
--- a/main/acf-freeradius3/APKBUILD
+++ b/main/acf-freeradius3/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="ACF for freeradius 3"
url="http://git.alpinelinux.org/cgit/acf-freeradius3"
arch="all"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua freeradius3"
makedepends=""
install=
diff --git a/main/acf-freeswitch-vmail/APKBUILD b/main/acf-freeswitch-vmail/APKBUILD
index 9ab4a44927..13cca1fe71 100644
--- a/main/acf-freeswitch-vmail/APKBUILD
+++ b/main/acf-freeswitch-vmail/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="ACF for a web interface for freeswitch voicemail"
url="http://git.alpinelinux.org/cgit/$pkgname"
arch="all"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua lua-sql-sqlite3 lua-socket freeswitch"
makedepends=""
install="$pkgname.post-upgrade"
diff --git a/main/acf-freeswitch/APKBUILD b/main/acf-freeswitch/APKBUILD
index eb13368a80..fd0777ca0f 100644
--- a/main/acf-freeswitch/APKBUILD
+++ b/main/acf-freeswitch/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="ACF for freeswitch"
url="http://git.alpinelinux.org/cgit/acf-freeswitch"
arch="all"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua freeswitch"
makedepends=""
install=
diff --git a/main/acf-gross/APKBUILD b/main/acf-gross/APKBUILD
index df7b525ee2..2a1465ae82 100644
--- a/main/acf-gross/APKBUILD
+++ b/main/acf-gross/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for gross"
url="http://git.alpinelinux.org/cgit/acf-gross"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua gross"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-heimdal/APKBUILD b/main/acf-heimdal/APKBUILD
index 57a367ec77..ccb3c0797e 100644
--- a/main/acf-heimdal/APKBUILD
+++ b/main/acf-heimdal/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="ACF module for heimdal"
url="http://git.alpinelinux.org/cgit/$pkgname"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua heimdal"
makedepends=""
install=
diff --git a/main/acf-iproute2-qos/APKBUILD b/main/acf-iproute2-qos/APKBUILD
index 8c97351433..1676226bff 100644
--- a/main/acf-iproute2-qos/APKBUILD
+++ b/main/acf-iproute2-qos/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="ACF module for iproute2-qos"
url="http://git.alpinelinux.org/cgit/$pkgname"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua iproute2-qos acf-alpine-baselayout>=0.5.7"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-ipsec-tools/APKBUILD b/main/acf-ipsec-tools/APKBUILD
index f091bbd066..96c82ecfde 100644
--- a/main/acf-ipsec-tools/APKBUILD
+++ b/main/acf-ipsec-tools/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for ipsec-tools"
url="http://git.alpinelinux.org/cgit/acf-ipsec-tools"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua ipsec-tools"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-iptables/APKBUILD b/main/acf-iptables/APKBUILD
index 25b0c0aaf4..0babbc9f9b 100644
--- a/main/acf-iptables/APKBUILD
+++ b/main/acf-iptables/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for iptables"
url="http://git.alpinelinux.org/cgit/acf-iptables"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua iptables"
makedepends=""
install=
diff --git a/main/acf-jquery/APKBUILD b/main/acf-jquery/APKBUILD
index 45a634b54f..52efe4cdd2 100644
--- a/main/acf-jquery/APKBUILD
+++ b/main/acf-jquery/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="jquery libraries for ACF"
url="http://git.alpinelinux.org/cgit/acf-jquery"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends=""
replaces="acf-core"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-kamailio/APKBUILD b/main/acf-kamailio/APKBUILD
index ddcbadeec7..581caf2c06 100644
--- a/main/acf-kamailio/APKBUILD
+++ b/main/acf-kamailio/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for kamailio"
url="http://git.alpinelinux.org/cgit/acf-kamailio"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua kamailio acf-db-lib"
makedepends="acf-db-lib"
install=
diff --git a/main/acf-lib/APKBUILD b/main/acf-lib/APKBUILD
index dc77f1036a..f4f882cab8 100644
--- a/main/acf-lib/APKBUILD
+++ b/main/acf-lib/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Lua libraries for ACF"
url="http://git.alpinelinux.org/cgit/acf-lib"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="lua-subprocess"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-lighttpd/APKBUILD b/main/acf-lighttpd/APKBUILD
index 10ba8437ac..46222f0979 100644
--- a/main/acf-lighttpd/APKBUILD
+++ b/main/acf-lighttpd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for lighttpd"
url="http://git.alpinelinux.org/cgit/acf-lighttpd"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua lighttpd"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-lvm2/APKBUILD b/main/acf-lvm2/APKBUILD
index 03ff3c4f9c..ce7447c839 100644
--- a/main/acf-lvm2/APKBUILD
+++ b/main/acf-lvm2/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="ACF module for lvm2"
url="http://git.alpinelinux.org/cgit/$pkgname"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua lvm2"
makedepends=""
install=
diff --git a/main/acf-mariadb/APKBUILD b/main/acf-mariadb/APKBUILD
index e68909c8f9..f6e78d21f7 100644
--- a/main/acf-mariadb/APKBUILD
+++ b/main/acf-mariadb/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="ACF module for mariadb"
url="http://git.alpinelinux.org/cgit/$pkgname"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua mariadb mariadb-client lua-sql-mysql acf-db-lib"
makedepends="acf-db-lib"
install=
diff --git a/main/acf-mdadm/APKBUILD b/main/acf-mdadm/APKBUILD
index 259abdb85d..0b7e322fff 100644
--- a/main/acf-mdadm/APKBUILD
+++ b/main/acf-mdadm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="ACF module for mdadm"
url="http://git.alpinelinux.org/cgit/$pkgname"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua mdadm"
makedepends=""
install=
diff --git a/main/acf-openldap/APKBUILD b/main/acf-openldap/APKBUILD
index 71ebe23f68..89457a2c4f 100644
--- a/main/acf-openldap/APKBUILD
+++ b/main/acf-openldap/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="ACF module for OpenLDAP"
url="http://git.alpinelinux.org/cgit/alacerda/$pkgname/"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua openldap openldap-back-bdb"
depends_dev=""
makedepends="$depends_dev"
diff --git a/main/acf-opennhrp/APKBUILD b/main/acf-opennhrp/APKBUILD
index 4b94407a56..c326b3cb23 100644
--- a/main/acf-opennhrp/APKBUILD
+++ b/main/acf-opennhrp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for opennhrp"
url="http://git.alpinelinux.org/cgit/acf-opennhrp"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua lua-posix opennhrp"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-openntpd/APKBUILD b/main/acf-openntpd/APKBUILD
index a4e0443569..94ce468d60 100644
--- a/main/acf-openntpd/APKBUILD
+++ b/main/acf-openntpd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for openntpd"
url="http://git.alpinelinux.org/cgit/acf-openntpd"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua openntpd"
makedepends=""
install=
diff --git a/main/acf-openssh/APKBUILD b/main/acf-openssh/APKBUILD
index a4704ca653..9dee78d630 100644
--- a/main/acf-openssh/APKBUILD
+++ b/main/acf-openssh/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for openssh"
url="http://git.alpinelinux.org/cgit/acf-openssh"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua openssh"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-openssl/APKBUILD b/main/acf-openssl/APKBUILD
index 9facd929f0..cc74dd2fa5 100644
--- a/main/acf-openssl/APKBUILD
+++ b/main/acf-openssl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for openssl"
url="http://git.alpinelinux.org/cgit/acf-openssl"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua openssl"
makedepends=""
install=
diff --git a/main/acf-openvpn/APKBUILD b/main/acf-openvpn/APKBUILD
index 33ae18bee9..7bac2b422c 100644
--- a/main/acf-openvpn/APKBUILD
+++ b/main/acf-openvpn/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for openvpn"
url="http://git.alpinelinux.org/cgit/acf-openvpn"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua openvpn"
makedepends=""
install=
diff --git a/main/acf-pingu/APKBUILD b/main/acf-pingu/APKBUILD
index 427263ffba..268ba93926 100644
--- a/main/acf-pingu/APKBUILD
+++ b/main/acf-pingu/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for pingu"
url="http://git.alpinelinux.org/cgit/acf-pingu"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua pingu"
makedepends=""
install=
diff --git a/main/acf-postfix/APKBUILD b/main/acf-postfix/APKBUILD
index e3a8c297ff..ff889844b4 100644
--- a/main/acf-postfix/APKBUILD
+++ b/main/acf-postfix/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for postfix"
url="http://git.alpinelinux.org/cgit/acf-postfix"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua postfix"
makedepends=""
install=
diff --git a/main/acf-postgresql/APKBUILD b/main/acf-postgresql/APKBUILD
index 68f7e18caa..4de14b9951 100644
--- a/main/acf-postgresql/APKBUILD
+++ b/main/acf-postgresql/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="ACF module for postgresql"
url="http://git.alpinelinux.org/cgit/$pkgname"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua postgresql acf-db-lib lua-sql-postgres"
makedepends="acf-db-lib"
install=
diff --git a/main/acf-ppp/APKBUILD b/main/acf-ppp/APKBUILD
index e311f14f6c..8ccb84ce73 100644
--- a/main/acf-ppp/APKBUILD
+++ b/main/acf-ppp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for ppp"
url="http://git.alpinelinux.org/cgit/acf-ppp"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua ppp"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-provisioning/APKBUILD b/main/acf-provisioning/APKBUILD
index 23b7bf8c82..c1e89eff85 100644
--- a/main/acf-provisioning/APKBUILD
+++ b/main/acf-provisioning/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="ACF for provisioning templated configs to devices"
url="http://git.alpinelinux.org/cgit/acf-provisioning"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua lua-sql-postgres postgresql-client lua-posixtz"
makedepends=""
install=""
diff --git a/main/acf-quagga/APKBUILD b/main/acf-quagga/APKBUILD
index 977ed544a6..fd7f57b658 100644
--- a/main/acf-quagga/APKBUILD
+++ b/main/acf-quagga/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for quagga"
url="http://git.alpinelinux.org/cgit/acf-quagga"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua quagga"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-samba/APKBUILD b/main/acf-samba/APKBUILD
index e5f9dd8384..f82cf203a0 100644
--- a/main/acf-samba/APKBUILD
+++ b/main/acf-samba/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for samba"
url="http://git.alpinelinux.org/cgit/acf-samba"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua samba"
makedepends=""
install=
diff --git a/main/acf-skins/APKBUILD b/main/acf-skins/APKBUILD
index 737e88b48d..c1573b438a 100644
--- a/main/acf-skins/APKBUILD
+++ b/main/acf-skins/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Skins for ACF"
url="http://git.alpinelinux.org/cgit/acf-skins"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends=""
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-snort/APKBUILD b/main/acf-snort/APKBUILD
index cc3731056d..51d7c3ba6f 100644
--- a/main/acf-snort/APKBUILD
+++ b/main/acf-snort/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for snort"
url="http://git.alpinelinux.org/cgit/acf-snort"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua snort"
makedepends=""
install=
diff --git a/main/acf-squid/APKBUILD b/main/acf-squid/APKBUILD
index ab1bd0d1e5..be6d959222 100644
--- a/main/acf-squid/APKBUILD
+++ b/main/acf-squid/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for squid"
url="http://git.alpinelinux.org/cgit/acf-squid"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua squid"
makedepends=""
install=
diff --git a/main/acf-tcpproxy/APKBUILD b/main/acf-tcpproxy/APKBUILD
index d3c30f87d9..dba6b7b001 100644
--- a/main/acf-tcpproxy/APKBUILD
+++ b/main/acf-tcpproxy/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for tcpproxy"
url="http://git.alpinelinux.org/cgit/acf-tcpproxy"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua tcpproxy"
makedepends=""
install=
diff --git a/main/acf-tinydns/APKBUILD b/main/acf-tinydns/APKBUILD
index 82fce53afd..1e2506a871 100644
--- a/main/acf-tinydns/APKBUILD
+++ b/main/acf-tinydns/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for tinydns"
url="http://git.alpinelinux.org/cgit/acf-tinydns"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua tinydns"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-unbound/APKBUILD b/main/acf-unbound/APKBUILD
index fb8921d1a0..aa0e882e88 100644
--- a/main/acf-unbound/APKBUILD
+++ b/main/acf-unbound/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for unbound"
url="http://git.alpinelinux.org/cgit/$pkgname"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua unbound"
replaces=""
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/main/acf-vlc-daemon/APKBUILD b/main/acf-vlc-daemon/APKBUILD
index 7c26f9b064..5952fb1fa1 100644
--- a/main/acf-vlc-daemon/APKBUILD
+++ b/main/acf-vlc-daemon/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A web-based system administration interface for vlc"
url="http://git.alpinelinux.org/cgit/acf-vlc-daemon"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua vlc-daemon"
depends_dev=""
makedepends="$depends_dev"
diff --git a/main/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD
index aab002cfc1..92f8a58f0e 100644
--- a/main/acf-weblog/APKBUILD
+++ b/main/acf-weblog/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="ACF for web proxy (squid and dansguardian) logfiles"
url="http://git.alpinelinux.org/cgit/acf-weblog"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-core lua lua-sql-postgres wget postgresql-client lua-subprocess"
makedepends=""
install="$pkgname.post-upgrade"
diff --git a/main/apk-cron/APKBUILD b/main/apk-cron/APKBUILD
index 7c085f99b9..05bbff6823 100644
--- a/main/apk-cron/APKBUILD
+++ b/main/apk-cron/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Periodic software updates"
url=http://git.alpinelinux.org/cgit/aports/tree/testing/apk-cron
arch=noarch
-license=GPL-2
+license=GPL2
depends=apk-tools
source=apk
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 2d3c43a15f..b061647b08 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -18,7 +18,7 @@ source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
url="http://git.alpinelinux.org/cgit/apk-tools/"
arch="all"
-license=GPL-2
+license=GPL2
_builddir="$srcdir/$pkgname-$pkgver"
prepare() {
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index 24cbfd193a..39c2fe78ac 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Init scripts for busybox daemons"
url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="busybox"
makedepends=""
install=$pkgname.post-install
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 1f810f8752..c54854083c 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=9
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url=http://busybox.net
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
makedepends="linux-headers"
install="$pkgname.post-install $pkgname.post-upgrade"
diff --git a/main/daq/APKBUILD b/main/daq/APKBUILD
index 622e840081..281dcfc21d 100644
--- a/main/daq/APKBUILD
+++ b/main/daq/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Data Acquisition library - packet I/O library"
url="http://www.snort.org/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
makedepends="libpcap-dev flex bison"
install=""
diff --git a/main/distcc/APKBUILD b/main/distcc/APKBUILD
index e6a05f4cdf..ea0198fb64 100644
--- a/main/distcc/APKBUILD
+++ b/main/distcc/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=9
pkgdesc="A distributed C, C++, Obj C compiler"
url="http://distcc.org"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
makedepends="popt-dev python-dev"
source="http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index 4c0706650b..40477bdf0e 100644
--- a/main/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Small forwarding DNS server"
url="http://www.thekelleys.org.uk/dnsmasq/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
makedepends="linux-headers"
install="$pkgname.pre-install $pkgname.pre-upgrade"
diff --git a/main/eggdrop/APKBUILD b/main/eggdrop/APKBUILD
index c3391c1e54..ce58ddc3d1 100644
--- a/main/eggdrop/APKBUILD
+++ b/main/eggdrop/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
pkgdesc="World's most popular Open Source IRC bot"
url="http://www.eggheads.org/"
arch="all"
-license='GPL-2'
+license='GPL2'
depends="tcl"
makedepends="tcl-dev !bind-libs"
install=
diff --git a/main/espeak/APKBUILD b/main/espeak/APKBUILD
index 1a3e521749..c94e503ac6 100644
--- a/main/espeak/APKBUILD
+++ b/main/espeak/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Speech synthesizer for English and other languages"
url="http://espeak.sourceforge.net/"
arch="all"
-license="GPL-3"
+license="GPL3"
subpackages="$pkgname-dev"
depends=
makedepends=
diff --git a/main/exo/APKBUILD b/main/exo/APKBUILD
index 8ee4fb9e6e..ab5d794d24 100644
--- a/main/exo/APKBUILD
+++ b/main/exo/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Extensions to Xfce by os-cillation"
url="http://www.os-cillation.com/article.php?sid=40"
arch="all"
-license="GPL-2 LGPL-2"
+license="GPL2 LGPL-2"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
depends="hicolor-icon-theme"
depends_dev="gtk+2.0-dev libxfce4util-dev"
diff --git a/main/fastjar/APKBUILD b/main/fastjar/APKBUILD
index 6faf5840a1..31cc92a136 100644
--- a/main/fastjar/APKBUILD
+++ b/main/fastjar/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="A fast implementation of Java Archiver"
url="http://savannah.nongnu.org/projects/fastjar"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
makedepends="zlib-dev"
install=""
diff --git a/main/garcon/APKBUILD b/main/garcon/APKBUILD
index bd0c111cd0..23af32e9ef 100644
--- a/main/garcon/APKBUILD
+++ b/main/garcon/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="a freedesktop.org compliant menu implementation based on GLib and GIO"
url="http://www.xfce.org/"
arch="all"
-license="GPL-2"
+license="GPL2"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
depends=
depends_dev="glib-dev gtk+2.0-dev libxfce4ui-dev"
diff --git a/main/gdnsd/APKBUILD b/main/gdnsd/APKBUILD
index 2e8df069ac..175d1f6123 100644
--- a/main/gdnsd/APKBUILD
+++ b/main/gdnsd/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Geographic Authoritative DNS server"
url="https://github.com/blblack/gdnsd/"
arch="all"
-license="GPL-3"
+license="GPL3"
depends=""
depends_dev=""
makedepends="userspace-rcu-dev libev-dev libcap-dev ragel autoconf automake libtool"
diff --git a/main/gpicview/APKBUILD b/main/gpicview/APKBUILD
index a4c6f20c70..aeacceaa3d 100644
--- a/main/gpicview/APKBUILD
+++ b/main/gpicview/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Picture viewer of the LXDE Desktop"
url="http://wiki.lxde.org/en/GPicView"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
subpackages="$pkgname-lang"
makedepends="gtk+-dev intltool libjpeg-turbo-dev"
diff --git a/main/gtk-xfce-engine/APKBUILD b/main/gtk-xfce-engine/APKBUILD
index e9399f8937..f21241f340 100644
--- a/main/gtk-xfce-engine/APKBUILD
+++ b/main/gtk-xfce-engine/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Xfce theme engine"
url="http://www.xfce.org/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
makedepends="gtk+2.0-dev gtk+3.0-dev"
source="http://archive.xfce.org/src/xfce/gtk-xfce-engine/${pkgver%.*}/gtk-xfce-engine-$pkgver.tar.bz2
diff --git a/main/installkernel/APKBUILD b/main/installkernel/APKBUILD
index 1c3b56f9d6..3a5963d85f 100644
--- a/main/installkernel/APKBUILD
+++ b/main/installkernel/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Alpine Linux Kernel install script"
url="http://git.alpinelinux.org/cgit/aports/tree/main/installkernel"
arch="noarch"
-license="GPL-2"
+license="GPL2"
subpackages=""
depends=""
source="installkernel"
diff --git a/main/libaio/APKBUILD b/main/libaio/APKBUILD
index 5d3ba20a45..f1e44094e3 100644
--- a/main/libaio/APKBUILD
+++ b/main/libaio/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Asynchronous input/output library"
url="http://lse.sourceforge.net/io/aio.html"
arch="all"
-license="LGPL-2"
+license="LGPL2"
depends=
makedepends="linux-headers"
install=
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD
index cec47b1575..755b6d45b2 100644
--- a/main/libc0.9.32/APKBUILD
+++ b/main/libc0.9.32/APKBUILD
@@ -7,7 +7,7 @@ _ver=${pkgver/_/-}
pkgrel=27
pkgdesc="C library for developing embedded Linux systems"
url=http://uclibc.org
-license="LGPL-2"
+license="LGPL2"
arch="all"
options="!strip !libc_musl"
makedepends="linux-headers"
diff --git a/main/libfprint/APKBUILD b/main/libfprint/APKBUILD
index 58415bb8bb..4c54bec355 100644
--- a/main/libfprint/APKBUILD
+++ b/main/libfprint/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="fingerprint reader and identification library"
url="http://www.freedesktop.org/wiki/Software/fprint/libfprint"
arch="all"
-license="LGPL-2.1"
+license="LGPL2.1"
depends=""
depends_dev="libusb-dev"
makedepends="$depends_dev nss-dev glib-dev gdk-pixbuf-dev pixman-dev"
diff --git a/main/libnetfilter_acct/APKBUILD b/main/libnetfilter_acct/APKBUILD
index a09486a4b0..f6217a27d7 100644
--- a/main/libnetfilter_acct/APKBUILD
+++ b/main/libnetfilter_acct/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Userspace library providing interface to extended accounting infrastructure."
url="http://www.netfilter.org/projects/libnetfilter_conntrack/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
makedepends="libnfnetlink-dev libmnl-dev linux-headers"
subpackages="$pkgname-dev"
diff --git a/main/libnetfilter_conntrack/APKBUILD b/main/libnetfilter_conntrack/APKBUILD
index 5a664ea5ec..8c78156abf 100644
--- a/main/libnetfilter_conntrack/APKBUILD
+++ b/main/libnetfilter_conntrack/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="programming interface (API) to the in-kernel connection tracking state table"
url="http://www.netfilter.org/projects/libnetfilter_conntrack/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
makedepends="linux-headers libnfnetlink-dev libmnl-dev"
subpackages="$pkgname-dev"
diff --git a/main/libnetfilter_log/APKBUILD b/main/libnetfilter_log/APKBUILD
index a3fd56b269..f028f08679 100644
--- a/main/libnetfilter_log/APKBUILD
+++ b/main/libnetfilter_log/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
pkgdesc="interface to packets that have been logged by the kernel packet filter"
url="http://www.netfilter.org/projects/libnetfilter_log/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
depends_dev="linux-headers"
makedepends="$depends_dev libnfnetlink-dev"
diff --git a/main/libnfnetlink/APKBUILD b/main/libnfnetlink/APKBUILD
index d949cbdef0..31878a239a 100644
--- a/main/libnfnetlink/APKBUILD
+++ b/main/libnfnetlink/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="low-level library for netfilter related kernel/userspace communication"
url="http://www.netfilter.org/projects/libnfnetlink/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=""
makedepends="linux-headers"
subpackages="$pkgname-dev"
diff --git a/main/libnftnl/APKBUILD b/main/libnftnl/APKBUILD
index 0e27df8286..022cce657f 100644
--- a/main/libnftnl/APKBUILD
+++ b/main/libnftnl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Netfilter library providing interface to the nf_tables subsystem"
url="http://netfilter.org/projects/libnftnl/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=""
depends_dev="libmnl-dev"
makedepends="$depends_dev bash"
diff --git a/main/libspf2/APKBUILD b/main/libspf2/APKBUILD
index 0d8d708443..213e7b8d75 100644
--- a/main/libspf2/APKBUILD
+++ b/main/libspf2/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Sender Policy Framework library, a part of the SPF/SRS protocol pair."
url="http://www.libspf2.org"
arch="all"
-license="LGPL-2.1 BSD-2"
+license="LGPL2.1 BSD-2"
subpackages="$pkgname-dev"
makedepends="autoconf automake libtool"
depends=
diff --git a/main/libxfce4util/APKBUILD b/main/libxfce4util/APKBUILD
index c92bd1a21f..e6b5b292c0 100644
--- a/main/libxfce4util/APKBUILD
+++ b/main/libxfce4util/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Basic utility non-GUI functions for Xfce"
url="http://www.xfce.org/"
arch="all"
-license="GPL-2"
+license="GPL2"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
depends=
depends_dev="glib-dev"
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index a8a7d17032..efc2f69d7d 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -49,7 +49,7 @@ for _i in $source; do
done
arch="x86 x86_64 armhf"
-license="GPL-2"
+license="GPL2"
prepare() {
local _patch_failed=
diff --git a/main/linux-headers/APKBUILD b/main/linux-headers/APKBUILD
index 12fe981840..9a4a5c470f 100644
--- a/main/linux-headers/APKBUILD
+++ b/main/linux-headers/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Linux system headers"
url="http://kernel.org"
arch="all"
-license='GPL-2'
+license='GPL2'
makedepends="perl"
options="!strip !tracedeps"
source="http://www.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz
diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD
index 4e102f077b..1a055cda04 100644
--- a/main/linux-rpi/APKBUILD
+++ b/main/linux-rpi/APKBUILD
@@ -39,7 +39,7 @@ for _i in $source; do
done
arch="armhf"
-license="GPL-2"
+license="GPL2"
prepare() {
local _patch_failed=
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index 5f9d1552d5..de4c871ab6 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -27,7 +27,7 @@ if [ "${pkgver%.0}" = "$pkgver" ]; then
fi
subpackages="$pkgname-dev"
arch="all"
-license="GPL-2"
+license="GPL2"
_abi_release=${pkgver}
diff --git a/main/lua-json4/APKBUILD b/main/lua-json4/APKBUILD
index 9f2ff21b9f..566ce5441e 100644
--- a/main/lua-json4/APKBUILD
+++ b/main/lua-json4/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="JSON encoding / decoding module for Lua (JSON4lua)"
url="https://github.com/craigmj/json4lua"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends=""
subpackages=""
for _i in $_luaversions; do
diff --git a/main/lua-xctrl/APKBUILD b/main/lua-xctrl/APKBUILD
index 23ad1baca5..4f6b764145 100644
--- a/main/lua-xctrl/APKBUILD
+++ b/main/lua-xctrl/APKBUILD
@@ -11,7 +11,7 @@ _luaversions="5.1 5.2 5.3"
pkgdesc="Lua module that allows you to query and manipulate various aspects of an X11 window manager"
url="https://github.com/yetanothergeek/xctrl"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
makedepends="lua-dev libx11-dev libxmu-dev"
for _i in $_luaversions; do
diff --git a/main/mdadm/APKBUILD b/main/mdadm/APKBUILD
index a89807d1c9..1c02a34358 100644
--- a/main/mdadm/APKBUILD
+++ b/main/mdadm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="a tool for managing Linux Software RAID arrays"
url="http://neil.brown.name/blog/mdadm"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
makedepends="groff linux-headers"
subpackages="$pkgname-doc"
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 65f7a5952e..be8a44fdc0 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -13,7 +13,7 @@ source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz
0001-improve-default-config.patch
"
arch="noarch"
-license="GPL-2"
+license="GPL2"
_builddir="$srcdir"/$pkgname-$_ver
prepare() {
diff --git a/main/mpc1/APKBUILD b/main/mpc1/APKBUILD
index 8a4b52041d..68ad50bf7a 100644
--- a/main/mpc1/APKBUILD
+++ b/main/mpc1/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Multiprecision C library"
url="http://www.multiprecision.org/"
arch="all"
-license="LGPL-2.1"
+license="LGPL2.1"
depends=
makedepends_host="gmp-dev mpfr-dev"
makedepends="$makedepends_host"
diff --git a/main/multisort/APKBUILD b/main/multisort/APKBUILD
index 9c2479b8ee..bacdce514c 100644
--- a/main/multisort/APKBUILD
+++ b/main/multisort/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Tool to merge multiple logfiles"
url="http://www.xach.com/multisort/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
makedepends=""
install=""
diff --git a/main/nagios-plugins/APKBUILD b/main/nagios-plugins/APKBUILD
index 73b7bb22a4..3fb9c3d3af 100644
--- a/main/nagios-plugins/APKBUILD
+++ b/main/nagios-plugins/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="Plugins for Nagios to check services on hosts"
url="http://nagiosplugins.org"
arch="all"
-license="GPL-2"
+license="GPL2"
depends="fping net-snmp-tools bind-tools nrpe-plugin perl-net-snmp"
makedepends="net-snmp-tools openssl-dev openldap-dev mariadb-dev postgresql-dev libpq
linux-headers"
diff --git a/main/nagios/APKBUILD b/main/nagios/APKBUILD
index 727ee1d2e7..1db5e740e0 100644
--- a/main/nagios/APKBUILD
+++ b/main/nagios/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="Popular monitoring tool"
url="http://www.nagios.org/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends="perl"
install="$pkgname.pre-install"
makedepends="gd-dev perl-dev libpng-dev libjpeg perl-net-snmp"
diff --git a/main/newt/APKBUILD b/main/newt/APKBUILD
index 7d12c7866d..fe7ad26f70 100644
--- a/main/newt/APKBUILD
+++ b/main/newt/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Redhat's Newt windowing toolkit development files"
url="https://fedorahosted.org/newt/"
arch="all"
-license="LGPL-2"
+license="LGPL2"
depends=
makedepends="slang-dev popt-dev python-dev ncurses-dev"
subpackages="$pkgname-dev $pkgname-doc py-newt:py"
diff --git a/main/nftables/APKBUILD b/main/nftables/APKBUILD
index 8794931974..2c939392e4 100644
--- a/main/nftables/APKBUILD
+++ b/main/nftables/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Netfilter tables userspace tools"
url="http://netfilter.org/projects/nftables/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=""
depends_dev="libmnl-dev libnftnl-dev gmp-dev readline-dev ncurses-dev"
makedepends="$depends_dev bison flex"
diff --git a/main/nspr/APKBUILD b/main/nspr/APKBUILD
index 25a2192d7f..36bd9b2d3d 100644
--- a/main/nspr/APKBUILD
+++ b/main/nspr/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Netscape Portable Runtime"
url="http://www.mozilla.org/projects/nspr/"
arch="all"
-license="MPL-1.1 GPL-2 LGPL-2.1"
+license="MPL-1.1 GPL2 LGPL-2.1"
depends=
# -dev package does not ship any symlinks so dependency cannot be autodetected
depends_dev="nspr"
diff --git a/main/open-iscsi/APKBUILD b/main/open-iscsi/APKBUILD
index 20d5fe47d5..50eb92a988 100644
--- a/main/open-iscsi/APKBUILD
+++ b/main/open-iscsi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=3
pkgdesc="High performance, transport independent, multi-platform iSCSI initiator"
url="http://www.open-iscsi.org"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
makedepends="openssl-dev linux-headers"
install=""
diff --git a/main/openjdk7/APKBUILD b/main/openjdk7/APKBUILD
index 0325f10fa6..31e84420aa 100644
--- a/main/openjdk7/APKBUILD
+++ b/main/openjdk7/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=0
pkgdesc="Sun OpenJDK 7 via IcedTea"
url="http://icedtea.classpath.org/"
arch="all"
-license="GPL-2 with Classpath"
+license="GPL2 with Classpath"
depends="$pkgname-jre"
options="sover-namecheck"
makedepends="bash findutils tar zip file paxmark gawk util-linux libxslt
diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
index 4aeb664f01..a8ceae72cf 100644
--- a/main/opennhrp/APKBUILD
+++ b/main/opennhrp/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=6
pkgdesc="NBMA Next Hop Resolution Protocol daemon"
url="http://sourceforge.net/projects/opennhrp"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
makedepends="c-ares-dev linux-headers"
subpackages="$pkgname-doc"
diff --git a/main/orage/APKBUILD b/main/orage/APKBUILD
index a79c94c5ee..0ebdf991fc 100644
--- a/main/orage/APKBUILD
+++ b/main/orage/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="A simple calendar application with reminders for Xfce"
url="http://www.xfce.org/projects/orage/"
arch="all"
-license="GPL-2"
+license="GPL2"
subpackages="$pkgname-doc $pkgname-lang"
depends="hicolor-icon-theme"
makedepends="xfce4-panel-dev libnotify-dev libxfce4ui-dev libical-dev popt-dev"
diff --git a/main/paxctl/APKBUILD b/main/paxctl/APKBUILD
index 9ca5861bbf..80ecc5ebbc 100644
--- a/main/paxctl/APKBUILD
+++ b/main/paxctl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Manage PaX releated program header flags"
url="http://pax.grsecurity.net"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=""
makedepends=""
install=
diff --git a/main/perl/APKBUILD b/main/perl/APKBUILD
index aac1fed3bf..d933a803b2 100644
--- a/main/perl/APKBUILD
+++ b/main/perl/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Larry Wall's Practical Extraction and Report Language"
url=http://www.perl.org
arch="all"
-license="Artistic GPL-2"
+license="Artistic GPL2"
source="http://www.cpan.org/src/5.0/perl-$pkgver.tar.gz
"
options="!fhs"
diff --git a/main/pflogsumm/APKBUILD b/main/pflogsumm/APKBUILD
index 72e65f56be..7a552187d3 100644
--- a/main/pflogsumm/APKBUILD
+++ b/main/pflogsumm/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Pflogsumm is a log analyzer for Postfix logs"
url="http://jimsun.linxnet.com/postfix_contrib.html"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="perl perl-date-calc sysklogd"
makedepends=""
subpackages="$pkgname-doc"
diff --git a/main/pth/APKBUILD b/main/pth/APKBUILD
index e2c109ee1b..36676dde56 100644
--- a/main/pth/APKBUILD
+++ b/main/pth/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=4
pkgdesc="The GNU Portable Threads."
url="http://www.gnu.org/software/pth"
arch="all"
-license="LGPL-2.1"
+license="LGPL2.1"
depends=""
subpackages="$pkgname-dev $pkgname-doc"
options="!libc_musl"
diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD
index 4b21a4d2ed..2bc3bd84f8 100644
--- a/main/qemu/APKBUILD
+++ b/main/qemu/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="QEMU is a generic machine emulator and virtualizer"
url="http://qemu.org/"
arch="all"
-license="GPL-2 LGPL-2"
+license="GPL2 LGPL-2"
makedepends="zlib-dev alsa-lib-dev gnutls-dev ncurses-dev glib-dev
libjpeg-turbo-dev libpng-dev vde2-dev spice-dev paxmark curl-dev
libcap-dev libcap-ng-dev libaio-dev usbredir-dev util-linux-dev
diff --git a/main/quagga-nhrp/APKBUILD b/main/quagga-nhrp/APKBUILD
index 2825e09c36..21f594ee2d 100644
--- a/main/quagga-nhrp/APKBUILD
+++ b/main/quagga-nhrp/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF, BGP and NHRP."
url="http://git.alpinelinux.org/cgit/user/tteras/quagga/commit/?h=nhrp"
arch="all"
-license="GPL-2"
+license="GPL2"
depends="iproute2"
makedepends="gawk texinfo perl autoconf automake libtool c-ares-dev
linux-headers readline-dev ncurses-dev net-snmp-dev libcap-dev"
diff --git a/main/quagga/APKBUILD b/main/quagga/APKBUILD
index 69a1d8f4eb..841c251c7d 100644
--- a/main/quagga/APKBUILD
+++ b/main/quagga/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=3
pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP."
url="http://quagga.net/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends="iproute2"
makedepends="linux-headers readline-dev ncurses-dev gawk texinfo perl net-snmp-dev"
install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade"
diff --git a/main/racktables/APKBUILD b/main/racktables/APKBUILD
index 5ce309f1d2..1e806d570c 100644
--- a/main/racktables/APKBUILD
+++ b/main/racktables/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Server room asset management"
url="http://racktables.org"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="php php-bcmath php-gd php-mysql php-pdo_mysql php-json"
depends_dev=
makedepends="$depends_dev"
diff --git a/main/ristretto/APKBUILD b/main/ristretto/APKBUILD
index 5ac96fe3b9..c7c0c78b5a 100644
--- a/main/ristretto/APKBUILD
+++ b/main/ristretto/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Ristretto is a image viewer for Xfce"
url="http://goodies.xfce.org/projects/applications/ristretto"
arch="all"
-license="GPL-2"
+license="GPL2"
depends="desktop-file-utils hicolor-icon-theme"
makedepends="libxfce4ui-dev dbus-glib-dev libexif-dev thunar-dev"
install=
diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD
index 6b18ad3c64..55c2ba7a74 100644
--- a/main/rsyslog/APKBUILD
+++ b/main/rsyslog/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=2
pkgdesc="Enhanced multi-threaded syslogd with database support and more."
url="http://www.rsyslog.com/"
arch="all"
-license="GPLv3 LGPL-3"
+license="GPLv3 LGPL3"
makedepends="zlib-dev gnutls-dev mariadb-dev postgresql-dev net-snmp-dev
libnet-dev libgcrypt-dev libee-dev libestr-dev liblogging-dev
json-c-dev util-linux-dev py-docutils"
diff --git a/main/scstadmin/APKBUILD b/main/scstadmin/APKBUILD
index c1ddb74892..a6f2bde87b 100644
--- a/main/scstadmin/APKBUILD
+++ b/main/scstadmin/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=2
pkgdesc="SCST administration tool written in perl"
url="http://scst.sourceforge.net"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="perl"
makedepends="perl-dev"
install=
diff --git a/main/shorewall-core/APKBUILD b/main/shorewall-core/APKBUILD
index b6f227692c..5b48320e52 100644
--- a/main/shorewall-core/APKBUILD
+++ b/main/shorewall-core/APKBUILD
@@ -12,7 +12,7 @@ pkgrel=0
pkgdesc="Core libraries for Shorewall"
url="http://www.shorewall.net/"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends=""
# coreutils for install -T
makedepends="coreutils bash"
diff --git a/main/shorewall/APKBUILD b/main/shorewall/APKBUILD
index 3bfe177c37..bcf6abecf7 100644
--- a/main/shorewall/APKBUILD
+++ b/main/shorewall/APKBUILD
@@ -12,7 +12,7 @@ pkgrel=0
pkgdesc="An iptables front end for firewall configuration"
url="http://www.shorewall.net/"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="shorewall-core perl iptables iproute2"
# coreutils for install -T
makedepends="coreutils bash"
diff --git a/main/shorewall6/APKBUILD b/main/shorewall6/APKBUILD
index ca843d889c..79f84232be 100644
--- a/main/shorewall6/APKBUILD
+++ b/main/shorewall6/APKBUILD
@@ -12,7 +12,7 @@ pkgrel=0
pkgdesc="Files for the IPV6 Shorewall Firewall"
url="http://www.shorewall.net/"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="shorewall-core perl ip6tables iproute2"
# coreutils for install -T
makedepends="coreutils bash"
diff --git a/main/sircbot/APKBUILD b/main/sircbot/APKBUILD
index c025b217ee..bffa0a05cb 100644
--- a/main/sircbot/APKBUILD
+++ b/main/sircbot/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Minimalistic IRC bot"
url="http://git.alpinelinux.org/cgit/sircbot/"
arch="all"
-license="GPL-2"
+license="GPL2"
pkgusers="sircbot"
pkggroups="sircbot"
depends=
diff --git a/main/slim/APKBUILD b/main/slim/APKBUILD
index a02beb8df2..0de7778fe5 100644
--- a/main/slim/APKBUILD
+++ b/main/slim/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=5
pkgdesc="Desktop-independent graphical login manager for X11"
url="http://slim.berlios.de/"
arch="all"
-license="GPL-2"
+license="GPL2"
subpackages="$pkgname-doc"
makedepends="libxmu-dev libpng-dev libjpeg-turbo-dev libxft-dev
cmake libxrandr-dev consolekit-dev"
diff --git a/main/sntpc/APKBUILD b/main/sntpc/APKBUILD
index 4520b745d8..2dc1bb7d26 100644
--- a/main/sntpc/APKBUILD
+++ b/main/sntpc/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=5
pkgdesc="Simple NTP client"
url="http://git.alpinelinux.org/cgit/sntpc"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
source="http://git.alpinelinux.org/cgit/sntpc.git/snapshot/sntpc-$pkgver.tar.bz2
sntpc.initd
diff --git a/main/squark/APKBUILD b/main/squark/APKBUILD
index 8d9d9e9833..053391e5d7 100644
--- a/main/squark/APKBUILD
+++ b/main/squark/APKBUILD
@@ -10,7 +10,7 @@ source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
"
url="http://git.alpinelinux.org/cgit/squark/"
arch="all"
-license=GPL-2
+license=GPL2
install="$pkgname.post-install"
prepare() {
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index 60a0a0238b..f0643f640b 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -9,7 +9,7 @@ install="squid.pre-install squid.pre-upgrade"
pkgusers="squid"
pkggroups="squid"
arch="all"
-license="GPL-2"
+license="GPL2"
depends="logrotate"
makedepends="openssl-dev perl-dev autoconf automake heimdal-dev libtool
libcap-dev linux-headers"
diff --git a/main/ssmtp/APKBUILD b/main/ssmtp/APKBUILD
index 928fd19841..0c795ec4cc 100644
--- a/main/ssmtp/APKBUILD
+++ b/main/ssmtp/APKBUILD
@@ -8,7 +8,7 @@ pkgdesc="Extremely simple MTA to get mail off the system to a mail hub"
subpackages="$pkgname-doc"
arch="all"
url="https://packages.debian.org/stable/mail/ssmtp"
-license="GPL-2"
+license="GPL2"
depends=
makedepends="openssl-dev autoconf"
install=
diff --git a/main/strongswan/APKBUILD b/main/strongswan/APKBUILD
index 1c196e24ca..f6affdf4c1 100644
--- a/main/strongswan/APKBUILD
+++ b/main/strongswan/APKBUILD
@@ -9,7 +9,7 @@ url="http://www.strongswan.org/"
arch="all"
pkgusers="ipsec"
pkggroups="ipsec"
-license="GPL-2 RSA-MD5 RSA-PKCS11 DES"
+license="GPL2 RSA-MD5 RSA-PKCS11 DES"
depends="iproute2 openssl"
depends_dev="sqlite-dev openssl-dev curl-dev gmp-dev libcap-dev"
makedepends="$depends_dev linux-headers python"
diff --git a/main/uwsgi/APKBUILD b/main/uwsgi/APKBUILD
index 86362eb77b..0ed6ea92d2 100644
--- a/main/uwsgi/APKBUILD
+++ b/main/uwsgi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="uWSGI application container server"
url=http://projects.unbit.it/uwsgi/
arch=all
-license=GPL-2
+license=GPL2
depends=mailcap
makedepends="linux-headers lua5.2-dev python python-dev zeromq-dev paxmark
pcre-dev python3 python3-dev"
diff --git a/main/xfce4-appfinder/APKBUILD b/main/xfce4-appfinder/APKBUILD
index a163d2188e..e167ffed13 100644
--- a/main/xfce4-appfinder/APKBUILD
+++ b/main/xfce4-appfinder/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Xfce application finder"
url="http://www.xfce.org/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends="hicolor-icon-theme"
makedepends="thunar-dev gtk+-dev libxfce4ui-dev garcon-dev"
subpackages="$pkgname-lang"
diff --git a/main/xfce4-battery-plugin/APKBUILD b/main/xfce4-battery-plugin/APKBUILD
index 4a15f888cb..3b27e688ea 100644
--- a/main/xfce4-battery-plugin/APKBUILD
+++ b/main/xfce4-battery-plugin/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
pkgdesc="A battery monitor plugin for the Xfce panel"
url="http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
arch="all"
-license="GPL-2"
+license="GPL2"
makedepends="xfce4-panel-dev libxfce4ui-dev perl-xml-parser intltool
linux-headers"
install=
diff --git a/main/xfce4-panel/APKBUILD b/main/xfce4-panel/APKBUILD
index 36e7b4e8b5..dc44715d1c 100644
--- a/main/xfce4-panel/APKBUILD
+++ b/main/xfce4-panel/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
pkgdesc="Panel for the Xfce desktop environment"
url="http://www.xfce.org/"
arch="all"
-license="GPL-2"
+license="GPL2"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
depends="hicolor-icon-theme"
depends_dev="libxfce4util-dev gtk+2.0-dev"
diff --git a/main/xfce4-settings/APKBUILD b/main/xfce4-settings/APKBUILD
index cfc363cc47..ffed0ea4a4 100644
--- a/main/xfce4-settings/APKBUILD
+++ b/main/xfce4-settings/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
pkgdesc="Settings manager for xfce"
url="http://www.xfce.org/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
subpackages="$pkgname-lang"
makedepends="libxfce4ui-dev exo-dev libxi-dev libxrandr-dev libxklavier-dev
diff --git a/main/xfce4-taskmanager/APKBUILD b/main/xfce4-taskmanager/APKBUILD
index fb68c48133..0255097e01 100644
--- a/main/xfce4-taskmanager/APKBUILD
+++ b/main/xfce4-taskmanager/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="a simple taskmanager for the Xfce Desktop Environment"
url="http://goodies.xfce.org/projects/applications/xfce4-taskmanager"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
makedepends="libxfce4ui-dev"
subpackages="$pkgname-lang"
diff --git a/main/xfce4-terminal/APKBUILD b/main/xfce4-terminal/APKBUILD
index 45c6e2bf61..632b338148 100644
--- a/main/xfce4-terminal/APKBUILD
+++ b/main/xfce4-terminal/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
url="http://www.xfce.org/projects/terminal/"
arch="all"
-license="GPL-2"
+license="GPL2"
subpackages="$pkgname-doc $pkgname-lang"
depends="startup-notification hicolor-icon-theme"
makedepends="exo-dev vte-dev libxfce4ui-dev"
diff --git a/main/xfconf/APKBUILD b/main/xfconf/APKBUILD
index ad694ab091..40ecf6638d 100644
--- a/main/xfconf/APKBUILD
+++ b/main/xfconf/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="Hierarchical configuration system for Xfce"
url="http://www.xfce.org/"
arch="all"
-license="GPL-2"
+license="GPL2"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
depends=
depends_dev="glib-dev dbus-dev dbus-glib-dev"
diff --git a/main/xfdesktop/APKBUILD b/main/xfdesktop/APKBUILD
index e533d81354..a5ffe3360e 100644
--- a/main/xfdesktop/APKBUILD
+++ b/main/xfdesktop/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="A desktop manager for Xfce"
url="http://www.xfce.org/"
arch="all"
-license="GPL-2"
+license="GPL2"
subpackages="$pkgname-doc $pkgname-lang"
depends="hicolor-icon-theme"
makedepends="garcon-dev thunar-dev libxfce4ui-dev libwnck-dev libnotify-dev
diff --git a/main/xfwm4/APKBUILD b/main/xfwm4/APKBUILD
index dd446c60bb..c54ca2ebe5 100644
--- a/main/xfwm4/APKBUILD
+++ b/main/xfwm4/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Xfce window manager, compatible with Gnome, Gnome2, KDE2, and KDE3"
url="http://www.xfce.org/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends="hicolor-icon-theme"
subpackages="$pkgname-lang"
makedepends="libxfce4ui-dev libwnck-dev libxrandr-dev libxcomposite-dev
diff --git a/testing/acf-jquery-mobile/APKBUILD b/testing/acf-jquery-mobile/APKBUILD
index 69a7358028..ff482f0698 100644
--- a/testing/acf-jquery-mobile/APKBUILD
+++ b/testing/acf-jquery-mobile/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="jquery mobile libraries for ACF"
url="http://git.alpinelinux.org/cgit/acf-jquery-mobile"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-jquery"
replaces=""
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/testing/acf-skins-jqmobile/APKBUILD b/testing/acf-skins-jqmobile/APKBUILD
index ea8796f833..7260a4c4e2 100644
--- a/testing/acf-skins-jqmobile/APKBUILD
+++ b/testing/acf-skins-jqmobile/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="ACF skin based upon jquery mobile"
url="http://git.alpinelinux.org/cgit/acf-skins-jqmobile"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="acf-skins acf-jquery-mobile"
replaces=""
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/testing/apts/APKBUILD b/testing/apts/APKBUILD
index 0f5648d486..f729e732f8 100644
--- a/testing/apts/APKBUILD
+++ b/testing/apts/APKBUILD
@@ -10,7 +10,7 @@ source="http://git.alpinelinux.org/cgit/jbilyk/$pkgname.git/snapshot/$pkgname-$p
"
url="http://git.alpinelinux.org/cgit/jbilyk/apts.git/"
arch="noarch"
-license=GPL-2
+license=GPL2
build() {
echo "Nothing to build, moving on to package"
diff --git a/testing/buildbot-slave/APKBUILD b/testing/buildbot-slave/APKBUILD
index ef3db390cc..b934870258 100644
--- a/testing/buildbot-slave/APKBUILD
+++ b/testing/buildbot-slave/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Buildbot slave daemon"
url="http://buildbot.net/"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends="python py-twisted"
depends_dev=""
makedepends="python-dev py-setuptools"
diff --git a/testing/dspam/APKBUILD b/testing/dspam/APKBUILD
index 1ccdad243a..a34433cca4 100644
--- a/testing/dspam/APKBUILD
+++ b/testing/dspam/APKBUILD
@@ -9,7 +9,7 @@ url="http://dspam.nuclearelephant.com/"
pkgusers="dspam"
pkggroups="dspam"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
install="$pkgname.pre-install"
makedepends="postgresql-dev sqlite-dev mariadb-dev autoconf automake libtool"
diff --git a/testing/gnump3d/APKBUILD b/testing/gnump3d/APKBUILD
index 11a2e88a9c..7f16002ce9 100644
--- a/testing/gnump3d/APKBUILD
+++ b/testing/gnump3d/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="A streaming server for MP3, OGG vorbis and other streamable files"
url="http://www.gnump3d.org/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends="perl"
makedepends=""
install=
diff --git a/testing/hardinfo/APKBUILD b/testing/hardinfo/APKBUILD
index 96d75b9937..968ba57d17 100644
--- a/testing/hardinfo/APKBUILD
+++ b/testing/hardinfo/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=5
pkgdesc="A system information and benchmark tool."
url="http://hardinfo.berlios.de/wiki/index.php/Main_Page"
arch="all"
-license="GPL-2"
+license="GPL2"
makedepends="gtk+-dev libsoup-dev>=2.4.0 gnutls-dev>=2.4.1"
depends=
source="http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.bz2
diff --git a/testing/kbuild/APKBUILD b/testing/kbuild/APKBUILD
index 4d5ad2f036..e209cdcfc5 100644
--- a/testing/kbuild/APKBUILD
+++ b/testing/kbuild/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="A makefile framework for writing simple makefiles for complex tasks"
url="http://svn.netlabs.org/kbuild/wiki"
arch="all"
-license="GPL-3"
+license="GPL3"
depends=""
depends_dev=""
makedepends="autoconf automake flex bison"
diff --git a/testing/lightdm/APKBUILD b/testing/lightdm/APKBUILD
index df153fa9b7..9876d3f613 100644
--- a/testing/lightdm/APKBUILD
+++ b/testing/lightdm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=5
pkgdesc="A cross-desktop display manager"
url="http://www.freedesktop.org/wiki/Software/LightDM"
arch="all"
-license="GPL-3"
+license="GPL3"
depends="dbus xinit accountsservice"
depends_dev="glib-dev libxklavier-dev libx11-dev"
makedepends="$depends_dev linux-pam-dev gtk+3.0-dev libxext-dev
diff --git a/testing/lua5.2-json4/APKBUILD b/testing/lua5.2-json4/APKBUILD
index fe4fd66e23..cf75f8b9fd 100644
--- a/testing/lua5.2-json4/APKBUILD
+++ b/testing/lua5.2-json4/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="JSON encoding / decoding module for Lua $_luaver (JSON4lua)"
url="http://json.luaforge.net/"
arch="noarch"
-license="GPL-2"
+license="GPL2"
depends=""
source="http://files.luaforge.net/releases/json/json/$pkgver/json4lua-$pkgver.zip"
diff --git a/testing/lua5.2-xctrl/APKBUILD b/testing/lua5.2-xctrl/APKBUILD
index 68a1386783..39c608acc2 100644
--- a/testing/lua5.2-xctrl/APKBUILD
+++ b/testing/lua5.2-xctrl/APKBUILD
@@ -11,7 +11,7 @@ pkgrel=0
pkgdesc="Lua $_luaver module to query and manipulate X11 window managers"
url="http://code.google.com/p/xctrl/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
makedepends="lua$_luaver-dev libx11-dev libxmu-dev"
install=
diff --git a/testing/lusca/APKBUILD b/testing/lusca/APKBUILD
index 661e3a4376..f6902c2536 100644
--- a/testing/lusca/APKBUILD
+++ b/testing/lusca/APKBUILD
@@ -9,7 +9,7 @@ install="lusca.pre-install lusca.pre-upgrade"
pkgusers="lusca"
pkggroups="lusca"
arch="all"
-license="GPL-2"
+license="GPL2"
depends="logrotate"
makedepends="openssl-dev perl-dev autoconf automake heimdal-dev libtool
libcap-dev linux-headers"
diff --git a/testing/madwimax/APKBUILD b/testing/madwimax/APKBUILD
index c3621388df..a06da00cd7 100644
--- a/testing/madwimax/APKBUILD
+++ b/testing/madwimax/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=4
pkgdesc="WiMAX driver for the Samsung SWC-U200 and similar USB modems"
url="http://code.google.com/p/madwimax/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
makedepends="libusb-dev"
install=
diff --git a/testing/postler/APKBUILD b/testing/postler/APKBUILD
index 12aa2604fb..e8f3117388 100644
--- a/testing/postler/APKBUILD
+++ b/testing/postler/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
pkgdesc="Email client"
url="https://launchpad.net/postler/"
arch=""
-license="LGPL-2.1"
+license="LGPL2.1"
depends="msmtp"
makedepends="gtk+-dev webkit-dev libunique-dev libnotify-dev libcanberra-dev
python vala db-dev openssl-dev"
diff --git a/testing/ruby-mime-types/APKBUILD b/testing/ruby-mime-types/APKBUILD
index 09a1b3b072..fbbf3b3f88 100644
--- a/testing/ruby-mime-types/APKBUILD
+++ b/testing/ruby-mime-types/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
pkgdesc="The mime-types library provides a library and registry for information about MIME content type definitions"
arch="noarch"
url="https://github.com/mime-types/ruby-mime-types/"
-license="MIT 'Artistic 2.0' GPL-2"
+license="MIT 'Artistic 2.0' GPL2"
depends="ruby"
depends_dev=
makedepends="$depends_dev"
diff --git a/testing/scummvm/APKBUILD b/testing/scummvm/APKBUILD
index 66c3f90c19..f4e7e84bb5 100644
--- a/testing/scummvm/APKBUILD
+++ b/testing/scummvm/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="engine for several graphical adventure games"
url="http://www.scummvm.org/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=""
makedepends="libogg-dev libvorbis-dev libtheora-dev zlib-dev
libpng-dev jpeg-dev glu-dev sdl-dev alsa-lib-dev freetype-dev"
diff --git a/unmaintained/fotoxx/APKBUILD b/unmaintained/fotoxx/APKBUILD
index e5ee47eae5..8ac4baee6f 100644
--- a/unmaintained/fotoxx/APKBUILD
+++ b/unmaintained/fotoxx/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Photo editing and collection management"
url="http://kornelix.squarespace.com/fotoxx"
arch="all"
-license="GPL-3"
+license="GPL3"
depends="xdg-utils exiftool"
makedepends="gtk+3.0-dev tiff-dev"
install=
diff --git a/unmaintained/libsyncml/APKBUILD b/unmaintained/libsyncml/APKBUILD
index 550f4b40f4..09d45d6741 100644
--- a/unmaintained/libsyncml/APKBUILD
+++ b/unmaintained/libsyncml/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=1
pkgdesc="Implementation of the SyncML protocol"
url="http://libsyncml.opensync.org/"
arch="all"
-license="LGPL-2.1"
+license="LGPL2.1"
depends=
makedepends="glib-dev libxml2-dev libwbxml-dev openobex-dev bluez-dev cmake"
install=
diff --git a/unmaintained/wifidog/APKBUILD b/unmaintained/wifidog/APKBUILD
index ef84c458e0..caa4872051 100644
--- a/unmaintained/wifidog/APKBUILD
+++ b/unmaintained/wifidog/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=2
pkgdesc="Wifi Captive Portal"
url="http://dev.wifidog.org/"
arch="all"
-license="GPL-2"
+license="GPL2"
depends=
makedepends=
subpackages="$pkgname-doc"