moved extra/* to main/

and fixed misc build issues

635 files changed, 35 insertions, 35 deletions

diff --git a/extra/popt/APKBUILD b/extra/popt/APKBUILD
deleted file mode 100644
index 4826bd2d2..000000000
--- 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 29657feed..29657feed 100644
--- a/extra/acct/APKBUILD
+++ b/main/acct/APKBUILD
diff --git a/extra/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD
index 1f29cfb0b..1f29cfb0b 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 fdb808017..fdb808017 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 040645d31..040645d31 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 c7abd3b02..c7abd3b02 100644
--- a/extra/acf-asterisk/APKBUILD
+++ b/main/acf-asterisk/APKBUILD
diff --git a/extra/acf-chrony/APKBUILD b/main/acf-chrony/APKBUILD
index 9db7c4d00..9db7c4d00 100644
--- a/extra/acf-chrony/APKBUILD
+++ b/main/acf-chrony/APKBUILD
diff --git a/extra/acf-clamav/APKBUILD b/main/acf-clamav/APKBUILD
index 511844df4..511844df4 100644
--- a/extra/acf-clamav/APKBUILD
+++ b/main/acf-clamav/APKBUILD
diff --git a/extra/acf-clamsmtp/APKBUILD b/main/acf-clamsmtp/APKBUILD
index b72fc2e32..b72fc2e32 100644
--- a/extra/acf-clamsmtp/APKBUILD
+++ b/main/acf-clamsmtp/APKBUILD
diff --git a/extra/acf-core/APKBUILD b/main/acf-core/APKBUILD
index dd9f65bbc..dd9f65bbc 100644
--- a/extra/acf-core/APKBUILD
+++ b/main/acf-core/APKBUILD
diff --git a/extra/acf-dansguardian/APKBUILD b/main/acf-dansguardian/APKBUILD
index c5d5ef7dd..c5d5ef7dd 100644
--- a/extra/acf-dansguardian/APKBUILD
+++ b/main/acf-dansguardian/APKBUILD
diff --git a/extra/acf-dhcp/APKBUILD b/main/acf-dhcp/APKBUILD
index bc92419bb..bc92419bb 100644
--- a/extra/acf-dhcp/APKBUILD
+++ b/main/acf-dhcp/APKBUILD
diff --git a/extra/acf-dnscache/APKBUILD b/main/acf-dnscache/APKBUILD
index 979df43c1..979df43c1 100644
--- a/extra/acf-dnscache/APKBUILD
+++ b/main/acf-dnscache/APKBUILD
diff --git a/extra/acf-dnsmasq/APKBUILD b/main/acf-dnsmasq/APKBUILD
index 8f0b8397b..8f0b8397b 100644
--- a/extra/acf-dnsmasq/APKBUILD
+++ b/main/acf-dnsmasq/APKBUILD
diff --git a/extra/acf-dovecot/APKBUILD b/main/acf-dovecot/APKBUILD
index a95208ad6..a95208ad6 100644
--- a/extra/acf-dovecot/APKBUILD
+++ b/main/acf-dovecot/APKBUILD
diff --git a/extra/acf-fetchmail/APKBUILD b/main/acf-fetchmail/APKBUILD
index c4638e342..c4638e342 100644
--- a/extra/acf-fetchmail/APKBUILD
+++ b/main/acf-fetchmail/APKBUILD
diff --git a/extra/acf-gnats/APKBUILD b/main/acf-gnats/APKBUILD
index 0dc58acd8..0dc58acd8 100644
--- a/extra/acf-gnats/APKBUILD
+++ b/main/acf-gnats/APKBUILD
diff --git a/extra/acf-gross/APKBUILD b/main/acf-gross/APKBUILD
index 4dcf979d1..4dcf979d1 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 2da2f90f2..2da2f90f2 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 12665845f..12665845f 100644
--- a/extra/acf-iptables/APKBUILD
+++ b/main/acf-iptables/APKBUILD
diff --git a/extra/acf-mdadm/APKBUILD b/main/acf-mdadm/APKBUILD
index 5069fa0c4..5069fa0c4 100644
--- a/extra/acf-mdadm/APKBUILD
+++ b/main/acf-mdadm/APKBUILD
diff --git a/extra/acf-opennhrp/APKBUILD b/main/acf-opennhrp/APKBUILD
index 4bc246496..4bc246496 100644
--- a/extra/acf-opennhrp/APKBUILD
+++ b/main/acf-opennhrp/APKBUILD
diff --git a/extra/acf-openntpd/APKBUILD b/main/acf-openntpd/APKBUILD
index f33272d17..f33272d17 100644
--- a/extra/acf-openntpd/APKBUILD
+++ b/main/acf-openntpd/APKBUILD
diff --git a/extra/acf-openssh/APKBUILD b/main/acf-openssh/APKBUILD
index 9228bacd7..9228bacd7 100644
--- a/extra/acf-openssh/APKBUILD
+++ b/main/acf-openssh/APKBUILD
diff --git a/extra/acf-openssl/APKBUILD b/main/acf-openssl/APKBUILD
index abaeeed12..abaeeed12 100644
--- a/extra/acf-openssl/APKBUILD
+++ b/main/acf-openssl/APKBUILD
diff --git a/extra/acf-openvpn/APKBUILD b/main/acf-openvpn/APKBUILD
index 34febc34c..34febc34c 100644
--- a/extra/acf-openvpn/APKBUILD
+++ b/main/acf-openvpn/APKBUILD
diff --git a/extra/acf-pingu/APKBUILD b/main/acf-pingu/APKBUILD
index 9efbf5b9a..9efbf5b9a 100644
--- a/extra/acf-pingu/APKBUILD
+++ b/main/acf-pingu/APKBUILD
diff --git a/extra/acf-postfix/APKBUILD b/main/acf-postfix/APKBUILD
index b525015e0..b525015e0 100644
--- a/extra/acf-postfix/APKBUILD
+++ b/main/acf-postfix/APKBUILD
diff --git a/extra/acf-postgresql/APKBUILD b/main/acf-postgresql/APKBUILD
index 88e8d68c7..88e8d68c7 100644
--- a/extra/acf-postgresql/APKBUILD
+++ b/main/acf-postgresql/APKBUILD
diff --git a/extra/acf-ppp/APKBUILD b/main/acf-ppp/APKBUILD
index cca9f5e0e..cca9f5e0e 100644
--- a/extra/acf-ppp/APKBUILD
+++ b/main/acf-ppp/APKBUILD
diff --git a/extra/acf-quagga/APKBUILD b/main/acf-quagga/APKBUILD
index 01c71c885..01c71c885 100644
--- a/extra/acf-quagga/APKBUILD
+++ b/main/acf-quagga/APKBUILD
diff --git a/extra/acf-samba/APKBUILD b/main/acf-samba/APKBUILD
index af0754859..af0754859 100644
--- a/extra/acf-samba/APKBUILD
+++ b/main/acf-samba/APKBUILD
diff --git a/extra/acf-shorewall/APKBUILD b/main/acf-shorewall/APKBUILD
index 64bd03a81..64bd03a81 100644
--- a/extra/acf-shorewall/APKBUILD
+++ b/main/acf-shorewall/APKBUILD
diff --git a/extra/acf-skins/APKBUILD b/main/acf-skins/APKBUILD
index 4e377d4b7..4e377d4b7 100644
--- a/extra/acf-skins/APKBUILD
+++ b/main/acf-skins/APKBUILD
diff --git a/extra/acf-snort/APKBUILD b/main/acf-snort/APKBUILD
index abe972d44..abe972d44 100644
--- a/extra/acf-snort/APKBUILD
+++ b/main/acf-snort/APKBUILD
diff --git a/extra/acf-squid/APKBUILD b/main/acf-squid/APKBUILD
index 9016b5804..9016b5804 100644
--- a/extra/acf-squid/APKBUILD
+++ b/main/acf-squid/APKBUILD
diff --git a/extra/acf-tcpproxy/APKBUILD b/main/acf-tcpproxy/APKBUILD
index c483088c6..c483088c6 100644
--- a/extra/acf-tcpproxy/APKBUILD
+++ b/main/acf-tcpproxy/APKBUILD
diff --git a/extra/acf-tinydns/APKBUILD b/main/acf-tinydns/APKBUILD
index 75eeab0b1..75eeab0b1 100644
--- a/extra/acf-tinydns/APKBUILD
+++ b/main/acf-tinydns/APKBUILD
diff --git a/extra/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD
index 15847a3f4..15847a3f4 100644
--- a/extra/acf-weblog/APKBUILD
+++ b/main/acf-weblog/APKBUILD
diff --git a/extra/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD
index b844b54ff..b844b54ff 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 beb1ab900..beb1ab900 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 daad650da..daad650da 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 56cad39f5..56cad39f5 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 23f92af3f..23f92af3f 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 38ab8eadf..38ab8eadf 100644
--- a/extra/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
diff --git a/extra/apr/APKBUILD b/main/apr/APKBUILD
index bee01f8dc..bee01f8dc 100644
--- a/extra/apr/APKBUILD
+++ b/main/apr/APKBUILD
diff --git a/extra/arpwatch/APKBUILD b/main/arpwatch/APKBUILD
index ed18e5966..ed18e5966 100644
--- a/extra/arpwatch/APKBUILD
+++ b/main/arpwatch/APKBUILD
diff --git a/extra/arpwatch/arpwatch.confd b/main/arpwatch/arpwatch.confd
index f44221aa3..f44221aa3 100644
--- a/extra/arpwatch/arpwatch.confd
+++ b/main/arpwatch/arpwatch.confd
diff --git a/extra/arpwatch/arpwatch.initd b/main/arpwatch/arpwatch.initd
index e039e1db8..e039e1db8 100644
--- a/extra/arpwatch/arpwatch.initd
+++ b/main/arpwatch/arpwatch.initd
diff --git a/extra/aspell/APKBUILD b/main/aspell/APKBUILD
index 30589a1a3..30589a1a3 100644
--- a/extra/aspell/APKBUILD
+++ b/main/aspell/APKBUILD
diff --git a/extra/aspell/libmath.patch b/main/aspell/libmath.patch
index 3fad33a5d..3fad33a5d 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 4956791d4..4956791d4 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 1acf87f34..1acf87f34 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 71370ec0b..71370ec0b 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 367dc7163..367dc7163 100644
--- a/extra/asterisk/103-rundir.patch
+++ b/main/asterisk/103-rundir.patch
diff --git a/extra/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 7e8bb1d18..7e8bb1d18 100644
--- a/extra/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
diff --git a/extra/asterisk/asterisk.confd b/main/asterisk/asterisk.confd
index fe9f138ab..fe9f138ab 100644
--- a/extra/asterisk/asterisk.confd
+++ b/main/asterisk/asterisk.confd
diff --git a/extra/asterisk/asterisk.initd b/main/asterisk/asterisk.initd
index 864a96b3c..864a96b3c 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 fd51c7fa5..fd51c7fa5 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 f4724251f..f4724251f 100644
--- a/extra/asterisk/asterisk.pre-install
+++ b/main/asterisk/asterisk.pre-install
diff --git a/extra/aumix/APKBUILD b/main/aumix/APKBUILD
index 034613b72..034613b72 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 8a32fd5b9..8a32fd5b9 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 bf20f0372..bf20f0372 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 498716b51..498716b51 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 2c1741b3b..2c1741b3b 100644
--- a/extra/aumix/aumix.initd
+++ b/main/aumix/aumix.initd
diff --git a/extra/b43-fwcutter/APKBUILD b/main/b43-fwcutter/APKBUILD
index 0a7f4cc6a..0a7f4cc6a 100644
--- a/extra/b43-fwcutter/APKBUILD
+++ b/main/b43-fwcutter/APKBUILD
diff --git a/extra/bc/APKBUILD b/main/bc/APKBUILD
index d5f1851f2..d5f1851f2 100644
--- a/extra/bc/APKBUILD
+++ b/main/bc/APKBUILD
diff --git a/extra/beep/APKBUILD b/main/beep/APKBUILD
index 742998204..742998204 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 33e6affa9..33e6affa9 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 533bfa717..533bfa717 100644
--- a/extra/bind/APKBUILD
+++ b/main/bind/APKBUILD
diff --git a/extra/bind/bind.127.zone b/main/bind/bind.127.zone
index 2ad28de52..2ad28de52 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 d58c61bde..d58c61bde 100644
--- a/extra/bind/bind.conf
+++ b/main/bind/bind.conf
diff --git a/extra/bind/bind.confd b/main/bind/bind.confd
index 82d376350..82d376350 100644
--- a/extra/bind/bind.confd
+++ b/main/bind/bind.confd
diff --git a/extra/bind/bind.initd b/main/bind/bind.initd
index 6469ee79a..6469ee79a 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 338d7050c..338d7050c 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 902a7047f..902a7047f 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 7e091c097..7e091c097 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 c79963450..c79963450 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 83120f77d..83120f77d 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 91400afc9..91400afc9 100644
--- a/extra/bitlib/APKBUILD
+++ b/main/bitlib/APKBUILD
diff --git a/extra/bridge-utils/APKBUILD b/main/bridge-utils/APKBUILD
index 0caaed9bc..0caaed9bc 100644
--- a/extra/bridge-utils/APKBUILD
+++ b/main/bridge-utils/APKBUILD
diff --git a/extra/bzip2/APKBUILD b/main/bzip2/APKBUILD
index 09721bb76..09721bb76 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 74f8df000..74f8df000 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 85a3c6af6..85a3c6af6 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 2427d6a7f..2427d6a7f 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 9a71342ca..9a71342ca 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 99b57c463..99b57c463 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 889eab359..889eab359 100644
--- a/extra/c-ares/APKBUILD
+++ b/main/c-ares/APKBUILD
diff --git a/extra/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD
index e39567de1..e39567de1 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 439cfca52..439cfca52 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 2143bdb72..2143bdb72 100644
--- a/extra/ccache/APKBUILD
+++ b/main/ccache/APKBUILD
diff --git a/extra/cdrkit/APKBUILD b/main/cdrkit/APKBUILD
index a5ca8d771..a5ca8d771 100644
--- a/extra/cdrkit/APKBUILD
+++ b/main/cdrkit/APKBUILD
diff --git a/extra/cgit/APKBUILD b/main/cgit/APKBUILD
index d7578539c..d7578539c 100644
--- a/extra/cgit/APKBUILD
+++ b/main/cgit/APKBUILD
diff --git a/extra/chrony/APKBUILD b/main/chrony/APKBUILD
index 21f8924a6..21f8924a6 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 498b24175..498b24175 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 4917d445b..4917d445b 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 2eec4e842..2eec4e842 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 f4e5d8eff..f4e5d8eff 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 5f39ca332..5f39ca332 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 d99b1e01d..d99b1e01d 100644
--- a/extra/chrony/chrony.conf
+++ b/main/chrony/chrony.conf
diff --git a/extra/chrony/chronyd.confd b/main/chrony/chronyd.confd
index 560825c2c..560825c2c 100644
--- a/extra/chrony/chronyd.confd
+++ b/main/chrony/chronyd.confd
diff --git a/extra/chrony/chronyd.initd b/main/chrony/chronyd.initd
index 49d7526bb..49d7526bb 100644
--- a/extra/chrony/chronyd.initd
+++ b/main/chrony/chronyd.initd
diff --git a/extra/cksfv/APKBUILD b/main/cksfv/APKBUILD
index bf2049a16..bf2049a16 100644
--- a/extra/cksfv/APKBUILD
+++ b/main/cksfv/APKBUILD
diff --git a/extra/clamav/APKBUILD b/main/clamav/APKBUILD
index a4daebc2f..a4daebc2f 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 82ae88f57..82ae88f57 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 757442841..757442841 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 493020610..493020610 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 59ac60a44..59ac60a44 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 9956f95d6..9956f95d6 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 bc8072aea..bc8072aea 100644
--- a/extra/clamav/clamd.confd
+++ b/main/clamav/clamd.confd
diff --git a/extra/clamav/clamd.initd b/main/clamav/clamd.initd
index d3b915557..d3b915557 100644
--- a/extra/clamav/clamd.initd
+++ b/main/clamav/clamd.initd
diff --git a/extra/clamav/freshclam.confd b/main/clamav/freshclam.confd
index 17559037d..17559037d 100644
--- a/extra/clamav/freshclam.confd
+++ b/main/clamav/freshclam.confd
diff --git a/extra/clamav/freshclam.initd b/main/clamav/freshclam.initd
index 7961c7f80..7961c7f80 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 c0032bae0..c0032bae0 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 824425492..824425492 100644
--- a/extra/clamsmtp/APKBUILD
+++ b/main/clamsmtp/APKBUILD
diff --git a/extra/clamsmtp/clamsmtp.post-upgrade b/main/clamsmtp/clamsmtp.post-upgrade
index 2dbccbb22..2dbccbb22 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 12de39f7b..12de39f7b 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 8d08b6868..8d08b6868 100644
--- a/extra/clamsmtp/clamsmtpd.confd
+++ b/main/clamsmtp/clamsmtpd.confd
diff --git a/extra/clamsmtp/clamsmtpd.initd b/main/clamsmtp/clamsmtpd.initd
index dbd817f37..dbd817f37 100644
--- a/extra/clamsmtp/clamsmtpd.initd
+++ b/main/clamsmtp/clamsmtpd.initd
diff --git a/extra/cmake/APKBUILD b/main/cmake/APKBUILD
index 71d74182e..71d74182e 100644
--- a/extra/cmake/APKBUILD
+++ b/main/cmake/APKBUILD
diff --git a/extra/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD
index 96a402a2f..96a402a2f 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 7c937cbd9..7c937cbd9 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 9394badca..9394badca 100644
--- a/extra/conntrack-tools/conntrackd.initd
+++ b/main/conntrack-tools/conntrackd.initd
diff --git a/extra/coreutils/APKBUILD b/main/coreutils/APKBUILD
index 4f3a62cb3..4f3a62cb3 100644
--- a/extra/coreutils/APKBUILD
+++ b/main/coreutils/APKBUILD
diff --git a/extra/coreutils/coreutils.post-deinstall b/main/coreutils/coreutils.post-deinstall
index 99b57c463..99b57c463 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 3e2b3c2a2..3e2b3c2a2 120000
--- a/extra/coreutils/coreutils.post-upgrade
+++ b/main/coreutils/coreutils.post-upgrade
diff --git a/extra/cpufreqd/APKBUILD b/main/cpufreqd/APKBUILD
index 98d7f94cf..98d7f94cf 100644
--- a/extra/cpufreqd/APKBUILD
+++ b/main/cpufreqd/APKBUILD
diff --git a/extra/cpufreqd/cpufreqd.initd b/main/cpufreqd/cpufreqd.initd
index fbacebad7..fbacebad7 100644
--- a/extra/cpufreqd/cpufreqd.initd
+++ b/main/cpufreqd/cpufreqd.initd
diff --git a/extra/cpufrequtils/APKBUILD b/main/cpufrequtils/APKBUILD
index 50cb2d1b0..50cb2d1b0 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 7dbe57043..7dbe57043 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 7a0336fff..7a0336fff 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 68f5b7594..68f5b7594 100644
--- a/extra/cpufrequtils/cpufrequtils.confd
+++ b/main/cpufrequtils/cpufrequtils.confd
diff --git a/extra/cpufrequtils/cpufrequtils.initd b/main/cpufrequtils/cpufrequtils.initd
index 9aadd94c1..9aadd94c1 100644
--- a/extra/cpufrequtils/cpufrequtils.initd
+++ b/main/cpufrequtils/cpufrequtils.initd
diff --git a/extra/cracklib-words/APKBUILD b/main/cracklib-words/APKBUILD
index b46043926..b46043926 100644
--- a/extra/cracklib-words/APKBUILD
+++ b/main/cracklib-words/APKBUILD
diff --git a/extra/cracklib/APKBUILD b/main/cracklib/APKBUILD
index e03c6a770..e03c6a770 100644
--- a/extra/cracklib/APKBUILD
+++ b/main/cracklib/APKBUILD
diff --git a/extra/ctags/APKBUILD b/main/ctags/APKBUILD
index 0d45e287c..0d45e287c 100644
--- a/extra/ctags/APKBUILD
+++ b/main/ctags/APKBUILD
diff --git a/extra/cutter/APKBUILD b/main/cutter/APKBUILD
index be27d880c..be27d880c 100644
--- a/extra/cutter/APKBUILD
+++ b/main/cutter/APKBUILD
diff --git a/extra/cvs/APKBUILD b/main/cvs/APKBUILD
index bcfcea6f2..bcfcea6f2 100644
--- a/extra/cvs/APKBUILD
+++ b/main/cvs/APKBUILD
diff --git a/extra/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 4e9075769..4e9075769 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 f7bf44b79..f7bf44b79 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 8937d7633..8937d7633 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 a5e9a4406..a5e9a4406 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 6aa684043..6aa684043 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 d7a3fe859..d7a3fe859 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 289aad403..289aad403 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 67857e2f7..67857e2f7 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 b711c07ff..b711c07ff 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 719accdc6..719accdc6 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 b0f6edf78..b0f6edf78 100644
--- a/extra/dahdi-linux/APKBUILD
+++ b/main/dahdi-linux/APKBUILD
diff --git a/extra/dahdi-tools/APKBUILD b/main/dahdi-tools/APKBUILD
index 9a1538fab..9a1538fab 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 5e99122a5..5e99122a5 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 24c50a633..24c50a633 100644
--- a/extra/dansguardian/APKBUILD
+++ b/main/dansguardian/APKBUILD
diff --git a/extra/dansguardian/dansguardian.initd b/main/dansguardian/dansguardian.initd
index e8f8e94cc..e8f8e94cc 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 2d06f3a6f..2d06f3a6f 100644
--- a/extra/dansguardian/dansguardian.pre-install
+++ b/main/dansguardian/dansguardian.pre-install
diff --git a/extra/db/APKBUILD b/main/db/APKBUILD
index 00940e41c..00940e41c 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 3c7e23ce0..3c7e23ce0 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 1f42dcec7..1f42dcec7 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 b58a43074..b58a43074 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 7a5534002..7a5534002 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 01bb25e91..01bb25e91 100644
--- a/extra/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
diff --git a/extra/dhcp/dhcp.post-upgrade b/main/dhcp/dhcp.post-upgrade
index b16fea6b4..b16fea6b4 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 090f654b9..090f654b9 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 df09ec708..df09ec708 100644
--- a/extra/dhcp/dhcpd.confd
+++ b/main/dhcp/dhcpd.confd
diff --git a/extra/dhcp/dhcpd.initd b/main/dhcp/dhcpd.initd
index cc9727fc7..cc9727fc7 100644
--- a/extra/dhcp/dhcpd.initd
+++ b/main/dhcp/dhcpd.initd
diff --git a/extra/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index 110f2c4c0..110f2c4c0 100644
--- a/extra/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
diff --git a/extra/dialog/APKBUILD b/main/dialog/APKBUILD
index 99619e31c..99619e31c 100644
--- a/extra/dialog/APKBUILD
+++ b/main/dialog/APKBUILD
diff --git a/extra/diffutils/APKBUILD b/main/diffutils/APKBUILD
index 5a9177130..5a9177130 100644
--- a/extra/diffutils/APKBUILD
+++ b/main/diffutils/APKBUILD
diff --git a/extra/diffutils/diffutils.post-deinstall b/main/diffutils/diffutils.post-deinstall
index c59247ad4..c59247ad4 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 1d9994228..1d9994228 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 2eb3998db..2eb3998db 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 becb8133a..becb8133a 100644
--- a/extra/dircproxy/APKBUILD
+++ b/main/dircproxy/APKBUILD
diff --git a/extra/dircproxy/dircproxy-gcc4.patch b/main/dircproxy/dircproxy-gcc4.patch
index 727d8db2b..727d8db2b 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 58f2f4b6c..58f2f4b6c 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 eb6ae5904..eb6ae5904 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 0596907a7..0596907a7 100644
--- a/extra/djbdns/APKBUILD
+++ b/main/djbdns/APKBUILD
diff --git a/extra/djbdns/dnscache.confd b/main/djbdns/dnscache.confd
index f456bf8db..f456bf8db 100644
--- a/extra/djbdns/dnscache.confd
+++ b/main/djbdns/dnscache.confd
diff --git a/extra/djbdns/dnscache.initd b/main/djbdns/dnscache.initd
index 481022496..481022496 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 061b8f028..061b8f028 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 5db44ec8f..5db44ec8f 100644
--- a/extra/djbdns/dnsroots.patch
+++ b/main/djbdns/dnsroots.patch
diff --git a/extra/djbdns/dnstracesort.patch b/main/djbdns/dnstracesort.patch
index 3bf56f5a1..3bf56f5a1 100644
--- a/extra/djbdns/dnstracesort.patch
+++ b/main/djbdns/dnstracesort.patch
diff --git a/extra/djbdns/headtail.patch b/main/djbdns/headtail.patch
index 31854803b..31854803b 100644
--- a/extra/djbdns/headtail.patch
+++ b/main/djbdns/headtail.patch
diff --git a/extra/djbdns/tinydns.confd b/main/djbdns/tinydns.confd
index 840570a63..840570a63 100644
--- a/extra/djbdns/tinydns.confd
+++ b/main/djbdns/tinydns.confd
diff --git a/extra/djbdns/tinydns.initd b/main/djbdns/tinydns.initd
index a68474c4e..a68474c4e 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 11ea87abc..11ea87abc 100644
--- a/extra/djbdns/tinydns.pre-install
+++ b/main/djbdns/tinydns.pre-install
diff --git a/extra/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index 328d54dfd..328d54dfd 100644
--- a/extra/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
diff --git a/extra/dnsmasq/dnsmasq.confd b/main/dnsmasq/dnsmasq.confd
index 47826dd50..47826dd50 100644
--- a/extra/dnsmasq/dnsmasq.confd
+++ b/main/dnsmasq/dnsmasq.confd
diff --git a/extra/dnsmasq/dnsmasq.initd b/main/dnsmasq/dnsmasq.initd
index 44109e982..44109e982 100644
--- a/extra/dnsmasq/dnsmasq.initd
+++ b/main/dnsmasq/dnsmasq.initd
diff --git a/extra/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 67d1c8707..67d1c8707 100644
--- a/extra/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
diff --git a/extra/dovecot/dovecot.initd b/main/dovecot/dovecot.initd
index d9799c0dc..d9799c0dc 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 5acdcb5c8..5acdcb5c8 100644
--- a/extra/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
diff --git a/extra/dropbear/APKBUILD b/main/dropbear/APKBUILD
index ca4af482c..ca4af482c 100644
--- a/extra/dropbear/APKBUILD
+++ b/main/dropbear/APKBUILD
diff --git a/extra/dropbear/dropbear.confd b/main/dropbear/dropbear.confd
index 555f275d9..555f275d9 100644
--- a/extra/dropbear/dropbear.confd
+++ b/main/dropbear/dropbear.confd
diff --git a/extra/dropbear/dropbear.initd b/main/dropbear/dropbear.initd
index afdee8c6d..afdee8c6d 100644
--- a/extra/dropbear/dropbear.initd
+++ b/main/dropbear/dropbear.initd
diff --git a/extra/dtach/APKBUILD b/main/dtach/APKBUILD
index 120ef4eee..120ef4eee 100644
--- a/extra/dtach/APKBUILD
+++ b/main/dtach/APKBUILD
diff --git a/extra/eggdrop/APKBUILD b/main/eggdrop/APKBUILD
index 59c21f2e0..59c21f2e0 100644
--- a/extra/eggdrop/APKBUILD
+++ b/main/eggdrop/APKBUILD
diff --git a/extra/eggdrop/eggdrop-installer b/main/eggdrop/eggdrop-installer
index 69faa00dc..69faa00dc 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 44b43cf34..44b43cf34 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 e70aef887..e70aef887 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 8ea2e94e6..8ea2e94e6 100644
--- a/extra/eggdrop/logs2html.mod.patch
+++ b/main/eggdrop/logs2html.mod.patch
diff --git a/extra/email/APKBUILD b/main/email/APKBUILD
index a1301fe04..a1301fe04 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 d7467844f..d7467844f 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 d08896ee3..d08896ee3 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 bf005e00a..bf005e00a 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 689922052..689922052 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 50c92d40e..50c92d40e 100644
--- a/extra/ethtool/APKBUILD
+++ b/main/ethtool/APKBUILD
diff --git a/extra/faac/APKBUILD b/main/faac/APKBUILD
index 3e523a4d5..3e523a4d5 100644
--- a/extra/faac/APKBUILD
+++ b/main/faac/APKBUILD
diff --git a/extra/faad2/APKBUILD b/main/faad2/APKBUILD
index e1453df90..e1453df90 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 dad4cd6e0..dad4cd6e0 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 ba4793765..ba4793765 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 ca10a6a60..ca10a6a60 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 fc208006c..fc208006c 100644
--- a/extra/fcgi/APKBUILD
+++ b/main/fcgi/APKBUILD
diff --git a/extra/fetchmail/APKBUILD b/main/fetchmail/APKBUILD
index 092556638..092556638 100644
--- a/extra/fetchmail/APKBUILD
+++ b/main/fetchmail/APKBUILD
diff --git a/extra/fetchmail/fetchmail.initd b/main/fetchmail/fetchmail.initd
index a1ed1ec83..a1ed1ec83 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 b16bfcc3e..b16bfcc3e 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 4a1b630e0..4a1b630e0 100644
--- a/extra/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
diff --git a/extra/flac/APKBUILD b/main/flac/APKBUILD
index a5626e1c4..a5626e1c4 100644
--- a/extra/flac/APKBUILD
+++ b/main/flac/APKBUILD
diff --git a/extra/fping/APKBUILD b/main/fping/APKBUILD
index 11b4f1819..11b4f1819 100644
--- a/extra/fping/APKBUILD
+++ b/main/fping/APKBUILD
diff --git a/extra/freetds/APKBUILD b/main/freetds/APKBUILD
index 5e58429d9..5e58429d9 100644
--- a/extra/freetds/APKBUILD
+++ b/main/freetds/APKBUILD
diff --git a/extra/freetype/10-bytecode.patch b/main/freetype/10-bytecode.patch
index dd901ad64..dd901ad64 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 217912aa1..217912aa1 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 b61a79221..b61a79221 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 95c1cd643..95c1cd643 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 e7f2a87ff..e7f2a87ff 100644
--- a/extra/freetype/APKBUILD
+++ b/main/freetype/APKBUILD
diff --git a/extra/gawk/APKBUILD b/main/gawk/APKBUILD
index 5bcd518d2..5bcd518d2 100644
--- a/extra/gawk/APKBUILD
+++ b/main/gawk/APKBUILD
diff --git a/extra/gawk/gawk.post-deinstall b/main/gawk/gawk.post-deinstall
index 99b57c463..99b57c463 100644
--- a/extra/gawk/gawk.post-deinstall
+++ b/main/gawk/gawk.post-deinstall
diff --git a/extra/gd/APKBUILD b/main/gd/APKBUILD
index 75cd56cc4..75cd56cc4 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 a20771f68..a20771f68 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 946d05501..946d05501 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 a851da314..a851da314 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 139ef99d7..139ef99d7 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 1337d08f5..1337d08f5 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 084f5a1d2..084f5a1d2 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 e20966b32..e20966b32 100644
--- a/extra/gdbm/APKBUILD
+++ b/main/gdbm/APKBUILD
diff --git a/extra/gettext/APKBUILD b/main/gettext/APKBUILD
index 958e1131c..958e1131c 100644
--- a/extra/gettext/APKBUILD
+++ b/main/gettext/APKBUILD
diff --git a/extra/ghostscript/APKBUILD b/main/ghostscript/APKBUILD
index e387f850f..e387f850f 100644
--- a/extra/ghostscript/APKBUILD
+++ b/main/ghostscript/APKBUILD
diff --git a/extra/glib/APKBUILD b/main/glib/APKBUILD
index e06678d98..e06678d98 100644
--- a/extra/glib/APKBUILD
+++ b/main/glib/APKBUILD
diff --git a/extra/gnats/APKBUILD b/main/gnats/APKBUILD
index 535f46ee4..535f46ee4 100644
--- a/extra/gnats/APKBUILD
+++ b/main/gnats/APKBUILD
diff --git a/extra/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
index 0a2e5a589..0a2e5a589 100644
--- a/extra/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
diff --git a/extra/gnupg/APKBUILD b/main/gnupg/APKBUILD
index fa1387b7d..fa1387b7d 100644
--- a/extra/gnupg/APKBUILD
+++ b/main/gnupg/APKBUILD
diff --git a/extra/gnutls/APKBUILD b/main/gnutls/APKBUILD
index f8dd61f2d..f8dd61f2d 100644
--- a/extra/gnutls/APKBUILD
+++ b/main/gnutls/APKBUILD
diff --git a/extra/gperf/APKBUILD b/main/gperf/APKBUILD
index cc97c06d5..cc97c06d5 100644
--- a/extra/gperf/APKBUILD
+++ b/main/gperf/APKBUILD
diff --git a/extra/grep/APKBUILD b/main/grep/APKBUILD
index 4bdc96472..4bdc96472 100644
--- a/extra/grep/APKBUILD
+++ b/main/grep/APKBUILD
diff --git a/extra/grep/grep.post-deinstall b/main/grep/grep.post-deinstall
index 99b57c463..99b57c463 100644
--- a/extra/grep/grep.post-deinstall
+++ b/main/grep/grep.post-deinstall
diff --git a/extra/gross/APKBUILD b/main/gross/APKBUILD
index 2dac13a66..2dac13a66 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 80f9ea776..80f9ea776 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 39cd90709..39cd90709 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 a20279f00..a20279f00 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 df06670a4..df06670a4 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 1e52785e1..1e52785e1 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 c3844d7a5..c3844d7a5 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 90361bcc6..90361bcc6 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 646e12f9d..646e12f9d 100644
--- a/extra/gross/grossd.confd
+++ b/main/gross/grossd.confd
diff --git a/extra/gross/grossd.initd b/main/gross/grossd.initd
index 3d1c43d70..3d1c43d70 100644
--- a/extra/gross/grossd.initd
+++ b/main/gross/grossd.initd
diff --git a/extra/gzip/APKBUILD b/main/gzip/APKBUILD
index eb06884d6..eb06884d6 100644
--- a/extra/gzip/APKBUILD
+++ b/main/gzip/APKBUILD
diff --git a/extra/gzip/gzip.post-deinstall b/main/gzip/gzip.post-deinstall
index 99b57c463..99b57c463 100644
--- a/extra/gzip/gzip.post-deinstall
+++ b/main/gzip/gzip.post-deinstall
diff --git a/extra/haserl/APKBUILD b/main/haserl/APKBUILD
index 2c4e08e49..2c4e08e49 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 a551bdce1..a551bdce1 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 c67dbae76..c67dbae76 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 40fc05f08..40fc05f08 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 35a9ed9f6..35a9ed9f6 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 19f879407..19f879407 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 36a86f1f9..36a86f1f9 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 69c791778..69c791778 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 a494e201a..a494e201a 100644
--- a/extra/heimdal/APKBUILD
+++ b/main/heimdal/APKBUILD
diff --git a/extra/heimdal/heimdal-kadmind.init b/main/heimdal/heimdal-kadmind.init
index b58ac994d..b58ac994d 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 753a101c3..753a101c3 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 517cb8621..517cb8621 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 88c02e598..88c02e598 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 5390b2cf6..5390b2cf6 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 2f8254e4d..2f8254e4d 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 b6e4ee888..b6e4ee888 100644
--- a/extra/htop/APKBUILD
+++ b/main/htop/APKBUILD
diff --git a/extra/hunspell/APKBUILD b/main/hunspell/APKBUILD
index 6883855ae..6883855ae 100644
--- a/extra/hunspell/APKBUILD
+++ b/main/hunspell/APKBUILD
diff --git a/extra/hylafax/APKBUILD b/main/hylafax/APKBUILD
index 42450d467..42450d467 100644
--- a/extra/hylafax/APKBUILD
+++ b/main/hylafax/APKBUILD
diff --git a/extra/hylafax/hylafax.post-install b/main/hylafax/hylafax.post-install
index 839f96f54..839f96f54 100644
--- a/extra/hylafax/hylafax.post-install
+++ b/main/hylafax/hylafax.post-install
diff --git a/extra/hypermail/APKBUILD b/main/hypermail/APKBUILD
index 6e4f41237..6e4f41237 100644
--- a/extra/hypermail/APKBUILD
+++ b/main/hypermail/APKBUILD
diff --git a/extra/hypermail/mdir2mbox.lua b/main/hypermail/mdir2mbox.lua
index dd883e02d..dd883e02d 100644
--- a/extra/hypermail/mdir2mbox.lua
+++ b/main/hypermail/mdir2mbox.lua
diff --git a/extra/iaxmodem/APKBUILD b/main/iaxmodem/APKBUILD
index f1f2b21c3..f1f2b21c3 100644
--- a/extra/iaxmodem/APKBUILD
+++ b/main/iaxmodem/APKBUILD
diff --git a/extra/iaxmodem/iaxmodem.confd b/main/iaxmodem/iaxmodem.confd
index 082a920e0..082a920e0 100644
--- a/extra/iaxmodem/iaxmodem.confd
+++ b/main/iaxmodem/iaxmodem.confd
diff --git a/extra/iaxmodem/iaxmodem.initd b/main/iaxmodem/iaxmodem.initd
index d6f2c947a..d6f2c947a 100644
--- a/extra/iaxmodem/iaxmodem.initd
+++ b/main/iaxmodem/iaxmodem.initd
diff --git a/extra/iaxmodem/nocxx.patch b/main/iaxmodem/nocxx.patch
index beb1ab900..beb1ab900 100644
--- a/extra/iaxmodem/nocxx.patch
+++ b/main/iaxmodem/nocxx.patch
diff --git a/extra/icu/APKBUILD b/main/icu/APKBUILD
index c2150b3ec..c2150b3ec 100644
--- a/extra/icu/APKBUILD
+++ b/main/icu/APKBUILD
diff --git a/extra/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
index 183b1e82c..183b1e82c 100644
--- a/extra/imagemagick/APKBUILD
+++ b/main/imagemagick/APKBUILD
diff --git a/extra/iproute2-qos/APKBUILD b/main/iproute2-qos/APKBUILD
index 902ff0c1a..902ff0c1a 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 60d409372..60d409372 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 b54374869..b54374869 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 5d5c60126..5d5c60126 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 9e6781335..9e6781335 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 91d7224e2..91d7224e2 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 19360347d..19360347d 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 c5e3e4b33..c5e3e4b33 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 c49eae347..c49eae347 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 a5c3346ee..a5c3346ee 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 b947b9b69..b947b9b69 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 66f8ed767..66f8ed767 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 16fdec7e3..16fdec7e3 100644
--- a/extra/ipsec-tools/racoon.initd
+++ b/main/ipsec-tools/racoon.initd
diff --git a/extra/iptraf/APKBUILD b/main/iptraf/APKBUILD
index 95e9de3f3..95e9de3f3 100644
--- a/extra/iptraf/APKBUILD
+++ b/main/iptraf/APKBUILD
diff --git a/extra/iputils/APKBUILD b/main/iputils/APKBUILD
index 02face483..02face483 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 5013ba4fd..5013ba4fd 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 99b57c463..99b57c463 100644
--- a/extra/iputils/iputils.post-install
+++ b/main/iputils/iputils.post-install
diff --git a/extra/irssi/APKBUILD b/main/irssi/APKBUILD
index bdb3c16c9..bdb3c16c9 100644
--- a/extra/irssi/APKBUILD
+++ b/main/irssi/APKBUILD
diff --git a/extra/jpeg/APKBUILD b/main/jpeg/APKBUILD
index c795091a4..c795091a4 100644
--- a/extra/jpeg/APKBUILD
+++ b/main/jpeg/APKBUILD
diff --git a/extra/json4lua/APKBUILD b/main/json4lua/APKBUILD
index bceb0ca83..bceb0ca83 100644
--- a/extra/json4lua/APKBUILD
+++ b/main/json4lua/APKBUILD
diff --git a/extra/ksymoops/APKBUILD b/main/ksymoops/APKBUILD
index d8cc04fdf..d8cc04fdf 100644
--- a/extra/ksymoops/APKBUILD
+++ b/main/ksymoops/APKBUILD
diff --git a/extra/less/APKBUILD b/main/less/APKBUILD
index 0567914a5..0567914a5 100644
--- a/extra/less/APKBUILD
+++ b/main/less/APKBUILD
diff --git a/extra/less/less.post-deinstall b/main/less/less.post-deinstall
index 99b57c463..99b57c463 100644
--- a/extra/less/less.post-deinstall
+++ b/main/less/less.post-deinstall
diff --git a/extra/lftp/APKBUILD b/main/lftp/APKBUILD
index 239573c12..239573c12 100644
--- a/extra/lftp/APKBUILD
+++ b/main/lftp/APKBUILD
diff --git a/extra/lha/APKBUILD b/main/lha/APKBUILD
index 705e51e07..705e51e07 100644
--- a/extra/lha/APKBUILD
+++ b/main/lha/APKBUILD
diff --git a/extra/libao/APKBUILD b/main/libao/APKBUILD
index a82ba4658..a82ba4658 100644
--- a/extra/libao/APKBUILD
+++ b/main/libao/APKBUILD
diff --git a/extra/libart-lgpl/APKBUILD b/main/libart-lgpl/APKBUILD
index 3ac38769a..3ac38769a 100644
--- a/extra/libart-lgpl/APKBUILD
+++ b/main/libart-lgpl/APKBUILD
diff --git a/extra/libassuan/APKBUILD b/main/libassuan/APKBUILD
index 2b2498c49..2b2498c49 100644
--- a/extra/libassuan/APKBUILD
+++ b/main/libassuan/APKBUILD
diff --git a/extra/libcap/APKBUILD b/main/libcap/APKBUILD
index 36c09984c..731729c03 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 000000000..88c5fcc6c
--- /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 13185722c..13185722c 100644
--- a/extra/libconfig/APKBUILD
+++ b/main/libconfig/APKBUILD
diff --git a/extra/libexif/APKBUILD b/main/libexif/APKBUILD
index c9f244b09..c9f244b09 100644
--- a/extra/libexif/APKBUILD
+++ b/main/libexif/APKBUILD
diff --git a/extra/libgcrypt/APKBUILD b/main/libgcrypt/APKBUILD
index efe95c1ab..efe95c1ab 100644
--- a/extra/libgcrypt/APKBUILD
+++ b/main/libgcrypt/APKBUILD
diff --git a/extra/libgcrypt/nocxx.patch b/main/libgcrypt/nocxx.patch
index beb1ab900..beb1ab900 100644
--- a/extra/libgcrypt/nocxx.patch
+++ b/main/libgcrypt/nocxx.patch
diff --git a/extra/libgpg-error/APKBUILD b/main/libgpg-error/APKBUILD
index 24cac4360..24cac4360 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 beb1ab900..beb1ab900 100644
--- a/extra/libgpg-error/nocxx.patch
+++ b/main/libgpg-error/nocxx.patch
diff --git a/extra/libiconv/APKBUILD b/main/libiconv/APKBUILD
index 6cd441ca6..6cd441ca6 100644
--- a/extra/libiconv/APKBUILD
+++ b/main/libiconv/APKBUILD
diff --git a/extra/libid3tag/APKBUILD b/main/libid3tag/APKBUILD
index 9410e353c..9410e353c 100644
--- a/extra/libid3tag/APKBUILD
+++ b/main/libid3tag/APKBUILD
diff --git a/extra/libidn/APKBUILD b/main/libidn/APKBUILD
index afcb59c78..afcb59c78 100644
--- a/extra/libidn/APKBUILD
+++ b/main/libidn/APKBUILD
diff --git a/extra/libksba/APKBUILD b/main/libksba/APKBUILD
index 470493700..470493700 100644
--- a/extra/libksba/APKBUILD
+++ b/main/libksba/APKBUILD
diff --git a/extra/libmcrypt/APKBUILD b/main/libmcrypt/APKBUILD
index 905d880f6..905d880f6 100644
--- a/extra/libmcrypt/APKBUILD
+++ b/main/libmcrypt/APKBUILD
diff --git a/extra/libnet/APKBUILD b/main/libnet/APKBUILD
index e756acc0e..e756acc0e 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 0f4c65094..0f4c65094 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 e6f9bbc6d..e6f9bbc6d 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 7f3aee35a..7f3aee35a 100644
--- a/extra/libnetfilter_conntrack/APKBUILD
+++ b/main/libnetfilter_conntrack/APKBUILD
diff --git a/extra/libnfnetlink/APKBUILD b/main/libnfnetlink/APKBUILD
index 63519aec0..63519aec0 100644
--- a/extra/libnfnetlink/APKBUILD
+++ b/main/libnfnetlink/APKBUILD
diff --git a/extra/libogg/APKBUILD b/main/libogg/APKBUILD
index d7920f886..8cfbf9687 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 beb1ab900..beb1ab900 100644
--- a/extra/libogg/nocxx.patch
+++ b/main/libogg/nocxx.patch
diff --git a/extra/libpng/APKBUILD b/main/libpng/APKBUILD
index 3d97159eb..3d97159eb 100644
--- a/extra/libpng/APKBUILD
+++ b/main/libpng/APKBUILD
diff --git a/extra/libpri/APKBUILD b/main/libpri/APKBUILD
index d4d90a810..d4d90a810 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 27ed1b8d4..27ed1b8d4 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 7bf31c7ac..7bf31c7ac 100644
--- a/extra/libpri/libpri-cflags.patch
+++ b/main/libpri/libpri-cflags.patch
diff --git a/extra/libsamplerate/APKBUILD b/main/libsamplerate/APKBUILD
index 786d6c1e9..786d6c1e9 100644
--- a/extra/libsamplerate/APKBUILD
+++ b/main/libsamplerate/APKBUILD
diff --git a/extra/libsndfile/APKBUILD b/main/libsndfile/APKBUILD
index 471c45a65..471c45a65 100644
--- a/extra/libsndfile/APKBUILD
+++ b/main/libsndfile/APKBUILD
diff --git a/extra/libtasn1/APKBUILD b/main/libtasn1/APKBUILD
index 27f71e805..27f71e805 100644
--- a/extra/libtasn1/APKBUILD
+++ b/main/libtasn1/APKBUILD
diff --git a/extra/libtheora/APKBUILD b/main/libtheora/APKBUILD
index e3b3999a3..e3b3999a3 100644
--- a/extra/libtheora/APKBUILD
+++ b/main/libtheora/APKBUILD
diff --git a/extra/libusb-compat/APKBUILD b/main/libusb-compat/APKBUILD
index 23e16cfa5..23e16cfa5 100644
--- a/extra/libusb-compat/APKBUILD
+++ b/main/libusb-compat/APKBUILD
diff --git a/extra/libusb/APKBUILD b/main/libusb/APKBUILD
index 7234ad31d..7234ad31d 100644
--- a/extra/libusb/APKBUILD
+++ b/main/libusb/APKBUILD
diff --git a/extra/libvorbis/APKBUILD b/main/libvorbis/APKBUILD
index c4c071343..c4c071343 100644
--- a/extra/libvorbis/APKBUILD
+++ b/main/libvorbis/APKBUILD
diff --git a/extra/libxml2/APKBUILD b/main/libxml2/APKBUILD
index a135ade72..a135ade72 100644
--- a/extra/libxml2/APKBUILD
+++ b/main/libxml2/APKBUILD
diff --git a/extra/libxml2/nocxx.patch b/main/libxml2/nocxx.patch
index beb1ab900..beb1ab900 100644
--- a/extra/libxml2/nocxx.patch
+++ b/main/libxml2/nocxx.patch
diff --git a/extra/libxslt/APKBUILD b/main/libxslt/APKBUILD
index 8f6ce2938..8f6ce2938 100644
--- a/extra/libxslt/APKBUILD
+++ b/main/libxslt/APKBUILD
diff --git a/extra/lighttpd/APKBUILD b/main/lighttpd/APKBUILD
index 0abe6dea7..0abe6dea7 100644
--- a/extra/lighttpd/APKBUILD
+++ b/main/lighttpd/APKBUILD
diff --git a/extra/lighttpd/lighttpd.conf b/main/lighttpd/lighttpd.conf
index 778a4062b..778a4062b 100644
--- a/extra/lighttpd/lighttpd.conf
+++ b/main/lighttpd/lighttpd.conf
diff --git a/extra/lighttpd/lighttpd.confd b/main/lighttpd/lighttpd.confd
index 70d417055..70d417055 100644
--- a/extra/lighttpd/lighttpd.confd
+++ b/main/lighttpd/lighttpd.confd
diff --git a/extra/lighttpd/lighttpd.initd b/main/lighttpd/lighttpd.initd
index 80aaacc5e..80aaacc5e 100644
--- a/extra/lighttpd/lighttpd.initd
+++ b/main/lighttpd/lighttpd.initd
diff --git a/extra/lighttpd/lighttpd.logrotate b/main/lighttpd/lighttpd.logrotate
index 76f0ef3ff..76f0ef3ff 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 5b116a637..5b116a637 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 4682680d6..4682680d6 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 3c3657773..3c3657773 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 1cb3770f9..1cb3770f9 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 ca1369af7..ca1369af7 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 2a88806ae..2a88806ae 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 63daa7508..63daa7508 100644
--- a/extra/lighttpd/spawn-fcgi.initd
+++ b/main/lighttpd/spawn-fcgi.initd
diff --git a/extra/links/APKBUILD b/main/links/APKBUILD
index 2d11cf9db..2d11cf9db 100644
--- a/extra/links/APKBUILD
+++ b/main/links/APKBUILD
diff --git a/extra/lm_sensors/APKBUILD b/main/lm_sensors/APKBUILD
index 0327dc775..0327dc775 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 fb163abc2..fb163abc2 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 9271c6bac..9271c6bac 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 18fb35370..18fb35370 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 d82841aeb..d82841aeb 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 cb99dce3f..cb99dce3f 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 d593f8414..d593f8414 100644
--- a/extra/lm_sensors/sensors.install
+++ b/main/lm_sensors/sensors.install
diff --git a/extra/logrotate/APKBUILD b/main/logrotate/APKBUILD
index e29b27e1e..e29b27e1e 100644
--- a/extra/logrotate/APKBUILD
+++ b/main/logrotate/APKBUILD
diff --git a/extra/lpc/APKBUILD b/main/lpc/APKBUILD
index af2b8a089..af2b8a089 100644
--- a/extra/lpc/APKBUILD
+++ b/main/lpc/APKBUILD
diff --git a/extra/lua/APKBUILD b/main/lua/APKBUILD
index 5e41bc03a..5e41bc03a 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 d051a21cb..d051a21cb 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 29ac4c3bf..29ac4c3bf 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 7b85aeafd..7b85aeafd 100644
--- a/extra/luaposix/APKBUILD
+++ b/main/luaposix/APKBUILD
diff --git a/extra/luasql-postgres/APKBUILD b/main/luasql-postgres/APKBUILD
index 36756ca65..36756ca65 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 a8650c551..a8650c551 100644
--- a/extra/luasql-postgres/config.new
+++ b/main/luasql-postgres/config.new
diff --git a/extra/lzo/APKBUILD b/main/lzo/APKBUILD
index a9f2b912e..a9f2b912e 100644
--- a/extra/lzo/APKBUILD
+++ b/main/lzo/APKBUILD
diff --git a/extra/man-pages/APKBUILD b/main/man-pages/APKBUILD
index b47b21cbf..b47b21cbf 100644
--- a/extra/man-pages/APKBUILD
+++ b/main/man-pages/APKBUILD
diff --git a/extra/man/APKBUILD b/main/man/APKBUILD
index c6940dbf3..c6940dbf3 100644
--- a/extra/man/APKBUILD
+++ b/main/man/APKBUILD
diff --git a/extra/man/man-troff.patch b/main/man/man-troff.patch
index e08e9316b..e08e9316b 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 00d40dd9a..00d40dd9a 100755
--- a/extra/man/whatis.periodic.daily
+++ b/main/man/whatis.periodic.daily
diff --git a/extra/md5/APKBUILD b/main/md5/APKBUILD
index 93e3747a9..93e3747a9 100644
--- a/extra/md5/APKBUILD
+++ b/main/md5/APKBUILD
diff --git a/extra/mini_httpd/APKBUILD b/main/mini_httpd/APKBUILD
index 4f7167e70..4f7167e70 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 397a331ad..397a331ad 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 4460a539e..4460a539e 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 96649fd6b..96649fd6b 100644
--- a/extra/mlmmj/APKBUILD
+++ b/main/mlmmj/APKBUILD
diff --git a/extra/mpg123/APKBUILD b/main/mpg123/APKBUILD
index 4a13dea81..4a13dea81 100644
--- a/extra/mpg123/APKBUILD
+++ b/main/mpg123/APKBUILD
diff --git a/extra/mysql/APKBUILD b/main/mysql/APKBUILD
index de03c127d..de03c127d 100644
--- a/extra/mysql/APKBUILD
+++ b/main/mysql/APKBUILD
diff --git a/extra/mysql/mysql.initd b/main/mysql/mysql.initd
index 8f841646b..8f841646b 100644
--- a/extra/mysql/mysql.initd
+++ b/main/mysql/mysql.initd
diff --git a/extra/mysql/mysql.mycnf b/main/mysql/mysql.mycnf
index 6df0334ef..6df0334ef 100644
--- a/extra/mysql/mysql.mycnf
+++ b/main/mysql/mysql.mycnf
diff --git a/extra/nano/APKBUILD b/main/nano/APKBUILD
index ab2a8bfc5..ab2a8bfc5 100644
--- a/extra/nano/APKBUILD
+++ b/main/nano/APKBUILD
diff --git a/extra/ncftp/APKBUILD b/main/ncftp/APKBUILD
index 4a43f4582..4a43f4582 100644
--- a/extra/ncftp/APKBUILD
+++ b/main/ncftp/APKBUILD
diff --git a/extra/ncftp/ncftp.post-install b/main/ncftp/ncftp.post-install
index e1ccb7b83..e1ccb7b83 100644
--- a/extra/ncftp/ncftp.post-install
+++ b/main/ncftp/ncftp.post-install
diff --git a/extra/neon/APKBUILD b/main/neon/APKBUILD
index 76d099e47..76d099e47 100644
--- a/extra/neon/APKBUILD
+++ b/main/neon/APKBUILD
diff --git a/extra/net-snmp/APKBUILD b/main/net-snmp/APKBUILD
index 6a28088d5..ac497cb9b 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 ad48a1d94..ad48a1d94 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 49beda58d..49beda58d 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 d9cee614e..d9cee614e 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 bf56233ab..bf56233ab 100644
--- a/extra/net-snmp/snmptrapd.initd
+++ b/main/net-snmp/snmptrapd.initd
diff --git a/extra/newt/APKBUILD b/main/newt/APKBUILD
index dc81b8b67..dc81b8b67 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 b9f86e6b6..b9f86e6b6 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 b9225f966..b9225f966 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 1ebbd99b5..1ebbd99b5 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 94a73d366..94a73d366 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 98a143a65..98a143a65 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 dc0b83927..dc0b83927 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 e9711d914..e9711d914 100644
--- a/extra/nfs-utils/nfs.initd
+++ b/main/nfs-utils/nfs.initd
diff --git a/extra/ngircd/APKBUILD b/main/ngircd/APKBUILD
index 2f618a077..2f618a077 100644
--- a/extra/ngircd/APKBUILD
+++ b/main/ngircd/APKBUILD
diff --git a/extra/ngircd/ngircd.initd b/main/ngircd/ngircd.initd
index 807d844e8..807d844e8 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 062e37ae4..062e37ae4 100644
--- a/extra/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
diff --git a/extra/nmap/APKBUILD b/main/nmap/APKBUILD
index bb0407876..bb0407876 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 3253fc26b..3253fc26b 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 5575e696d..5575e696d 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 beb1ab900..beb1ab900 100644
--- a/extra/ntfs-3g/nocxx.patch
+++ b/main/ntfs-3g/nocxx.patch
diff --git a/extra/oidentd/APKBUILD b/main/oidentd/APKBUILD
index 130283f72..130283f72 100644
--- a/extra/oidentd/APKBUILD
+++ b/main/oidentd/APKBUILD
diff --git a/extra/oidentd/oidentd.conf b/main/oidentd/oidentd.conf
index 03b28d827..03b28d827 100644
--- a/extra/oidentd/oidentd.conf
+++ b/main/oidentd/oidentd.conf
diff --git a/extra/oidentd/oidentd.confd b/main/oidentd/oidentd.confd
index 3116889e6..3116889e6 100644
--- a/extra/oidentd/oidentd.confd
+++ b/main/oidentd/oidentd.confd
diff --git a/extra/oidentd/oidentd.initd b/main/oidentd/oidentd.initd
index c40b058da..c40b058da 100644
--- a/extra/oidentd/oidentd.initd
+++ b/main/oidentd/oidentd.initd
diff --git a/extra/openldap/APKBUILD b/main/openldap/APKBUILD
index bb4db8296..bb4db8296 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 c05790e3e..c05790e3e 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 448249a3b..448249a3b 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 1d6affdfe..1d6affdfe 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 b208a9f5f..b208a9f5f 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 2240ad3f3..2240ad3f3 100644
--- a/extra/openldap/slapd.confd
+++ b/main/openldap/slapd.confd
diff --git a/extra/openldap/slapd.initd b/main/openldap/slapd.initd
index 1637d3335..1637d3335 100644
--- a/extra/openldap/slapd.initd
+++ b/main/openldap/slapd.initd
diff --git a/extra/openldap/slurpd.initd b/main/openldap/slurpd.initd
index f5aa2ead5..f5aa2ead5 100644
--- a/extra/openldap/slurpd.initd
+++ b/main/openldap/slurpd.initd
diff --git a/extra/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
index c72d0d269..c72d0d269 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 67b44ab5d..67b44ab5d 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 60e4827d6..60e4827d6 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 c3bece169..c3bece169 100644
--- a/extra/opennhrp/opennhrp.confd
+++ b/main/opennhrp/opennhrp.confd
diff --git a/extra/opennhrp/opennhrp.initd b/main/opennhrp/opennhrp.initd
index ac7ea6a57..ac7ea6a57 100755
--- a/extra/opennhrp/opennhrp.initd
+++ b/main/opennhrp/opennhrp.initd
diff --git a/extra/openvpn/APKBUILD b/main/openvpn/APKBUILD
index 3b927139d..3b927139d 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 e042124ea..e042124ea 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 a6e4529e1..a6e4529e1 100644
--- a/extra/openvpn/openvpn.initd
+++ b/main/openvpn/openvpn.initd
diff --git a/extra/p7zip/APKBUILD b/main/p7zip/APKBUILD
index 38d676028..38d676028 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 d06708b4b..d06708b4b 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 1c41b6d07..1c41b6d07 100644
--- a/extra/pciutils/APKBUILD
+++ b/main/pciutils/APKBUILD
diff --git a/extra/pcmciautils/APKBUILD b/main/pcmciautils/APKBUILD
index f11f6e06b..f11f6e06b 100644
--- a/extra/pcmciautils/APKBUILD
+++ b/main/pcmciautils/APKBUILD
diff --git a/extra/pcre/APKBUILD b/main/pcre/APKBUILD
index f2749d6a3..f2749d6a3 100644
--- a/extra/pcre/APKBUILD
+++ b/main/pcre/APKBUILD
diff --git a/extra/perl-archive-zip/APKBUILD b/main/perl-archive-zip/APKBUILD
index 2f78683ee..2f78683ee 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 e0cc0b30d..e0cc0b30d 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 352e26e72..352e26e72 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 b35d517de..b35d517de 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 0b1e8ea99..0b1e8ea99 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 4acae9848..4acae9848 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 929d58722..929d58722 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 7d3edc3ab..7d3edc3ab 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 0b0909c5d..0b0909c5d 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 431f52a98..431f52a98 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 fb7ea0125..fb7ea0125 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 f8e350c1d..f8e350c1d 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 f25ce2164..f25ce2164 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 c8ef7ea72..c8ef7ea72 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 7fc9d69ed..7fc9d69ed 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 be3f83df0..be3f83df0 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 6a3c88461..6a3c88461 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 372398d65..372398d65 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 0e133c30e..0e133c30e 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 1bbfe33fe..1bbfe33fe 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 2ce850ee4..2ce850ee4 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 d959c43d0..d959c43d0 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 9e0bc32ca..9e0bc32ca 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 8ee87e58b..8ee87e58b 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 df47aee24..df47aee24 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 1c02dfe16..1c02dfe16 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 59ece194b..59ece194b 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 4cd3b727e..4cd3b727e 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 e95b8411c..e95b8411c 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 7dc23116c..7dc23116c 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 74d2ecbe1..74d2ecbe1 100644
--- a/extra/perl-xml-simple/APKBUILD
+++ b/main/perl-xml-simple/APKBUILD
diff --git a/extra/pgcluster/APKBUILD b/main/pgcluster/APKBUILD
index 9d92b9b65..9d92b9b65 100644
--- a/extra/pgcluster/APKBUILD
+++ b/main/pgcluster/APKBUILD
diff --git a/extra/pgcluster/pgcluster.confd b/main/pgcluster/pgcluster.confd
index 9e1376eec..9e1376eec 100644
--- a/extra/pgcluster/pgcluster.confd
+++ b/main/pgcluster/pgcluster.confd
diff --git a/extra/pgcluster/pgcluster.initd b/main/pgcluster/pgcluster.initd
index fb5cdfdf3..fb5cdfdf3 100644
--- a/extra/pgcluster/pgcluster.initd
+++ b/main/pgcluster/pgcluster.initd
diff --git a/extra/pgpool/APKBUILD b/main/pgpool/APKBUILD
index 980b3019a..980b3019a 100644
--- a/extra/pgpool/APKBUILD
+++ b/main/pgpool/APKBUILD
diff --git a/extra/pgpool/pgpool.initd b/main/pgpool/pgpool.initd
index d577cf9e1..d577cf9e1 100644
--- a/extra/pgpool/pgpool.initd
+++ b/main/pgpool/pgpool.initd
diff --git a/extra/php-apc/APKBUILD b/main/php-apc/APKBUILD
index d3460aaa5..d3460aaa5 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 eb8a7e8f2..eb8a7e8f2 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 8e72f404c..8e72f404c 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 7f939e8b8..7f939e8b8 100644
--- a/extra/php-fileinfo/magic.patch
+++ b/main/php-fileinfo/magic.patch
diff --git a/extra/php/APKBUILD b/main/php/APKBUILD
index f1a36a24e..f1a36a24e 100644
--- a/extra/php/APKBUILD
+++ b/main/php/APKBUILD
diff --git a/extra/pinentry/APKBUILD b/main/pinentry/APKBUILD
index 5322ebe7a..5322ebe7a 100644
--- a/extra/pinentry/APKBUILD
+++ b/main/pinentry/APKBUILD
diff --git a/extra/pingu/APKBUILD b/main/pingu/APKBUILD
index fdd91972a..fdd91972a 100644
--- a/extra/pingu/APKBUILD
+++ b/main/pingu/APKBUILD
diff --git a/extra/pingu/pingu.initd b/main/pingu/pingu.initd
index 39301f80e..39301f80e 100644
--- a/extra/pingu/pingu.initd
+++ b/main/pingu/pingu.initd
diff --git a/extra/portmap/APKBUILD b/main/portmap/APKBUILD
index 7539f314a..7539f314a 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 c6af8f8c8..c6af8f8c8 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 c2756c992..c2756c992 100644
--- a/extra/portmap/portmap.confd
+++ b/main/portmap/portmap.confd
diff --git a/extra/portmap/portmap.initd b/main/portmap/portmap.initd
index 65d23d748..65d23d748 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 b0dcfb9c5..b0dcfb9c5 100644
--- a/extra/portmap/portmap.pre-install
+++ b/main/portmap/portmap.pre-install
diff --git a/extra/postfix/APKBUILD b/main/postfix/APKBUILD
index 71a9199c0..71a9199c0 100644
--- a/extra/postfix/APKBUILD
+++ b/main/postfix/APKBUILD
diff --git a/extra/postfix/dynamicmaps.cf b/main/postfix/dynamicmaps.cf
index dfe211055..dfe211055 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 630abedc3..630abedc3 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 b8d23833b..b8d23833b 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 b8d23833b..b8d23833b 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 f15b00cf7..f15b00cf7 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 b8d23833b..b8d23833b 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 b2396b3ae..b2396b3ae 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 98e01db0b..98e01db0b 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 22414ef61..22414ef61 100644
--- a/extra/postfix/postfix.pre-install
+++ b/main/postfix/postfix.pre-install
diff --git a/extra/postgresql/APKBUILD b/main/postgresql/APKBUILD
index a2d921ed1..a2d921ed1 100644
--- a/extra/postgresql/APKBUILD
+++ b/main/postgresql/APKBUILD
diff --git a/extra/postgresql/postgresql.confd b/main/postgresql/postgresql.confd
index 56561b0c4..56561b0c4 100644
--- a/extra/postgresql/postgresql.confd
+++ b/main/postgresql/postgresql.confd
diff --git a/extra/postgresql/postgresql.initd b/main/postgresql/postgresql.initd
index 3863a49aa..3863a49aa 100644
--- a/extra/postgresql/postgresql.initd
+++ b/main/postgresql/postgresql.initd
diff --git a/extra/pth/APKBUILD b/main/pth/APKBUILD
index ce5cc5e12..ce5cc5e12 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 1c8200a4c..1c8200a4c 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 7a4a5ab30..7a4a5ab30 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 3914dea7a..3914dea7a 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 d5d38b99c..d5d38b99c 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 f345db8c8..f345db8c8 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 aaa3fc64d..aaa3fc64d 100644
--- a/extra/quagga/APKBUILD
+++ b/main/quagga/APKBUILD
diff --git a/extra/quagga/bgpd.initd b/main/quagga/bgpd.initd
index b6104235c..b6104235c 100644
--- a/extra/quagga/bgpd.initd
+++ b/main/quagga/bgpd.initd
diff --git a/extra/quagga/ospf6d.initd b/main/quagga/ospf6d.initd
index 6edafe5f7..6edafe5f7 100644
--- a/extra/quagga/ospf6d.initd
+++ b/main/quagga/ospf6d.initd
diff --git a/extra/quagga/ospfd.initd b/main/quagga/ospfd.initd
index f67ca2c15..f67ca2c15 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 72ee89929..72ee89929 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 e558d30a6..e558d30a6 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 53636d6b5..53636d6b5 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 2c1b868d1..2c1b868d1 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 ad562df00..ad562df00 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 c1c670d20..c1c670d20 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 2643891dc..2643891dc 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 987d6ec4b..987d6ec4b 100644
--- a/extra/quagga/ripd.initd
+++ b/main/quagga/ripd.initd
diff --git a/extra/quagga/ripngd.initd b/main/quagga/ripngd.initd
index 9bf2ff2a8..9bf2ff2a8 100644
--- a/extra/quagga/ripngd.initd
+++ b/main/quagga/ripngd.initd
diff --git a/extra/quagga/zebra.confd b/main/quagga/zebra.confd
index a5256acd0..a5256acd0 100644
--- a/extra/quagga/zebra.confd
+++ b/main/quagga/zebra.confd
diff --git a/extra/quagga/zebra.initd b/main/quagga/zebra.initd
index f0cc00843..f0cc00843 100644
--- a/extra/quagga/zebra.initd
+++ b/main/quagga/zebra.initd
diff --git a/extra/razor/APKBUILD b/main/razor/APKBUILD
index 703420864..703420864 100644
--- a/extra/razor/APKBUILD
+++ b/main/razor/APKBUILD
diff --git a/extra/roundcubemail/APKBUILD b/main/roundcubemail/APKBUILD
index f56de7b77..f56de7b77 100644
--- a/extra/roundcubemail/APKBUILD
+++ b/main/roundcubemail/APKBUILD
diff --git a/extra/rrdtool/APKBUILD b/main/rrdtool/APKBUILD
index 541a54e85..541a54e85 100644
--- a/extra/rrdtool/APKBUILD
+++ b/main/rrdtool/APKBUILD
diff --git a/extra/rsync/APKBUILD b/main/rsync/APKBUILD
index 4b0e8f120..4b0e8f120 100644
--- a/extra/rsync/APKBUILD
+++ b/main/rsync/APKBUILD
diff --git a/extra/rsync/rsyncd.conf b/main/rsync/rsyncd.conf
index b6dd5994d..b6dd5994d 100644
--- a/extra/rsync/rsyncd.conf
+++ b/main/rsync/rsyncd.conf
diff --git a/extra/rsync/rsyncd.confd b/main/rsync/rsyncd.confd
index c3d897ed2..c3d897ed2 100644
--- a/extra/rsync/rsyncd.confd
+++ b/main/rsync/rsyncd.confd
diff --git a/extra/rsync/rsyncd.initd b/main/rsync/rsyncd.initd
index 1b2028229..1b2028229 100644
--- a/extra/rsync/rsyncd.initd
+++ b/main/rsync/rsyncd.initd
diff --git a/extra/rsync/rsyncd.logrotate b/main/rsync/rsyncd.logrotate
index 34bcf72d2..34bcf72d2 100644
--- a/extra/rsync/rsyncd.logrotate
+++ b/main/rsync/rsyncd.logrotate
diff --git a/extra/ruby/APKBUILD b/main/ruby/APKBUILD
index ffeb78150..ffeb78150 100644
--- a/extra/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
diff --git a/extra/rubygems/APKBUILD b/main/rubygems/APKBUILD
index 8ba7c4883..8ba7c4883 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 3b76ad3f9..3b76ad3f9 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 5854fa5d8..5854fa5d8 100644
--- a/extra/run-parts/APKBUILD
+++ b/main/run-parts/APKBUILD
diff --git a/extra/samba/APKBUILD b/main/samba/APKBUILD
index c28a6e2de..c28a6e2de 100644
--- a/extra/samba/APKBUILD
+++ b/main/samba/APKBUILD
diff --git a/extra/samba/samba.confd b/main/samba/samba.confd
index 3788c3c17..3788c3c17 100644
--- a/extra/samba/samba.confd
+++ b/main/samba/samba.confd
diff --git a/extra/samba/samba.initd b/main/samba/samba.initd
index d2d395a98..d2d395a98 100644
--- a/extra/samba/samba.initd
+++ b/main/samba/samba.initd
diff --git a/extra/screen/APKBUILD b/main/screen/APKBUILD
index ffa48fa20..ffa48fa20 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 4a90f49b9..4a90f49b9 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 99ba1e6f8..99ba1e6f8 100644
--- a/extra/sed/APKBUILD
+++ b/main/sed/APKBUILD
diff --git a/extra/sed/sed.post-deinstall b/main/sed/sed.post-deinstall
index 99b57c463..99b57c463 100644
--- a/extra/sed/sed.post-deinstall
+++ b/main/sed/sed.post-deinstall
diff --git a/extra/sfic/APKBUILD b/main/sfic/APKBUILD
index 3f781b4de..3f781b4de 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 54538aac1..54538aac1 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 1c0a51d8a..1c0a51d8a 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 9dda676c5..9dda676c5 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 9c98a3bfd..9c98a3bfd 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 d2537e8a1..d2537e8a1 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 e601c96a5..e601c96a5 100644
--- a/extra/shorewall-perl/APKBUILD
+++ b/main/shorewall-perl/APKBUILD
diff --git a/extra/shorewall-shell/APKBUILD b/main/shorewall-shell/APKBUILD
index 643562f20..643562f20 100644
--- a/extra/shorewall-shell/APKBUILD
+++ b/main/shorewall-shell/APKBUILD
diff --git a/extra/shorewall/APKBUILD b/main/shorewall/APKBUILD
index 735973cc2..735973cc2 100644
--- a/extra/shorewall/APKBUILD
+++ b/main/shorewall/APKBUILD
diff --git a/extra/sic/APKBUILD b/main/sic/APKBUILD
index 72e197ea0..72e197ea0 100644
--- a/extra/sic/APKBUILD
+++ b/main/sic/APKBUILD
diff --git a/extra/slang/APKBUILD b/main/slang/APKBUILD
index c1fe96200..c1fe96200 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 d7ed5a8d6..d7ed5a8d6 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 35b482065..35b482065 100644
--- a/extra/snort/APKBUILD
+++ b/main/snort/APKBUILD
diff --git a/extra/snort/nocxx.patch b/main/snort/nocxx.patch
index beb1ab900..beb1ab900 100644
--- a/extra/snort/nocxx.patch
+++ b/main/snort/nocxx.patch
diff --git a/extra/snort/snort.confd b/main/snort/snort.confd
index d4d240ac9..d4d240ac9 100644
--- a/extra/snort/snort.confd
+++ b/main/snort/snort.confd
diff --git a/extra/snort/snort.initd b/main/snort/snort.initd
index a5c2b05c4..a5c2b05c4 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 e1555163a..e1555163a 100644
--- a/extra/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
diff --git a/extra/sntpc/APKBUILD b/main/sntpc/APKBUILD
index 6df6a6efd..6df6a6efd 100644
--- a/extra/sntpc/APKBUILD
+++ b/main/sntpc/APKBUILD
diff --git a/extra/sntpc/sntpc.confd b/main/sntpc/sntpc.confd
index a92e4be86..a92e4be86 100644
--- a/extra/sntpc/sntpc.confd
+++ b/main/sntpc/sntpc.confd
diff --git a/extra/sntpc/sntpc.initd b/main/sntpc/sntpc.initd
index a97e51bdb..a97e51bdb 100644
--- a/extra/sntpc/sntpc.initd
+++ b/main/sntpc/sntpc.initd
diff --git a/extra/spamassassin/APKBUILD b/main/spamassassin/APKBUILD
index 3da01a62f..3da01a62f 100644
--- a/extra/spamassassin/APKBUILD
+++ b/main/spamassassin/APKBUILD
diff --git a/extra/spamassassin/spamd.conf b/main/spamassassin/spamd.conf
index b6fca036f..b6fca036f 100644
--- a/extra/spamassassin/spamd.conf
+++ b/main/spamassassin/spamd.conf
diff --git a/extra/spamassassin/spamd.init b/main/spamassassin/spamd.init
index 89723889f..89723889f 100644
--- a/extra/spamassassin/spamd.init
+++ b/main/spamassassin/spamd.init
diff --git a/extra/sqlite/APKBUILD b/main/sqlite/APKBUILD
index 40a5cd7e4..40a5cd7e4 100644
--- a/extra/sqlite/APKBUILD
+++ b/main/sqlite/APKBUILD
diff --git a/extra/sqlite/license.txt b/main/sqlite/license.txt
index 118c5d5e6..118c5d5e6 100644
--- a/extra/sqlite/license.txt
+++ b/main/sqlite/license.txt
diff --git a/extra/squid/APKBUILD b/main/squid/APKBUILD
index ac840cbbd..ac840cbbd 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 5ac174dee..5ac174dee 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 14a9ee84b..14a9ee84b 100644
--- a/extra/squid/squid.confd
+++ b/main/squid/squid.confd
diff --git a/extra/squid/squid.initd b/main/squid/squid.initd
index bbdc2bed2..bbdc2bed2 100644
--- a/extra/squid/squid.initd
+++ b/main/squid/squid.initd
diff --git a/extra/squid/squid.logrotate b/main/squid/squid.logrotate
index fb3279e01..fb3279e01 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 88df6d26f..88df6d26f 100644
--- a/extra/squid/squid.post-install
+++ b/main/squid/squid.post-install
diff --git a/extra/ssmtp/APKBUILD b/main/ssmtp/APKBUILD
index 2f63b689f..2f63b689f 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 fca144fa6..fca144fa6 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 dd4baf9f8..dd4baf9f8 100644
--- a/extra/ssmtp/generate_config.patch
+++ b/main/ssmtp/generate_config.patch
diff --git a/extra/strace/APKBUILD b/main/strace/APKBUILD
index eb1f88c2f..eb1f88c2f 100644
--- a/extra/strace/APKBUILD
+++ b/main/strace/APKBUILD
diff --git a/extra/subversion/APKBUILD b/main/subversion/APKBUILD
index 538f77d0b..538f77d0b 100644
--- a/extra/subversion/APKBUILD
+++ b/main/subversion/APKBUILD
diff --git a/extra/subversion/subversion.pre-install b/main/subversion/subversion.pre-install
index fb516ee5a..fb516ee5a 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 b487a4097..b487a4097 100644
--- a/extra/subversion/svnserve.confd
+++ b/main/subversion/svnserve.confd
diff --git a/extra/subversion/svnserve.initd b/main/subversion/svnserve.initd
index 036d0187e..036d0187e 100644
--- a/extra/subversion/svnserve.initd
+++ b/main/subversion/svnserve.initd
diff --git a/extra/sysfsutils/APKBUILD b/main/sysfsutils/APKBUILD
index e462aec70..e462aec70 100644
--- a/extra/sysfsutils/APKBUILD
+++ b/main/sysfsutils/APKBUILD
diff --git a/extra/sysklogd/APKBUILD b/main/sysklogd/APKBUILD
index e3fe8badc..e3fe8badc 100644
--- a/extra/sysklogd/APKBUILD
+++ b/main/sysklogd/APKBUILD
diff --git a/extra/sysklogd/LICENSE b/main/sysklogd/LICENSE
index 7e9b5d59c..7e9b5d59c 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 40b8817d4..40b8817d4 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 ad311a512..ad311a512 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 8c3f571f3..8c3f571f3 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 6175cdfe7..6175cdfe7 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 c97357391..c97357391 100644
--- a/extra/sysklogd/sysklogd.confd
+++ b/main/sysklogd/sysklogd.confd
diff --git a/extra/sysklogd/sysklogd.initd b/main/sysklogd/sysklogd.initd
index 59db00fc9..59db00fc9 100644
--- a/extra/sysklogd/sysklogd.initd
+++ b/main/sysklogd/sysklogd.initd
diff --git a/extra/sysklogd/sysklogd.logrotate b/main/sysklogd/sysklogd.logrotate
index 29afd15bd..29afd15bd 100644
--- a/extra/sysklogd/sysklogd.logrotate
+++ b/main/sysklogd/sysklogd.logrotate
diff --git a/extra/sysstat/APKBUILD b/main/sysstat/APKBUILD
index f9a1408b7..f9a1408b7 100644
--- a/extra/sysstat/APKBUILD
+++ b/main/sysstat/APKBUILD
diff --git a/extra/tar/APKBUILD b/main/tar/APKBUILD
index 7e713be6c..7e713be6c 100644
--- a/extra/tar/APKBUILD
+++ b/main/tar/APKBUILD
diff --git a/extra/tar/tar.post-deinstall b/main/tar/tar.post-deinstall
index 99b57c463..99b57c463 100644
--- a/extra/tar/tar.post-deinstall
+++ b/main/tar/tar.post-deinstall
diff --git a/extra/tcl/APKBUILD b/main/tcl/APKBUILD
index 32a9eff63..32a9eff63 100644
--- a/extra/tcl/APKBUILD
+++ b/main/tcl/APKBUILD
diff --git a/extra/tcpdump/APKBUILD b/main/tcpdump/APKBUILD
index ad9f5323f..ad9f5323f 100644
--- a/extra/tcpdump/APKBUILD
+++ b/main/tcpdump/APKBUILD
diff --git a/extra/tcpproxy/APKBUILD b/main/tcpproxy/APKBUILD
index fb7d1226d..a06aacb39 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 a7fd4292d..a7fd4292d 100644
--- a/extra/tcpproxy/tcpproxy.initd
+++ b/main/tcpproxy/tcpproxy.initd
diff --git a/extra/tiff/APKBUILD b/main/tiff/APKBUILD
index c580a84a3..c580a84a3 100644
--- a/extra/tiff/APKBUILD
+++ b/main/tiff/APKBUILD
diff --git a/extra/tinyproxy/APKBUILD b/main/tinyproxy/APKBUILD
index 046daa830..046daa830 100644
--- a/extra/tinyproxy/APKBUILD
+++ b/main/tinyproxy/APKBUILD
diff --git a/extra/tinyproxy/tinyproxy.initd b/main/tinyproxy/tinyproxy.initd
index bee5d041f..bee5d041f 100644
--- a/extra/tinyproxy/tinyproxy.initd
+++ b/main/tinyproxy/tinyproxy.initd
diff --git a/extra/tinyproxy/tinyproxy.install b/main/tinyproxy/tinyproxy.install
index 5fa366737..5fa366737 100644
--- a/extra/tinyproxy/tinyproxy.install
+++ b/main/tinyproxy/tinyproxy.install
diff --git a/extra/tmux/APKBUILD b/main/tmux/APKBUILD
index 7edc93226..7edc93226 100644
--- a/extra/tmux/APKBUILD
+++ b/main/tmux/APKBUILD
diff --git a/extra/tmux/build.patch b/main/tmux/build.patch
index b16c4f4ca..b16c4f4ca 100644
--- a/extra/tmux/build.patch
+++ b/main/tmux/build.patch
diff --git a/extra/transmission/APKBUILD b/main/transmission/APKBUILD
index 0942c1b2a..0942c1b2a 100644
--- a/extra/transmission/APKBUILD
+++ b/main/transmission/APKBUILD
diff --git a/extra/transmission/transmission-daemon.confd b/main/transmission/transmission-daemon.confd
index c1f338f07..c1f338f07 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 af9461cc6..af9461cc6 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 44a14760f..44a14760f 100644
--- a/extra/transmission/transmission.pre-install
+++ b/main/transmission/transmission.pre-install
diff --git a/extra/udev/APKBUILD b/main/udev/APKBUILD
index d25b5faa4..d25b5faa4 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 1a0259798..1a0259798 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 839565a5b..839565a5b 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 96beb845b..96beb845b 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 87c3a6ac9..87c3a6ac9 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 26774ab4a..26774ab4a 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 8eaea1176..8eaea1176 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 3814bb565..3814bb565 100644
--- a/extra/uiconv/APKBUILD
+++ b/main/uiconv/APKBUILD
diff --git a/extra/unarj/APKBUILD b/main/unarj/APKBUILD
index b2e0c7260..b2e0c7260 100644
--- a/extra/unarj/APKBUILD
+++ b/main/unarj/APKBUILD
diff --git a/extra/unfs3/APKBUILD b/main/unfs3/APKBUILD
index 28de30157..28de30157 100644
--- a/extra/unfs3/APKBUILD
+++ b/main/unfs3/APKBUILD
diff --git a/extra/unixodbc/APKBUILD b/main/unixodbc/APKBUILD
index cd72a1653..cd72a1653 100644
--- a/extra/unixodbc/APKBUILD
+++ b/main/unixodbc/APKBUILD
diff --git a/extra/unrar/APKBUILD b/main/unrar/APKBUILD
index 67f33fac0..67f33fac0 100644
--- a/extra/unrar/APKBUILD
+++ b/main/unrar/APKBUILD
diff --git a/extra/usbutils/APKBUILD b/main/usbutils/APKBUILD
index 7dc7905c3..7dc7905c3 100644
--- a/extra/usbutils/APKBUILD
+++ b/main/usbutils/APKBUILD
diff --git a/extra/v86d/APKBUILD b/main/v86d/APKBUILD
index 8bcdcf618..8bcdcf618 100644
--- a/extra/v86d/APKBUILD
+++ b/main/v86d/APKBUILD
diff --git a/extra/v86d/modprobe.uvesafb b/main/v86d/modprobe.uvesafb
index 5e46e1088..5e46e1088 100644
--- a/extra/v86d/modprobe.uvesafb
+++ b/main/v86d/modprobe.uvesafb
diff --git a/extra/vala/APKBUILD b/main/vala/APKBUILD
index 1a03977a0..1a03977a0 100644
--- a/extra/vala/APKBUILD
+++ b/main/vala/APKBUILD
diff --git a/extra/valgrind/APKBUILD b/main/valgrind/APKBUILD
index dcba29837..dcba29837 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 db6551996..db6551996 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 3dee6bda2..3dee6bda2 100644
--- a/extra/vim/APKBUILD
+++ b/main/vim/APKBUILD
diff --git a/extra/vim/vimrc b/main/vim/vimrc
index e30173424..e30173424 100644
--- a/extra/vim/vimrc
+++ b/main/vim/vimrc
diff --git a/extra/vsftpd/APKBUILD b/main/vsftpd/APKBUILD
index fef929cad..fef929cad 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 22161907c..22161907c 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 0abb80c6e..0abb80c6e 100644
--- a/extra/vsftpd/vsftpd.confd
+++ b/main/vsftpd/vsftpd.confd
diff --git a/extra/vsftpd/vsftpd.initd b/main/vsftpd/vsftpd.initd
index 9e8b124b0..9e8b124b0 100644
--- a/extra/vsftpd/vsftpd.initd
+++ b/main/vsftpd/vsftpd.initd
diff --git a/extra/wget/APKBUILD b/main/wget/APKBUILD
index b6581fa48..b6581fa48 100644
--- a/extra/wget/APKBUILD
+++ b/main/wget/APKBUILD
diff --git a/extra/wget/wget.post-deinstall b/main/wget/wget.post-deinstall
index 99b57c463..99b57c463 100644
--- a/extra/wget/wget.post-deinstall
+++ b/main/wget/wget.post-deinstall
diff --git a/extra/xvidcore/APKBUILD b/main/xvidcore/APKBUILD
index 64858bf8d..64858bf8d 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 5ddad23b9..5ddad23b9 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 d85fb117b..d85fb117b 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 14a8821b0..14a8821b0 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 4998c35b7..4998c35b7 100644
--- a/extra/zip/APKBUILD
+++ b/main/zip/APKBUILD
diff --git a/extra/zonenotify/APKBUILD b/main/zonenotify/APKBUILD
index 9709eba4e..9709eba4e 100644
--- a/extra/zonenotify/APKBUILD
+++ b/main/zonenotify/APKBUILD