635 files changed, 35 insertions, 35 deletions

diff --git a/extra/popt/APKBUILD b/extra/popt/APKBUILD
deleted file mode 100644
index 4826bd2d287..00000000000
--- a/extra/popt/APKBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=popt
-pkgver=1.14
-pkgrel=0
-pkgdesc="Parse Options - Command line parser"
-url="http://rpm5.org/"
-license="as-is"
-depends="uclibc"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://rpm5.org/files/popt/$pkgname-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--without-included-gettext \
-		--disable-nls || return 1
-	make || return 1
-	make install DESTDIR="$pkgdir"
-}
-md5sums="4f90a07316eb825604dd10ae4f9f3f04  popt-1.14.tar.gz"
diff --git a/extra/acct/APKBUILD b/main/acct/APKBUILD
index 29657feed9e..29657feed9e 100644
--- a/extra/acct/APKBUILD
+++ b/main/acct/APKBUILD
diff --git a/extra/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD
index 1f29cfb0b14..1f29cfb0b14 100644
--- a/extra/acf-alpine-baselayout/APKBUILD
+++ b/main/acf-alpine-baselayout/APKBUILD
diff --git a/extra/acf-alpine-conf/APKBUILD b/main/acf-alpine-conf/APKBUILD
index fdb808017c0..fdb808017c0 100644
--- a/extra/acf-alpine-conf/APKBUILD
+++ b/main/acf-alpine-conf/APKBUILD
diff --git a/extra/acf-apk-tools/APKBUILD b/main/acf-apk-tools/APKBUILD
index 040645d3121..040645d3121 100644
--- a/extra/acf-apk-tools/APKBUILD
+++ b/main/acf-apk-tools/APKBUILD
diff --git a/extra/acf-asterisk/APKBUILD b/main/acf-asterisk/APKBUILD
index c7abd3b02fb..c7abd3b02fb 100644
--- a/extra/acf-asterisk/APKBUILD
+++ b/main/acf-asterisk/APKBUILD
diff --git a/extra/acf-chrony/APKBUILD b/main/acf-chrony/APKBUILD
index 9db7c4d0007..9db7c4d0007 100644
--- a/extra/acf-chrony/APKBUILD
+++ b/main/acf-chrony/APKBUILD
diff --git a/extra/acf-clamav/APKBUILD b/main/acf-clamav/APKBUILD
index 511844df491..511844df491 100644
--- a/extra/acf-clamav/APKBUILD
+++ b/main/acf-clamav/APKBUILD
diff --git a/extra/acf-clamsmtp/APKBUILD b/main/acf-clamsmtp/APKBUILD
index b72fc2e32b8..b72fc2e32b8 100644
--- a/extra/acf-clamsmtp/APKBUILD
+++ b/main/acf-clamsmtp/APKBUILD
diff --git a/extra/acf-core/APKBUILD b/main/acf-core/APKBUILD
index dd9f65bbc71..dd9f65bbc71 100644
--- a/extra/acf-core/APKBUILD
+++ b/main/acf-core/APKBUILD
diff --git a/extra/acf-dansguardian/APKBUILD b/main/acf-dansguardian/APKBUILD
index c5d5ef7dd5d..c5d5ef7dd5d 100644
--- a/extra/acf-dansguardian/APKBUILD
+++ b/main/acf-dansguardian/APKBUILD
diff --git a/extra/acf-dhcp/APKBUILD b/main/acf-dhcp/APKBUILD
index bc92419bb99..bc92419bb99 100644
--- a/extra/acf-dhcp/APKBUILD
+++ b/main/acf-dhcp/APKBUILD
diff --git a/extra/acf-dnscache/APKBUILD b/main/acf-dnscache/APKBUILD
index 979df43c19b..979df43c19b 100644
--- a/extra/acf-dnscache/APKBUILD
+++ b/main/acf-dnscache/APKBUILD
diff --git a/extra/acf-dnsmasq/APKBUILD b/main/acf-dnsmasq/APKBUILD
index 8f0b8397b3c..8f0b8397b3c 100644
--- a/extra/acf-dnsmasq/APKBUILD
+++ b/main/acf-dnsmasq/APKBUILD
diff --git a/extra/acf-dovecot/APKBUILD b/main/acf-dovecot/APKBUILD
index a95208ad6ef..a95208ad6ef 100644
--- a/extra/acf-dovecot/APKBUILD
+++ b/main/acf-dovecot/APKBUILD
diff --git a/extra/acf-fetchmail/APKBUILD b/main/acf-fetchmail/APKBUILD
index c4638e342d8..c4638e342d8 100644
--- a/extra/acf-fetchmail/APKBUILD
+++ b/main/acf-fetchmail/APKBUILD
diff --git a/extra/acf-gnats/APKBUILD b/main/acf-gnats/APKBUILD
index 0dc58acd835..0dc58acd835 100644
--- a/extra/acf-gnats/APKBUILD
+++ b/main/acf-gnats/APKBUILD
diff --git a/extra/acf-gross/APKBUILD b/main/acf-gross/APKBUILD
index 4dcf979d183..4dcf979d183 100644
--- a/extra/acf-gross/APKBUILD
+++ b/main/acf-gross/APKBUILD
diff --git a/extra/acf-ipsec-tools/APKBUILD b/main/acf-ipsec-tools/APKBUILD
index 2da2f90f293..2da2f90f293 100644
--- a/extra/acf-ipsec-tools/APKBUILD
+++ b/main/acf-ipsec-tools/APKBUILD
diff --git a/extra/acf-iptables/APKBUILD b/main/acf-iptables/APKBUILD
index 12665845f86..12665845f86 100644
--- a/extra/acf-iptables/APKBUILD
+++ b/main/acf-iptables/APKBUILD
diff --git a/extra/acf-mdadm/APKBUILD b/main/acf-mdadm/APKBUILD
index 5069fa0c41a..5069fa0c41a 100644
--- a/extra/acf-mdadm/APKBUILD
+++ b/main/acf-mdadm/APKBUILD
diff --git a/extra/acf-opennhrp/APKBUILD b/main/acf-opennhrp/APKBUILD
index 4bc246496ba..4bc246496ba 100644
--- a/extra/acf-opennhrp/APKBUILD
+++ b/main/acf-opennhrp/APKBUILD
diff --git a/extra/acf-openntpd/APKBUILD b/main/acf-openntpd/APKBUILD
index f33272d176b..f33272d176b 100644
--- a/extra/acf-openntpd/APKBUILD
+++ b/main/acf-openntpd/APKBUILD
diff --git a/extra/acf-openssh/APKBUILD b/main/acf-openssh/APKBUILD
index 9228bacd75d..9228bacd75d 100644
--- a/extra/acf-openssh/APKBUILD
+++ b/main/acf-openssh/APKBUILD
diff --git a/extra/acf-openssl/APKBUILD b/main/acf-openssl/APKBUILD
index abaeeed12ae..abaeeed12ae 100644
--- a/extra/acf-openssl/APKBUILD
+++ b/main/acf-openssl/APKBUILD
diff --git a/extra/acf-openvpn/APKBUILD b/main/acf-openvpn/APKBUILD
index 34febc34c4f..34febc34c4f 100644
--- a/extra/acf-openvpn/APKBUILD
+++ b/main/acf-openvpn/APKBUILD
diff --git a/extra/acf-pingu/APKBUILD b/main/acf-pingu/APKBUILD
index 9efbf5b9a3e..9efbf5b9a3e 100644
--- a/extra/acf-pingu/APKBUILD
+++ b/main/acf-pingu/APKBUILD
diff --git a/extra/acf-postfix/APKBUILD b/main/acf-postfix/APKBUILD
index b525015e0d6..b525015e0d6 100644
--- a/extra/acf-postfix/APKBUILD
+++ b/main/acf-postfix/APKBUILD
diff --git a/extra/acf-postgresql/APKBUILD b/main/acf-postgresql/APKBUILD
index 88e8d68c75d..88e8d68c75d 100644
--- a/extra/acf-postgresql/APKBUILD
+++ b/main/acf-postgresql/APKBUILD
diff --git a/extra/acf-ppp/APKBUILD b/main/acf-ppp/APKBUILD
index cca9f5e0e00..cca9f5e0e00 100644
--- a/extra/acf-ppp/APKBUILD
+++ b/main/acf-ppp/APKBUILD
diff --git a/extra/acf-quagga/APKBUILD b/main/acf-quagga/APKBUILD
index 01c71c88517..01c71c88517 100644
--- a/extra/acf-quagga/APKBUILD
+++ b/main/acf-quagga/APKBUILD
diff --git a/extra/acf-samba/APKBUILD b/main/acf-samba/APKBUILD
index af075485946..af075485946 100644
--- a/extra/acf-samba/APKBUILD
+++ b/main/acf-samba/APKBUILD
diff --git a/extra/acf-shorewall/APKBUILD b/main/acf-shorewall/APKBUILD
index 64bd03a81e6..64bd03a81e6 100644
--- a/extra/acf-shorewall/APKBUILD
+++ b/main/acf-shorewall/APKBUILD
diff --git a/extra/acf-skins/APKBUILD b/main/acf-skins/APKBUILD
index 4e377d4b7fe..4e377d4b7fe 100644
--- a/extra/acf-skins/APKBUILD
+++ b/main/acf-skins/APKBUILD
diff --git a/extra/acf-snort/APKBUILD b/main/acf-snort/APKBUILD
index abe972d44ad..abe972d44ad 100644
--- a/extra/acf-snort/APKBUILD
+++ b/main/acf-snort/APKBUILD
diff --git a/extra/acf-squid/APKBUILD b/main/acf-squid/APKBUILD
index 9016b580451..9016b580451 100644
--- a/extra/acf-squid/APKBUILD
+++ b/main/acf-squid/APKBUILD
diff --git a/extra/acf-tcpproxy/APKBUILD b/main/acf-tcpproxy/APKBUILD
index c483088c620..c483088c620 100644
--- a/extra/acf-tcpproxy/APKBUILD
+++ b/main/acf-tcpproxy/APKBUILD
diff --git a/extra/acf-tinydns/APKBUILD b/main/acf-tinydns/APKBUILD
index 75eeab0b1af..75eeab0b1af 100644
--- a/extra/acf-tinydns/APKBUILD
+++ b/main/acf-tinydns/APKBUILD
diff --git a/extra/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD
index 15847a3f488..15847a3f488 100644
--- a/extra/acf-weblog/APKBUILD
+++ b/main/acf-weblog/APKBUILD
diff --git a/extra/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD
index b844b54ff09..b844b54ff09 100644
--- a/extra/alsa-lib/APKBUILD
+++ b/main/alsa-lib/APKBUILD
diff --git a/extra/alsa-lib/nocxx.patch b/main/alsa-lib/nocxx.patch
index beb1ab9006b..beb1ab9006b 100644
--- a/extra/alsa-lib/nocxx.patch
+++ b/main/alsa-lib/nocxx.patch
diff --git a/extra/amavisd-new/APKBUILD b/main/amavisd-new/APKBUILD
index daad650daa5..daad650daa5 100644
--- a/extra/amavisd-new/APKBUILD
+++ b/main/amavisd-new/APKBUILD
diff --git a/extra/amavisd-new/amavisd-new.post-install b/main/amavisd-new/amavisd-new.post-install
index 56cad39f523..56cad39f523 100755
--- a/extra/amavisd-new/amavisd-new.post-install
+++ b/main/amavisd-new/amavisd-new.post-install
diff --git a/extra/amavisd-new/amavisd.init b/main/amavisd-new/amavisd.init
index 23f92af3f36..23f92af3f36 100644
--- a/extra/amavisd-new/amavisd.init
+++ b/main/amavisd-new/amavisd.init
diff --git a/extra/apr-util/APKBUILD b/main/apr-util/APKBUILD
index 38ab8eadf3c..38ab8eadf3c 100644
--- a/extra/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
diff --git a/extra/apr/APKBUILD b/main/apr/APKBUILD
index bee01f8dca4..bee01f8dca4 100644
--- a/extra/apr/APKBUILD
+++ b/main/apr/APKBUILD
diff --git a/extra/arpwatch/APKBUILD b/main/arpwatch/APKBUILD
index ed18e59661f..ed18e59661f 100644
--- a/extra/arpwatch/APKBUILD
+++ b/main/arpwatch/APKBUILD
diff --git a/extra/arpwatch/arpwatch.confd b/main/arpwatch/arpwatch.confd
index f44221aa36c..f44221aa36c 100644
--- a/extra/arpwatch/arpwatch.confd
+++ b/main/arpwatch/arpwatch.confd
diff --git a/extra/arpwatch/arpwatch.initd b/main/arpwatch/arpwatch.initd
index e039e1db8ab..e039e1db8ab 100644
--- a/extra/arpwatch/arpwatch.initd
+++ b/main/arpwatch/arpwatch.initd
diff --git a/extra/aspell/APKBUILD b/main/aspell/APKBUILD
index 30589a1a34e..30589a1a34e 100644
--- a/extra/aspell/APKBUILD
+++ b/main/aspell/APKBUILD
diff --git a/extra/aspell/libmath.patch b/main/aspell/libmath.patch
index 3fad33a5d2c..3fad33a5d2c 100644
--- a/extra/aspell/libmath.patch
+++ b/main/aspell/libmath.patch
diff --git a/extra/asterisk/100-uclibc-daemon.patch b/main/asterisk/100-uclibc-daemon.patch
index 4956791d4df..4956791d4df 100644
--- a/extra/asterisk/100-uclibc-daemon.patch
+++ b/main/asterisk/100-uclibc-daemon.patch
diff --git a/extra/asterisk/101-caps-uclibc.patch b/main/asterisk/101-caps-uclibc.patch
index 1acf87f34fe..1acf87f34fe 100644
--- a/extra/asterisk/101-caps-uclibc.patch
+++ b/main/asterisk/101-caps-uclibc.patch
diff --git a/extra/asterisk/102-gsm-pic.patch b/main/asterisk/102-gsm-pic.patch
index 71370ec0b7b..71370ec0b7b 100644
--- a/extra/asterisk/102-gsm-pic.patch
+++ b/main/asterisk/102-gsm-pic.patch
diff --git a/extra/asterisk/103-rundir.patch b/main/asterisk/103-rundir.patch
index 367dc7163f5..367dc7163f5 100644
--- a/extra/asterisk/103-rundir.patch
+++ b/main/asterisk/103-rundir.patch
diff --git a/extra/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 7e8bb1d1829..7e8bb1d1829 100644
--- a/extra/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
diff --git a/extra/asterisk/asterisk.confd b/main/asterisk/asterisk.confd
index fe9f138ab7f..fe9f138ab7f 100644
--- a/extra/asterisk/asterisk.confd
+++ b/main/asterisk/asterisk.confd
diff --git a/extra/asterisk/asterisk.initd b/main/asterisk/asterisk.initd
index 864a96b3cf6..864a96b3cf6 100644
--- a/extra/asterisk/asterisk.initd
+++ b/main/asterisk/asterisk.initd
diff --git a/extra/asterisk/asterisk.post-install b/main/asterisk/asterisk.post-install
index fd51c7fa5d9..fd51c7fa5d9 100644
--- a/extra/asterisk/asterisk.post-install
+++ b/main/asterisk/asterisk.post-install
diff --git a/extra/asterisk/asterisk.pre-install b/main/asterisk/asterisk.pre-install
index f4724251f38..f4724251f38 100644
--- a/extra/asterisk/asterisk.pre-install
+++ b/main/asterisk/asterisk.pre-install
diff --git a/extra/aumix/APKBUILD b/main/aumix/APKBUILD
index 034613b7251..034613b7251 100644
--- a/extra/aumix/APKBUILD
+++ b/main/aumix/APKBUILD
diff --git a/extra/aumix/aumix-2.8-mute.patch b/main/aumix/aumix-2.8-mute.patch
index 8a32fd5b9b8..8a32fd5b9b8 100644
--- a/extra/aumix/aumix-2.8-mute.patch
+++ b/main/aumix/aumix-2.8-mute.patch
diff --git a/extra/aumix/aumix-2.8-nohome.patch b/main/aumix/aumix-2.8-nohome.patch
index bf20f0372c0..bf20f0372c0 100644
--- a/extra/aumix/aumix-2.8-nohome.patch
+++ b/main/aumix/aumix-2.8-nohome.patch
diff --git a/extra/aumix/aumix-2.8-save_load.patch b/main/aumix/aumix-2.8-save_load.patch
index 498716b517a..498716b517a 100644
--- a/extra/aumix/aumix-2.8-save_load.patch
+++ b/main/aumix/aumix-2.8-save_load.patch
diff --git a/extra/aumix/aumix.initd b/main/aumix/aumix.initd
index 2c1741b3b98..2c1741b3b98 100644
--- a/extra/aumix/aumix.initd
+++ b/main/aumix/aumix.initd
diff --git a/extra/b43-fwcutter/APKBUILD b/main/b43-fwcutter/APKBUILD
index 0a7f4cc6a4f..0a7f4cc6a4f 100644
--- a/extra/b43-fwcutter/APKBUILD
+++ b/main/b43-fwcutter/APKBUILD
diff --git a/extra/bc/APKBUILD b/main/bc/APKBUILD
index d5f1851f2d3..d5f1851f2d3 100644
--- a/extra/bc/APKBUILD
+++ b/main/bc/APKBUILD
diff --git a/extra/beep/APKBUILD b/main/beep/APKBUILD
index 742998204e0..742998204e0 100644
--- a/extra/beep/APKBUILD
+++ b/main/beep/APKBUILD
diff --git a/extra/beep/beep-1.2.2-nosuid.patch b/main/beep/beep-1.2.2-nosuid.patch
index 33e6affa9ff..33e6affa9ff 100644
--- a/extra/beep/beep-1.2.2-nosuid.patch
+++ b/main/beep/beep-1.2.2-nosuid.patch
diff --git a/extra/bind/APKBUILD b/main/bind/APKBUILD
index 533bfa7177a..533bfa7177a 100644
--- a/extra/bind/APKBUILD
+++ b/main/bind/APKBUILD
diff --git a/extra/bind/bind.127.zone b/main/bind/bind.127.zone
index 2ad28de52c3..2ad28de52c3 100644
--- a/extra/bind/bind.127.zone
+++ b/main/bind/bind.127.zone
diff --git a/extra/bind/bind.conf b/main/bind/bind.conf
index d58c61bde0c..d58c61bde0c 100644
--- a/extra/bind/bind.conf
+++ b/main/bind/bind.conf
diff --git a/extra/bind/bind.confd b/main/bind/bind.confd
index 82d37635090..82d37635090 100644
--- a/extra/bind/bind.confd
+++ b/main/bind/bind.confd
diff --git a/extra/bind/bind.initd b/main/bind/bind.initd
index 6469ee79ac4..6469ee79ac4 100644
--- a/extra/bind/bind.initd
+++ b/main/bind/bind.initd
diff --git a/extra/bind/bind.localhost.zone b/main/bind/bind.localhost.zone
index 338d7050ca0..338d7050ca0 100644
--- a/extra/bind/bind.localhost.zone
+++ b/main/bind/bind.localhost.zone
diff --git a/extra/bind/bind.named.ca b/main/bind/bind.named.ca
index 902a7047f9c..902a7047f9c 100644
--- a/extra/bind/bind.named.ca
+++ b/main/bind/bind.named.ca
diff --git a/extra/bind/bind.post-install b/main/bind/bind.post-install
index 7e091c097ca..7e091c097ca 100644
--- a/extra/bind/bind.post-install
+++ b/main/bind/bind.post-install
diff --git a/extra/bind/bind.pre-install b/main/bind/bind.pre-install
index c7996345029..c7996345029 100644
--- a/extra/bind/bind.pre-install
+++ b/main/bind/bind.pre-install
diff --git a/extra/bind/bind.so_bsdcompat.patch b/main/bind/bind.so_bsdcompat.patch
index 83120f77de2..83120f77de2 100644
--- a/extra/bind/bind.so_bsdcompat.patch
+++ b/main/bind/bind.so_bsdcompat.patch
diff --git a/extra/bitlib/APKBUILD b/main/bitlib/APKBUILD
index 91400afc909..91400afc909 100644
--- a/extra/bitlib/APKBUILD
+++ b/main/bitlib/APKBUILD
diff --git a/extra/bridge-utils/APKBUILD b/main/bridge-utils/APKBUILD
index 0caaed9bcfe..0caaed9bcfe 100644
--- a/extra/bridge-utils/APKBUILD
+++ b/main/bridge-utils/APKBUILD
diff --git a/extra/bzip2/APKBUILD b/main/bzip2/APKBUILD
index 09721bb7609..09721bb7609 100644
--- a/extra/bzip2/APKBUILD
+++ b/main/bzip2/APKBUILD
diff --git a/extra/bzip2/bzip2-1.0.4-POSIX-shell.patch b/main/bzip2/bzip2-1.0.4-POSIX-shell.patch
index 74f8df000b1..74f8df000b1 100644
--- a/extra/bzip2/bzip2-1.0.4-POSIX-shell.patch
+++ b/main/bzip2/bzip2-1.0.4-POSIX-shell.patch
diff --git a/extra/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch b/main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
index 85a3c6af6c3..85a3c6af6c3 100644
--- a/extra/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
+++ b/main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
diff --git a/extra/bzip2/bzip2-1.0.4-man-links.patch b/main/bzip2/bzip2-1.0.4-man-links.patch
index 2427d6a7fb1..2427d6a7fb1 100644
--- a/extra/bzip2/bzip2-1.0.4-man-links.patch
+++ b/main/bzip2/bzip2-1.0.4-man-links.patch
diff --git a/extra/bzip2/bzip2-1.0.4-saneso.patch b/main/bzip2/bzip2-1.0.4-saneso.patch
index 9a71342ca9d..9a71342ca9d 100644
--- a/extra/bzip2/bzip2-1.0.4-saneso.patch
+++ b/main/bzip2/bzip2-1.0.4-saneso.patch
diff --git a/extra/bzip2/bzip2.post-deinstall b/main/bzip2/bzip2.post-deinstall
index 99b57c46353..99b57c46353 100644
--- a/extra/bzip2/bzip2.post-deinstall
+++ b/main/bzip2/bzip2.post-deinstall
diff --git a/extra/c-ares/APKBUILD b/main/c-ares/APKBUILD
index 889eab3591d..889eab3591d 100644
--- a/extra/c-ares/APKBUILD
+++ b/main/c-ares/APKBUILD
diff --git a/extra/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD
index e39567de177..e39567de177 100644
--- a/extra/ca-certificates/APKBUILD
+++ b/main/ca-certificates/APKBUILD
diff --git a/extra/ca-certificates/ca-certificates.post-install b/main/ca-certificates/ca-certificates.post-install
index 439cfca52e3..439cfca52e3 100644
--- a/extra/ca-certificates/ca-certificates.post-install
+++ b/main/ca-certificates/ca-certificates.post-install
diff --git a/extra/ccache/APKBUILD b/main/ccache/APKBUILD
index 2143bdb7286..2143bdb7286 100644
--- a/extra/ccache/APKBUILD
+++ b/main/ccache/APKBUILD
diff --git a/extra/cdrkit/APKBUILD b/main/cdrkit/APKBUILD
index a5ca8d77104..a5ca8d77104 100644
--- a/extra/cdrkit/APKBUILD
+++ b/main/cdrkit/APKBUILD
diff --git a/extra/cgit/APKBUILD b/main/cgit/APKBUILD
index d7578539c82..d7578539c82 100644
--- a/extra/cgit/APKBUILD
+++ b/main/cgit/APKBUILD
diff --git a/extra/chrony/APKBUILD b/main/chrony/APKBUILD
index 21f8924a66b..21f8924a66b 100644
--- a/extra/chrony/APKBUILD
+++ b/main/chrony/APKBUILD
diff --git a/extra/chrony/chrony-1.20-chrony.conf.example-gentoo.diff b/main/chrony/chrony-1.20-chrony.conf.example-gentoo.diff
index 498b2417509..498b2417509 100644
--- a/extra/chrony/chrony-1.20-chrony.conf.example-gentoo.diff
+++ b/main/chrony/chrony-1.20-chrony.conf.example-gentoo.diff
diff --git a/extra/chrony/chrony-1.20-conf.c-gentoo.diff b/main/chrony/chrony-1.20-conf.c-gentoo.diff
index 4917d445be0..4917d445be0 100644
--- a/extra/chrony/chrony-1.20-conf.c-gentoo.diff
+++ b/main/chrony/chrony-1.20-conf.c-gentoo.diff
diff --git a/extra/chrony/chrony-1.21-makefile.diff b/main/chrony/chrony-1.21-makefile.diff
index 2eec4e84289..2eec4e84289 100644
--- a/extra/chrony/chrony-1.21-makefile.diff
+++ b/main/chrony/chrony-1.21-makefile.diff
diff --git a/extra/chrony/chrony-1.23-reply-ip.diff b/main/chrony/chrony-1.23-reply-ip.diff
index f4e5d8eff42..f4e5d8eff42 100644
--- a/extra/chrony/chrony-1.23-reply-ip.diff
+++ b/main/chrony/chrony-1.23-reply-ip.diff
diff --git a/extra/chrony/chrony-1.23-sources.diff b/main/chrony/chrony-1.23-sources.diff
index 5f39ca3321f..5f39ca3321f 100644
--- a/extra/chrony/chrony-1.23-sources.diff
+++ b/main/chrony/chrony-1.23-sources.diff
diff --git a/extra/chrony/chrony.conf b/main/chrony/chrony.conf
index d99b1e01d4f..d99b1e01d4f 100644
--- a/extra/chrony/chrony.conf
+++ b/main/chrony/chrony.conf
diff --git a/extra/chrony/chronyd.confd b/main/chrony/chronyd.confd
index 560825c2c82..560825c2c82 100644
--- a/extra/chrony/chronyd.confd
+++ b/main/chrony/chronyd.confd
diff --git a/extra/chrony/chronyd.initd b/main/chrony/chronyd.initd
index 49d7526bb58..49d7526bb58 100644
--- a/extra/chrony/chronyd.initd
+++ b/main/chrony/chronyd.initd
diff --git a/extra/cksfv/APKBUILD b/main/cksfv/APKBUILD
index bf2049a167c..bf2049a167c 100644
--- a/extra/cksfv/APKBUILD
+++ b/main/cksfv/APKBUILD
diff --git a/extra/clamav/APKBUILD b/main/clamav/APKBUILD
index a4daebc2fff..a4daebc2fff 100644
--- a/extra/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
diff --git a/extra/clamav/clamav-0.95.1-nls.patch b/main/clamav/clamav-0.95.1-nls.patch
index 82ae88f576d..82ae88f576d 100644
--- a/extra/clamav/clamav-0.95.1-nls.patch
+++ b/main/clamav/clamav-0.95.1-nls.patch
diff --git a/extra/clamav/clamav.logrotate b/main/clamav/clamav.logrotate
index 7574428413f..7574428413f 100644
--- a/extra/clamav/clamav.logrotate
+++ b/main/clamav/clamav.logrotate
diff --git a/extra/clamav/clamav.post-install b/main/clamav/clamav.post-install
index 49302061015..49302061015 100644
--- a/extra/clamav/clamav.post-install
+++ b/main/clamav/clamav.post-install
diff --git a/extra/clamav/clamav.pre-install b/main/clamav/clamav.pre-install
index 59ac60a44dd..59ac60a44dd 100644
--- a/extra/clamav/clamav.pre-install
+++ b/main/clamav/clamav.pre-install
diff --git a/extra/clamav/clamav.pre-upgrade b/main/clamav/clamav.pre-upgrade
index 9956f95d63a..9956f95d63a 100644
--- a/extra/clamav/clamav.pre-upgrade
+++ b/main/clamav/clamav.pre-upgrade
diff --git a/extra/clamav/clamd.confd b/main/clamav/clamd.confd
index bc8072aead9..bc8072aead9 100644
--- a/extra/clamav/clamd.confd
+++ b/main/clamav/clamd.confd
diff --git a/extra/clamav/clamd.initd b/main/clamav/clamd.initd
index d3b9155572d..d3b9155572d 100644
--- a/extra/clamav/clamd.initd
+++ b/main/clamav/clamd.initd
diff --git a/extra/clamav/freshclam.confd b/main/clamav/freshclam.confd
index 17559037dac..17559037dac 100644
--- a/extra/clamav/freshclam.confd
+++ b/main/clamav/freshclam.confd
diff --git a/extra/clamav/freshclam.initd b/main/clamav/freshclam.initd
index 7961c7f8070..7961c7f8070 100644
--- a/extra/clamav/freshclam.initd
+++ b/main/clamav/freshclam.initd
diff --git a/extra/clamsmtp/0001-extra-clamsmtp-renamed-init.d-script-to-clamsmtpd.patch b/main/clamsmtp/0001-extra-clamsmtp-renamed-init.d-script-to-clamsmtpd.patch
index c0032bae07f..c0032bae07f 100644
--- a/extra/clamsmtp/0001-extra-clamsmtp-renamed-init.d-script-to-clamsmtpd.patch
+++ b/main/clamsmtp/0001-extra-clamsmtp-renamed-init.d-script-to-clamsmtpd.patch
diff --git a/extra/clamsmtp/APKBUILD b/main/clamsmtp/APKBUILD
index 82442549231..82442549231 100644
--- a/extra/clamsmtp/APKBUILD
+++ b/main/clamsmtp/APKBUILD
diff --git a/extra/clamsmtp/clamsmtp.post-upgrade b/main/clamsmtp/clamsmtp.post-upgrade
index 2dbccbb22aa..2dbccbb22aa 100644
--- a/extra/clamsmtp/clamsmtp.post-upgrade
+++ b/main/clamsmtp/clamsmtp.post-upgrade
diff --git a/extra/clamsmtp/clamsmtp.pre-upgrade b/main/clamsmtp/clamsmtp.pre-upgrade
index 12de39f7b15..12de39f7b15 100644
--- a/extra/clamsmtp/clamsmtp.pre-upgrade
+++ b/main/clamsmtp/clamsmtp.pre-upgrade
diff --git a/extra/clamsmtp/clamsmtpd.confd b/main/clamsmtp/clamsmtpd.confd
index 8d08b6868c5..8d08b6868c5 100644
--- a/extra/clamsmtp/clamsmtpd.confd
+++ b/main/clamsmtp/clamsmtpd.confd
diff --git a/extra/clamsmtp/clamsmtpd.initd b/main/clamsmtp/clamsmtpd.initd
index dbd817f370c..dbd817f370c 100644
--- a/extra/clamsmtp/clamsmtpd.initd
+++ b/main/clamsmtp/clamsmtpd.initd
diff --git a/extra/cmake/APKBUILD b/main/cmake/APKBUILD
index 71d74182e8d..71d74182e8d 100644
--- a/extra/cmake/APKBUILD
+++ b/main/cmake/APKBUILD
diff --git a/extra/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD
index 96a402a2f16..96a402a2f16 100644
--- a/extra/conntrack-tools/APKBUILD
+++ b/main/conntrack-tools/APKBUILD
diff --git a/extra/conntrack-tools/conntrackd.confd b/main/conntrack-tools/conntrackd.confd
index 7c937cbd9e3..7c937cbd9e3 100644
--- a/extra/conntrack-tools/conntrackd.confd
+++ b/main/conntrack-tools/conntrackd.confd
diff --git a/extra/conntrack-tools/conntrackd.initd b/main/conntrack-tools/conntrackd.initd
index 9394badca12..9394badca12 100644
--- a/extra/conntrack-tools/conntrackd.initd
+++ b/main/conntrack-tools/conntrackd.initd
diff --git a/extra/coreutils/APKBUILD b/main/coreutils/APKBUILD
index 4f3a62cb357..4f3a62cb357 100644
--- a/extra/coreutils/APKBUILD
+++ b/main/coreutils/APKBUILD
diff --git a/extra/coreutils/coreutils.post-deinstall b/main/coreutils/coreutils.post-deinstall
index 99b57c46353..99b57c46353 100644
--- a/extra/coreutils/coreutils.post-deinstall
+++ b/main/coreutils/coreutils.post-deinstall
diff --git a/extra/coreutils/coreutils.post-upgrade b/main/coreutils/coreutils.post-upgrade
index 3e2b3c2a22f..3e2b3c2a22f 120000
--- a/extra/coreutils/coreutils.post-upgrade
+++ b/main/coreutils/coreutils.post-upgrade
diff --git a/extra/cpufreqd/APKBUILD b/main/cpufreqd/APKBUILD
index 98d7f94cf37..98d7f94cf37 100644
--- a/extra/cpufreqd/APKBUILD
+++ b/main/cpufreqd/APKBUILD
diff --git a/extra/cpufreqd/cpufreqd.initd b/main/cpufreqd/cpufreqd.initd
index fbacebad75c..fbacebad75c 100644
--- a/extra/cpufreqd/cpufreqd.initd
+++ b/main/cpufreqd/cpufreqd.initd
diff --git a/extra/cpufrequtils/APKBUILD b/main/cpufrequtils/APKBUILD
index 50cb2d1b08d..50cb2d1b08d 100644
--- a/extra/cpufrequtils/APKBUILD
+++ b/main/cpufrequtils/APKBUILD
diff --git a/extra/cpufrequtils/cpufrequtils-005-build.patch b/main/cpufrequtils/cpufrequtils-005-build.patch
index 7dbe57043a3..7dbe57043a3 100644
--- a/extra/cpufrequtils/cpufrequtils-005-build.patch
+++ b/main/cpufrequtils/cpufrequtils-005-build.patch
diff --git a/extra/cpufrequtils/cpufrequtils-005-nls.patch b/main/cpufrequtils/cpufrequtils-005-nls.patch
index 7a0336fff4c..7a0336fff4c 100644
--- a/extra/cpufrequtils/cpufrequtils-005-nls.patch
+++ b/main/cpufrequtils/cpufrequtils-005-nls.patch
diff --git a/extra/cpufrequtils/cpufrequtils.confd b/main/cpufrequtils/cpufrequtils.confd
index 68f5b7594c6..68f5b7594c6 100644
--- a/extra/cpufrequtils/cpufrequtils.confd
+++ b/main/cpufrequtils/cpufrequtils.confd
diff --git a/extra/cpufrequtils/cpufrequtils.initd b/main/cpufrequtils/cpufrequtils.initd
index 9aadd94c10b..9aadd94c10b 100644
--- a/extra/cpufrequtils/cpufrequtils.initd
+++ b/main/cpufrequtils/cpufrequtils.initd
diff --git a/extra/cracklib-words/APKBUILD b/main/cracklib-words/APKBUILD
index b460439263f..b460439263f 100644
--- a/extra/cracklib-words/APKBUILD
+++ b/main/cracklib-words/APKBUILD
diff --git a/extra/cracklib/APKBUILD b/main/cracklib/APKBUILD
index e03c6a7700e..e03c6a7700e 100644
--- a/extra/cracklib/APKBUILD
+++ b/main/cracklib/APKBUILD
diff --git a/extra/ctags/APKBUILD b/main/ctags/APKBUILD
index 0d45e287c33..0d45e287c33 100644
--- a/extra/ctags/APKBUILD
+++ b/main/ctags/APKBUILD
diff --git a/extra/cutter/APKBUILD b/main/cutter/APKBUILD
index be27d880c7d..be27d880c7d 100644
--- a/extra/cutter/APKBUILD
+++ b/main/cutter/APKBUILD
diff --git a/extra/cvs/APKBUILD b/main/cvs/APKBUILD
index bcfcea6f248..bcfcea6f248 100644
--- a/extra/cvs/APKBUILD
+++ b/main/cvs/APKBUILD
diff --git a/extra/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 4e9075769af..4e9075769af 100644
--- a/extra/cyrus-sasl/APKBUILD
+++ b/main/cyrus-sasl/APKBUILD
diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch b/main/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch
index f7bf44b7941..f7bf44b7941 100644
--- a/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch
+++ b/main/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch
diff --git a/extra/cyrus-sasl/db-4.7.patch b/main/cyrus-sasl/db-4.7.patch
index 8937d7633d9..8937d7633d9 100644
--- a/extra/cyrus-sasl/db-4.7.patch
+++ b/main/cyrus-sasl/db-4.7.patch
diff --git a/extra/cyrus-sasl/saslauthd.initd b/main/cyrus-sasl/saslauthd.initd
index a5e9a440616..a5e9a440616 100644
--- a/extra/cyrus-sasl/saslauthd.initd
+++ b/main/cyrus-sasl/saslauthd.initd
diff --git a/extra/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD
index 6aa684043ca..6aa684043ca 100644
--- a/extra/dahdi-linux-grsec/APKBUILD
+++ b/main/dahdi-linux-grsec/APKBUILD
diff --git a/extra/dahdi-linux-grsec/dahdi-bri_dchan.patch b/main/dahdi-linux-grsec/dahdi-bri_dchan.patch
index d7a3fe859b0..d7a3fe859b0 100644
--- a/extra/dahdi-linux-grsec/dahdi-bri_dchan.patch
+++ b/main/dahdi-linux-grsec/dahdi-bri_dchan.patch
diff --git a/extra/dahdi-linux-grsec/dahdi-depmod.patch b/main/dahdi-linux-grsec/dahdi-depmod.patch
index 289aad403b3..289aad403b3 100644
--- a/extra/dahdi-linux-grsec/dahdi-depmod.patch
+++ b/main/dahdi-linux-grsec/dahdi-depmod.patch
diff --git a/extra/dahdi-linux-grsec/dahdi-linux-2.2.0-hfc-4s.patch b/main/dahdi-linux-grsec/dahdi-linux-2.2.0-hfc-4s.patch
index 67857e2f7d4..67857e2f7d4 100644
--- a/extra/dahdi-linux-grsec/dahdi-linux-2.2.0-hfc-4s.patch
+++ b/main/dahdi-linux-grsec/dahdi-linux-2.2.0-hfc-4s.patch
diff --git a/extra/dahdi-linux-grsec/dahdi-zaphfc.patch b/main/dahdi-linux-grsec/dahdi-zaphfc.patch
index b711c07ff9c..b711c07ff9c 100644
--- a/extra/dahdi-linux-grsec/dahdi-zaphfc.patch
+++ b/main/dahdi-linux-grsec/dahdi-zaphfc.patch
diff --git a/extra/dahdi-linux-grsec/zaphfc-dahdi-flortz.diff b/main/dahdi-linux-grsec/zaphfc-dahdi-flortz.diff
index 719accdc690..719accdc690 100644
--- a/extra/dahdi-linux-grsec/zaphfc-dahdi-flortz.diff
+++ b/main/dahdi-linux-grsec/zaphfc-dahdi-flortz.diff
diff --git a/extra/dahdi-linux/APKBUILD b/main/dahdi-linux/APKBUILD
index b0f6edf789b..b0f6edf789b 100644
--- a/extra/dahdi-linux/APKBUILD
+++ b/main/dahdi-linux/APKBUILD
diff --git a/extra/dahdi-tools/APKBUILD b/main/dahdi-tools/APKBUILD
index 9a1538fab65..9a1538fab65 100644
--- a/extra/dahdi-tools/APKBUILD
+++ b/main/dahdi-tools/APKBUILD
diff --git a/extra/dahdi-tools/dahdi-tools.initd b/main/dahdi-tools/dahdi-tools.initd
index 5e99122a5a7..5e99122a5a7 100644
--- a/extra/dahdi-tools/dahdi-tools.initd
+++ b/main/dahdi-tools/dahdi-tools.initd
diff --git a/extra/dansguardian/APKBUILD b/main/dansguardian/APKBUILD
index 24c50a63339..24c50a63339 100644
--- a/extra/dansguardian/APKBUILD
+++ b/main/dansguardian/APKBUILD
diff --git a/extra/dansguardian/dansguardian.initd b/main/dansguardian/dansguardian.initd
index e8f8e94cc30..e8f8e94cc30 100644
--- a/extra/dansguardian/dansguardian.initd
+++ b/main/dansguardian/dansguardian.initd
diff --git a/extra/dansguardian/dansguardian.pre-install b/main/dansguardian/dansguardian.pre-install
index 2d06f3a6f67..2d06f3a6f67 100644
--- a/extra/dansguardian/dansguardian.pre-install
+++ b/main/dansguardian/dansguardian.pre-install
diff --git a/extra/db/APKBUILD b/main/db/APKBUILD
index 00940e41c6c..00940e41c6c 100644
--- a/extra/db/APKBUILD
+++ b/main/db/APKBUILD
diff --git a/extra/db/patch.4.7.25.1 b/main/db/patch.4.7.25.1
index 3c7e23ce079..3c7e23ce079 100644
--- a/extra/db/patch.4.7.25.1
+++ b/main/db/patch.4.7.25.1
diff --git a/extra/db/patch.4.7.25.2 b/main/db/patch.4.7.25.2
index 1f42dcec71f..1f42dcec71f 100644
--- a/extra/db/patch.4.7.25.2
+++ b/main/db/patch.4.7.25.2
diff --git a/extra/db/patch.4.7.25.3 b/main/db/patch.4.7.25.3
index b58a43074fd..b58a43074fd 100644
--- a/extra/db/patch.4.7.25.3
+++ b/main/db/patch.4.7.25.3
diff --git a/extra/db/patch.4.7.25.4 b/main/db/patch.4.7.25.4
index 7a55340023b..7a55340023b 100644
--- a/extra/db/patch.4.7.25.4
+++ b/main/db/patch.4.7.25.4
diff --git a/extra/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 01bb25e91d1..01bb25e91d1 100644
--- a/extra/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
diff --git a/extra/dhcp/dhcp.post-upgrade b/main/dhcp/dhcp.post-upgrade
index b16fea6b4af..b16fea6b4af 100644
--- a/extra/dhcp/dhcp.post-upgrade
+++ b/main/dhcp/dhcp.post-upgrade
diff --git a/extra/dhcp/dhcp.pre-upgrade b/main/dhcp/dhcp.pre-upgrade
index 090f654b9a4..090f654b9a4 100644
--- a/extra/dhcp/dhcp.pre-upgrade
+++ b/main/dhcp/dhcp.pre-upgrade
diff --git a/extra/dhcp/dhcpd.confd b/main/dhcp/dhcpd.confd
index df09ec7082f..df09ec7082f 100644
--- a/extra/dhcp/dhcpd.confd
+++ b/main/dhcp/dhcpd.confd
diff --git a/extra/dhcp/dhcpd.initd b/main/dhcp/dhcpd.initd
index cc9727fc7c8..cc9727fc7c8 100644
--- a/extra/dhcp/dhcpd.initd
+++ b/main/dhcp/dhcpd.initd
diff --git a/extra/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index 110f2c4c0b3..110f2c4c0b3 100644
--- a/extra/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
diff --git a/extra/dialog/APKBUILD b/main/dialog/APKBUILD
index 99619e31cff..99619e31cff 100644
--- a/extra/dialog/APKBUILD
+++ b/main/dialog/APKBUILD
diff --git a/extra/diffutils/APKBUILD b/main/diffutils/APKBUILD
index 5a9177130f2..5a9177130f2 100644
--- a/extra/diffutils/APKBUILD
+++ b/main/diffutils/APKBUILD
diff --git a/extra/diffutils/diffutils.post-deinstall b/main/diffutils/diffutils.post-deinstall
index c59247ad416..c59247ad416 100644
--- a/extra/diffutils/diffutils.post-deinstall
+++ b/main/diffutils/diffutils.post-deinstall
diff --git a/extra/dircproxy/1.0.5-CVE-2007-5226.patch b/main/dircproxy/1.0.5-CVE-2007-5226.patch
index 1d9994228bd..1d9994228bd 100644
--- a/extra/dircproxy/1.0.5-CVE-2007-5226.patch
+++ b/main/dircproxy/1.0.5-CVE-2007-5226.patch
diff --git a/extra/dircproxy/1.1.0-less-lag-on-attach.patch b/main/dircproxy/1.1.0-less-lag-on-attach.patch
index 2eb3998db1c..2eb3998db1c 100644
--- a/extra/dircproxy/1.1.0-less-lag-on-attach.patch
+++ b/main/dircproxy/1.1.0-less-lag-on-attach.patch
diff --git a/extra/dircproxy/APKBUILD b/main/dircproxy/APKBUILD
index becb8133ae9..becb8133ae9 100644
--- a/extra/dircproxy/APKBUILD
+++ b/main/dircproxy/APKBUILD
diff --git a/extra/dircproxy/dircproxy-gcc4.patch b/main/dircproxy/dircproxy-gcc4.patch
index 727d8db2b48..727d8db2b48 100644
--- a/extra/dircproxy/dircproxy-gcc4.patch
+++ b/main/dircproxy/dircproxy-gcc4.patch
diff --git a/extra/djbdns/1.05-errno.patch b/main/djbdns/1.05-errno.patch
index 58f2f4b6c97..58f2f4b6c97 100644
--- a/extra/djbdns/1.05-errno.patch
+++ b/main/djbdns/1.05-errno.patch
diff --git a/extra/djbdns/1.05-response.patch b/main/djbdns/1.05-response.patch
index eb6ae59049a..eb6ae59049a 100644
--- a/extra/djbdns/1.05-response.patch
+++ b/main/djbdns/1.05-response.patch
diff --git a/extra/djbdns/APKBUILD b/main/djbdns/APKBUILD
index 0596907a798..0596907a798 100644
--- a/extra/djbdns/APKBUILD
+++ b/main/djbdns/APKBUILD
diff --git a/extra/djbdns/dnscache.confd b/main/djbdns/dnscache.confd
index f456bf8db99..f456bf8db99 100644
--- a/extra/djbdns/dnscache.confd
+++ b/main/djbdns/dnscache.confd
diff --git a/extra/djbdns/dnscache.initd b/main/djbdns/dnscache.initd
index 481022496ef..481022496ef 100755
--- a/extra/djbdns/dnscache.initd
+++ b/main/djbdns/dnscache.initd
diff --git a/extra/djbdns/dnscache.pre-install b/main/djbdns/dnscache.pre-install
index 061b8f02800..061b8f02800 100644
--- a/extra/djbdns/dnscache.pre-install
+++ b/main/djbdns/dnscache.pre-install
diff --git a/extra/djbdns/dnsroots.patch b/main/djbdns/dnsroots.patch
index 5db44ec8f41..5db44ec8f41 100644
--- a/extra/djbdns/dnsroots.patch
+++ b/main/djbdns/dnsroots.patch
diff --git a/extra/djbdns/dnstracesort.patch b/main/djbdns/dnstracesort.patch
index 3bf56f5a1ce..3bf56f5a1ce 100644
--- a/extra/djbdns/dnstracesort.patch
+++ b/main/djbdns/dnstracesort.patch
diff --git a/extra/djbdns/headtail.patch b/main/djbdns/headtail.patch
index 31854803ba8..31854803ba8 100644
--- a/extra/djbdns/headtail.patch
+++ b/main/djbdns/headtail.patch
diff --git a/extra/djbdns/tinydns.confd b/main/djbdns/tinydns.confd
index 840570a63c2..840570a63c2 100644
--- a/extra/djbdns/tinydns.confd
+++ b/main/djbdns/tinydns.confd
diff --git a/extra/djbdns/tinydns.initd b/main/djbdns/tinydns.initd
index a68474c4ecb..a68474c4ecb 100755
--- a/extra/djbdns/tinydns.initd
+++ b/main/djbdns/tinydns.initd
diff --git a/extra/djbdns/tinydns.pre-install b/main/djbdns/tinydns.pre-install
index 11ea87abcb9..11ea87abcb9 100644
--- a/extra/djbdns/tinydns.pre-install
+++ b/main/djbdns/tinydns.pre-install
diff --git a/extra/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index 328d54dfded..328d54dfded 100644
--- a/extra/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
diff --git a/extra/dnsmasq/dnsmasq.confd b/main/dnsmasq/dnsmasq.confd
index 47826dd5082..47826dd5082 100644
--- a/extra/dnsmasq/dnsmasq.confd
+++ b/main/dnsmasq/dnsmasq.confd
diff --git a/extra/dnsmasq/dnsmasq.initd b/main/dnsmasq/dnsmasq.initd
index 44109e98295..44109e98295 100644
--- a/extra/dnsmasq/dnsmasq.initd
+++ b/main/dnsmasq/dnsmasq.initd
diff --git a/extra/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 67d1c870782..67d1c870782 100644
--- a/extra/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
diff --git a/extra/dovecot/dovecot.initd b/main/dovecot/dovecot.initd
index d9799c0dce2..d9799c0dce2 100644
--- a/extra/dovecot/dovecot.initd
+++ b/main/dovecot/dovecot.initd
diff --git a/extra/dovecot/dovecot.pre-install b/main/dovecot/dovecot.pre-install
index 5acdcb5c8d8..5acdcb5c8d8 100644
--- a/extra/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
diff --git a/extra/dropbear/APKBUILD b/main/dropbear/APKBUILD
index ca4af482cfb..ca4af482cfb 100644
--- a/extra/dropbear/APKBUILD
+++ b/main/dropbear/APKBUILD
diff --git a/extra/dropbear/dropbear.confd b/main/dropbear/dropbear.confd
index 555f275d993..555f275d993 100644
--- a/extra/dropbear/dropbear.confd
+++ b/main/dropbear/dropbear.confd
diff --git a/extra/dropbear/dropbear.initd b/main/dropbear/dropbear.initd
index afdee8c6d3c..afdee8c6d3c 100644
--- a/extra/dropbear/dropbear.initd
+++ b/main/dropbear/dropbear.initd
diff --git a/extra/dtach/APKBUILD b/main/dtach/APKBUILD
index 120ef4eee78..120ef4eee78 100644
--- a/extra/dtach/APKBUILD
+++ b/main/dtach/APKBUILD
diff --git a/extra/eggdrop/APKBUILD b/main/eggdrop/APKBUILD
index 59c21f2e07b..59c21f2e07b 100644
--- a/extra/eggdrop/APKBUILD
+++ b/main/eggdrop/APKBUILD
diff --git a/extra/eggdrop/eggdrop-installer b/main/eggdrop/eggdrop-installer
index 69faa00dca8..69faa00dca8 100644
--- a/extra/eggdrop/eggdrop-installer
+++ b/main/eggdrop/eggdrop-installer
diff --git a/extra/eggdrop/eggdrop.post-install b/main/eggdrop/eggdrop.post-install
index 44b43cf34ef..44b43cf34ef 100644
--- a/extra/eggdrop/eggdrop.post-install
+++ b/main/eggdrop/eggdrop.post-install
diff --git a/extra/eggdrop/gseen.mod.patch b/main/eggdrop/gseen.mod.patch
index e70aef88734..e70aef88734 100644
--- a/extra/eggdrop/gseen.mod.patch
+++ b/main/eggdrop/gseen.mod.patch
diff --git a/extra/eggdrop/logs2html.mod.patch b/main/eggdrop/logs2html.mod.patch
index 8ea2e94e629..8ea2e94e629 100644
--- a/extra/eggdrop/logs2html.mod.patch
+++ b/main/eggdrop/logs2html.mod.patch
diff --git a/extra/email/APKBUILD b/main/email/APKBUILD
index a1301fe0446..a1301fe0446 100644
--- a/extra/email/APKBUILD
+++ b/main/email/APKBUILD
diff --git a/extra/email/email-3.1.0-doc.patch b/main/email/email-3.1.0-doc.patch
index d7467844f06..d7467844f06 100644
--- a/extra/email/email-3.1.0-doc.patch
+++ b/main/email/email-3.1.0-doc.patch
diff --git a/extra/email/email-3.1.0-ldflags.patch b/main/email/email-3.1.0-ldflags.patch
index d08896ee3af..d08896ee3af 100644
--- a/extra/email/email-3.1.0-ldflags.patch
+++ b/main/email/email-3.1.0-ldflags.patch
diff --git a/extra/espeak/APKBUILD b/main/espeak/APKBUILD
index bf005e00a5d..bf005e00a5d 100644
--- a/extra/espeak/APKBUILD
+++ b/main/espeak/APKBUILD
diff --git a/extra/espeak/espeak-1.40.02-uclibc++.patch b/main/espeak/espeak-1.40.02-uclibc++.patch
index 68992205259..68992205259 100644
--- a/extra/espeak/espeak-1.40.02-uclibc++.patch
+++ b/main/espeak/espeak-1.40.02-uclibc++.patch
diff --git a/extra/ethtool/APKBUILD b/main/ethtool/APKBUILD
index 50c92d40ec3..50c92d40ec3 100644
--- a/extra/ethtool/APKBUILD
+++ b/main/ethtool/APKBUILD
diff --git a/extra/faac/APKBUILD b/main/faac/APKBUILD
index 3e523a4d517..3e523a4d517 100644
--- a/extra/faac/APKBUILD
+++ b/main/faac/APKBUILD
diff --git a/extra/faad2/APKBUILD b/main/faad2/APKBUILD
index e1453df902b..e1453df902b 100644
--- a/extra/faad2/APKBUILD
+++ b/main/faad2/APKBUILD
diff --git a/extra/fcgi/10-fcgi-2.4.0-Makefile.patch b/main/fcgi/10-fcgi-2.4.0-Makefile.patch
index dad4cd6e02d..dad4cd6e02d 100644
--- a/extra/fcgi/10-fcgi-2.4.0-Makefile.patch
+++ b/main/fcgi/10-fcgi-2.4.0-Makefile.patch
diff --git a/extra/fcgi/20-fcgi-2.4.0-clientdata-pointer.patch b/main/fcgi/20-fcgi-2.4.0-clientdata-pointer.patch
index ba4793765d5..ba4793765d5 100644
--- a/extra/fcgi/20-fcgi-2.4.0-clientdata-pointer.patch
+++ b/main/fcgi/20-fcgi-2.4.0-clientdata-pointer.patch
diff --git a/extra/fcgi/30-fcgi-2.4.0-html-updates.patch b/main/fcgi/30-fcgi-2.4.0-html-updates.patch
index ca10a6a6039..ca10a6a6039 100644
--- a/extra/fcgi/30-fcgi-2.4.0-html-updates.patch
+++ b/main/fcgi/30-fcgi-2.4.0-html-updates.patch
diff --git a/extra/fcgi/APKBUILD b/main/fcgi/APKBUILD
index fc208006cb6..fc208006cb6 100644
--- a/extra/fcgi/APKBUILD
+++ b/main/fcgi/APKBUILD
diff --git a/extra/fetchmail/APKBUILD b/main/fetchmail/APKBUILD
index 092556638ab..092556638ab 100644
--- a/extra/fetchmail/APKBUILD
+++ b/main/fetchmail/APKBUILD
diff --git a/extra/fetchmail/fetchmail.initd b/main/fetchmail/fetchmail.initd
index a1ed1ec8371..a1ed1ec8371 100755
--- a/extra/fetchmail/fetchmail.initd
+++ b/main/fetchmail/fetchmail.initd
diff --git a/extra/fetchmail/fetchmail.post-install b/main/fetchmail/fetchmail.post-install
index b16bfcc3e42..b16bfcc3e42 100644
--- a/extra/fetchmail/fetchmail.post-install
+++ b/main/fetchmail/fetchmail.post-install
diff --git a/extra/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install
index 4a1b630e008..4a1b630e008 100644
--- a/extra/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
diff --git a/extra/flac/APKBUILD b/main/flac/APKBUILD
index a5626e1c446..a5626e1c446 100644
--- a/extra/flac/APKBUILD
+++ b/main/flac/APKBUILD
diff --git a/extra/fping/APKBUILD b/main/fping/APKBUILD
index 11b4f1819a8..11b4f1819a8 100644
--- a/extra/fping/APKBUILD
+++ b/main/fping/APKBUILD
diff --git a/extra/freetds/APKBUILD b/main/freetds/APKBUILD
index 5e58429d9c0..5e58429d9c0 100644
--- a/extra/freetds/APKBUILD
+++ b/main/freetds/APKBUILD
diff --git a/extra/freetype/10-bytecode.patch b/main/freetype/10-bytecode.patch
index dd901ad64b7..dd901ad64b7 100644
--- a/extra/freetype/10-bytecode.patch
+++ b/main/freetype/10-bytecode.patch
diff --git a/extra/freetype/20-enable-spr.patch b/main/freetype/20-enable-spr.patch
index 217912aa1f2..217912aa1f2 100644
--- a/extra/freetype/20-enable-spr.patch
+++ b/main/freetype/20-enable-spr.patch
diff --git a/extra/freetype/30-enable-valid.patch b/main/freetype/30-enable-valid.patch
index b61a792219b..b61a792219b 100644
--- a/extra/freetype/30-enable-valid.patch
+++ b/main/freetype/30-enable-valid.patch
diff --git a/extra/freetype/40-memcpy-fix.patch b/main/freetype/40-memcpy-fix.patch
index 95c1cd6430c..95c1cd6430c 100644
--- a/extra/freetype/40-memcpy-fix.patch
+++ b/main/freetype/40-memcpy-fix.patch
diff --git a/extra/freetype/APKBUILD b/main/freetype/APKBUILD
index e7f2a87ffc2..e7f2a87ffc2 100644
--- a/extra/freetype/APKBUILD
+++ b/main/freetype/APKBUILD
diff --git a/extra/gawk/APKBUILD b/main/gawk/APKBUILD
index 5bcd518d236..5bcd518d236 100644
--- a/extra/gawk/APKBUILD
+++ b/main/gawk/APKBUILD
diff --git a/extra/gawk/gawk.post-deinstall b/main/gawk/gawk.post-deinstall
index 99b57c46353..99b57c46353 100644
--- a/extra/gawk/gawk.post-deinstall
+++ b/main/gawk/gawk.post-deinstall
diff --git a/extra/gd/APKBUILD b/main/gd/APKBUILD
index 75cd56cc48c..75cd56cc48c 100644
--- a/extra/gd/APKBUILD
+++ b/main/gd/APKBUILD
diff --git a/extra/gdb/50_all_gdb-pie-1.patch b/main/gdb/50_all_gdb-pie-1.patch
index a20771f6898..a20771f6898 100644
--- a/extra/gdb/50_all_gdb-pie-1.patch
+++ b/main/gdb/50_all_gdb-pie-1.patch
diff --git a/extra/gdb/50_all_gdb-pie-2.patch b/main/gdb/50_all_gdb-pie-2.patch
index 946d0550181..946d0550181 100644
--- a/extra/gdb/50_all_gdb-pie-2.patch
+++ b/main/gdb/50_all_gdb-pie-2.patch
diff --git a/extra/gdb/APKBUILD b/main/gdb/APKBUILD
index a851da31415..a851da31415 100644
--- a/extra/gdb/APKBUILD
+++ b/main/gdb/APKBUILD
diff --git a/extra/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch b/main/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch
index 139ef99d7ee..139ef99d7ee 100644
--- a/extra/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch
+++ b/main/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch
diff --git a/extra/gdbm/20-gdbm-1.8.3-compat-linking.patch b/main/gdbm/20-gdbm-1.8.3-compat-linking.patch
index 1337d08f5b2..1337d08f5b2 100644
--- a/extra/gdbm/20-gdbm-1.8.3-compat-linking.patch
+++ b/main/gdbm/20-gdbm-1.8.3-compat-linking.patch
diff --git a/extra/gdbm/30-gdbm-1.8.3-build.patch b/main/gdbm/30-gdbm-1.8.3-build.patch
index 084f5a1d247..084f5a1d247 100644
--- a/extra/gdbm/30-gdbm-1.8.3-build.patch
+++ b/main/gdbm/30-gdbm-1.8.3-build.patch
diff --git a/extra/gdbm/APKBUILD b/main/gdbm/APKBUILD
index e20966b3234..e20966b3234 100644
--- a/extra/gdbm/APKBUILD
+++ b/main/gdbm/APKBUILD
diff --git a/extra/gettext/APKBUILD b/main/gettext/APKBUILD
index 958e1131c8e..958e1131c8e 100644
--- a/extra/gettext/APKBUILD
+++ b/main/gettext/APKBUILD
diff --git a/extra/ghostscript/APKBUILD b/main/ghostscript/APKBUILD
index e387f850f30..e387f850f30 100644
--- a/extra/ghostscript/APKBUILD
+++ b/main/ghostscript/APKBUILD
diff --git a/extra/glib/APKBUILD b/main/glib/APKBUILD
index e06678d9897..e06678d9897 100644
--- a/extra/glib/APKBUILD
+++ b/main/glib/APKBUILD
diff --git a/extra/gnats/APKBUILD b/main/gnats/APKBUILD
index 535f46ee424..535f46ee424 100644
--- a/extra/gnats/APKBUILD
+++ b/main/gnats/APKBUILD
diff --git a/extra/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
index 0a2e5a589be..0a2e5a589be 100644
--- a/extra/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
diff --git a/extra/gnupg/APKBUILD b/main/gnupg/APKBUILD
index fa1387b7db9..fa1387b7db9 100644
--- a/extra/gnupg/APKBUILD
+++ b/main/gnupg/APKBUILD
diff --git a/extra/gnutls/APKBUILD b/main/gnutls/APKBUILD
index f8dd61f2d5e..f8dd61f2d5e 100644
--- a/extra/gnutls/APKBUILD
+++ b/main/gnutls/APKBUILD
diff --git a/extra/gperf/APKBUILD b/main/gperf/APKBUILD
index cc97c06d5c7..cc97c06d5c7 100644
--- a/extra/gperf/APKBUILD
+++ b/main/gperf/APKBUILD
diff --git a/extra/grep/APKBUILD b/main/grep/APKBUILD
index 4bdc96472a2..4bdc96472a2 100644
--- a/extra/grep/APKBUILD
+++ b/main/grep/APKBUILD
diff --git a/extra/grep/grep.post-deinstall b/main/grep/grep.post-deinstall
index 99b57c46353..99b57c46353 100644
--- a/extra/grep/grep.post-deinstall
+++ b/main/grep/grep.post-deinstall
diff --git a/extra/gross/APKBUILD b/main/gross/APKBUILD
index 2dac13a66aa..2dac13a66aa 100644
--- a/extra/gross/APKBUILD
+++ b/main/gross/APKBUILD
diff --git a/extra/gross/gross-1.0.1-configure.ac.patch b/main/gross/gross-1.0.1-configure.ac.patch
index 80f9ea77621..80f9ea77621 100644
--- a/extra/gross/gross-1.0.1-configure.ac.patch
+++ b/main/gross/gross-1.0.1-configure.ac.patch
diff --git a/extra/gross/gross-1.0.1-default-conf.patch b/main/gross/gross-1.0.1-default-conf.patch
index 39cd90709d9..39cd90709d9 100644
--- a/extra/gross/gross-1.0.1-default-conf.patch
+++ b/main/gross/gross-1.0.1-default-conf.patch
diff --git a/extra/gross/gross-1.0.1-user.patch b/main/gross/gross-1.0.1-user.patch
index a20279f0030..a20279f0030 100644
--- a/extra/gross/gross-1.0.1-user.patch
+++ b/main/gross/gross-1.0.1-user.patch
diff --git a/extra/gross/gross.post-install b/main/gross/gross.post-install
index df06670a418..df06670a418 100644
--- a/extra/gross/gross.post-install
+++ b/main/gross/gross.post-install
diff --git a/extra/gross/gross.post-upgrade b/main/gross/gross.post-upgrade
index 1e52785e15e..1e52785e15e 100644
--- a/extra/gross/gross.post-upgrade
+++ b/main/gross/gross.post-upgrade
diff --git a/extra/gross/gross.pre-install b/main/gross/gross.pre-install
index c3844d7a5e5..c3844d7a5e5 100644
--- a/extra/gross/gross.pre-install
+++ b/main/gross/gross.pre-install
diff --git a/extra/gross/gross.pre-upgrade b/main/gross/gross.pre-upgrade
index 90361bcc655..90361bcc655 100644
--- a/extra/gross/gross.pre-upgrade
+++ b/main/gross/gross.pre-upgrade
diff --git a/extra/gross/grossd.confd b/main/gross/grossd.confd
index 646e12f9d74..646e12f9d74 100644
--- a/extra/gross/grossd.confd
+++ b/main/gross/grossd.confd
diff --git a/extra/gross/grossd.initd b/main/gross/grossd.initd
index 3d1c43d7088..3d1c43d7088 100644
--- a/extra/gross/grossd.initd
+++ b/main/gross/grossd.initd
diff --git a/extra/gzip/APKBUILD b/main/gzip/APKBUILD
index eb06884d6d5..eb06884d6d5 100644
--- a/extra/gzip/APKBUILD
+++ b/main/gzip/APKBUILD
diff --git a/extra/gzip/gzip.post-deinstall b/main/gzip/gzip.post-deinstall
index 99b57c46353..99b57c46353 100644
--- a/extra/gzip/gzip.post-deinstall
+++ b/main/gzip/gzip.post-deinstall
diff --git a/extra/haserl/APKBUILD b/main/haserl/APKBUILD
index 2c4e08e4930..2c4e08e4930 100644
--- a/extra/haserl/APKBUILD
+++ b/main/haserl/APKBUILD
diff --git a/extra/heimdal/001_all_heimdal-no_libedit.patch b/main/heimdal/001_all_heimdal-no_libedit.patch
index a551bdce158..a551bdce158 100644
--- a/extra/heimdal/001_all_heimdal-no_libedit.patch
+++ b/main/heimdal/001_all_heimdal-no_libedit.patch
diff --git a/extra/heimdal/002_all_heimdal-fPIC.patch b/main/heimdal/002_all_heimdal-fPIC.patch
index c67dbae7646..c67dbae7646 100644
--- a/extra/heimdal/002_all_heimdal-fPIC.patch
+++ b/main/heimdal/002_all_heimdal-fPIC.patch
diff --git a/extra/heimdal/003_all_heimdal-rxapps.patch b/main/heimdal/003_all_heimdal-rxapps.patch
index 40fc05f083d..40fc05f083d 100644
--- a/extra/heimdal/003_all_heimdal-rxapps.patch
+++ b/main/heimdal/003_all_heimdal-rxapps.patch
diff --git a/extra/heimdal/005_all_heimdal-suid_fix.patch b/main/heimdal/005_all_heimdal-suid_fix.patch
index 35a9ed9f6b4..35a9ed9f6b4 100644
--- a/extra/heimdal/005_all_heimdal-suid_fix.patch
+++ b/main/heimdal/005_all_heimdal-suid_fix.patch
diff --git a/extra/heimdal/013_all_heimdal-pthread-lib.patch b/main/heimdal/013_all_heimdal-pthread-lib.patch
index 19f8794075f..19f8794075f 100644
--- a/extra/heimdal/013_all_heimdal-pthread-lib.patch
+++ b/main/heimdal/013_all_heimdal-pthread-lib.patch
diff --git a/extra/heimdal/014_all_heimdal-path.patch b/main/heimdal/014_all_heimdal-path.patch
index 36a86f1f93b..36a86f1f93b 100644
--- a/extra/heimdal/014_all_heimdal-path.patch
+++ b/main/heimdal/014_all_heimdal-path.patch
diff --git a/extra/heimdal/022_all_heimdal-as-needed.patch b/main/heimdal/022_all_heimdal-as-needed.patch
index 69c791778a5..69c791778a5 100644
--- a/extra/heimdal/022_all_heimdal-as-needed.patch
+++ b/main/heimdal/022_all_heimdal-as-needed.patch
diff --git a/extra/heimdal/APKBUILD b/main/heimdal/APKBUILD
index a494e201a62..a494e201a62 100644
--- a/extra/heimdal/APKBUILD
+++ b/main/heimdal/APKBUILD
diff --git a/extra/heimdal/heimdal-kadmind.init b/main/heimdal/heimdal-kadmind.init
index b58ac994dfa..b58ac994dfa 100755
--- a/extra/heimdal/heimdal-kadmind.init
+++ b/main/heimdal/heimdal-kadmind.init
diff --git a/extra/heimdal/heimdal-kdc.init b/main/heimdal/heimdal-kdc.init
index 753a101c301..753a101c301 100755
--- a/extra/heimdal/heimdal-kdc.init
+++ b/main/heimdal/heimdal-kdc.init
diff --git a/extra/heimdal/heimdal-kpasswdd.init b/main/heimdal/heimdal-kpasswdd.init
index 517cb862109..517cb862109 100755
--- a/extra/heimdal/heimdal-kpasswdd.init
+++ b/main/heimdal/heimdal-kpasswdd.init
diff --git a/extra/heimdal/heimdal-r23235-kb5-libwind_la.patch b/main/heimdal/heimdal-r23235-kb5-libwind_la.patch
index 88c02e598c6..88c02e598c6 100644
--- a/extra/heimdal/heimdal-r23235-kb5-libwind_la.patch
+++ b/main/heimdal/heimdal-r23235-kb5-libwind_la.patch
diff --git a/extra/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch b/main/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch
index 5390b2cf69a..5390b2cf69a 100644
--- a/extra/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch
+++ b/main/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch
diff --git a/extra/heimdal/heimdal-system_sqlite.patch b/main/heimdal/heimdal-system_sqlite.patch
index 2f8254e4d6b..2f8254e4d6b 100644
--- a/extra/heimdal/heimdal-system_sqlite.patch
+++ b/main/heimdal/heimdal-system_sqlite.patch
diff --git a/extra/htop/APKBUILD b/main/htop/APKBUILD
index b6e4ee88801..b6e4ee88801 100644
--- a/extra/htop/APKBUILD
+++ b/main/htop/APKBUILD
diff --git a/extra/hunspell/APKBUILD b/main/hunspell/APKBUILD
index 6883855aee4..6883855aee4 100644
--- a/extra/hunspell/APKBUILD
+++ b/main/hunspell/APKBUILD
diff --git a/extra/hylafax/APKBUILD b/main/hylafax/APKBUILD
index 42450d46782..42450d46782 100644
--- a/extra/hylafax/APKBUILD
+++ b/main/hylafax/APKBUILD
diff --git a/extra/hylafax/hylafax.post-install b/main/hylafax/hylafax.post-install
index 839f96f543c..839f96f543c 100644
--- a/extra/hylafax/hylafax.post-install
+++ b/main/hylafax/hylafax.post-install
diff --git a/extra/hypermail/APKBUILD b/main/hypermail/APKBUILD
index 6e4f412374c..6e4f412374c 100644
--- a/extra/hypermail/APKBUILD
+++ b/main/hypermail/APKBUILD
diff --git a/extra/hypermail/mdir2mbox.lua b/main/hypermail/mdir2mbox.lua
index dd883e02dbe..dd883e02dbe 100644
--- a/extra/hypermail/mdir2mbox.lua
+++ b/main/hypermail/mdir2mbox.lua
diff --git a/extra/iaxmodem/APKBUILD b/main/iaxmodem/APKBUILD
index f1f2b21c3a2..f1f2b21c3a2 100644
--- a/extra/iaxmodem/APKBUILD
+++ b/main/iaxmodem/APKBUILD
diff --git a/extra/iaxmodem/iaxmodem.confd b/main/iaxmodem/iaxmodem.confd
index 082a920e0b1..082a920e0b1 100644
--- a/extra/iaxmodem/iaxmodem.confd
+++ b/main/iaxmodem/iaxmodem.confd
diff --git a/extra/iaxmodem/iaxmodem.initd b/main/iaxmodem/iaxmodem.initd
index d6f2c947ac8..d6f2c947ac8 100644
--- a/extra/iaxmodem/iaxmodem.initd
+++ b/main/iaxmodem/iaxmodem.initd
diff --git a/extra/iaxmodem/nocxx.patch b/main/iaxmodem/nocxx.patch
index beb1ab9006b..beb1ab9006b 100644
--- a/extra/iaxmodem/nocxx.patch
+++ b/main/iaxmodem/nocxx.patch
diff --git a/extra/icu/APKBUILD b/main/icu/APKBUILD
index c2150b3ec8e..c2150b3ec8e 100644
--- a/extra/icu/APKBUILD
+++ b/main/icu/APKBUILD
diff --git a/extra/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
index 183b1e82ccc..183b1e82ccc 100644
--- a/extra/imagemagick/APKBUILD
+++ b/main/imagemagick/APKBUILD
diff --git a/extra/iproute2-qos/APKBUILD b/main/iproute2-qos/APKBUILD
index 902ff0c1aef..902ff0c1aef 100644
--- a/extra/iproute2-qos/APKBUILD
+++ b/main/iproute2-qos/APKBUILD
diff --git a/extra/iproute2-qos/qos.confd b/main/iproute2-qos/qos.confd
index 60d4093726a..60d4093726a 100644
--- a/extra/iproute2-qos/qos.confd
+++ b/main/iproute2-qos/qos.confd
diff --git a/extra/iproute2-qos/qos.initd b/main/iproute2-qos/qos.initd
index b543748691e..b543748691e 100644
--- a/extra/iproute2-qos/qos.initd
+++ b/main/iproute2-qos/qos.initd
diff --git a/extra/iproute2-qos/setup-qos b/main/iproute2-qos/setup-qos
index 5d5c601268d..5d5c601268d 100644
--- a/extra/iproute2-qos/setup-qos
+++ b/main/iproute2-qos/setup-qos
diff --git a/extra/ipsec-tools/00-verify-cert-leak.patch b/main/ipsec-tools/00-verify-cert-leak.patch
index 9e678133591..9e678133591 100644
--- a/extra/ipsec-tools/00-verify-cert-leak.patch
+++ b/main/ipsec-tools/00-verify-cert-leak.patch
diff --git a/extra/ipsec-tools/20-natoa-fix.patch b/main/ipsec-tools/20-natoa-fix.patch
index 91d7224e2a6..91d7224e2a6 100644
--- a/extra/ipsec-tools/20-natoa-fix.patch
+++ b/main/ipsec-tools/20-natoa-fix.patch
diff --git a/extra/ipsec-tools/30-natt-ports-cleanup.patch b/main/ipsec-tools/30-natt-ports-cleanup.patch
index 19360347dac..19360347dac 100644
--- a/extra/ipsec-tools/30-natt-ports-cleanup.patch
+++ b/main/ipsec-tools/30-natt-ports-cleanup.patch
diff --git a/extra/ipsec-tools/40-cmpsaddr-cleanup.patch b/main/ipsec-tools/40-cmpsaddr-cleanup.patch
index c5e3e4b3304..c5e3e4b3304 100644
--- a/extra/ipsec-tools/40-cmpsaddr-cleanup.patch
+++ b/main/ipsec-tools/40-cmpsaddr-cleanup.patch
diff --git a/extra/ipsec-tools/50-reverse-connect.patch b/main/ipsec-tools/50-reverse-connect.patch
index c49eae347f3..c49eae347f3 100644
--- a/extra/ipsec-tools/50-reverse-connect.patch
+++ b/main/ipsec-tools/50-reverse-connect.patch
diff --git a/extra/ipsec-tools/60-debug-quick.patch b/main/ipsec-tools/60-debug-quick.patch
index a5c3346ee99..a5c3346ee99 100644
--- a/extra/ipsec-tools/60-debug-quick.patch
+++ b/main/ipsec-tools/60-debug-quick.patch
diff --git a/extra/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD
index b947b9b6956..b947b9b6956 100644
--- a/extra/ipsec-tools/APKBUILD
+++ b/main/ipsec-tools/APKBUILD
diff --git a/extra/ipsec-tools/racoon.confd b/main/ipsec-tools/racoon.confd
index 66f8ed76744..66f8ed76744 100644
--- a/extra/ipsec-tools/racoon.confd
+++ b/main/ipsec-tools/racoon.confd
diff --git a/extra/ipsec-tools/racoon.initd b/main/ipsec-tools/racoon.initd
index 16fdec7e3a3..16fdec7e3a3 100644
--- a/extra/ipsec-tools/racoon.initd
+++ b/main/ipsec-tools/racoon.initd
diff --git a/extra/iptraf/APKBUILD b/main/iptraf/APKBUILD
index 95e9de3f35b..95e9de3f35b 100644
--- a/extra/iptraf/APKBUILD
+++ b/main/iptraf/APKBUILD
diff --git a/extra/iputils/APKBUILD b/main/iputils/APKBUILD
index 02face483a5..02face483a5 100644
--- a/extra/iputils/APKBUILD
+++ b/main/iputils/APKBUILD
diff --git a/extra/iputils/iputils-20070202-no-open-max.patch b/main/iputils/iputils-20070202-no-open-max.patch
index 5013ba4fdc0..5013ba4fdc0 100644
--- a/extra/iputils/iputils-20070202-no-open-max.patch
+++ b/main/iputils/iputils-20070202-no-open-max.patch
diff --git a/extra/iputils/iputils.post-install b/main/iputils/iputils.post-install
index 99b57c46353..99b57c46353 100644
--- a/extra/iputils/iputils.post-install
+++ b/main/iputils/iputils.post-install
diff --git a/extra/irssi/APKBUILD b/main/irssi/APKBUILD
index bdb3c16c929..bdb3c16c929 100644
--- a/extra/irssi/APKBUILD
+++ b/main/irssi/APKBUILD
diff --git a/extra/jpeg/APKBUILD b/main/jpeg/APKBUILD
index c795091a4d2..c795091a4d2 100644
--- a/extra/jpeg/APKBUILD
+++ b/main/jpeg/APKBUILD
diff --git a/extra/json4lua/APKBUILD b/main/json4lua/APKBUILD
index bceb0ca836a..bceb0ca836a 100644
--- a/extra/json4lua/APKBUILD
+++ b/main/json4lua/APKBUILD
diff --git a/extra/ksymoops/APKBUILD b/main/ksymoops/APKBUILD
index d8cc04fdf7d..d8cc04fdf7d 100644
--- a/extra/ksymoops/APKBUILD
+++ b/main/ksymoops/APKBUILD
diff --git a/extra/less/APKBUILD b/main/less/APKBUILD
index 0567914a5e8..0567914a5e8 100644
--- a/extra/less/APKBUILD
+++ b/main/less/APKBUILD
diff --git a/extra/less/less.post-deinstall b/main/less/less.post-deinstall
index 99b57c46353..99b57c46353 100644
--- a/extra/less/less.post-deinstall
+++ b/main/less/less.post-deinstall
diff --git a/extra/lftp/APKBUILD b/main/lftp/APKBUILD
index 239573c1212..239573c1212 100644
--- a/extra/lftp/APKBUILD
+++ b/main/lftp/APKBUILD
diff --git a/extra/lha/APKBUILD b/main/lha/APKBUILD
index 705e51e0773..705e51e0773 100644
--- a/extra/lha/APKBUILD
+++ b/main/lha/APKBUILD
diff --git a/extra/libao/APKBUILD b/main/libao/APKBUILD
index a82ba465879..a82ba465879 100644
--- a/extra/libao/APKBUILD
+++ b/main/libao/APKBUILD
diff --git a/extra/libart-lgpl/APKBUILD b/main/libart-lgpl/APKBUILD
index 3ac38769a06..3ac38769a06 100644
--- a/extra/libart-lgpl/APKBUILD
+++ b/main/libart-lgpl/APKBUILD
diff --git a/extra/libassuan/APKBUILD b/main/libassuan/APKBUILD
index 2b2498c49ef..2b2498c49ef 100644
--- a/extra/libassuan/APKBUILD
+++ b/main/libassuan/APKBUILD
diff --git a/extra/libcap/APKBUILD b/main/libcap/APKBUILD
index 36c09984c29..731729c03a0 100644
--- a/extra/libcap/APKBUILD
+++ b/main/libcap/APKBUILD
@@ -1,18 +1,23 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libcap
 pkgver=2.16
 pkgrel=1
 pkgdesc="POSIX 1003.1e capabilities"
 license="GPL"
 url="http://www.friedhoff.org/posixfilecaps.html"
-depends="uclibc"
-makedepends=""
+depends=
+makedepends="perl"
 source="http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$pkgname-$pkgver.tar.gz
+	include-order.patch
 	"
 subpackages="$pkgname-doc $pkgname-dev"
 
-build () 
+build ()
 {
 	cd "$srcdir/$pkgname-$pkgver"
+	patch -p1 < ../include-order.patch || return 1
+
 	make lib=/lib prefix=/usr LIBATTR=no DESTDIR="$pkgdir" install
 }
-md5sums="9e075fda242c4070ba76407064c13302  libcap-2.16.tar.gz"
+md5sums="9e075fda242c4070ba76407064c13302  libcap-2.16.tar.gz
+db5c78e0ab579bb6723fff5ebb2fd530  include-order.patch"
diff --git a/main/libcap/include-order.patch b/main/libcap/include-order.patch
new file mode 100644
index 00000000000..88c5fcc6c83
--- /dev/null
+++ b/main/libcap/include-order.patch
@@ -0,0 +1,16 @@
+diff -ur a/progs/capsh.c b/progs/capsh.c
+--- a/progs/capsh.c	2009-07-24 07:14:03.000000000 +0000
++++ b/progs/capsh.c	2009-07-24 07:14:19.000000000 +0000
+@@ -12,11 +12,11 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <sys/wait.h>
+ #include <sys/prctl.h>
+ #include <sys/capability.h>
+ #include <unistd.h>
+ #include <errno.h>
+-#include <sys/wait.h>
+ 
+ /* prctl based API for altering character of current process */
+ #define PR_GET_KEEPCAPS    7
diff --git a/extra/libconfig/APKBUILD b/main/libconfig/APKBUILD
index 13185722c9b..13185722c9b 100644
--- a/extra/libconfig/APKBUILD
+++ b/main/libconfig/APKBUILD
diff --git a/extra/libexif/APKBUILD b/main/libexif/APKBUILD
index c9f244b09d6..c9f244b09d6 100644
--- a/extra/libexif/APKBUILD
+++ b/main/libexif/APKBUILD
diff --git a/extra/libgcrypt/APKBUILD b/main/libgcrypt/APKBUILD
index efe95c1abf3..efe95c1abf3 100644
--- a/extra/libgcrypt/APKBUILD
+++ b/main/libgcrypt/APKBUILD
diff --git a/extra/libgcrypt/nocxx.patch b/main/libgcrypt/nocxx.patch
index beb1ab9006b..beb1ab9006b 100644
--- a/extra/libgcrypt/nocxx.patch
+++ b/main/libgcrypt/nocxx.patch
diff --git a/extra/libgpg-error/APKBUILD b/main/libgpg-error/APKBUILD
index 24cac436068..24cac436068 100644
--- a/extra/libgpg-error/APKBUILD
+++ b/main/libgpg-error/APKBUILD
diff --git a/extra/libgpg-error/nocxx.patch b/main/libgpg-error/nocxx.patch
index beb1ab9006b..beb1ab9006b 100644
--- a/extra/libgpg-error/nocxx.patch
+++ b/main/libgpg-error/nocxx.patch
diff --git a/extra/libiconv/APKBUILD b/main/libiconv/APKBUILD
index 6cd441ca6e1..6cd441ca6e1 100644
--- a/extra/libiconv/APKBUILD
+++ b/main/libiconv/APKBUILD
diff --git a/extra/libid3tag/APKBUILD b/main/libid3tag/APKBUILD
index 9410e353c63..9410e353c63 100644
--- a/extra/libid3tag/APKBUILD
+++ b/main/libid3tag/APKBUILD
diff --git a/extra/libidn/APKBUILD b/main/libidn/APKBUILD
index afcb59c788a..afcb59c788a 100644
--- a/extra/libidn/APKBUILD
+++ b/main/libidn/APKBUILD
diff --git a/extra/libksba/APKBUILD b/main/libksba/APKBUILD
index 47049370023..47049370023 100644
--- a/extra/libksba/APKBUILD
+++ b/main/libksba/APKBUILD
diff --git a/extra/libmcrypt/APKBUILD b/main/libmcrypt/APKBUILD
index 905d880f6f7..905d880f6f7 100644
--- a/extra/libmcrypt/APKBUILD
+++ b/main/libmcrypt/APKBUILD
diff --git a/extra/libnet/APKBUILD b/main/libnet/APKBUILD
index e756acc0eca..e756acc0eca 100644
--- a/extra/libnet/APKBUILD
+++ b/main/libnet/APKBUILD
diff --git a/extra/libnet/libnet-1.1.2.1-autotools.patch b/main/libnet/libnet-1.1.2.1-autotools.patch
index 0f4c65094db..0f4c65094db 100644
--- a/extra/libnet/libnet-1.1.2.1-autotools.patch
+++ b/main/libnet/libnet-1.1.2.1-autotools.patch
diff --git a/extra/libnet/libnet-1.1.2.1-fix-chksum.patch b/main/libnet/libnet-1.1.2.1-fix-chksum.patch
index e6f9bbc6dd2..e6f9bbc6dd2 100644
--- a/extra/libnet/libnet-1.1.2.1-fix-chksum.patch
+++ b/main/libnet/libnet-1.1.2.1-fix-chksum.patch
diff --git a/extra/libnetfilter_conntrack/APKBUILD b/main/libnetfilter_conntrack/APKBUILD
index 7f3aee35a97..7f3aee35a97 100644
--- a/extra/libnetfilter_conntrack/APKBUILD
+++ b/main/libnetfilter_conntrack/APKBUILD
diff --git a/extra/libnfnetlink/APKBUILD b/main/libnfnetlink/APKBUILD
index 63519aec0ca..63519aec0ca 100644
--- a/extra/libnfnetlink/APKBUILD
+++ b/main/libnfnetlink/APKBUILD
diff --git a/extra/libogg/APKBUILD b/main/libogg/APKBUILD
index d7920f88680..8cfbf96871c 100644
--- a/extra/libogg/APKBUILD
+++ b/main/libogg/APKBUILD
@@ -1,22 +1,20 @@
 # Contributor: Mika Havela <mika.havela@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+
 pkgname=libogg
 pkgver=1.1.3
 pkgrel=0
 pkgdesc="Ogg bitstream and framing library"
 url="http://xiph.org/ogg/"
 license="as-is"
-depends="uclibc"
+depends=
 subpackages="$pkgname-doc $pkgname-dev"
 source="http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.gz
-	nocxx.patch
 	"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	msg "Punting useless CXX check..."
-	patch -p1 < "$srcdir"/nocxx.patch || return 1
-
 	./configure --prefix=/usr
 	make || return 1
 	make -j1 DESTDIR="$pkgdir" install
diff --git a/extra/libogg/nocxx.patch b/main/libogg/nocxx.patch
index beb1ab9006b..beb1ab9006b 100644
--- a/extra/libogg/nocxx.patch
+++ b/main/libogg/nocxx.patch
diff --git a/extra/libpng/APKBUILD b/main/libpng/APKBUILD
index 3d97159ebc7..3d97159ebc7 100644
--- a/extra/libpng/APKBUILD
+++ b/main/libpng/APKBUILD
diff --git a/extra/libpri/APKBUILD b/main/libpri/APKBUILD
index d4d90a81038..d4d90a81038 100644
--- a/extra/libpri/APKBUILD
+++ b/main/libpri/APKBUILD
diff --git a/extra/libpri/libpri-1.4.9-i14292.patch b/main/libpri/libpri-1.4.9-i14292.patch
index 27ed1b8d432..27ed1b8d432 100644
--- a/extra/libpri/libpri-1.4.9-i14292.patch
+++ b/main/libpri/libpri-1.4.9-i14292.patch
diff --git a/extra/libpri/libpri-cflags.patch b/main/libpri/libpri-cflags.patch
index 7bf31c7ac1b..7bf31c7ac1b 100644
--- a/extra/libpri/libpri-cflags.patch
+++ b/main/libpri/libpri-cflags.patch
diff --git a/extra/libsamplerate/APKBUILD b/main/libsamplerate/APKBUILD
index 786d6c1e9a4..786d6c1e9a4 100644
--- a/extra/libsamplerate/APKBUILD
+++ b/main/libsamplerate/APKBUILD
diff --git a/extra/libsndfile/APKBUILD b/main/libsndfile/APKBUILD
index 471c45a6576..471c45a6576 100644
--- a/extra/libsndfile/APKBUILD
+++ b/main/libsndfile/APKBUILD
diff --git a/extra/libtasn1/APKBUILD b/main/libtasn1/APKBUILD
index 27f71e8056d..27f71e8056d 100644
--- a/extra/libtasn1/APKBUILD
+++ b/main/libtasn1/APKBUILD
diff --git a/extra/libtheora/APKBUILD b/main/libtheora/APKBUILD
index e3b3999a3d5..e3b3999a3d5 100644
--- a/extra/libtheora/APKBUILD
+++ b/main/libtheora/APKBUILD
diff --git a/extra/libusb-compat/APKBUILD b/main/libusb-compat/APKBUILD
index 23e16cfa57b..23e16cfa57b 100644
--- a/extra/libusb-compat/APKBUILD
+++ b/main/libusb-compat/APKBUILD
diff --git a/extra/libusb/APKBUILD b/main/libusb/APKBUILD
index 7234ad31dfd..7234ad31dfd 100644
--- a/extra/libusb/APKBUILD
+++ b/main/libusb/APKBUILD
diff --git a/extra/libvorbis/APKBUILD b/main/libvorbis/APKBUILD
index c4c0713435c..c4c0713435c 100644
--- a/extra/libvorbis/APKBUILD
+++ b/main/libvorbis/APKBUILD
diff --git a/extra/libxml2/APKBUILD b/main/libxml2/APKBUILD
index a135ade72c9..a135ade72c9 100644
--- a/extra/libxml2/APKBUILD
+++ b/main/libxml2/APKBUILD
diff --git a/extra/libxml2/nocxx.patch b/main/libxml2/nocxx.patch
index beb1ab9006b..beb1ab9006b 100644
--- a/extra/libxml2/nocxx.patch
+++ b/main/libxml2/nocxx.patch
diff --git a/extra/libxslt/APKBUILD b/main/libxslt/APKBUILD
index 8f6ce293800..8f6ce293800 100644
--- a/extra/libxslt/APKBUILD
+++ b/main/libxslt/APKBUILD
diff --git a/extra/lighttpd/APKBUILD b/main/lighttpd/APKBUILD
index 0abe6dea707..0abe6dea707 100644
--- a/extra/lighttpd/APKBUILD
+++ b/main/lighttpd/APKBUILD
diff --git a/extra/lighttpd/lighttpd.conf b/main/lighttpd/lighttpd.conf
index 778a4062b6f..778a4062b6f 100644
--- a/extra/lighttpd/lighttpd.conf
+++ b/main/lighttpd/lighttpd.conf
diff --git a/extra/lighttpd/lighttpd.confd b/main/lighttpd/lighttpd.confd
index 70d4170555b..70d4170555b 100644
--- a/extra/lighttpd/lighttpd.confd
+++ b/main/lighttpd/lighttpd.confd
diff --git a/extra/lighttpd/lighttpd.initd b/main/lighttpd/lighttpd.initd
index 80aaacc5e59..80aaacc5e59 100644
--- a/extra/lighttpd/lighttpd.initd
+++ b/main/lighttpd/lighttpd.initd
diff --git a/extra/lighttpd/lighttpd.logrotate b/main/lighttpd/lighttpd.logrotate
index 76f0ef3ff58..76f0ef3ff58 100644
--- a/extra/lighttpd/lighttpd.logrotate
+++ b/main/lighttpd/lighttpd.logrotate
diff --git a/extra/lighttpd/lighttpd.post-install b/main/lighttpd/lighttpd.post-install
index 5b116a6375e..5b116a6375e 100644
--- a/extra/lighttpd/lighttpd.post-install
+++ b/main/lighttpd/lighttpd.post-install
diff --git a/extra/lighttpd/lighttpd.pre-install b/main/lighttpd/lighttpd.pre-install
index 4682680d6b6..4682680d6b6 100644
--- a/extra/lighttpd/lighttpd.pre-install
+++ b/main/lighttpd/lighttpd.pre-install
diff --git a/extra/lighttpd/mime-types.conf b/main/lighttpd/mime-types.conf
index 3c365777395..3c365777395 100644
--- a/extra/lighttpd/mime-types.conf
+++ b/main/lighttpd/mime-types.conf
diff --git a/extra/lighttpd/mod_cgi.conf b/main/lighttpd/mod_cgi.conf
index 1cb3770f9b2..1cb3770f9b2 100644
--- a/extra/lighttpd/mod_cgi.conf
+++ b/main/lighttpd/mod_cgi.conf
diff --git a/extra/lighttpd/mod_fastcgi.conf b/main/lighttpd/mod_fastcgi.conf
index ca1369af79e..ca1369af79e 100644
--- a/extra/lighttpd/mod_fastcgi.conf
+++ b/main/lighttpd/mod_fastcgi.conf
diff --git a/extra/lighttpd/spawn-fcgi.confd b/main/lighttpd/spawn-fcgi.confd
index 2a88806ae0d..2a88806ae0d 100644
--- a/extra/lighttpd/spawn-fcgi.confd
+++ b/main/lighttpd/spawn-fcgi.confd
diff --git a/extra/lighttpd/spawn-fcgi.initd b/main/lighttpd/spawn-fcgi.initd
index 63daa75081f..63daa75081f 100644
--- a/extra/lighttpd/spawn-fcgi.initd
+++ b/main/lighttpd/spawn-fcgi.initd
diff --git a/extra/links/APKBUILD b/main/links/APKBUILD
index 2d11cf9dba7..2d11cf9dba7 100644
--- a/extra/links/APKBUILD
+++ b/main/links/APKBUILD
diff --git a/extra/lm_sensors/APKBUILD b/main/lm_sensors/APKBUILD
index 0327dc77518..0327dc77518 100644
--- a/extra/lm_sensors/APKBUILD
+++ b/main/lm_sensors/APKBUILD
diff --git a/extra/lm_sensors/fancontrol.initd b/main/lm_sensors/fancontrol.initd
index fb163abc23b..fb163abc23b 100644
--- a/extra/lm_sensors/fancontrol.initd
+++ b/main/lm_sensors/fancontrol.initd
diff --git a/extra/lm_sensors/lm_sensors-3.1.0-sensors-detect-alpine.patch b/main/lm_sensors/lm_sensors-3.1.0-sensors-detect-alpine.patch
index 9271c6bac2a..9271c6bac2a 100644
--- a/extra/lm_sensors/lm_sensors-3.1.0-sensors-detect-alpine.patch
+++ b/main/lm_sensors/lm_sensors-3.1.0-sensors-detect-alpine.patch
diff --git a/extra/lm_sensors/lm_sensors.initd b/main/lm_sensors/lm_sensors.initd
index 18fb3537062..18fb3537062 100644
--- a/extra/lm_sensors/lm_sensors.initd
+++ b/main/lm_sensors/lm_sensors.initd
diff --git a/extra/lm_sensors/sensord.confd b/main/lm_sensors/sensord.confd
index d82841aebd4..d82841aebd4 100644
--- a/extra/lm_sensors/sensord.confd
+++ b/main/lm_sensors/sensord.confd
diff --git a/extra/lm_sensors/sensord.initd b/main/lm_sensors/sensord.initd
index cb99dce3f05..cb99dce3f05 100644
--- a/extra/lm_sensors/sensord.initd
+++ b/main/lm_sensors/sensord.initd
diff --git a/extra/lm_sensors/sensors.install b/main/lm_sensors/sensors.install
index d593f841449..d593f841449 100644
--- a/extra/lm_sensors/sensors.install
+++ b/main/lm_sensors/sensors.install
diff --git a/extra/logrotate/APKBUILD b/main/logrotate/APKBUILD
index e29b27e1eab..e29b27e1eab 100644
--- a/extra/logrotate/APKBUILD
+++ b/main/logrotate/APKBUILD
diff --git a/extra/lpc/APKBUILD b/main/lpc/APKBUILD
index af2b8a089d0..af2b8a089d0 100644
--- a/extra/lpc/APKBUILD
+++ b/main/lpc/APKBUILD
diff --git a/extra/lua/APKBUILD b/main/lua/APKBUILD
index 5e41bc03ad2..5e41bc03ad2 100644
--- a/extra/lua/APKBUILD
+++ b/main/lua/APKBUILD
diff --git a/extra/lua/lua-5.1-make.patch b/main/lua/lua-5.1-make.patch
index d051a21cb63..d051a21cb63 100644
--- a/extra/lua/lua-5.1-make.patch
+++ b/main/lua/lua-5.1-make.patch
diff --git a/extra/lua/lua-5.1-module_paths.patch b/main/lua/lua-5.1-module_paths.patch
index 29ac4c3bf4b..29ac4c3bf4b 100644
--- a/extra/lua/lua-5.1-module_paths.patch
+++ b/main/lua/lua-5.1-module_paths.patch
diff --git a/extra/luaposix/APKBUILD b/main/luaposix/APKBUILD
index 7b85aeafdf0..7b85aeafdf0 100644
--- a/extra/luaposix/APKBUILD
+++ b/main/luaposix/APKBUILD
diff --git a/extra/luasql-postgres/APKBUILD b/main/luasql-postgres/APKBUILD
index 36756ca6573..36756ca6573 100644
--- a/extra/luasql-postgres/APKBUILD
+++ b/main/luasql-postgres/APKBUILD
diff --git a/extra/luasql-postgres/config.new b/main/luasql-postgres/config.new
index a8650c55118..a8650c55118 100644
--- a/extra/luasql-postgres/config.new
+++ b/main/luasql-postgres/config.new
diff --git a/extra/lzo/APKBUILD b/main/lzo/APKBUILD
index a9f2b912e15..a9f2b912e15 100644
--- a/extra/lzo/APKBUILD
+++ b/main/lzo/APKBUILD
diff --git a/extra/man-pages/APKBUILD b/main/man-pages/APKBUILD
index b47b21cbfdb..b47b21cbfdb 100644
--- a/extra/man-pages/APKBUILD
+++ b/main/man-pages/APKBUILD
diff --git a/extra/man/APKBUILD b/main/man/APKBUILD
index c6940dbf3b2..c6940dbf3b2 100644
--- a/extra/man/APKBUILD
+++ b/main/man/APKBUILD
diff --git a/extra/man/man-troff.patch b/main/man/man-troff.patch
index e08e9316b21..e08e9316b21 100644
--- a/extra/man/man-troff.patch
+++ b/main/man/man-troff.patch
diff --git a/extra/man/whatis.periodic.daily b/main/man/whatis.periodic.daily
index 00d40dd9af3..00d40dd9af3 100755
--- a/extra/man/whatis.periodic.daily
+++ b/main/man/whatis.periodic.daily
diff --git a/extra/md5/APKBUILD b/main/md5/APKBUILD
index 93e3747a921..93e3747a921 100644
--- a/extra/md5/APKBUILD
+++ b/main/md5/APKBUILD
diff --git a/extra/mini_httpd/APKBUILD b/main/mini_httpd/APKBUILD
index 4f7167e709c..4f7167e709c 100644
--- a/extra/mini_httpd/APKBUILD
+++ b/main/mini_httpd/APKBUILD
diff --git a/extra/mini_httpd/mini_httpd.conf.sample b/main/mini_httpd/mini_httpd.conf.sample
index 397a331ad30..397a331ad30 100644
--- a/extra/mini_httpd/mini_httpd.conf.sample
+++ b/main/mini_httpd/mini_httpd.conf.sample
diff --git a/extra/mini_httpd/mini_httpd.initd b/main/mini_httpd/mini_httpd.initd
index 4460a539ef5..4460a539ef5 100644
--- a/extra/mini_httpd/mini_httpd.initd
+++ b/main/mini_httpd/mini_httpd.initd
diff --git a/extra/mlmmj/APKBUILD b/main/mlmmj/APKBUILD
index 96649fd6b6d..96649fd6b6d 100644
--- a/extra/mlmmj/APKBUILD
+++ b/main/mlmmj/APKBUILD
diff --git a/extra/mpg123/APKBUILD b/main/mpg123/APKBUILD
index 4a13dea81a1..4a13dea81a1 100644
--- a/extra/mpg123/APKBUILD
+++ b/main/mpg123/APKBUILD
diff --git a/extra/mysql/APKBUILD b/main/mysql/APKBUILD
index de03c127da1..de03c127da1 100644
--- a/extra/mysql/APKBUILD
+++ b/main/mysql/APKBUILD
diff --git a/extra/mysql/mysql.initd b/main/mysql/mysql.initd
index 8f841646b87..8f841646b87 100644
--- a/extra/mysql/mysql.initd
+++ b/main/mysql/mysql.initd
diff --git a/extra/mysql/mysql.mycnf b/main/mysql/mysql.mycnf
index 6df0334eff8..6df0334eff8 100644
--- a/extra/mysql/mysql.mycnf
+++ b/main/mysql/mysql.mycnf
diff --git a/extra/nano/APKBUILD b/main/nano/APKBUILD
index ab2a8bfc56e..ab2a8bfc56e 100644
--- a/extra/nano/APKBUILD
+++ b/main/nano/APKBUILD
diff --git a/extra/ncftp/APKBUILD b/main/ncftp/APKBUILD
index 4a43f4582c8..4a43f4582c8 100644
--- a/extra/ncftp/APKBUILD
+++ b/main/ncftp/APKBUILD
diff --git a/extra/ncftp/ncftp.post-install b/main/ncftp/ncftp.post-install
index e1ccb7b8393..e1ccb7b8393 100644
--- a/extra/ncftp/ncftp.post-install
+++ b/main/ncftp/ncftp.post-install
diff --git a/extra/neon/APKBUILD b/main/neon/APKBUILD
index 76d099e4716..76d099e4716 100644
--- a/extra/neon/APKBUILD
+++ b/main/neon/APKBUILD
diff --git a/extra/net-snmp/APKBUILD b/main/net-snmp/APKBUILD
index 6a28088d574..ac497cb9b3d 100644
--- a/extra/net-snmp/APKBUILD
+++ b/main/net-snmp/APKBUILD
@@ -6,8 +6,8 @@ pkgrel=0
 pkgdesc="Simple Network Management Protocol"
 url="http://www.net-snmp.org/"
 license="GPL"
-depends="uclibc"
-makedepends=""
+depends=
+makedepends="perl-dev"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-tools"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 snmpd.initd
diff --git a/extra/net-snmp/snmpd.confd b/main/net-snmp/snmpd.confd
index ad48a1d94d1..ad48a1d94d1 100644
--- a/extra/net-snmp/snmpd.confd
+++ b/main/net-snmp/snmpd.confd
diff --git a/extra/net-snmp/snmpd.initd b/main/net-snmp/snmpd.initd
index 49beda58d82..49beda58d82 100644
--- a/extra/net-snmp/snmpd.initd
+++ b/main/net-snmp/snmpd.initd
diff --git a/extra/net-snmp/snmptrapd.confd b/main/net-snmp/snmptrapd.confd
index d9cee614ea4..d9cee614ea4 100644
--- a/extra/net-snmp/snmptrapd.confd
+++ b/main/net-snmp/snmptrapd.confd
diff --git a/extra/net-snmp/snmptrapd.initd b/main/net-snmp/snmptrapd.initd
index bf56233ab6a..bf56233ab6a 100644
--- a/extra/net-snmp/snmptrapd.initd
+++ b/main/net-snmp/snmptrapd.initd
diff --git a/extra/newt/APKBUILD b/main/newt/APKBUILD
index dc81b8b6709..dc81b8b6709 100644
--- a/extra/newt/APKBUILD
+++ b/main/newt/APKBUILD
diff --git a/extra/newt/newt-0.52.7-notcl.patch b/main/newt/newt-0.52.7-notcl.patch
index b9f86e6b605..b9f86e6b605 100644
--- a/extra/newt/newt-0.52.7-notcl.patch
+++ b/main/newt/newt-0.52.7-notcl.patch
diff --git a/extra/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD
index b9225f96635..b9225f96635 100644
--- a/extra/nfs-utils/APKBUILD
+++ b/main/nfs-utils/APKBUILD
diff --git a/extra/nfs-utils/nfs-utils-mtab-sym.patch b/main/nfs-utils/nfs-utils-mtab-sym.patch
index 1ebbd99b574..1ebbd99b574 100644
--- a/extra/nfs-utils/nfs-utils-mtab-sym.patch
+++ b/main/nfs-utils/nfs-utils-mtab-sym.patch
diff --git a/extra/nfs-utils/nfs-utils-no-exec.patch b/main/nfs-utils/nfs-utils-no-exec.patch
index 94a73d366f4..94a73d366f4 100644
--- a/extra/nfs-utils/nfs-utils-no-exec.patch
+++ b/main/nfs-utils/nfs-utils-no-exec.patch
diff --git a/extra/nfs-utils/nfs.confd b/main/nfs-utils/nfs.confd
index 98a143a654d..98a143a654d 100644
--- a/extra/nfs-utils/nfs.confd
+++ b/main/nfs-utils/nfs.confd
diff --git a/extra/nfs-utils/nfs.exports b/main/nfs-utils/nfs.exports
index dc0b8392714..dc0b8392714 100644
--- a/extra/nfs-utils/nfs.exports
+++ b/main/nfs-utils/nfs.exports
diff --git a/extra/nfs-utils/nfs.initd b/main/nfs-utils/nfs.initd
index e9711d914db..e9711d914db 100644
--- a/extra/nfs-utils/nfs.initd
+++ b/main/nfs-utils/nfs.initd
diff --git a/extra/ngircd/APKBUILD b/main/ngircd/APKBUILD
index 2f618a0776c..2f618a0776c 100644
--- a/extra/ngircd/APKBUILD
+++ b/main/ngircd/APKBUILD
diff --git a/extra/ngircd/ngircd.initd b/main/ngircd/ngircd.initd
index 807d844e8d9..807d844e8d9 100644
--- a/extra/ngircd/ngircd.initd
+++ b/main/ngircd/ngircd.initd
diff --git a/extra/ngircd/ngircd.pre-install b/main/ngircd/ngircd.pre-install
index 062e37ae4f7..062e37ae4f7 100644
--- a/extra/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
diff --git a/extra/nmap/APKBUILD b/main/nmap/APKBUILD
index bb04078768c..bb04078768c 100644
--- a/extra/nmap/APKBUILD
+++ b/main/nmap/APKBUILD
diff --git a/extra/nmap/nmap-4.53-uclibc++-output.cc.patch b/main/nmap/nmap-4.53-uclibc++-output.cc.patch
index 3253fc26b31..3253fc26b31 100644
--- a/extra/nmap/nmap-4.53-uclibc++-output.cc.patch
+++ b/main/nmap/nmap-4.53-uclibc++-output.cc.patch
diff --git a/extra/ntfs-3g/APKBUILD b/main/ntfs-3g/APKBUILD
index 5575e696de1..5575e696de1 100644
--- a/extra/ntfs-3g/APKBUILD
+++ b/main/ntfs-3g/APKBUILD
diff --git a/extra/ntfs-3g/nocxx.patch b/main/ntfs-3g/nocxx.patch
index beb1ab9006b..beb1ab9006b 100644
--- a/extra/ntfs-3g/nocxx.patch
+++ b/main/ntfs-3g/nocxx.patch
diff --git a/extra/oidentd/APKBUILD b/main/oidentd/APKBUILD
index 130283f72ac..130283f72ac 100644
--- a/extra/oidentd/APKBUILD
+++ b/main/oidentd/APKBUILD
diff --git a/extra/oidentd/oidentd.conf b/main/oidentd/oidentd.conf
index 03b28d82780..03b28d82780 100644
--- a/extra/oidentd/oidentd.conf
+++ b/main/oidentd/oidentd.conf
diff --git a/extra/oidentd/oidentd.confd b/main/oidentd/oidentd.confd
index 3116889e67e..3116889e67e 100644
--- a/extra/oidentd/oidentd.confd
+++ b/main/oidentd/oidentd.confd
diff --git a/extra/oidentd/oidentd.initd b/main/oidentd/oidentd.initd
index c40b058dac8..c40b058dac8 100644
--- a/extra/oidentd/oidentd.initd
+++ b/main/oidentd/oidentd.initd
diff --git a/extra/openldap/APKBUILD b/main/openldap/APKBUILD
index bb4db8296e2..bb4db8296e2 100644
--- a/extra/openldap/APKBUILD
+++ b/main/openldap/APKBUILD
diff --git a/extra/openldap/openldap-2.4-ppolicy.patch b/main/openldap/openldap-2.4-ppolicy.patch
index c05790e3e29..c05790e3e29 100644
--- a/extra/openldap/openldap-2.4-ppolicy.patch
+++ b/main/openldap/openldap-2.4-ppolicy.patch
diff --git a/extra/openldap/openldap-2.4.11-libldap_r.patch b/main/openldap/openldap-2.4.11-libldap_r.patch
index 448249a3b58..448249a3b58 100644
--- a/extra/openldap/openldap-2.4.11-libldap_r.patch
+++ b/main/openldap/openldap-2.4.11-libldap_r.patch
diff --git a/extra/openldap/openldap.post-install b/main/openldap/openldap.post-install
index 1d6affdfee0..1d6affdfee0 100644
--- a/extra/openldap/openldap.post-install
+++ b/main/openldap/openldap.post-install
diff --git a/extra/openldap/openldap.pre-install b/main/openldap/openldap.pre-install
index b208a9f5f2e..b208a9f5f2e 100644
--- a/extra/openldap/openldap.pre-install
+++ b/main/openldap/openldap.pre-install
diff --git a/extra/openldap/slapd.confd b/main/openldap/slapd.confd
index 2240ad3f302..2240ad3f302 100644
--- a/extra/openldap/slapd.confd
+++ b/main/openldap/slapd.confd
diff --git a/extra/openldap/slapd.initd b/main/openldap/slapd.initd
index 1637d3335ae..1637d3335ae 100644
--- a/extra/openldap/slapd.initd
+++ b/main/openldap/slapd.initd
diff --git a/extra/openldap/slurpd.initd b/main/openldap/slurpd.initd
index f5aa2ead5a3..f5aa2ead5a3 100644
--- a/extra/openldap/slurpd.initd
+++ b/main/openldap/slurpd.initd
diff --git a/extra/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
index c72d0d269cd..c72d0d269cd 100644
--- a/extra/opennhrp/APKBUILD
+++ b/main/opennhrp/APKBUILD
diff --git a/extra/opennhrp/opennhrp-0.9.2-fix-false-assert.patch b/main/opennhrp/opennhrp-0.9.2-fix-false-assert.patch
index 67b44ab5d21..67b44ab5d21 100644
--- a/extra/opennhrp/opennhrp-0.9.2-fix-false-assert.patch
+++ b/main/opennhrp/opennhrp-0.9.2-fix-false-assert.patch
diff --git a/extra/opennhrp/opennhrp-0.9.3-peer-up-bgp.patch b/main/opennhrp/opennhrp-0.9.3-peer-up-bgp.patch
index 60e4827d6fe..60e4827d6fe 100644
--- a/extra/opennhrp/opennhrp-0.9.3-peer-up-bgp.patch
+++ b/main/opennhrp/opennhrp-0.9.3-peer-up-bgp.patch
diff --git a/extra/opennhrp/opennhrp.confd b/main/opennhrp/opennhrp.confd
index c3bece169e6..c3bece169e6 100644
--- a/extra/opennhrp/opennhrp.confd
+++ b/main/opennhrp/opennhrp.confd
diff --git a/extra/opennhrp/opennhrp.initd b/main/opennhrp/opennhrp.initd
index ac7ea6a572e..ac7ea6a572e 100755
--- a/extra/opennhrp/opennhrp.initd
+++ b/main/opennhrp/opennhrp.initd
diff --git a/extra/openvpn/APKBUILD b/main/openvpn/APKBUILD
index 3b927139d10..3b927139d10 100644
--- a/extra/openvpn/APKBUILD
+++ b/main/openvpn/APKBUILD
diff --git a/extra/openvpn/openvpn-2.0.9-persistent.patch b/main/openvpn/openvpn-2.0.9-persistent.patch
index e042124ea49..e042124ea49 100644
--- a/extra/openvpn/openvpn-2.0.9-persistent.patch
+++ b/main/openvpn/openvpn-2.0.9-persistent.patch
diff --git a/extra/openvpn/openvpn.initd b/main/openvpn/openvpn.initd
index a6e4529e1c8..a6e4529e1c8 100644
--- a/extra/openvpn/openvpn.initd
+++ b/main/openvpn/openvpn.initd
diff --git a/extra/p7zip/APKBUILD b/main/p7zip/APKBUILD
index 38d6760282b..38d6760282b 100644
--- a/extra/p7zip/APKBUILD
+++ b/main/p7zip/APKBUILD
diff --git a/extra/p7zip/p7zip-cc-cxx.patch b/main/p7zip/p7zip-cc-cxx.patch
index d06708b4bbe..d06708b4bbe 100644
--- a/extra/p7zip/p7zip-cc-cxx.patch
+++ b/main/p7zip/p7zip-cc-cxx.patch
diff --git a/extra/pciutils/APKBUILD b/main/pciutils/APKBUILD
index 1c41b6d07b4..1c41b6d07b4 100644
--- a/extra/pciutils/APKBUILD
+++ b/main/pciutils/APKBUILD
diff --git a/extra/pcmciautils/APKBUILD b/main/pcmciautils/APKBUILD
index f11f6e06bfa..f11f6e06bfa 100644
--- a/extra/pcmciautils/APKBUILD
+++ b/main/pcmciautils/APKBUILD
diff --git a/extra/pcre/APKBUILD b/main/pcre/APKBUILD
index f2749d6a3ea..f2749d6a3ea 100644
--- a/extra/pcre/APKBUILD
+++ b/main/pcre/APKBUILD
diff --git a/extra/perl-archive-zip/APKBUILD b/main/perl-archive-zip/APKBUILD
index 2f78683eeca..2f78683eeca 100644
--- a/extra/perl-archive-zip/APKBUILD
+++ b/main/perl-archive-zip/APKBUILD
diff --git a/extra/perl-convert-binhex/APKBUILD b/main/perl-convert-binhex/APKBUILD
index e0cc0b30d14..e0cc0b30d14 100644
--- a/extra/perl-convert-binhex/APKBUILD
+++ b/main/perl-convert-binhex/APKBUILD
diff --git a/extra/perl-convert-tnef/APKBUILD b/main/perl-convert-tnef/APKBUILD
index 352e26e7283..352e26e7283 100644
--- a/extra/perl-convert-tnef/APKBUILD
+++ b/main/perl-convert-tnef/APKBUILD
diff --git a/extra/perl-convert-uulib/APKBUILD b/main/perl-convert-uulib/APKBUILD
index b35d517dea0..b35d517dea0 100644
--- a/extra/perl-convert-uulib/APKBUILD
+++ b/main/perl-convert-uulib/APKBUILD
diff --git a/extra/perl-crypt-openssl-random/APKBUILD b/main/perl-crypt-openssl-random/APKBUILD
index 0b1e8ea995a..0b1e8ea995a 100644
--- a/extra/perl-crypt-openssl-random/APKBUILD
+++ b/main/perl-crypt-openssl-random/APKBUILD
diff --git a/extra/perl-crypt-openssl-rsa/APKBUILD b/main/perl-crypt-openssl-rsa/APKBUILD
index 4acae984809..4acae984809 100644
--- a/extra/perl-crypt-openssl-rsa/APKBUILD
+++ b/main/perl-crypt-openssl-rsa/APKBUILD
diff --git a/extra/perl-db/APKBUILD b/main/perl-db/APKBUILD
index 929d5872275..929d5872275 100644
--- a/extra/perl-db/APKBUILD
+++ b/main/perl-db/APKBUILD
diff --git a/extra/perl-db_file/APKBUILD b/main/perl-db_file/APKBUILD
index 7d3edc3ab1b..7d3edc3ab1b 100644
--- a/extra/perl-db_file/APKBUILD
+++ b/main/perl-db_file/APKBUILD
diff --git a/extra/perl-digest-sha1/APKBUILD b/main/perl-digest-sha1/APKBUILD
index 0b0909c5dc6..0b0909c5dc6 100644
--- a/extra/perl-digest-sha1/APKBUILD
+++ b/main/perl-digest-sha1/APKBUILD
diff --git a/extra/perl-getopt-long/APKBUILD b/main/perl-getopt-long/APKBUILD
index 431f52a9899..431f52a9899 100644
--- a/extra/perl-getopt-long/APKBUILD
+++ b/main/perl-getopt-long/APKBUILD
diff --git a/extra/perl-html-parser/APKBUILD b/main/perl-html-parser/APKBUILD
index fb7ea012555..fb7ea012555 100644
--- a/extra/perl-html-parser/APKBUILD
+++ b/main/perl-html-parser/APKBUILD
diff --git a/extra/perl-inline/APKBUILD b/main/perl-inline/APKBUILD
index f8e350c1da0..f8e350c1da0 100644
--- a/extra/perl-inline/APKBUILD
+++ b/main/perl-inline/APKBUILD
diff --git a/extra/perl-io-stringy/APKBUILD b/main/perl-io-stringy/APKBUILD
index f25ce2164c4..f25ce2164c4 100644
--- a/extra/perl-io-stringy/APKBUILD
+++ b/main/perl-io-stringy/APKBUILD
diff --git a/extra/perl-mail-clamav/APKBUILD b/main/perl-mail-clamav/APKBUILD
index c8ef7ea723f..c8ef7ea723f 100644
--- a/extra/perl-mail-clamav/APKBUILD
+++ b/main/perl-mail-clamav/APKBUILD
diff --git a/extra/perl-mail-dkim/APKBUILD b/main/perl-mail-dkim/APKBUILD
index 7fc9d69ed3d..7fc9d69ed3d 100644
--- a/extra/perl-mail-dkim/APKBUILD
+++ b/main/perl-mail-dkim/APKBUILD
diff --git a/extra/perl-mail-domainkeys/APKBUILD b/main/perl-mail-domainkeys/APKBUILD
index be3f83df067..be3f83df067 100644
--- a/extra/perl-mail-domainkeys/APKBUILD
+++ b/main/perl-mail-domainkeys/APKBUILD
diff --git a/extra/perl-mail-spamassassin/APKBUILD b/main/perl-mail-spamassassin/APKBUILD
index 6a3c884616d..6a3c884616d 100644
--- a/extra/perl-mail-spamassassin/APKBUILD
+++ b/main/perl-mail-spamassassin/APKBUILD
diff --git a/extra/perl-mail-spf/APKBUILD b/main/perl-mail-spf/APKBUILD
index 372398d65fb..372398d65fb 100644
--- a/extra/perl-mail-spf/APKBUILD
+++ b/main/perl-mail-spf/APKBUILD
diff --git a/extra/perl-mail-tools/APKBUILD b/main/perl-mail-tools/APKBUILD
index 0e133c30e74..0e133c30e74 100644
--- a/extra/perl-mail-tools/APKBUILD
+++ b/main/perl-mail-tools/APKBUILD
diff --git a/extra/perl-mime-tools/APKBUILD b/main/perl-mime-tools/APKBUILD
index 1bbfe33fec6..1bbfe33fec6 100644
--- a/extra/perl-mime-tools/APKBUILD
+++ b/main/perl-mime-tools/APKBUILD
diff --git a/extra/perl-net-dns/APKBUILD b/main/perl-net-dns/APKBUILD
index 2ce850ee4db..2ce850ee4db 100644
--- a/extra/perl-net-dns/APKBUILD
+++ b/main/perl-net-dns/APKBUILD
diff --git a/extra/perl-net-ip/APKBUILD b/main/perl-net-ip/APKBUILD
index d959c43d0a6..d959c43d0a6 100644
--- a/extra/perl-net-ip/APKBUILD
+++ b/main/perl-net-ip/APKBUILD
diff --git a/extra/perl-net-server/APKBUILD b/main/perl-net-server/APKBUILD
index 9e0bc32ca49..9e0bc32ca49 100644
--- a/extra/perl-net-server/APKBUILD
+++ b/main/perl-net-server/APKBUILD
diff --git a/extra/perl-parse-recdescent/APKBUILD b/main/perl-parse-recdescent/APKBUILD
index 8ee87e58b7d..8ee87e58b7d 100644
--- a/extra/perl-parse-recdescent/APKBUILD
+++ b/main/perl-parse-recdescent/APKBUILD
diff --git a/extra/perl-test-pod/APKBUILD b/main/perl-test-pod/APKBUILD
index df47aee249f..df47aee249f 100644
--- a/extra/perl-test-pod/APKBUILD
+++ b/main/perl-test-pod/APKBUILD
diff --git a/extra/perl-time-date/APKBUILD b/main/perl-time-date/APKBUILD
index 1c02dfe1648..1c02dfe1648 100644
--- a/extra/perl-time-date/APKBUILD
+++ b/main/perl-time-date/APKBUILD
diff --git a/extra/perl-unix-syslog/APKBUILD b/main/perl-unix-syslog/APKBUILD
index 59ece194b0c..59ece194b0c 100644
--- a/extra/perl-unix-syslog/APKBUILD
+++ b/main/perl-unix-syslog/APKBUILD
diff --git a/extra/perl-uri-escape/APKBUILD b/main/perl-uri-escape/APKBUILD
index 4cd3b727e7f..4cd3b727e7f 100644
--- a/extra/perl-uri-escape/APKBUILD
+++ b/main/perl-uri-escape/APKBUILD
diff --git a/extra/perl-uri/APKBUILD b/main/perl-uri/APKBUILD
index e95b8411c93..e95b8411c93 100644
--- a/extra/perl-uri/APKBUILD
+++ b/main/perl-uri/APKBUILD
diff --git a/extra/perl-xml-parser/APKBUILD b/main/perl-xml-parser/APKBUILD
index 7dc23116cea..7dc23116cea 100644
--- a/extra/perl-xml-parser/APKBUILD
+++ b/main/perl-xml-parser/APKBUILD
diff --git a/extra/perl-xml-simple/APKBUILD b/main/perl-xml-simple/APKBUILD
index 74d2ecbe199..74d2ecbe199 100644
--- a/extra/perl-xml-simple/APKBUILD
+++ b/main/perl-xml-simple/APKBUILD
diff --git a/extra/pgcluster/APKBUILD b/main/pgcluster/APKBUILD
index 9d92b9b65b3..9d92b9b65b3 100644
--- a/extra/pgcluster/APKBUILD
+++ b/main/pgcluster/APKBUILD
diff --git a/extra/pgcluster/pgcluster.confd b/main/pgcluster/pgcluster.confd
index 9e1376eec70..9e1376eec70 100644
--- a/extra/pgcluster/pgcluster.confd
+++ b/main/pgcluster/pgcluster.confd
diff --git a/extra/pgcluster/pgcluster.initd b/main/pgcluster/pgcluster.initd
index fb5cdfdf352..fb5cdfdf352 100644
--- a/extra/pgcluster/pgcluster.initd
+++ b/main/pgcluster/pgcluster.initd
diff --git a/extra/pgpool/APKBUILD b/main/pgpool/APKBUILD
index 980b3019a87..980b3019a87 100644
--- a/extra/pgpool/APKBUILD
+++ b/main/pgpool/APKBUILD
diff --git a/extra/pgpool/pgpool.initd b/main/pgpool/pgpool.initd
index d577cf9e161..d577cf9e161 100644
--- a/extra/pgpool/pgpool.initd
+++ b/main/pgpool/pgpool.initd
diff --git a/extra/php-apc/APKBUILD b/main/php-apc/APKBUILD
index d3460aaa569..d3460aaa569 100644
--- a/extra/php-apc/APKBUILD
+++ b/main/php-apc/APKBUILD
diff --git a/extra/php-apc/apc.ini b/main/php-apc/apc.ini
index eb8a7e8f2c8..eb8a7e8f2c8 100644
--- a/extra/php-apc/apc.ini
+++ b/main/php-apc/apc.ini
diff --git a/extra/php-fileinfo/APKBUILD b/main/php-fileinfo/APKBUILD
index 8e72f404c3c..8e72f404c3c 100644
--- a/extra/php-fileinfo/APKBUILD
+++ b/main/php-fileinfo/APKBUILD
diff --git a/extra/php-fileinfo/magic.patch b/main/php-fileinfo/magic.patch
index 7f939e8b886..7f939e8b886 100644
--- a/extra/php-fileinfo/magic.patch
+++ b/main/php-fileinfo/magic.patch
diff --git a/extra/php/APKBUILD b/main/php/APKBUILD
index f1a36a24e9a..f1a36a24e9a 100644
--- a/extra/php/APKBUILD
+++ b/main/php/APKBUILD
diff --git a/extra/pinentry/APKBUILD b/main/pinentry/APKBUILD
index 5322ebe7a2c..5322ebe7a2c 100644
--- a/extra/pinentry/APKBUILD
+++ b/main/pinentry/APKBUILD
diff --git a/extra/pingu/APKBUILD b/main/pingu/APKBUILD
index fdd91972ab0..fdd91972ab0 100644
--- a/extra/pingu/APKBUILD
+++ b/main/pingu/APKBUILD
diff --git a/extra/pingu/pingu.initd b/main/pingu/pingu.initd
index 39301f80e48..39301f80e48 100644
--- a/extra/pingu/pingu.initd
+++ b/main/pingu/pingu.initd
diff --git a/extra/portmap/APKBUILD b/main/portmap/APKBUILD
index 7539f314aa7..7539f314aa7 100644
--- a/extra/portmap/APKBUILD
+++ b/main/portmap/APKBUILD
diff --git a/extra/portmap/portmap-6.0-tcpd.patch b/main/portmap/portmap-6.0-tcpd.patch
index c6af8f8c80b..c6af8f8c80b 100644
--- a/extra/portmap/portmap-6.0-tcpd.patch
+++ b/main/portmap/portmap-6.0-tcpd.patch
diff --git a/extra/portmap/portmap.confd b/main/portmap/portmap.confd
index c2756c992b4..c2756c992b4 100644
--- a/extra/portmap/portmap.confd
+++ b/main/portmap/portmap.confd
diff --git a/extra/portmap/portmap.initd b/main/portmap/portmap.initd
index 65d23d74849..65d23d74849 100644
--- a/extra/portmap/portmap.initd
+++ b/main/portmap/portmap.initd
diff --git a/extra/portmap/portmap.pre-install b/main/portmap/portmap.pre-install
index b0dcfb9c5c1..b0dcfb9c5c1 100644
--- a/extra/portmap/portmap.pre-install
+++ b/main/portmap/portmap.pre-install
diff --git a/extra/postfix/APKBUILD b/main/postfix/APKBUILD
index 71a9199c071..71a9199c071 100644
--- a/extra/postfix/APKBUILD
+++ b/main/postfix/APKBUILD
diff --git a/extra/postfix/dynamicmaps.cf b/main/postfix/dynamicmaps.cf
index dfe21105525..dfe21105525 100644
--- a/extra/postfix/dynamicmaps.cf
+++ b/main/postfix/dynamicmaps.cf
diff --git a/extra/postfix/postfix-2.6.1-dynamicmaps.patch b/main/postfix/postfix-2.6.1-dynamicmaps.patch
index 630abedc3ba..630abedc3ba 100644
--- a/extra/postfix/postfix-2.6.1-dynamicmaps.patch
+++ b/main/postfix/postfix-2.6.1-dynamicmaps.patch
diff --git a/extra/postfix/postfix-ldap.post-install b/main/postfix/postfix-ldap.post-install
index b8d23833b66..b8d23833b66 100644
--- a/extra/postfix/postfix-ldap.post-install
+++ b/main/postfix/postfix-ldap.post-install
diff --git a/extra/postfix/postfix-mysql.post-install b/main/postfix/postfix-mysql.post-install
index b8d23833b66..b8d23833b66 100644
--- a/extra/postfix/postfix-mysql.post-install
+++ b/main/postfix/postfix-mysql.post-install
diff --git a/extra/postfix/postfix-pcre.post-install b/main/postfix/postfix-pcre.post-install
index f15b00cf758..f15b00cf758 100644
--- a/extra/postfix/postfix-pcre.post-install
+++ b/main/postfix/postfix-pcre.post-install
diff --git a/extra/postfix/postfix-pgsql.post-install b/main/postfix/postfix-pgsql.post-install
index b8d23833b66..b8d23833b66 100644
--- a/extra/postfix/postfix-pgsql.post-install
+++ b/main/postfix/postfix-pgsql.post-install
diff --git a/extra/postfix/postfix.initd b/main/postfix/postfix.initd
index b2396b3aea3..b2396b3aea3 100644
--- a/extra/postfix/postfix.initd
+++ b/main/postfix/postfix.initd
diff --git a/extra/postfix/postfix.post-install b/main/postfix/postfix.post-install
index 98e01db0bb4..98e01db0bb4 100644
--- a/extra/postfix/postfix.post-install
+++ b/main/postfix/postfix.post-install
diff --git a/extra/postfix/postfix.pre-install b/main/postfix/postfix.pre-install
index 22414ef615c..22414ef615c 100644
--- a/extra/postfix/postfix.pre-install
+++ b/main/postfix/postfix.pre-install
diff --git a/extra/postgresql/APKBUILD b/main/postgresql/APKBUILD
index a2d921ed14a..a2d921ed14a 100644
--- a/extra/postgresql/APKBUILD
+++ b/main/postgresql/APKBUILD
diff --git a/extra/postgresql/postgresql.confd b/main/postgresql/postgresql.confd
index 56561b0c40c..56561b0c40c 100644
--- a/extra/postgresql/postgresql.confd
+++ b/main/postgresql/postgresql.confd
diff --git a/extra/postgresql/postgresql.initd b/main/postgresql/postgresql.initd
index 3863a49aa40..3863a49aa40 100644
--- a/extra/postgresql/postgresql.initd
+++ b/main/postgresql/postgresql.initd
diff --git a/extra/pth/APKBUILD b/main/pth/APKBUILD
index ce5cc5e126e..ce5cc5e126e 100644
--- a/extra/pth/APKBUILD
+++ b/main/pth/APKBUILD
diff --git a/extra/pth/pth-2.0.5-parallelfix.patch b/main/pth/pth-2.0.5-parallelfix.patch
index 1c8200a4cb2..1c8200a4cb2 100644
--- a/extra/pth/pth-2.0.5-parallelfix.patch
+++ b/main/pth/pth-2.0.5-parallelfix.patch
diff --git a/extra/pth/pth-2.0.6-ldflags.patch b/main/pth/pth-2.0.6-ldflags.patch
index 7a4a5ab3000..7a4a5ab3000 100644
--- a/extra/pth/pth-2.0.6-ldflags.patch
+++ b/main/pth/pth-2.0.6-ldflags.patch
diff --git a/extra/pth/pth-2.0.6-sigstack.patch b/main/pth/pth-2.0.6-sigstack.patch
index 3914dea7ac6..3914dea7ac6 100644
--- a/extra/pth/pth-2.0.6-sigstack.patch
+++ b/main/pth/pth-2.0.6-sigstack.patch
diff --git a/extra/python/APKBUILD b/main/python/APKBUILD
index d5d38b99ca9..d5d38b99ca9 100644
--- a/extra/python/APKBUILD
+++ b/main/python/APKBUILD
diff --git a/extra/python/python-2.6-internal-expat.patch b/main/python/python-2.6-internal-expat.patch
index f345db8c8e9..f345db8c8e9 100644
--- a/extra/python/python-2.6-internal-expat.patch
+++ b/main/python/python-2.6-internal-expat.patch
diff --git a/extra/quagga/APKBUILD b/main/quagga/APKBUILD
index aaa3fc64d07..aaa3fc64d07 100644
--- a/extra/quagga/APKBUILD
+++ b/main/quagga/APKBUILD
diff --git a/extra/quagga/bgpd.initd b/main/quagga/bgpd.initd
index b6104235c39..b6104235c39 100644
--- a/extra/quagga/bgpd.initd
+++ b/main/quagga/bgpd.initd
diff --git a/extra/quagga/ospf6d.initd b/main/quagga/ospf6d.initd
index 6edafe5f745..6edafe5f745 100644
--- a/extra/quagga/ospf6d.initd
+++ b/main/quagga/ospf6d.initd
diff --git a/extra/quagga/ospfd.initd b/main/quagga/ospfd.initd
index f67ca2c154a..f67ca2c154a 100644
--- a/extra/quagga/ospfd.initd
+++ b/main/quagga/ospfd.initd
diff --git a/extra/quagga/quagga-0.99.11-del-routes.patch b/main/quagga/quagga-0.99.11-del-routes.patch
index 72ee89929cf..72ee89929cf 100644
--- a/extra/quagga/quagga-0.99.11-del-routes.patch
+++ b/main/quagga/quagga-0.99.11-del-routes.patch
diff --git a/extra/quagga/quagga-0.99.11-fd-leak.patch b/main/quagga/quagga-0.99.11-fd-leak.patch
index e558d30a6ec..e558d30a6ec 100644
--- a/extra/quagga/quagga-0.99.11-fd-leak.patch
+++ b/main/quagga/quagga-0.99.11-fd-leak.patch
diff --git a/extra/quagga/quagga-0.99.11-ipv6-only.patch b/main/quagga/quagga-0.99.11-ipv6-only.patch
index 53636d6b57f..53636d6b57f 100644
--- a/extra/quagga/quagga-0.99.11-ipv6-only.patch
+++ b/main/quagga/quagga-0.99.11-ipv6-only.patch
diff --git a/extra/quagga/quagga-0.99.11-link-libcap.patch b/main/quagga/quagga-0.99.11-link-libcap.patch
index 2c1b868d158..2c1b868d158 100644
--- a/extra/quagga/quagga-0.99.11-link-libcap.patch
+++ b/main/quagga/quagga-0.99.11-link-libcap.patch
diff --git a/extra/quagga/quagga-0.99.11-zombie.patch b/main/quagga/quagga-0.99.11-zombie.patch
index ad562df0002..ad562df0002 100644
--- a/extra/quagga/quagga-0.99.11-zombie.patch
+++ b/main/quagga/quagga-0.99.11-zombie.patch
diff --git a/extra/quagga/quagga.post-install b/main/quagga/quagga.post-install
index c1c670d2019..c1c670d2019 100644
--- a/extra/quagga/quagga.post-install
+++ b/main/quagga/quagga.post-install
diff --git a/extra/quagga/quagga.pre-install b/main/quagga/quagga.pre-install
index 2643891dc74..2643891dc74 100644
--- a/extra/quagga/quagga.pre-install
+++ b/main/quagga/quagga.pre-install
diff --git a/extra/quagga/ripd.initd b/main/quagga/ripd.initd
index 987d6ec4b6a..987d6ec4b6a 100644
--- a/extra/quagga/ripd.initd
+++ b/main/quagga/ripd.initd
diff --git a/extra/quagga/ripngd.initd b/main/quagga/ripngd.initd
index 9bf2ff2a872..9bf2ff2a872 100644
--- a/extra/quagga/ripngd.initd
+++ b/main/quagga/ripngd.initd
diff --git a/extra/quagga/zebra.confd b/main/quagga/zebra.confd
index a5256acd04d..a5256acd04d 100644
--- a/extra/quagga/zebra.confd
+++ b/main/quagga/zebra.confd
diff --git a/extra/quagga/zebra.initd b/main/quagga/zebra.initd
index f0cc0084326..f0cc0084326 100644
--- a/extra/quagga/zebra.initd
+++ b/main/quagga/zebra.initd
diff --git a/extra/razor/APKBUILD b/main/razor/APKBUILD
index 7034208641a..7034208641a 100644
--- a/extra/razor/APKBUILD
+++ b/main/razor/APKBUILD
diff --git a/extra/roundcubemail/APKBUILD b/main/roundcubemail/APKBUILD
index f56de7b77c9..f56de7b77c9 100644
--- a/extra/roundcubemail/APKBUILD
+++ b/main/roundcubemail/APKBUILD
diff --git a/extra/rrdtool/APKBUILD b/main/rrdtool/APKBUILD
index 541a54e85e9..541a54e85e9 100644
--- a/extra/rrdtool/APKBUILD
+++ b/main/rrdtool/APKBUILD
diff --git a/extra/rsync/APKBUILD b/main/rsync/APKBUILD
index 4b0e8f12053..4b0e8f12053 100644
--- a/extra/rsync/APKBUILD
+++ b/main/rsync/APKBUILD
diff --git a/extra/rsync/rsyncd.conf b/main/rsync/rsyncd.conf
index b6dd5994d40..b6dd5994d40 100644
--- a/extra/rsync/rsyncd.conf
+++ b/main/rsync/rsyncd.conf
diff --git a/extra/rsync/rsyncd.confd b/main/rsync/rsyncd.confd
index c3d897ed2f2..c3d897ed2f2 100644
--- a/extra/rsync/rsyncd.confd
+++ b/main/rsync/rsyncd.confd
diff --git a/extra/rsync/rsyncd.initd b/main/rsync/rsyncd.initd
index 1b20282296a..1b20282296a 100644
--- a/extra/rsync/rsyncd.initd
+++ b/main/rsync/rsyncd.initd
diff --git a/extra/rsync/rsyncd.logrotate b/main/rsync/rsyncd.logrotate
index 34bcf72d210..34bcf72d210 100644
--- a/extra/rsync/rsyncd.logrotate
+++ b/main/rsync/rsyncd.logrotate
diff --git a/extra/ruby/APKBUILD b/main/ruby/APKBUILD
index ffeb781502a..ffeb781502a 100644
--- a/extra/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
diff --git a/extra/rubygems/APKBUILD b/main/rubygems/APKBUILD
index 8ba7c48834c..8ba7c48834c 100644
--- a/extra/rubygems/APKBUILD
+++ b/main/rubygems/APKBUILD
diff --git a/extra/rubygems/rubygems-1.3.1-setup.patch b/main/rubygems/rubygems-1.3.1-setup.patch
index 3b76ad3f999..3b76ad3f999 100644
--- a/extra/rubygems/rubygems-1.3.1-setup.patch
+++ b/main/rubygems/rubygems-1.3.1-setup.patch
diff --git a/extra/run-parts/APKBUILD b/main/run-parts/APKBUILD
index 5854fa5d81f..5854fa5d81f 100644
--- a/extra/run-parts/APKBUILD
+++ b/main/run-parts/APKBUILD
diff --git a/extra/samba/APKBUILD b/main/samba/APKBUILD
index c28a6e2de31..c28a6e2de31 100644
--- a/extra/samba/APKBUILD
+++ b/main/samba/APKBUILD
diff --git a/extra/samba/samba.confd b/main/samba/samba.confd
index 3788c3c173c..3788c3c173c 100644
--- a/extra/samba/samba.confd
+++ b/main/samba/samba.confd
diff --git a/extra/samba/samba.initd b/main/samba/samba.initd
index d2d395a9897..d2d395a9897 100644
--- a/extra/samba/samba.initd
+++ b/main/samba/samba.initd
diff --git a/extra/screen/APKBUILD b/main/screen/APKBUILD
index ffa48fa2080..ffa48fa2080 100644
--- a/extra/screen/APKBUILD
+++ b/main/screen/APKBUILD
diff --git a/extra/screen/screen-4.0.3.patch b/main/screen/screen-4.0.3.patch
index 4a90f49b91f..4a90f49b91f 100644
--- a/extra/screen/screen-4.0.3.patch
+++ b/main/screen/screen-4.0.3.patch
diff --git a/extra/sed/APKBUILD b/main/sed/APKBUILD
index 99ba1e6f8b6..99ba1e6f8b6 100644
--- a/extra/sed/APKBUILD
+++ b/main/sed/APKBUILD
diff --git a/extra/sed/sed.post-deinstall b/main/sed/sed.post-deinstall
index 99b57c46353..99b57c46353 100644
--- a/extra/sed/sed.post-deinstall
+++ b/main/sed/sed.post-deinstall
diff --git a/extra/sfic/APKBUILD b/main/sfic/APKBUILD
index 3f781b4dee1..3f781b4dee1 100644
--- a/extra/sfic/APKBUILD
+++ b/main/sfic/APKBUILD
diff --git a/extra/sfic/sfic-0.1.7-signal.patch b/main/sfic/sfic-0.1.7-signal.patch
index 54538aac1ab..54538aac1ab 100644
--- a/extra/sfic/sfic-0.1.7-signal.patch
+++ b/main/sfic/sfic-0.1.7-signal.patch
diff --git a/extra/shorewall-common/APKBUILD b/main/shorewall-common/APKBUILD
index 1c0a51d8a6b..1c0a51d8a6b 100644
--- a/extra/shorewall-common/APKBUILD
+++ b/main/shorewall-common/APKBUILD
diff --git a/extra/shorewall-common/shorewall.initd b/main/shorewall-common/shorewall.initd
index 9dda676c574..9dda676c574 100644
--- a/extra/shorewall-common/shorewall.initd
+++ b/main/shorewall-common/shorewall.initd
diff --git a/extra/shorewall-lite/APKBUILD b/main/shorewall-lite/APKBUILD
index 9c98a3bfdac..9c98a3bfdac 100644
--- a/extra/shorewall-lite/APKBUILD
+++ b/main/shorewall-lite/APKBUILD
diff --git a/extra/shorewall-lite/shorewall-lite.initd b/main/shorewall-lite/shorewall-lite.initd
index d2537e8a129..d2537e8a129 100755
--- a/extra/shorewall-lite/shorewall-lite.initd
+++ b/main/shorewall-lite/shorewall-lite.initd
diff --git a/extra/shorewall-perl/APKBUILD b/main/shorewall-perl/APKBUILD
index e601c96a52e..e601c96a52e 100644
--- a/extra/shorewall-perl/APKBUILD
+++ b/main/shorewall-perl/APKBUILD
diff --git a/extra/shorewall-shell/APKBUILD b/main/shorewall-shell/APKBUILD
index 643562f2093..643562f2093 100644
--- a/extra/shorewall-shell/APKBUILD
+++ b/main/shorewall-shell/APKBUILD
diff --git a/extra/shorewall/APKBUILD b/main/shorewall/APKBUILD
index 735973cc26c..735973cc26c 100644
--- a/extra/shorewall/APKBUILD
+++ b/main/shorewall/APKBUILD
diff --git a/extra/sic/APKBUILD b/main/sic/APKBUILD
index 72e197ea08b..72e197ea08b 100644
--- a/extra/sic/APKBUILD
+++ b/main/sic/APKBUILD
diff --git a/extra/slang/APKBUILD b/main/slang/APKBUILD
index c1fe9620003..c1fe9620003 100644
--- a/extra/slang/APKBUILD
+++ b/main/slang/APKBUILD
diff --git a/extra/slang/slang-2.1.3-uclibc.patch b/main/slang/slang-2.1.3-uclibc.patch
index d7ed5a8d650..d7ed5a8d650 100644
--- a/extra/slang/slang-2.1.3-uclibc.patch
+++ b/main/slang/slang-2.1.3-uclibc.patch
diff --git a/extra/snort/APKBUILD b/main/snort/APKBUILD
index 35b4820651b..35b4820651b 100644
--- a/extra/snort/APKBUILD
+++ b/main/snort/APKBUILD
diff --git a/extra/snort/nocxx.patch b/main/snort/nocxx.patch
index beb1ab9006b..beb1ab9006b 100644
--- a/extra/snort/nocxx.patch
+++ b/main/snort/nocxx.patch
diff --git a/extra/snort/snort.confd b/main/snort/snort.confd
index d4d240ac966..d4d240ac966 100644
--- a/extra/snort/snort.confd
+++ b/main/snort/snort.confd
diff --git a/extra/snort/snort.initd b/main/snort/snort.initd
index a5c2b05c47e..a5c2b05c47e 100644
--- a/extra/snort/snort.initd
+++ b/main/snort/snort.initd
diff --git a/extra/snort/snort.pre-install b/main/snort/snort.pre-install
index e1555163a70..e1555163a70 100644
--- a/extra/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
diff --git a/extra/sntpc/APKBUILD b/main/sntpc/APKBUILD
index 6df6a6efd08..6df6a6efd08 100644
--- a/extra/sntpc/APKBUILD
+++ b/main/sntpc/APKBUILD
diff --git a/extra/sntpc/sntpc.confd b/main/sntpc/sntpc.confd
index a92e4be8684..a92e4be8684 100644
--- a/extra/sntpc/sntpc.confd
+++ b/main/sntpc/sntpc.confd
diff --git a/extra/sntpc/sntpc.initd b/main/sntpc/sntpc.initd
index a97e51bdbd8..a97e51bdbd8 100644
--- a/extra/sntpc/sntpc.initd
+++ b/main/sntpc/sntpc.initd
diff --git a/extra/spamassassin/APKBUILD b/main/spamassassin/APKBUILD
index 3da01a62f2d..3da01a62f2d 100644
--- a/extra/spamassassin/APKBUILD
+++ b/main/spamassassin/APKBUILD
diff --git a/extra/spamassassin/spamd.conf b/main/spamassassin/spamd.conf
index b6fca036f2e..b6fca036f2e 100644
--- a/extra/spamassassin/spamd.conf
+++ b/main/spamassassin/spamd.conf
diff --git a/extra/spamassassin/spamd.init b/main/spamassassin/spamd.init
index 89723889f4c..89723889f4c 100644
--- a/extra/spamassassin/spamd.init
+++ b/main/spamassassin/spamd.init
diff --git a/extra/sqlite/APKBUILD b/main/sqlite/APKBUILD
index 40a5cd7e443..40a5cd7e443 100644
--- a/extra/sqlite/APKBUILD
+++ b/main/sqlite/APKBUILD
diff --git a/extra/sqlite/license.txt b/main/sqlite/license.txt
index 118c5d5e60e..118c5d5e60e 100644
--- a/extra/sqlite/license.txt
+++ b/main/sqlite/license.txt
diff --git a/extra/squid/APKBUILD b/main/squid/APKBUILD
index ac840cbbd54..ac840cbbd54 100644
--- a/extra/squid/APKBUILD
+++ b/main/squid/APKBUILD
diff --git a/extra/squid/squid-2.7-gentoo.patch b/main/squid/squid-2.7-gentoo.patch
index 5ac174dee2b..5ac174dee2b 100644
--- a/extra/squid/squid-2.7-gentoo.patch
+++ b/main/squid/squid-2.7-gentoo.patch
diff --git a/extra/squid/squid.confd b/main/squid/squid.confd
index 14a9ee84bd7..14a9ee84bd7 100644
--- a/extra/squid/squid.confd
+++ b/main/squid/squid.confd
diff --git a/extra/squid/squid.initd b/main/squid/squid.initd
index bbdc2bed2ad..bbdc2bed2ad 100644
--- a/extra/squid/squid.initd
+++ b/main/squid/squid.initd
diff --git a/extra/squid/squid.logrotate b/main/squid/squid.logrotate
index fb3279e0138..fb3279e0138 100644
--- a/extra/squid/squid.logrotate
+++ b/main/squid/squid.logrotate
diff --git a/extra/squid/squid.post-install b/main/squid/squid.post-install
index 88df6d26f9e..88df6d26f9e 100644
--- a/extra/squid/squid.post-install
+++ b/main/squid/squid.post-install
diff --git a/extra/ssmtp/APKBUILD b/main/ssmtp/APKBUILD
index 2f63b689f91..2f63b689f91 100644
--- a/extra/ssmtp/APKBUILD
+++ b/main/ssmtp/APKBUILD
diff --git a/extra/ssmtp/CVE-2008-3962.patch b/main/ssmtp/CVE-2008-3962.patch
index fca144fa680..fca144fa680 100644
--- a/extra/ssmtp/CVE-2008-3962.patch
+++ b/main/ssmtp/CVE-2008-3962.patch
diff --git a/extra/ssmtp/generate_config.patch b/main/ssmtp/generate_config.patch
index dd4baf9f8a8..dd4baf9f8a8 100644
--- a/extra/ssmtp/generate_config.patch
+++ b/main/ssmtp/generate_config.patch
diff --git a/extra/strace/APKBUILD b/main/strace/APKBUILD
index eb1f88c2fab..eb1f88c2fab 100644
--- a/extra/strace/APKBUILD
+++ b/main/strace/APKBUILD
diff --git a/extra/subversion/APKBUILD b/main/subversion/APKBUILD
index 538f77d0be3..538f77d0be3 100644
--- a/extra/subversion/APKBUILD
+++ b/main/subversion/APKBUILD
diff --git a/extra/subversion/subversion.pre-install b/main/subversion/subversion.pre-install
index fb516ee5a0e..fb516ee5a0e 100644
--- a/extra/subversion/subversion.pre-install
+++ b/main/subversion/subversion.pre-install
diff --git a/extra/subversion/svnserve.confd b/main/subversion/svnserve.confd
index b487a409758..b487a409758 100644
--- a/extra/subversion/svnserve.confd
+++ b/main/subversion/svnserve.confd
diff --git a/extra/subversion/svnserve.initd b/main/subversion/svnserve.initd
index 036d0187e7e..036d0187e7e 100644
--- a/extra/subversion/svnserve.initd
+++ b/main/subversion/svnserve.initd
diff --git a/extra/sysfsutils/APKBUILD b/main/sysfsutils/APKBUILD
index e462aec7052..e462aec7052 100644
--- a/extra/sysfsutils/APKBUILD
+++ b/main/sysfsutils/APKBUILD
diff --git a/extra/sysklogd/APKBUILD b/main/sysklogd/APKBUILD
index e3fe8badc5d..e3fe8badc5d 100644
--- a/extra/sysklogd/APKBUILD
+++ b/main/sysklogd/APKBUILD
diff --git a/extra/sysklogd/LICENSE b/main/sysklogd/LICENSE
index 7e9b5d59c32..7e9b5d59c32 100644
--- a/extra/sysklogd/LICENSE
+++ b/main/sysklogd/LICENSE
diff --git a/extra/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff b/main/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
index 40b8817d4e2..40b8817d4e2 100644
--- a/extra/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
+++ b/main/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
diff --git a/extra/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff b/main/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff
index ad311a512c0..ad311a512c0 100644
--- a/extra/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff
+++ b/main/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff
diff --git a/extra/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff b/main/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
index 8c3f571f3ca..8c3f571f3ca 100644
--- a/extra/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
+++ b/main/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
diff --git a/extra/sysklogd/sysklogd-1.5-build.patch b/main/sysklogd/sysklogd-1.5-build.patch
index 6175cdfe783..6175cdfe783 100644
--- a/extra/sysklogd/sysklogd-1.5-build.patch
+++ b/main/sysklogd/sysklogd-1.5-build.patch
diff --git a/extra/sysklogd/sysklogd.confd b/main/sysklogd/sysklogd.confd
index c9735739117..c9735739117 100644
--- a/extra/sysklogd/sysklogd.confd
+++ b/main/sysklogd/sysklogd.confd
diff --git a/extra/sysklogd/sysklogd.initd b/main/sysklogd/sysklogd.initd
index 59db00fc991..59db00fc991 100644
--- a/extra/sysklogd/sysklogd.initd
+++ b/main/sysklogd/sysklogd.initd
diff --git a/extra/sysklogd/sysklogd.logrotate b/main/sysklogd/sysklogd.logrotate
index 29afd15bd4e..29afd15bd4e 100644
--- a/extra/sysklogd/sysklogd.logrotate
+++ b/main/sysklogd/sysklogd.logrotate
diff --git a/extra/sysstat/APKBUILD b/main/sysstat/APKBUILD
index f9a1408b7f6..f9a1408b7f6 100644
--- a/extra/sysstat/APKBUILD
+++ b/main/sysstat/APKBUILD
diff --git a/extra/tar/APKBUILD b/main/tar/APKBUILD
index 7e713be6c99..7e713be6c99 100644
--- a/extra/tar/APKBUILD
+++ b/main/tar/APKBUILD
diff --git a/extra/tar/tar.post-deinstall b/main/tar/tar.post-deinstall
index 99b57c46353..99b57c46353 100644
--- a/extra/tar/tar.post-deinstall
+++ b/main/tar/tar.post-deinstall
diff --git a/extra/tcl/APKBUILD b/main/tcl/APKBUILD
index 32a9eff63fb..32a9eff63fb 100644
--- a/extra/tcl/APKBUILD
+++ b/main/tcl/APKBUILD
diff --git a/extra/tcpdump/APKBUILD b/main/tcpdump/APKBUILD
index ad9f5323f42..ad9f5323f42 100644
--- a/extra/tcpdump/APKBUILD
+++ b/main/tcpdump/APKBUILD
diff --git a/extra/tcpproxy/APKBUILD b/main/tcpproxy/APKBUILD
index fb7d1226d7c..a06aacb39a6 100644
--- a/extra/tcpproxy/APKBUILD
+++ b/main/tcpproxy/APKBUILD
@@ -1,19 +1,20 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
 pkgname=tcpproxy
-pkgver=2.0.0-beta15
+pkgver=2.0.0_beta15
+_realver=2.0.0-beta15
 pkgrel=0
 pkgdesc="Transparent TCP Proxy"
 url="http://www.quietsche-entchen.de/cgi-bin/wiki.cgi/proxies/TcpProxy"
 license="GPL"
-depends="uclibc"
+depends=
 makedepends="ctags"
 install=""
 subpackages=""
-source="http://www.quietsche-entchen.de/download/$pkgname-$pkgver.tar.gz
+source="http://www.quietsche-entchen.de/download/$pkgname-$_realver.tar.gz
 	tcpproxy.initd"
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$srcdir/$pkgname-$_realver"
 
 	make || return 1
 
diff --git a/extra/tcpproxy/tcpproxy.initd b/main/tcpproxy/tcpproxy.initd
index a7fd4292db1..a7fd4292db1 100644
--- a/extra/tcpproxy/tcpproxy.initd
+++ b/main/tcpproxy/tcpproxy.initd
diff --git a/extra/tiff/APKBUILD b/main/tiff/APKBUILD
index c580a84a302..c580a84a302 100644
--- a/extra/tiff/APKBUILD
+++ b/main/tiff/APKBUILD
diff --git a/extra/tinyproxy/APKBUILD b/main/tinyproxy/APKBUILD
index 046daa8307b..046daa8307b 100644
--- a/extra/tinyproxy/APKBUILD
+++ b/main/tinyproxy/APKBUILD
diff --git a/extra/tinyproxy/tinyproxy.initd b/main/tinyproxy/tinyproxy.initd
index bee5d041fbd..bee5d041fbd 100644
--- a/extra/tinyproxy/tinyproxy.initd
+++ b/main/tinyproxy/tinyproxy.initd
diff --git a/extra/tinyproxy/tinyproxy.install b/main/tinyproxy/tinyproxy.install
index 5fa366737be..5fa366737be 100644
--- a/extra/tinyproxy/tinyproxy.install
+++ b/main/tinyproxy/tinyproxy.install
diff --git a/extra/tmux/APKBUILD b/main/tmux/APKBUILD
index 7edc932264c..7edc932264c 100644
--- a/extra/tmux/APKBUILD
+++ b/main/tmux/APKBUILD
diff --git a/extra/tmux/build.patch b/main/tmux/build.patch
index b16c4f4cab5..b16c4f4cab5 100644
--- a/extra/tmux/build.patch
+++ b/main/tmux/build.patch
diff --git a/extra/transmission/APKBUILD b/main/transmission/APKBUILD
index 0942c1b2a3f..0942c1b2a3f 100644
--- a/extra/transmission/APKBUILD
+++ b/main/transmission/APKBUILD
diff --git a/extra/transmission/transmission-daemon.confd b/main/transmission/transmission-daemon.confd
index c1f338f07ce..c1f338f07ce 100644
--- a/extra/transmission/transmission-daemon.confd
+++ b/main/transmission/transmission-daemon.confd
diff --git a/extra/transmission/transmission-daemon.initd b/main/transmission/transmission-daemon.initd
index af9461cc60c..af9461cc60c 100644
--- a/extra/transmission/transmission-daemon.initd
+++ b/main/transmission/transmission-daemon.initd
diff --git a/extra/transmission/transmission.pre-install b/main/transmission/transmission.pre-install
index 44a14760f64..44a14760f64 100644
--- a/extra/transmission/transmission.pre-install
+++ b/main/transmission/transmission.pre-install
diff --git a/extra/udev/APKBUILD b/main/udev/APKBUILD
index d25b5faa492..d25b5faa492 100644
--- a/extra/udev/APKBUILD
+++ b/main/udev/APKBUILD
diff --git a/extra/udev/move_tmp_persistent_rules.sh b/main/udev/move_tmp_persistent_rules.sh
index 1a0259798bc..1a0259798bc 100755
--- a/extra/udev/move_tmp_persistent_rules.sh
+++ b/main/udev/move_tmp_persistent_rules.sh
diff --git a/extra/udev/udev-mount.initd b/main/udev/udev-mount.initd
index 839565a5bac..839565a5bac 100755
--- a/extra/udev/udev-mount.initd
+++ b/main/udev/udev-mount.initd
diff --git a/extra/udev/udev-postmount.initd b/main/udev/udev-postmount.initd
index 96beb845bb9..96beb845bb9 100755
--- a/extra/udev/udev-postmount.initd
+++ b/main/udev/udev-postmount.initd
diff --git a/extra/udev/udev-start.sh b/main/udev/udev-start.sh
index 87c3a6ac932..87c3a6ac932 100644
--- a/extra/udev/udev-start.sh
+++ b/main/udev/udev-start.sh
diff --git a/extra/udev/udev.initd b/main/udev/udev.initd
index 26774ab4acf..26774ab4acf 100755
--- a/extra/udev/udev.initd
+++ b/main/udev/udev.initd
diff --git a/extra/udev/write_root_link_rule b/main/udev/write_root_link_rule
index 8eaea117693..8eaea117693 100755
--- a/extra/udev/write_root_link_rule
+++ b/main/udev/write_root_link_rule
diff --git a/extra/uiconv/APKBUILD b/main/uiconv/APKBUILD
index 3814bb56563..3814bb56563 100644
--- a/extra/uiconv/APKBUILD
+++ b/main/uiconv/APKBUILD
diff --git a/extra/unarj/APKBUILD b/main/unarj/APKBUILD
index b2e0c72607e..b2e0c72607e 100644
--- a/extra/unarj/APKBUILD
+++ b/main/unarj/APKBUILD
diff --git a/extra/unfs3/APKBUILD b/main/unfs3/APKBUILD
index 28de3015711..28de3015711 100644
--- a/extra/unfs3/APKBUILD
+++ b/main/unfs3/APKBUILD
diff --git a/extra/unixodbc/APKBUILD b/main/unixodbc/APKBUILD
index cd72a165373..cd72a165373 100644
--- a/extra/unixodbc/APKBUILD
+++ b/main/unixodbc/APKBUILD
diff --git a/extra/unrar/APKBUILD b/main/unrar/APKBUILD
index 67f33fac05d..67f33fac05d 100644
--- a/extra/unrar/APKBUILD
+++ b/main/unrar/APKBUILD
diff --git a/extra/usbutils/APKBUILD b/main/usbutils/APKBUILD
index 7dc7905c30a..7dc7905c30a 100644
--- a/extra/usbutils/APKBUILD
+++ b/main/usbutils/APKBUILD
diff --git a/extra/v86d/APKBUILD b/main/v86d/APKBUILD
index 8bcdcf6181b..8bcdcf6181b 100644
--- a/extra/v86d/APKBUILD
+++ b/main/v86d/APKBUILD
diff --git a/extra/v86d/modprobe.uvesafb b/main/v86d/modprobe.uvesafb
index 5e46e108833..5e46e108833 100644
--- a/extra/v86d/modprobe.uvesafb
+++ b/main/v86d/modprobe.uvesafb
diff --git a/extra/vala/APKBUILD b/main/vala/APKBUILD
index 1a03977a057..1a03977a057 100644
--- a/extra/vala/APKBUILD
+++ b/main/vala/APKBUILD
diff --git a/extra/valgrind/APKBUILD b/main/valgrind/APKBUILD
index dcba2983737..dcba2983737 100644
--- a/extra/valgrind/APKBUILD
+++ b/main/valgrind/APKBUILD
diff --git a/extra/valgrind/valgrind-3.4.0-uclibc.patch b/main/valgrind/valgrind-3.4.0-uclibc.patch
index db6551996e3..db6551996e3 100644
--- a/extra/valgrind/valgrind-3.4.0-uclibc.patch
+++ b/main/valgrind/valgrind-3.4.0-uclibc.patch
diff --git a/extra/vim/APKBUILD b/main/vim/APKBUILD
index 3dee6bda28a..3dee6bda28a 100644
--- a/extra/vim/APKBUILD
+++ b/main/vim/APKBUILD
diff --git a/extra/vim/vimrc b/main/vim/vimrc
index e3017342455..e3017342455 100644
--- a/extra/vim/vimrc
+++ b/main/vim/vimrc
diff --git a/extra/vsftpd/APKBUILD b/main/vsftpd/APKBUILD
index fef929cad66..fef929cad66 100644
--- a/extra/vsftpd/APKBUILD
+++ b/main/vsftpd/APKBUILD
diff --git a/extra/vsftpd/vsftpd-enable-ssl.patch b/main/vsftpd/vsftpd-enable-ssl.patch
index 22161907cdf..22161907cdf 100644
--- a/extra/vsftpd/vsftpd-enable-ssl.patch
+++ b/main/vsftpd/vsftpd-enable-ssl.patch
diff --git a/extra/vsftpd/vsftpd.confd b/main/vsftpd/vsftpd.confd
index 0abb80c6e89..0abb80c6e89 100644
--- a/extra/vsftpd/vsftpd.confd
+++ b/main/vsftpd/vsftpd.confd
diff --git a/extra/vsftpd/vsftpd.initd b/main/vsftpd/vsftpd.initd
index 9e8b124b00e..9e8b124b00e 100644
--- a/extra/vsftpd/vsftpd.initd
+++ b/main/vsftpd/vsftpd.initd
diff --git a/extra/wget/APKBUILD b/main/wget/APKBUILD
index b6581fa48ab..b6581fa48ab 100644
--- a/extra/wget/APKBUILD
+++ b/main/wget/APKBUILD
diff --git a/extra/wget/wget.post-deinstall b/main/wget/wget.post-deinstall
index 99b57c46353..99b57c46353 100644
--- a/extra/wget/wget.post-deinstall
+++ b/main/wget/wget.post-deinstall
diff --git a/extra/xvidcore/APKBUILD b/main/xvidcore/APKBUILD
index 64858bf8df1..64858bf8df1 100644
--- a/extra/xvidcore/APKBUILD
+++ b/main/xvidcore/APKBUILD
diff --git a/extra/zip/10-zip-3.0-build.patch b/main/zip/10-zip-3.0-build.patch
index 5ddad23b95a..5ddad23b95a 100644
--- a/extra/zip/10-zip-3.0-build.patch
+++ b/main/zip/10-zip-3.0-build.patch
diff --git a/extra/zip/20-zip-3.0-exec-stack.patch b/main/zip/20-zip-3.0-exec-stack.patch
index d85fb117b08..d85fb117b08 100644
--- a/extra/zip/20-zip-3.0-exec-stack.patch
+++ b/main/zip/20-zip-3.0-exec-stack.patch
diff --git a/extra/zip/30-zip-3.0-pic.patch b/main/zip/30-zip-3.0-pic.patch
index 14a8821b045..14a8821b045 100644
--- a/extra/zip/30-zip-3.0-pic.patch
+++ b/main/zip/30-zip-3.0-pic.patch
diff --git a/extra/zip/APKBUILD b/main/zip/APKBUILD
index 4998c35b762..4998c35b762 100644
--- a/extra/zip/APKBUILD
+++ b/main/zip/APKBUILD
diff --git a/extra/zonenotify/APKBUILD b/main/zonenotify/APKBUILD
index 9709eba4ee3..9709eba4ee3 100644
--- a/extra/zonenotify/APKBUILD
+++ b/main/zonenotify/APKBUILD