830 files changed, 50 insertions, 62 deletions

diff --git a/core/patch/APKBUILD b/core/patch/APKBUILD
deleted file mode 100644
index 2006c9fb9d..0000000000
--- a/core/patch/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=patch
-pkgver=2.5.9
-pkgrel=0
-pkgdesc="Utility to apply diffs to files"
-url="http://www.gnu.org/software/patch/patch.html"
-license='GPL'
-depends='uclibc'
-source=http://alpha.gnu.org/gnu/diffutils/$pkgname-$pkgver.tar.gz
-
-subpackages="$pkgname-doc"
-
-build() {
-	cd $startdir/src/$pkgname-$pkgver
-	./configure --prefix=/usr --mandir=/usr/share/man
-	make || return 1
-	make prefix=$startdir/pkg/usr mandir=$startdir/pkg/usr/share/man install
-}
-
-md5sums='dacfb618082f8d3a2194601193cf8716  patch-2.5.9.tar.gz'
diff --git a/extra/popt/APKBUILD b/extra/popt/APKBUILD
deleted file mode 100644
index 4826bd2d28..0000000000
--- 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/core/abuild/0001-core-abuild-fix-options-order-to-apk-add.patch b/main/abuild/0001-core-abuild-fix-options-order-to-apk-add.patch
index 7a5c25a815..7a5c25a815 100644
--- a/core/abuild/0001-core-abuild-fix-options-order-to-apk-add.patch
+++ b/main/abuild/0001-core-abuild-fix-options-order-to-apk-add.patch
diff --git a/core/abuild/APKBUILD b/main/abuild/APKBUILD
index 4122b36fd2..4122b36fd2 100644
--- a/core/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
diff --git a/extra/acct/APKBUILD b/main/acct/APKBUILD
index 29657feed9..29657feed9 100644
--- a/extra/acct/APKBUILD
+++ b/main/acct/APKBUILD
diff --git a/extra/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD
index 1f29cfb0b1..1f29cfb0b1 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 fdb808017c..fdb808017c 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 040645d312..040645d312 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 c7abd3b02f..c7abd3b02f 100644
--- a/extra/acf-asterisk/APKBUILD
+++ b/main/acf-asterisk/APKBUILD
diff --git a/extra/acf-chrony/APKBUILD b/main/acf-chrony/APKBUILD
index 9db7c4d000..9db7c4d000 100644
--- a/extra/acf-chrony/APKBUILD
+++ b/main/acf-chrony/APKBUILD
diff --git a/extra/acf-clamav/APKBUILD b/main/acf-clamav/APKBUILD
index 511844df49..511844df49 100644
--- a/extra/acf-clamav/APKBUILD
+++ b/main/acf-clamav/APKBUILD
diff --git a/extra/acf-clamsmtp/APKBUILD b/main/acf-clamsmtp/APKBUILD
index b72fc2e32b..b72fc2e32b 100644
--- a/extra/acf-clamsmtp/APKBUILD
+++ b/main/acf-clamsmtp/APKBUILD
diff --git a/extra/acf-core/APKBUILD b/main/acf-core/APKBUILD
index dd9f65bbc7..dd9f65bbc7 100644
--- a/extra/acf-core/APKBUILD
+++ b/main/acf-core/APKBUILD
diff --git a/extra/acf-dansguardian/APKBUILD b/main/acf-dansguardian/APKBUILD
index c5d5ef7dd5..c5d5ef7dd5 100644
--- a/extra/acf-dansguardian/APKBUILD
+++ b/main/acf-dansguardian/APKBUILD
diff --git a/extra/acf-dhcp/APKBUILD b/main/acf-dhcp/APKBUILD
index bc92419bb9..bc92419bb9 100644
--- a/extra/acf-dhcp/APKBUILD
+++ b/main/acf-dhcp/APKBUILD
diff --git a/extra/acf-dnscache/APKBUILD b/main/acf-dnscache/APKBUILD
index 979df43c19..979df43c19 100644
--- a/extra/acf-dnscache/APKBUILD
+++ b/main/acf-dnscache/APKBUILD
diff --git a/extra/acf-dnsmasq/APKBUILD b/main/acf-dnsmasq/APKBUILD
index 8f0b8397b3..8f0b8397b3 100644
--- a/extra/acf-dnsmasq/APKBUILD
+++ b/main/acf-dnsmasq/APKBUILD
diff --git a/extra/acf-dovecot/APKBUILD b/main/acf-dovecot/APKBUILD
index a95208ad6e..a95208ad6e 100644
--- a/extra/acf-dovecot/APKBUILD
+++ b/main/acf-dovecot/APKBUILD
diff --git a/extra/acf-fetchmail/APKBUILD b/main/acf-fetchmail/APKBUILD
index c4638e342d..c4638e342d 100644
--- a/extra/acf-fetchmail/APKBUILD
+++ b/main/acf-fetchmail/APKBUILD
diff --git a/extra/acf-gnats/APKBUILD b/main/acf-gnats/APKBUILD
index 0dc58acd83..0dc58acd83 100644
--- a/extra/acf-gnats/APKBUILD
+++ b/main/acf-gnats/APKBUILD
diff --git a/extra/acf-gross/APKBUILD b/main/acf-gross/APKBUILD
index 4dcf979d18..4dcf979d18 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 2da2f90f29..2da2f90f29 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 12665845f8..12665845f8 100644
--- a/extra/acf-iptables/APKBUILD
+++ b/main/acf-iptables/APKBUILD
diff --git a/extra/acf-mdadm/APKBUILD b/main/acf-mdadm/APKBUILD
index 5069fa0c41..5069fa0c41 100644
--- a/extra/acf-mdadm/APKBUILD
+++ b/main/acf-mdadm/APKBUILD
diff --git a/extra/acf-opennhrp/APKBUILD b/main/acf-opennhrp/APKBUILD
index 4bc246496b..4bc246496b 100644
--- a/extra/acf-opennhrp/APKBUILD
+++ b/main/acf-opennhrp/APKBUILD
diff --git a/extra/acf-openntpd/APKBUILD b/main/acf-openntpd/APKBUILD
index f33272d176..f33272d176 100644
--- a/extra/acf-openntpd/APKBUILD
+++ b/main/acf-openntpd/APKBUILD
diff --git a/extra/acf-openssh/APKBUILD b/main/acf-openssh/APKBUILD
index 9228bacd75..9228bacd75 100644
--- a/extra/acf-openssh/APKBUILD
+++ b/main/acf-openssh/APKBUILD
diff --git a/extra/acf-openssl/APKBUILD b/main/acf-openssl/APKBUILD
index abaeeed12a..abaeeed12a 100644
--- a/extra/acf-openssl/APKBUILD
+++ b/main/acf-openssl/APKBUILD
diff --git a/extra/acf-openvpn/APKBUILD b/main/acf-openvpn/APKBUILD
index 34febc34c4..34febc34c4 100644
--- a/extra/acf-openvpn/APKBUILD
+++ b/main/acf-openvpn/APKBUILD
diff --git a/extra/acf-pingu/APKBUILD b/main/acf-pingu/APKBUILD
index 9efbf5b9a3..9efbf5b9a3 100644
--- a/extra/acf-pingu/APKBUILD
+++ b/main/acf-pingu/APKBUILD
diff --git a/extra/acf-postfix/APKBUILD b/main/acf-postfix/APKBUILD
index b525015e0d..b525015e0d 100644
--- a/extra/acf-postfix/APKBUILD
+++ b/main/acf-postfix/APKBUILD
diff --git a/extra/acf-postgresql/APKBUILD b/main/acf-postgresql/APKBUILD
index 88e8d68c75..88e8d68c75 100644
--- a/extra/acf-postgresql/APKBUILD
+++ b/main/acf-postgresql/APKBUILD
diff --git a/extra/acf-ppp/APKBUILD b/main/acf-ppp/APKBUILD
index cca9f5e0e0..cca9f5e0e0 100644
--- a/extra/acf-ppp/APKBUILD
+++ b/main/acf-ppp/APKBUILD
diff --git a/extra/acf-quagga/APKBUILD b/main/acf-quagga/APKBUILD
index 01c71c8851..01c71c8851 100644
--- a/extra/acf-quagga/APKBUILD
+++ b/main/acf-quagga/APKBUILD
diff --git a/extra/acf-samba/APKBUILD b/main/acf-samba/APKBUILD
index af07548594..af07548594 100644
--- a/extra/acf-samba/APKBUILD
+++ b/main/acf-samba/APKBUILD
diff --git a/extra/acf-shorewall/APKBUILD b/main/acf-shorewall/APKBUILD
index 64bd03a81e..64bd03a81e 100644
--- a/extra/acf-shorewall/APKBUILD
+++ b/main/acf-shorewall/APKBUILD
diff --git a/extra/acf-skins/APKBUILD b/main/acf-skins/APKBUILD
index 4e377d4b7f..4e377d4b7f 100644
--- a/extra/acf-skins/APKBUILD
+++ b/main/acf-skins/APKBUILD
diff --git a/extra/acf-snort/APKBUILD b/main/acf-snort/APKBUILD
index abe972d44a..abe972d44a 100644
--- a/extra/acf-snort/APKBUILD
+++ b/main/acf-snort/APKBUILD
diff --git a/extra/acf-squid/APKBUILD b/main/acf-squid/APKBUILD
index 9016b58045..9016b58045 100644
--- a/extra/acf-squid/APKBUILD
+++ b/main/acf-squid/APKBUILD
diff --git a/extra/acf-tcpproxy/APKBUILD b/main/acf-tcpproxy/APKBUILD
index c483088c62..c483088c62 100644
--- a/extra/acf-tcpproxy/APKBUILD
+++ b/main/acf-tcpproxy/APKBUILD
diff --git a/extra/acf-tinydns/APKBUILD b/main/acf-tinydns/APKBUILD
index 75eeab0b1a..75eeab0b1a 100644
--- a/extra/acf-tinydns/APKBUILD
+++ b/main/acf-tinydns/APKBUILD
diff --git a/extra/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD
index 15847a3f48..15847a3f48 100644
--- a/extra/acf-weblog/APKBUILD
+++ b/main/acf-weblog/APKBUILD
diff --git a/core/alpine-base/APKBUILD b/main/alpine-base/APKBUILD
index b59032b17a..b59032b17a 100644
--- a/core/alpine-base/APKBUILD
+++ b/main/alpine-base/APKBUILD
diff --git a/core/alpine-baselayout/0001-profile-change-default-path.patch b/main/alpine-baselayout/0001-profile-change-default-path.patch
index 8f6945ce7b..8f6945ce7b 100644
--- a/core/alpine-baselayout/0001-profile-change-default-path.patch
+++ b/main/alpine-baselayout/0001-profile-change-default-path.patch
diff --git a/core/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index ffa96bd446..ffa96bd446 100644
--- a/core/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
diff --git a/core/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 08e641d02b..08e641d02b 100644
--- a/core/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
diff --git a/core/alpine-sdk/APKBUILD b/main/alpine-sdk/APKBUILD
index 533815db38..533815db38 100644
--- a/core/alpine-sdk/APKBUILD
+++ b/main/alpine-sdk/APKBUILD
diff --git a/extra/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD
index b844b54ff0..b844b54ff0 100644
--- a/extra/alsa-lib/APKBUILD
+++ b/main/alsa-lib/APKBUILD
diff --git a/core/file/nocxx.patch b/main/alsa-lib/nocxx.patch
index beb1ab9006..beb1ab9006 100644
--- a/core/file/nocxx.patch
+++ b/main/alsa-lib/nocxx.patch
diff --git a/extra/amavisd-new/APKBUILD b/main/amavisd-new/APKBUILD
index daad650daa..daad650daa 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 56cad39f52..56cad39f52 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 23f92af3f3..23f92af3f3 100644
--- a/extra/amavisd-new/amavisd.init
+++ b/main/amavisd-new/amavisd.init
diff --git a/core/apk-tools/0001-io-move-csumming-away-from-bstream-to-gunzip.patch b/main/apk-tools/0001-io-move-csumming-away-from-bstream-to-gunzip.patch
index 05f7d2c97a..05f7d2c97a 100644
--- a/core/apk-tools/0001-io-move-csumming-away-from-bstream-to-gunzip.patch
+++ b/main/apk-tools/0001-io-move-csumming-away-from-bstream-to-gunzip.patch
diff --git a/core/apk-tools/0002-pkg-fix-package-scanner-to-read-whole-archive.patch b/main/apk-tools/0002-pkg-fix-package-scanner-to-read-whole-archive.patch
index 3609a6aa42..3609a6aa42 100644
--- a/core/apk-tools/0002-pkg-fix-package-scanner-to-read-whole-archive.patch
+++ b/main/apk-tools/0002-pkg-fix-package-scanner-to-read-whole-archive.patch
diff --git a/core/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 4472ce0c5a..4472ce0c5a 100644
--- a/core/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
diff --git a/extra/apr-util/APKBUILD b/main/apr-util/APKBUILD
index 38ab8eadf3..38ab8eadf3 100644
--- a/extra/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
diff --git a/extra/apr/APKBUILD b/main/apr/APKBUILD
index bee01f8dca..bee01f8dca 100644
--- a/extra/apr/APKBUILD
+++ b/main/apr/APKBUILD
diff --git a/extra/arpwatch/APKBUILD b/main/arpwatch/APKBUILD
index ed18e59661..ed18e59661 100644
--- a/extra/arpwatch/APKBUILD
+++ b/main/arpwatch/APKBUILD
diff --git a/extra/arpwatch/arpwatch.confd b/main/arpwatch/arpwatch.confd
index f44221aa36..f44221aa36 100644
--- a/extra/arpwatch/arpwatch.confd
+++ b/main/arpwatch/arpwatch.confd
diff --git a/extra/arpwatch/arpwatch.initd b/main/arpwatch/arpwatch.initd
index e039e1db8a..e039e1db8a 100644
--- a/extra/arpwatch/arpwatch.initd
+++ b/main/arpwatch/arpwatch.initd
diff --git a/extra/aspell/APKBUILD b/main/aspell/APKBUILD
index 30589a1a34..30589a1a34 100644
--- a/extra/aspell/APKBUILD
+++ b/main/aspell/APKBUILD
diff --git a/extra/aspell/libmath.patch b/main/aspell/libmath.patch
index 3fad33a5d2..3fad33a5d2 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 4956791d4d..4956791d4d 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 1acf87f34f..1acf87f34f 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 71370ec0b7..71370ec0b7 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 367dc7163f..367dc7163f 100644
--- a/extra/asterisk/103-rundir.patch
+++ b/main/asterisk/103-rundir.patch
diff --git a/extra/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 7e8bb1d182..7e8bb1d182 100644
--- a/extra/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
diff --git a/extra/asterisk/asterisk.confd b/main/asterisk/asterisk.confd
index fe9f138ab7..fe9f138ab7 100644
--- a/extra/asterisk/asterisk.confd
+++ b/main/asterisk/asterisk.confd
diff --git a/extra/asterisk/asterisk.initd b/main/asterisk/asterisk.initd
index 864a96b3cf..864a96b3cf 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 fd51c7fa5d..fd51c7fa5d 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 f4724251f3..f4724251f3 100644
--- a/extra/asterisk/asterisk.pre-install
+++ b/main/asterisk/asterisk.pre-install
diff --git a/extra/aumix/APKBUILD b/main/aumix/APKBUILD
index 034613b725..034613b725 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 8a32fd5b9b..8a32fd5b9b 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 bf20f0372c..bf20f0372c 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 498716b517..498716b517 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 2c1741b3b9..2c1741b3b9 100644
--- a/extra/aumix/aumix.initd
+++ b/main/aumix/aumix.initd
diff --git a/core/autoconf/APKBUILD b/main/autoconf/APKBUILD
index 8de79f6ef3..8de79f6ef3 100644
--- a/core/autoconf/APKBUILD
+++ b/main/autoconf/APKBUILD
diff --git a/core/automake/APKBUILD b/main/automake/APKBUILD
index 356f68e3f5..356f68e3f5 100644
--- a/core/automake/APKBUILD
+++ b/main/automake/APKBUILD
diff --git a/extra/b43-fwcutter/APKBUILD b/main/b43-fwcutter/APKBUILD
index 0a7f4cc6a4..0a7f4cc6a4 100644
--- a/extra/b43-fwcutter/APKBUILD
+++ b/main/b43-fwcutter/APKBUILD
diff --git a/core/bash/APKBUILD b/main/bash/APKBUILD
index 886c0c0669..886c0c0669 100644
--- a/core/bash/APKBUILD
+++ b/main/bash/APKBUILD
diff --git a/core/bash/bash-noinfo.patch b/main/bash/bash-noinfo.patch
index dcb598a493..dcb598a493 100644
--- a/core/bash/bash-noinfo.patch
+++ b/main/bash/bash-noinfo.patch
diff --git a/core/bbsuid/APKBUILD b/main/bbsuid/APKBUILD
index 45db1e43dc..45db1e43dc 100644
--- a/core/bbsuid/APKBUILD
+++ b/main/bbsuid/APKBUILD
diff --git a/extra/bc/APKBUILD b/main/bc/APKBUILD
index d5f1851f2d..d5f1851f2d 100644
--- a/extra/bc/APKBUILD
+++ b/main/bc/APKBUILD
diff --git a/core/beecrypt/APKBUILD b/main/beecrypt/APKBUILD
index b11cba439f..b11cba439f 100644
--- a/core/beecrypt/APKBUILD
+++ b/main/beecrypt/APKBUILD
diff --git a/core/beecrypt/beecrypt-4.1.2-base64.patch b/main/beecrypt/beecrypt-4.1.2-base64.patch
index c6c370bd07..c6c370bd07 100644
--- a/core/beecrypt/beecrypt-4.1.2-base64.patch
+++ b/main/beecrypt/beecrypt-4.1.2-base64.patch
diff --git a/extra/beep/APKBUILD b/main/beep/APKBUILD
index 742998204e..742998204e 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 33e6affa9f..33e6affa9f 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 533bfa7177..533bfa7177 100644
--- a/extra/bind/APKBUILD
+++ b/main/bind/APKBUILD
diff --git a/extra/bind/bind.127.zone b/main/bind/bind.127.zone
index 2ad28de52c..2ad28de52c 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 d58c61bde0..d58c61bde0 100644
--- a/extra/bind/bind.conf
+++ b/main/bind/bind.conf
diff --git a/extra/bind/bind.confd b/main/bind/bind.confd
index 82d3763509..82d3763509 100644
--- a/extra/bind/bind.confd
+++ b/main/bind/bind.confd
diff --git a/extra/bind/bind.initd b/main/bind/bind.initd
index 6469ee79ac..6469ee79ac 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 338d7050ca..338d7050ca 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 902a7047f9..902a7047f9 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 7e091c097c..7e091c097c 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 c799634502..c799634502 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 83120f77de..83120f77de 100644
--- a/extra/bind/bind.so_bsdcompat.patch
+++ b/main/bind/bind.so_bsdcompat.patch
diff --git a/core/binutils/APKBUILD b/main/binutils/APKBUILD
index caed3abcdc..caed3abcdc 100644
--- a/core/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
diff --git a/core/bison/APKBUILD b/main/bison/APKBUILD
index c0de867ead..c0de867ead 100644
--- a/core/bison/APKBUILD
+++ b/main/bison/APKBUILD
diff --git a/extra/bitlib/APKBUILD b/main/bitlib/APKBUILD
index 91400afc90..91400afc90 100644
--- a/extra/bitlib/APKBUILD
+++ b/main/bitlib/APKBUILD
diff --git a/core/bkeymaps/APKBUILD b/main/bkeymaps/APKBUILD
index 416b9811cc..416b9811cc 100644
--- a/core/bkeymaps/APKBUILD
+++ b/main/bkeymaps/APKBUILD
diff --git a/extra/bridge-utils/APKBUILD b/main/bridge-utils/APKBUILD
index 0caaed9bcf..0caaed9bcf 100644
--- a/extra/bridge-utils/APKBUILD
+++ b/main/bridge-utils/APKBUILD
diff --git a/core/build-base/APKBUILD b/main/build-base/APKBUILD
index 32c4e93b62..32c4e93b62 100644
--- a/core/build-base/APKBUILD
+++ b/main/build-base/APKBUILD
diff --git a/core/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index 6dc784924d..6dc784924d 100644
--- a/core/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
diff --git a/core/busybox-initscripts/busybox-initscripts.post-install b/main/busybox-initscripts/busybox-initscripts.post-install
index 11575f58b9..11575f58b9 100644
--- a/core/busybox-initscripts/busybox-initscripts.post-install
+++ b/main/busybox-initscripts/busybox-initscripts.post-install
diff --git a/core/busybox-initscripts/cron.confd b/main/busybox-initscripts/cron.confd
index 2f2eb7bb75..2f2eb7bb75 100644
--- a/core/busybox-initscripts/cron.confd
+++ b/main/busybox-initscripts/cron.confd
diff --git a/core/busybox-initscripts/cron.initd b/main/busybox-initscripts/cron.initd
index ffae38b806..ffae38b806 100644
--- a/core/busybox-initscripts/cron.initd
+++ b/main/busybox-initscripts/cron.initd
diff --git a/core/busybox-initscripts/dnsd.initd b/main/busybox-initscripts/dnsd.initd
index 8d625f9e5e..8d625f9e5e 100644
--- a/core/busybox-initscripts/dnsd.initd
+++ b/main/busybox-initscripts/dnsd.initd
diff --git a/core/busybox-initscripts/dvbdev b/main/busybox-initscripts/dvbdev
index f0186c176c..f0186c176c 100644
--- a/core/busybox-initscripts/dvbdev
+++ b/main/busybox-initscripts/dvbdev
diff --git a/core/busybox-initscripts/httpd.initd b/main/busybox-initscripts/httpd.initd
index 7f114e650c..7f114e650c 100644
--- a/core/busybox-initscripts/httpd.initd
+++ b/main/busybox-initscripts/httpd.initd
diff --git a/core/busybox-initscripts/ide_links b/main/busybox-initscripts/ide_links
index be0c95aa9c..be0c95aa9c 100644
--- a/core/busybox-initscripts/ide_links
+++ b/main/busybox-initscripts/ide_links
diff --git a/core/busybox-initscripts/inetd.initd b/main/busybox-initscripts/inetd.initd
index b5cf9d7d3e..b5cf9d7d3e 100644
--- a/core/busybox-initscripts/inetd.initd
+++ b/main/busybox-initscripts/inetd.initd
diff --git a/core/busybox-initscripts/klogd.confd b/main/busybox-initscripts/klogd.confd
index 100deedaac..100deedaac 100644
--- a/core/busybox-initscripts/klogd.confd
+++ b/main/busybox-initscripts/klogd.confd
diff --git a/core/busybox-initscripts/klogd.initd b/main/busybox-initscripts/klogd.initd
index 5cf7e6fd16..5cf7e6fd16 100644
--- a/core/busybox-initscripts/klogd.initd
+++ b/main/busybox-initscripts/klogd.initd
diff --git a/core/busybox-initscripts/mdev-mount.initd b/main/busybox-initscripts/mdev-mount.initd
index c7aaa824c2..c7aaa824c2 100644
--- a/core/busybox-initscripts/mdev-mount.initd
+++ b/main/busybox-initscripts/mdev-mount.initd
diff --git a/core/busybox-initscripts/mdev.conf b/main/busybox-initscripts/mdev.conf
index 6ee65a20e5..6ee65a20e5 100644
--- a/core/busybox-initscripts/mdev.conf
+++ b/main/busybox-initscripts/mdev.conf
diff --git a/core/busybox-initscripts/mdev.initd b/main/busybox-initscripts/mdev.initd
index e9309c7006..e9309c7006 100644
--- a/core/busybox-initscripts/mdev.initd
+++ b/main/busybox-initscripts/mdev.initd
diff --git a/core/busybox-initscripts/rdate.confd b/main/busybox-initscripts/rdate.confd
index 93c6786169..93c6786169 100644
--- a/core/busybox-initscripts/rdate.confd
+++ b/main/busybox-initscripts/rdate.confd
diff --git a/core/busybox-initscripts/rdate.initd b/main/busybox-initscripts/rdate.initd
index 3e6c6582c9..3e6c6582c9 100644
--- a/core/busybox-initscripts/rdate.initd
+++ b/main/busybox-initscripts/rdate.initd
diff --git a/core/busybox-initscripts/syslog.confd b/main/busybox-initscripts/syslog.confd
index 5f23b819d5..5f23b819d5 100644
--- a/core/busybox-initscripts/syslog.confd
+++ b/main/busybox-initscripts/syslog.confd
diff --git a/core/busybox-initscripts/syslog.initd b/main/busybox-initscripts/syslog.initd
index 390cd6def3..390cd6def3 100644
--- a/core/busybox-initscripts/syslog.initd
+++ b/main/busybox-initscripts/syslog.initd
diff --git a/core/busybox-initscripts/usbdev b/main/busybox-initscripts/usbdev
index b1aff296cd..b1aff296cd 100644
--- a/core/busybox-initscripts/usbdev
+++ b/main/busybox-initscripts/usbdev
diff --git a/core/busybox-initscripts/usbdisk_link b/main/busybox-initscripts/usbdisk_link
index 750242bb5c..750242bb5c 100644
--- a/core/busybox-initscripts/usbdisk_link
+++ b/main/busybox-initscripts/usbdisk_link
diff --git a/core/busybox-initscripts/watchdog.confd b/main/busybox-initscripts/watchdog.confd
index 5cfd2c2cc4..5cfd2c2cc4 100644
--- a/core/busybox-initscripts/watchdog.confd
+++ b/main/busybox-initscripts/watchdog.confd
diff --git a/core/busybox-initscripts/watchdog.initd b/main/busybox-initscripts/watchdog.initd
index 7363bb7553..7363bb7553 100644
--- a/core/busybox-initscripts/watchdog.initd
+++ b/main/busybox-initscripts/watchdog.initd
diff --git a/core/busybox/APKBUILD b/main/busybox/APKBUILD
index 94621bb45a..94621bb45a 100644
--- a/core/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
diff --git a/core/busybox/bb-tar-numeric-owner.patch b/main/busybox/bb-tar-numeric-owner.patch
index ad6481ffe4..ad6481ffe4 100644
--- a/core/busybox/bb-tar-numeric-owner.patch
+++ b/main/busybox/bb-tar-numeric-owner.patch
diff --git a/core/busybox/busybox-1.11.1-bb.patch b/main/busybox/busybox-1.11.1-bb.patch
index bb858cacd8..bb858cacd8 100644
--- a/core/busybox/busybox-1.11.1-bb.patch
+++ b/main/busybox/busybox-1.11.1-bb.patch
diff --git a/core/busybox/busybox-1.14.2-df.patch b/main/busybox/busybox-1.14.2-df.patch
index 7829f5fb7c..7829f5fb7c 100644
--- a/core/busybox/busybox-1.14.2-df.patch
+++ b/main/busybox/busybox-1.14.2-df.patch
diff --git a/core/busybox/busybox-1.14.2-ls.patch b/main/busybox/busybox-1.14.2-ls.patch
index 64e0a94f37..64e0a94f37 100644
--- a/core/busybox/busybox-1.14.2-ls.patch
+++ b/main/busybox/busybox-1.14.2-ls.patch
diff --git a/core/busybox/busybox-1.14.2-udhcpd.patch b/main/busybox/busybox-1.14.2-udhcpd.patch
index a1502b41f6..a1502b41f6 100644
--- a/core/busybox/busybox-1.14.2-udhcpd.patch
+++ b/main/busybox/busybox-1.14.2-udhcpd.patch
diff --git a/core/busybox/busybox.post-install b/main/busybox/busybox.post-install
index 8baed730c6..8baed730c6 100644
--- a/core/busybox/busybox.post-install
+++ b/main/busybox/busybox.post-install
diff --git a/core/busybox/busybox.post-upgrade b/main/busybox/busybox.post-upgrade
index 1f4b450e5e..1f4b450e5e 120000
--- a/core/busybox/busybox.post-upgrade
+++ b/main/busybox/busybox.post-upgrade
diff --git a/core/busybox/busyboxconfig b/main/busybox/busyboxconfig
index 38f0a19f4c..38f0a19f4c 100644
--- a/core/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
diff --git a/extra/bzip2/APKBUILD b/main/bzip2/APKBUILD
index 09721bb760..09721bb760 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 74f8df000b..74f8df000b 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 85a3c6af6c..85a3c6af6c 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 2427d6a7fb..2427d6a7fb 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 9a71342ca9..9a71342ca9 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 99b57c4635..99b57c4635 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 889eab3591..889eab3591 100644
--- a/extra/c-ares/APKBUILD
+++ b/main/c-ares/APKBUILD
diff --git a/extra/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD
index e39567de17..e39567de17 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 439cfca52e..439cfca52e 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 2143bdb728..2143bdb728 100644
--- a/extra/ccache/APKBUILD
+++ b/main/ccache/APKBUILD
diff --git a/extra/cdrkit/APKBUILD b/main/cdrkit/APKBUILD
index a5ca8d7710..a5ca8d7710 100644
--- a/extra/cdrkit/APKBUILD
+++ b/main/cdrkit/APKBUILD
diff --git a/extra/cgit/APKBUILD b/main/cgit/APKBUILD
index d7578539c8..d7578539c8 100644
--- a/extra/cgit/APKBUILD
+++ b/main/cgit/APKBUILD
diff --git a/extra/chrony/APKBUILD b/main/chrony/APKBUILD
index 21f8924a66..21f8924a66 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 498b241750..498b241750 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 4917d445be..4917d445be 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 2eec4e8428..2eec4e8428 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 f4e5d8eff4..f4e5d8eff4 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 5f39ca3321..5f39ca3321 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 d99b1e01d4..d99b1e01d4 100644
--- a/extra/chrony/chrony.conf
+++ b/main/chrony/chrony.conf
diff --git a/extra/chrony/chronyd.confd b/main/chrony/chronyd.confd
index 560825c2c8..560825c2c8 100644
--- a/extra/chrony/chronyd.confd
+++ b/main/chrony/chronyd.confd
diff --git a/extra/chrony/chronyd.initd b/main/chrony/chronyd.initd
index 49d7526bb5..49d7526bb5 100644
--- a/extra/chrony/chronyd.initd
+++ b/main/chrony/chronyd.initd
diff --git a/extra/cksfv/APKBUILD b/main/cksfv/APKBUILD
index bf2049a167..bf2049a167 100644
--- a/extra/cksfv/APKBUILD
+++ b/main/cksfv/APKBUILD
diff --git a/extra/clamav/APKBUILD b/main/clamav/APKBUILD
index a4daebc2ff..a4daebc2ff 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 82ae88f576..82ae88f576 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 7574428413..7574428413 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 4930206101..4930206101 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 59ac60a44d..59ac60a44d 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 9956f95d63..9956f95d63 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 bc8072aead..bc8072aead 100644
--- a/extra/clamav/clamd.confd
+++ b/main/clamav/clamd.confd
diff --git a/extra/clamav/clamd.initd b/main/clamav/clamd.initd
index d3b9155572..d3b9155572 100644
--- a/extra/clamav/clamd.initd
+++ b/main/clamav/clamd.initd
diff --git a/extra/clamav/freshclam.confd b/main/clamav/freshclam.confd
index 17559037da..17559037da 100644
--- a/extra/clamav/freshclam.confd
+++ b/main/clamav/freshclam.confd
diff --git a/extra/clamav/freshclam.initd b/main/clamav/freshclam.initd
index 7961c7f807..7961c7f807 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 c0032bae07..c0032bae07 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 8244254923..8244254923 100644
--- a/extra/clamsmtp/APKBUILD
+++ b/main/clamsmtp/APKBUILD
diff --git a/extra/clamsmtp/clamsmtp.post-upgrade b/main/clamsmtp/clamsmtp.post-upgrade
index 2dbccbb22a..2dbccbb22a 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 12de39f7b1..12de39f7b1 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 8d08b6868c..8d08b6868c 100644
--- a/extra/clamsmtp/clamsmtpd.confd
+++ b/main/clamsmtp/clamsmtpd.confd
diff --git a/extra/clamsmtp/clamsmtpd.initd b/main/clamsmtp/clamsmtpd.initd
index dbd817f370..dbd817f370 100644
--- a/extra/clamsmtp/clamsmtpd.initd
+++ b/main/clamsmtp/clamsmtpd.initd
diff --git a/extra/cmake/APKBUILD b/main/cmake/APKBUILD
index 71d74182e8..71d74182e8 100644
--- a/extra/cmake/APKBUILD
+++ b/main/cmake/APKBUILD
diff --git a/extra/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD
index 96a402a2f1..96a402a2f1 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 7c937cbd9e..7c937cbd9e 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 9394badca1..9394badca1 100644
--- a/extra/conntrack-tools/conntrackd.initd
+++ b/main/conntrack-tools/conntrackd.initd
diff --git a/extra/coreutils/APKBUILD b/main/coreutils/APKBUILD
index 4f3a62cb35..4f3a62cb35 100644
--- a/extra/coreutils/APKBUILD
+++ b/main/coreutils/APKBUILD
diff --git a/extra/coreutils/coreutils.post-deinstall b/main/coreutils/coreutils.post-deinstall
index 99b57c4635..99b57c4635 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 3e2b3c2a22..3e2b3c2a22 120000
--- a/extra/coreutils/coreutils.post-upgrade
+++ b/main/coreutils/coreutils.post-upgrade
diff --git a/extra/cpufreqd/APKBUILD b/main/cpufreqd/APKBUILD
index 98d7f94cf3..98d7f94cf3 100644
--- a/extra/cpufreqd/APKBUILD
+++ b/main/cpufreqd/APKBUILD
diff --git a/extra/cpufreqd/cpufreqd.initd b/main/cpufreqd/cpufreqd.initd
index fbacebad75..fbacebad75 100644
--- a/extra/cpufreqd/cpufreqd.initd
+++ b/main/cpufreqd/cpufreqd.initd
diff --git a/extra/cpufrequtils/APKBUILD b/main/cpufrequtils/APKBUILD
index 50cb2d1b08..50cb2d1b08 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 7dbe57043a..7dbe57043a 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 7a0336fff4..7a0336fff4 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 68f5b7594c..68f5b7594c 100644
--- a/extra/cpufrequtils/cpufrequtils.confd
+++ b/main/cpufrequtils/cpufrequtils.confd
diff --git a/extra/cpufrequtils/cpufrequtils.initd b/main/cpufrequtils/cpufrequtils.initd
index 9aadd94c10..9aadd94c10 100644
--- a/extra/cpufrequtils/cpufrequtils.initd
+++ b/main/cpufrequtils/cpufrequtils.initd
diff --git a/extra/cracklib-words/APKBUILD b/main/cracklib-words/APKBUILD
index b460439263..b460439263 100644
--- a/extra/cracklib-words/APKBUILD
+++ b/main/cracklib-words/APKBUILD
diff --git a/extra/cracklib/APKBUILD b/main/cracklib/APKBUILD
index e03c6a7700..e03c6a7700 100644
--- a/extra/cracklib/APKBUILD
+++ b/main/cracklib/APKBUILD
diff --git a/core/cramfs/APKBUILD b/main/cramfs/APKBUILD
index e40e57c2cc..e40e57c2cc 100644
--- a/core/cramfs/APKBUILD
+++ b/main/cramfs/APKBUILD
diff --git a/extra/ctags/APKBUILD b/main/ctags/APKBUILD
index 0d45e287c3..0d45e287c3 100644
--- a/extra/ctags/APKBUILD
+++ b/main/ctags/APKBUILD
diff --git a/core/curl/APKBUILD b/main/curl/APKBUILD
index c54e9ce316..c54e9ce316 100644
--- a/core/curl/APKBUILD
+++ b/main/curl/APKBUILD
diff --git a/extra/cutter/APKBUILD b/main/cutter/APKBUILD
index be27d880c7..be27d880c7 100644
--- a/extra/cutter/APKBUILD
+++ b/main/cutter/APKBUILD
diff --git a/extra/cvs/APKBUILD b/main/cvs/APKBUILD
index bcfcea6f24..bcfcea6f24 100644
--- a/extra/cvs/APKBUILD
+++ b/main/cvs/APKBUILD
diff --git a/extra/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 4e9075769a..4e9075769a 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 f7bf44b794..f7bf44b794 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 8937d7633d..8937d7633d 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 a5e9a44061..a5e9a44061 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 6aa684043c..6aa684043c 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 d7a3fe859b..d7a3fe859b 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 289aad403b..289aad403b 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 67857e2f7d..67857e2f7d 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 b711c07ff9..b711c07ff9 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 719accdc69..719accdc69 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 b0f6edf789..b0f6edf789 100644
--- a/extra/dahdi-linux/APKBUILD
+++ b/main/dahdi-linux/APKBUILD
diff --git a/extra/dahdi-tools/APKBUILD b/main/dahdi-tools/APKBUILD
index 9a1538fab6..9a1538fab6 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 5e99122a5a..5e99122a5a 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 24c50a6333..24c50a6333 100644
--- a/extra/dansguardian/APKBUILD
+++ b/main/dansguardian/APKBUILD
diff --git a/extra/dansguardian/dansguardian.initd b/main/dansguardian/dansguardian.initd
index e8f8e94cc3..e8f8e94cc3 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 2d06f3a6f6..2d06f3a6f6 100644
--- a/extra/dansguardian/dansguardian.pre-install
+++ b/main/dansguardian/dansguardian.pre-install
diff --git a/extra/db/APKBUILD b/main/db/APKBUILD
index 00940e41c6..00940e41c6 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 3c7e23ce07..3c7e23ce07 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 1f42dcec71..1f42dcec71 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 b58a43074f..b58a43074f 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 7a55340023..7a55340023 100644
--- a/extra/db/patch.4.7.25.4
+++ b/main/db/patch.4.7.25.4
diff --git a/core/device-mapper/APKBUILD b/main/device-mapper/APKBUILD
index 3384137567..3384137567 100644
--- a/core/device-mapper/APKBUILD
+++ b/main/device-mapper/APKBUILD
diff --git a/extra/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 01bb25e91d..01bb25e91d 100644
--- a/extra/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
diff --git a/extra/dhcp/dhcp.post-upgrade b/main/dhcp/dhcp.post-upgrade
index b16fea6b4a..b16fea6b4a 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 090f654b9a..090f654b9a 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 df09ec7082..df09ec7082 100644
--- a/extra/dhcp/dhcpd.confd
+++ b/main/dhcp/dhcpd.confd
diff --git a/extra/dhcp/dhcpd.initd b/main/dhcp/dhcpd.initd
index cc9727fc7c..cc9727fc7c 100644
--- a/extra/dhcp/dhcpd.initd
+++ b/main/dhcp/dhcpd.initd
diff --git a/extra/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index 110f2c4c0b..110f2c4c0b 100644
--- a/extra/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
diff --git a/extra/dialog/APKBUILD b/main/dialog/APKBUILD
index 99619e31cf..99619e31cf 100644
--- a/extra/dialog/APKBUILD
+++ b/main/dialog/APKBUILD
diff --git a/extra/diffutils/APKBUILD b/main/diffutils/APKBUILD
index 5a9177130f..5a9177130f 100644
--- a/extra/diffutils/APKBUILD
+++ b/main/diffutils/APKBUILD
diff --git a/extra/diffutils/diffutils.post-deinstall b/main/diffutils/diffutils.post-deinstall
index c59247ad41..c59247ad41 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 1d9994228b..1d9994228b 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 2eb3998db1..2eb3998db1 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 becb8133ae..becb8133ae 100644
--- a/extra/dircproxy/APKBUILD
+++ b/main/dircproxy/APKBUILD
diff --git a/extra/dircproxy/dircproxy-gcc4.patch b/main/dircproxy/dircproxy-gcc4.patch
index 727d8db2b4..727d8db2b4 100644
--- a/extra/dircproxy/dircproxy-gcc4.patch
+++ b/main/dircproxy/dircproxy-gcc4.patch
diff --git a/core/distcc/APKBUILD b/main/distcc/APKBUILD
index 002885ea05..002885ea05 100644
--- a/core/distcc/APKBUILD
+++ b/main/distcc/APKBUILD
diff --git a/core/distcc/distcc-3.1-clone.patch b/main/distcc/distcc-3.1-clone.patch
index 70e8f8351f..70e8f8351f 100644
--- a/core/distcc/distcc-3.1-clone.patch
+++ b/main/distcc/distcc-3.1-clone.patch
diff --git a/core/distcc/distcc-hardened.patch b/main/distcc/distcc-hardened.patch
index 69b3a65169..69b3a65169 100644
--- a/core/distcc/distcc-hardened.patch
+++ b/main/distcc/distcc-hardened.patch
diff --git a/core/distcc/distccd.confd b/main/distcc/distccd.confd
index b4e72b6c15..b4e72b6c15 100644
--- a/core/distcc/distccd.confd
+++ b/main/distcc/distccd.confd
diff --git a/core/distcc/distccd.initd b/main/distcc/distccd.initd
index c1490fae31..c1490fae31 100644
--- a/core/distcc/distccd.initd
+++ b/main/distcc/distccd.initd
diff --git a/extra/djbdns/1.05-errno.patch b/main/djbdns/1.05-errno.patch
index 58f2f4b6c9..58f2f4b6c9 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 eb6ae59049..eb6ae59049 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 0596907a79..0596907a79 100644
--- a/extra/djbdns/APKBUILD
+++ b/main/djbdns/APKBUILD
diff --git a/extra/djbdns/dnscache.confd b/main/djbdns/dnscache.confd
index f456bf8db9..f456bf8db9 100644
--- a/extra/djbdns/dnscache.confd
+++ b/main/djbdns/dnscache.confd
diff --git a/extra/djbdns/dnscache.initd b/main/djbdns/dnscache.initd
index 481022496e..481022496e 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 061b8f0280..061b8f0280 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 5db44ec8f4..5db44ec8f4 100644
--- a/extra/djbdns/dnsroots.patch
+++ b/main/djbdns/dnsroots.patch
diff --git a/extra/djbdns/dnstracesort.patch b/main/djbdns/dnstracesort.patch
index 3bf56f5a1c..3bf56f5a1c 100644
--- a/extra/djbdns/dnstracesort.patch
+++ b/main/djbdns/dnstracesort.patch
diff --git a/extra/djbdns/headtail.patch b/main/djbdns/headtail.patch
index 31854803ba..31854803ba 100644
--- a/extra/djbdns/headtail.patch
+++ b/main/djbdns/headtail.patch
diff --git a/extra/djbdns/tinydns.confd b/main/djbdns/tinydns.confd
index 840570a63c..840570a63c 100644
--- a/extra/djbdns/tinydns.confd
+++ b/main/djbdns/tinydns.confd
diff --git a/extra/djbdns/tinydns.initd b/main/djbdns/tinydns.initd
index a68474c4ec..a68474c4ec 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 11ea87abcb..11ea87abcb 100644
--- a/extra/djbdns/tinydns.pre-install
+++ b/main/djbdns/tinydns.pre-install
diff --git a/extra/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index 328d54dfde..328d54dfde 100644
--- a/extra/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
diff --git a/extra/dnsmasq/dnsmasq.confd b/main/dnsmasq/dnsmasq.confd
index 47826dd508..47826dd508 100644
--- a/extra/dnsmasq/dnsmasq.confd
+++ b/main/dnsmasq/dnsmasq.confd
diff --git a/extra/dnsmasq/dnsmasq.initd b/main/dnsmasq/dnsmasq.initd
index 44109e9829..44109e9829 100644
--- a/extra/dnsmasq/dnsmasq.initd
+++ b/main/dnsmasq/dnsmasq.initd
diff --git a/core/dosfstools/APKBUILD b/main/dosfstools/APKBUILD
index 4864244772..4864244772 100644
--- a/core/dosfstools/APKBUILD
+++ b/main/dosfstools/APKBUILD
diff --git a/extra/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 67d1c87078..67d1c87078 100644
--- a/extra/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
diff --git a/extra/dovecot/dovecot.initd b/main/dovecot/dovecot.initd
index d9799c0dce..d9799c0dce 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 5acdcb5c8d..5acdcb5c8d 100644
--- a/extra/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
diff --git a/extra/dropbear/APKBUILD b/main/dropbear/APKBUILD
index ca4af482cf..ca4af482cf 100644
--- a/extra/dropbear/APKBUILD
+++ b/main/dropbear/APKBUILD
diff --git a/extra/dropbear/dropbear.confd b/main/dropbear/dropbear.confd
index 555f275d99..555f275d99 100644
--- a/extra/dropbear/dropbear.confd
+++ b/main/dropbear/dropbear.confd
diff --git a/extra/dropbear/dropbear.initd b/main/dropbear/dropbear.initd
index afdee8c6d3..afdee8c6d3 100644
--- a/extra/dropbear/dropbear.initd
+++ b/main/dropbear/dropbear.initd
diff --git a/extra/dtach/APKBUILD b/main/dtach/APKBUILD
index 120ef4eee7..120ef4eee7 100644
--- a/extra/dtach/APKBUILD
+++ b/main/dtach/APKBUILD
diff --git a/core/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD
index eedabbffa7..eedabbffa7 100644
--- a/core/e2fsprogs/APKBUILD
+++ b/main/e2fsprogs/APKBUILD
diff --git a/extra/eggdrop/APKBUILD b/main/eggdrop/APKBUILD
index 59c21f2e07..59c21f2e07 100644
--- a/extra/eggdrop/APKBUILD
+++ b/main/eggdrop/APKBUILD
diff --git a/extra/eggdrop/eggdrop-installer b/main/eggdrop/eggdrop-installer
index 69faa00dca..69faa00dca 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 44b43cf34e..44b43cf34e 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 e70aef8873..e70aef8873 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 8ea2e94e62..8ea2e94e62 100644
--- a/extra/eggdrop/logs2html.mod.patch
+++ b/main/eggdrop/logs2html.mod.patch
diff --git a/extra/email/APKBUILD b/main/email/APKBUILD
index a1301fe044..a1301fe044 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 d7467844f0..d7467844f0 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 d08896ee3a..d08896ee3a 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 bf005e00a5..bf005e00a5 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 6899220525..6899220525 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 50c92d40ec..50c92d40ec 100644
--- a/extra/ethtool/APKBUILD
+++ b/main/ethtool/APKBUILD
diff --git a/core/expat/APKBUILD b/main/expat/APKBUILD
index 3f81d32565..3f81d32565 100644
--- a/core/expat/APKBUILD
+++ b/main/expat/APKBUILD
diff --git a/extra/faac/APKBUILD b/main/faac/APKBUILD
index 3e523a4d51..3e523a4d51 100644
--- a/extra/faac/APKBUILD
+++ b/main/faac/APKBUILD
diff --git a/extra/faad2/APKBUILD b/main/faad2/APKBUILD
index e1453df902..e1453df902 100644
--- a/extra/faad2/APKBUILD
+++ b/main/faad2/APKBUILD
diff --git a/core/fakeroot/APKBUILD b/main/fakeroot/APKBUILD
index d9bfb67b87..d9bfb67b87 100644
--- a/core/fakeroot/APKBUILD
+++ b/main/fakeroot/APKBUILD
diff --git a/core/fakeroot/busybox-compat.patch b/main/fakeroot/busybox-compat.patch
index 1d07d0d31a..1d07d0d31a 100644
--- a/core/fakeroot/busybox-compat.patch
+++ b/main/fakeroot/busybox-compat.patch
diff --git a/extra/fcgi/10-fcgi-2.4.0-Makefile.patch b/main/fcgi/10-fcgi-2.4.0-Makefile.patch
index dad4cd6e02..dad4cd6e02 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 ba4793765d..ba4793765d 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 ca10a6a603..ca10a6a603 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 fc208006cb..fc208006cb 100644
--- a/extra/fcgi/APKBUILD
+++ b/main/fcgi/APKBUILD
diff --git a/extra/fetchmail/APKBUILD b/main/fetchmail/APKBUILD
index 092556638a..092556638a 100644
--- a/extra/fetchmail/APKBUILD
+++ b/main/fetchmail/APKBUILD
diff --git a/extra/fetchmail/fetchmail.initd b/main/fetchmail/fetchmail.initd
index a1ed1ec837..a1ed1ec837 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 b16bfcc3e4..b16bfcc3e4 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 4a1b630e00..4a1b630e00 100644
--- a/extra/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
diff --git a/core/file/APKBUILD b/main/file/APKBUILD
index 7754f6ced6..7754f6ced6 100644
--- a/core/file/APKBUILD
+++ b/main/file/APKBUILD
diff --git a/core/parted/nocxx.patch b/main/file/nocxx.patch
index beb1ab9006..beb1ab9006 100644
--- a/core/parted/nocxx.patch
+++ b/main/file/nocxx.patch
diff --git a/extra/flac/APKBUILD b/main/flac/APKBUILD
index a5626e1c44..a5626e1c44 100644
--- a/extra/flac/APKBUILD
+++ b/main/flac/APKBUILD
diff --git a/core/flex/APKBUILD b/main/flex/APKBUILD
index 88f1f0b39b..d44643d776 100644
--- a/core/flex/APKBUILD
+++ b/main/flex/APKBUILD
@@ -1,10 +1,11 @@
+# Maintainer: Natanael Copa <ncop@alpinelinux.org>
 pkgname=flex
 pkgver=2.5.35
 pkgrel=2
 pkgdesc="A tool for generating text-scanning programs"
 url="http://flex.sourceforge.net"
 license=custom
-depends='uclibc m4'
+depends='m4'
 makedepends=m4
 source="http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2"
 subpackages="$pkgname-doc"
diff --git a/extra/fping/APKBUILD b/main/fping/APKBUILD
index 11b4f1819a..11b4f1819a 100644
--- a/extra/fping/APKBUILD
+++ b/main/fping/APKBUILD
diff --git a/extra/freetds/APKBUILD b/main/freetds/APKBUILD
index 5e58429d9c..5e58429d9c 100644
--- a/extra/freetds/APKBUILD
+++ b/main/freetds/APKBUILD
diff --git a/extra/freetype/10-bytecode.patch b/main/freetype/10-bytecode.patch
index dd901ad64b..dd901ad64b 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 217912aa1f..217912aa1f 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 b61a792219..b61a792219 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 95c1cd6430..95c1cd6430 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 e7f2a87ffc..e7f2a87ffc 100644
--- a/extra/freetype/APKBUILD
+++ b/main/freetype/APKBUILD
diff --git a/extra/gawk/APKBUILD b/main/gawk/APKBUILD
index 5bcd518d23..5bcd518d23 100644
--- a/extra/gawk/APKBUILD
+++ b/main/gawk/APKBUILD
diff --git a/extra/gawk/gawk.post-deinstall b/main/gawk/gawk.post-deinstall
index 99b57c4635..99b57c4635 100644
--- a/extra/gawk/gawk.post-deinstall
+++ b/main/gawk/gawk.post-deinstall
diff --git a/core/gcc/00_all_gcc-4.0-cvs-incompat.patch b/main/gcc/00_all_gcc-4.0-cvs-incompat.patch
index e5bc302e26..e5bc302e26 100644
--- a/core/gcc/00_all_gcc-4.0-cvs-incompat.patch
+++ b/main/gcc/00_all_gcc-4.0-cvs-incompat.patch
diff --git a/core/gcc/01_all_gcc-4.0.2-v9.0.0-start_endfile-boundschecking-no.patch b/main/gcc/01_all_gcc-4.0.2-v9.0.0-start_endfile-boundschecking-no.patch
index 8871506195..8871506195 100644
--- a/core/gcc/01_all_gcc-4.0.2-v9.0.0-start_endfile-boundschecking-no.patch
+++ b/main/gcc/01_all_gcc-4.0.2-v9.0.0-start_endfile-boundschecking-no.patch
diff --git a/core/gcc/01_all_gcc-4.3.1-crtbeginTS-stuff.patch b/main/gcc/01_all_gcc-4.3.1-crtbeginTS-stuff.patch
index 8bc9a70567..8bc9a70567 100644
--- a/core/gcc/01_all_gcc-4.3.1-crtbeginTS-stuff.patch
+++ b/main/gcc/01_all_gcc-4.3.1-crtbeginTS-stuff.patch
diff --git a/core/gcc/02_all_gcc-4.3.1-v10.0.1-start_endfile.patch b/main/gcc/02_all_gcc-4.3.1-v10.0.1-start_endfile.patch
index 75b3654c8e..75b3654c8e 100644
--- a/core/gcc/02_all_gcc-4.3.1-v10.0.1-start_endfile.patch
+++ b/main/gcc/02_all_gcc-4.3.1-v10.0.1-start_endfile.patch
diff --git a/core/gcc/03_all_gcc-4.3.2-hardened-default.patch b/main/gcc/03_all_gcc-4.3.2-hardened-default.patch
index 04da4ea11b..04da4ea11b 100644
--- a/core/gcc/03_all_gcc-4.3.2-hardened-default.patch
+++ b/main/gcc/03_all_gcc-4.3.2-hardened-default.patch
diff --git a/core/gcc/APKBUILD b/main/gcc/APKBUILD
index dbb656603a..dbb656603a 100644
--- a/core/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
diff --git a/core/gcc/gcc-4.2.0-cc1-no-stack-protector.patch b/main/gcc/gcc-4.2.0-cc1-no-stack-protector.patch
index cc80d1bc75..cc80d1bc75 100644
--- a/core/gcc/gcc-4.2.0-cc1-no-stack-protector.patch
+++ b/main/gcc/gcc-4.2.0-cc1-no-stack-protector.patch
diff --git a/core/gcc/gcc-spec-env.patch b/main/gcc/gcc-spec-env.patch
index 9d5e666a54..9d5e666a54 100644
--- a/core/gcc/gcc-spec-env.patch
+++ b/main/gcc/gcc-spec-env.patch
diff --git a/core/gcc/gcc4-stack-protector-uclibc-no_tls.patch b/main/gcc/gcc4-stack-protector-uclibc-no_tls.patch
index c9b54adbe1..c9b54adbe1 100644
--- a/core/gcc/gcc4-stack-protector-uclibc-no_tls.patch
+++ b/main/gcc/gcc4-stack-protector-uclibc-no_tls.patch
diff --git a/core/gcc/pt_gnu_eh_frame.patch b/main/gcc/pt_gnu_eh_frame.patch
index 3e029104aa..3e029104aa 100644
--- a/core/gcc/pt_gnu_eh_frame.patch
+++ b/main/gcc/pt_gnu_eh_frame.patch
diff --git a/extra/gd/APKBUILD b/main/gd/APKBUILD
index 75cd56cc48..75cd56cc48 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 a20771f689..a20771f689 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 946d055018..946d055018 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 a851da3141..a851da3141 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 139ef99d7e..139ef99d7e 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 1337d08f5b..1337d08f5b 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 084f5a1d24..084f5a1d24 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 e20966b323..e20966b323 100644
--- a/extra/gdbm/APKBUILD
+++ b/main/gdbm/APKBUILD
diff --git a/extra/gettext/APKBUILD b/main/gettext/APKBUILD
index 958e1131c8..958e1131c8 100644
--- a/extra/gettext/APKBUILD
+++ b/main/gettext/APKBUILD
diff --git a/extra/ghostscript/APKBUILD b/main/ghostscript/APKBUILD
index e387f850f3..e387f850f3 100644
--- a/extra/ghostscript/APKBUILD
+++ b/main/ghostscript/APKBUILD
diff --git a/core/git/APKBUILD b/main/git/APKBUILD
index 2f5d36dba8..2f5d36dba8 100644
--- a/core/git/APKBUILD
+++ b/main/git/APKBUILD
diff --git a/core/git/bb-tar.patch b/main/git/bb-tar.patch
index 0f15de5d25..0f15de5d25 100644
--- a/core/git/bb-tar.patch
+++ b/main/git/bb-tar.patch
diff --git a/extra/glib/APKBUILD b/main/glib/APKBUILD
index e06678d989..e06678d989 100644
--- a/extra/glib/APKBUILD
+++ b/main/glib/APKBUILD
diff --git a/core/gmp/APKBUILD b/main/gmp/APKBUILD
index 71a61e8191..82651e897d 100644
--- a/core/gmp/APKBUILD
+++ b/main/gmp/APKBUILD
@@ -1,3 +1,4 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gmp
 pkgver=4.3.1
 pkgrel=0
@@ -5,6 +6,7 @@ pkgdesc="A free library for arbitrary precision arithmetic"
 url="http://gmplib.org/"
 license="LGPL3"
 makedepends="m4 texinfo"
+depends=
 subpackages="$pkgname-doc $pkgname-dev"
 source="ftp://ftp.gnu.org/gnu/gmp/gmp-$pkgver.tar.bz2
 	gmp-4.1.4-noexecstack.patch
diff --git a/core/gmp/gmp-4.1.4-noexecstack.patch b/main/gmp/gmp-4.1.4-noexecstack.patch
index 093bec1a5d..093bec1a5d 100644
--- a/core/gmp/gmp-4.1.4-noexecstack.patch
+++ b/main/gmp/gmp-4.1.4-noexecstack.patch
diff --git a/extra/gnats/APKBUILD b/main/gnats/APKBUILD
index 535f46ee42..535f46ee42 100644
--- a/extra/gnats/APKBUILD
+++ b/main/gnats/APKBUILD
diff --git a/extra/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
index 0a2e5a589b..0a2e5a589b 100644
--- a/extra/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
diff --git a/extra/gnupg/APKBUILD b/main/gnupg/APKBUILD
index fa1387b7db..fa1387b7db 100644
--- a/extra/gnupg/APKBUILD
+++ b/main/gnupg/APKBUILD
diff --git a/extra/gnutls/APKBUILD b/main/gnutls/APKBUILD
index f8dd61f2d5..f8dd61f2d5 100644
--- a/extra/gnutls/APKBUILD
+++ b/main/gnutls/APKBUILD
diff --git a/extra/gperf/APKBUILD b/main/gperf/APKBUILD
index cc97c06d5c..cc97c06d5c 100644
--- a/extra/gperf/APKBUILD
+++ b/main/gperf/APKBUILD
diff --git a/extra/grep/APKBUILD b/main/grep/APKBUILD
index 4bdc96472a..4bdc96472a 100644
--- a/extra/grep/APKBUILD
+++ b/main/grep/APKBUILD
diff --git a/extra/grep/grep.post-deinstall b/main/grep/grep.post-deinstall
index 99b57c4635..99b57c4635 100644
--- a/extra/grep/grep.post-deinstall
+++ b/main/grep/grep.post-deinstall
diff --git a/core/groff/APKBUILD b/main/groff/APKBUILD
index 6866c2db08..6866c2db08 100644
--- a/core/groff/APKBUILD
+++ b/main/groff/APKBUILD
diff --git a/extra/gross/APKBUILD b/main/gross/APKBUILD
index 2dac13a66a..2dac13a66a 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 80f9ea7762..80f9ea7762 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 39cd90709d..39cd90709d 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 a20279f003..a20279f003 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 df06670a41..df06670a41 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 1e52785e15..1e52785e15 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 c3844d7a5e..c3844d7a5e 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 90361bcc65..90361bcc65 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 646e12f9d7..646e12f9d7 100644
--- a/extra/gross/grossd.confd
+++ b/main/gross/grossd.confd
diff --git a/extra/gross/grossd.initd b/main/gross/grossd.initd
index 3d1c43d708..3d1c43d708 100644
--- a/extra/gross/grossd.initd
+++ b/main/gross/grossd.initd
diff --git a/extra/gzip/APKBUILD b/main/gzip/APKBUILD
index eb06884d6d..eb06884d6d 100644
--- a/extra/gzip/APKBUILD
+++ b/main/gzip/APKBUILD
diff --git a/extra/gzip/gzip.post-deinstall b/main/gzip/gzip.post-deinstall
index 99b57c4635..99b57c4635 100644
--- a/extra/gzip/gzip.post-deinstall
+++ b/main/gzip/gzip.post-deinstall
diff --git a/extra/haserl/APKBUILD b/main/haserl/APKBUILD
index 2c4e08e493..2c4e08e493 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 a551bdce15..a551bdce15 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 c67dbae764..c67dbae764 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 40fc05f083..40fc05f083 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 35a9ed9f6b..35a9ed9f6b 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 19f8794075..19f8794075 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 36a86f1f93..36a86f1f93 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 69c791778a..69c791778a 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 a494e201a6..a494e201a6 100644
--- a/extra/heimdal/APKBUILD
+++ b/main/heimdal/APKBUILD
diff --git a/extra/heimdal/heimdal-kadmind.init b/main/heimdal/heimdal-kadmind.init
index b58ac994df..b58ac994df 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 753a101c30..753a101c30 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 517cb86210..517cb86210 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 88c02e598c..88c02e598c 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 5390b2cf69..5390b2cf69 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 2f8254e4d6..2f8254e4d6 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 b6e4ee8880..b6e4ee8880 100644
--- a/extra/htop/APKBUILD
+++ b/main/htop/APKBUILD
diff --git a/extra/hunspell/APKBUILD b/main/hunspell/APKBUILD
index 6883855aee..6883855aee 100644
--- a/extra/hunspell/APKBUILD
+++ b/main/hunspell/APKBUILD
diff --git a/extra/hylafax/APKBUILD b/main/hylafax/APKBUILD
index 42450d4678..42450d4678 100644
--- a/extra/hylafax/APKBUILD
+++ b/main/hylafax/APKBUILD
diff --git a/extra/hylafax/hylafax.post-install b/main/hylafax/hylafax.post-install
index 839f96f543..839f96f543 100644
--- a/extra/hylafax/hylafax.post-install
+++ b/main/hylafax/hylafax.post-install
diff --git a/extra/hypermail/APKBUILD b/main/hypermail/APKBUILD
index 6e4f412374..6e4f412374 100644
--- a/extra/hypermail/APKBUILD
+++ b/main/hypermail/APKBUILD
diff --git a/extra/hypermail/mdir2mbox.lua b/main/hypermail/mdir2mbox.lua
index dd883e02db..dd883e02db 100644
--- a/extra/hypermail/mdir2mbox.lua
+++ b/main/hypermail/mdir2mbox.lua
diff --git a/extra/iaxmodem/APKBUILD b/main/iaxmodem/APKBUILD
index f1f2b21c3a..f1f2b21c3a 100644
--- a/extra/iaxmodem/APKBUILD
+++ b/main/iaxmodem/APKBUILD
diff --git a/extra/iaxmodem/iaxmodem.confd b/main/iaxmodem/iaxmodem.confd
index 082a920e0b..082a920e0b 100644
--- a/extra/iaxmodem/iaxmodem.confd
+++ b/main/iaxmodem/iaxmodem.confd
diff --git a/extra/iaxmodem/iaxmodem.initd b/main/iaxmodem/iaxmodem.initd
index d6f2c947ac..d6f2c947ac 100644
--- a/extra/iaxmodem/iaxmodem.initd
+++ b/main/iaxmodem/iaxmodem.initd
diff --git a/extra/alsa-lib/nocxx.patch b/main/iaxmodem/nocxx.patch
index beb1ab9006..beb1ab9006 100644
--- a/extra/alsa-lib/nocxx.patch
+++ b/main/iaxmodem/nocxx.patch
diff --git a/extra/icu/APKBUILD b/main/icu/APKBUILD
index c2150b3ec8..c2150b3ec8 100644
--- a/extra/icu/APKBUILD
+++ b/main/icu/APKBUILD
diff --git a/extra/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
index 183b1e82cc..183b1e82cc 100644
--- a/extra/imagemagick/APKBUILD
+++ b/main/imagemagick/APKBUILD
diff --git a/core/installkernel/APKBUILD b/main/installkernel/APKBUILD
index 76690b904a..76690b904a 100644
--- a/core/installkernel/APKBUILD
+++ b/main/installkernel/APKBUILD
diff --git a/extra/iproute2-qos/APKBUILD b/main/iproute2-qos/APKBUILD
index 902ff0c1ae..902ff0c1ae 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 60d4093726..60d4093726 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 b543748691..b543748691 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 5d5c601268..5d5c601268 100644
--- a/extra/iproute2-qos/setup-qos
+++ b/main/iproute2-qos/setup-qos
diff --git a/core/iproute2/APKBUILD b/main/iproute2/APKBUILD
index 93f0adad22..93f0adad22 100644
--- a/core/iproute2/APKBUILD
+++ b/main/iproute2/APKBUILD
diff --git a/core/iproute2/iproute2.post-deinstall b/main/iproute2/iproute2.post-deinstall
index dd117e5d80..dd117e5d80 100644
--- a/core/iproute2/iproute2.post-deinstall
+++ b/main/iproute2/iproute2.post-deinstall
diff --git a/core/iproute2/iproute2.post-install b/main/iproute2/iproute2.post-install
index 36d567ea21..36d567ea21 100644
--- a/core/iproute2/iproute2.post-install
+++ b/main/iproute2/iproute2.post-install
diff --git a/extra/ipsec-tools/00-verify-cert-leak.patch b/main/ipsec-tools/00-verify-cert-leak.patch
index 9e67813359..9e67813359 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 91d7224e2a..91d7224e2a 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 19360347da..19360347da 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 c5e3e4b330..c5e3e4b330 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 c49eae347f..c49eae347f 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 a5c3346ee9..a5c3346ee9 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 b947b9b695..b947b9b695 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 66f8ed7674..66f8ed7674 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 16fdec7e3a..16fdec7e3a 100644
--- a/extra/ipsec-tools/racoon.initd
+++ b/main/ipsec-tools/racoon.initd
diff --git a/core/iptables/APKBUILD b/main/iptables/APKBUILD
index 2a503aca77..2a503aca77 100644
--- a/core/iptables/APKBUILD
+++ b/main/iptables/APKBUILD
diff --git a/core/iptables/iptables-1.4.2-include-in.patch b/main/iptables/iptables-1.4.2-include-in.patch
index 138fa564ca..138fa564ca 100644
--- a/core/iptables/iptables-1.4.2-include-in.patch
+++ b/main/iptables/iptables-1.4.2-include-in.patch
diff --git a/core/iptables/iptables.confd b/main/iptables/iptables.confd
index 91287debdb..91287debdb 100644
--- a/core/iptables/iptables.confd
+++ b/main/iptables/iptables.confd
diff --git a/core/iptables/iptables.initd b/main/iptables/iptables.initd
index e63d8ea9e2..e63d8ea9e2 100755
--- a/core/iptables/iptables.initd
+++ b/main/iptables/iptables.initd
diff --git a/extra/iptraf/APKBUILD b/main/iptraf/APKBUILD
index 95e9de3f35..95e9de3f35 100644
--- a/extra/iptraf/APKBUILD
+++ b/main/iptraf/APKBUILD
diff --git a/extra/iputils/APKBUILD b/main/iputils/APKBUILD
index 02face483a..02face483a 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 5013ba4fdc..5013ba4fdc 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 99b57c4635..99b57c4635 100644
--- a/extra/iputils/iputils.post-install
+++ b/main/iputils/iputils.post-install
diff --git a/extra/irssi/APKBUILD b/main/irssi/APKBUILD
index bdb3c16c92..bdb3c16c92 100644
--- a/extra/irssi/APKBUILD
+++ b/main/irssi/APKBUILD
diff --git a/core/iscsitarget-grsec/APKBUILD b/main/iscsitarget-grsec/APKBUILD
index a555918a8c..a555918a8c 100644
--- a/core/iscsitarget-grsec/APKBUILD
+++ b/main/iscsitarget-grsec/APKBUILD
diff --git a/core/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.28.patch b/main/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.28.patch
index ec35cd526f..ec35cd526f 100644
--- a/core/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.28.patch
+++ b/main/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.28.patch
diff --git a/core/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.29.patch b/main/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.29.patch
index 092fdc3fd9..092fdc3fd9 100644
--- a/core/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.29.patch
+++ b/main/iscsitarget-grsec/iscsitarget-0.4.17+linux-2.6.29.patch
diff --git a/core/iscsitarget/APKBUILD b/main/iscsitarget/APKBUILD
index 3bdf98ee06..3bdf98ee06 100644
--- a/core/iscsitarget/APKBUILD
+++ b/main/iscsitarget/APKBUILD
diff --git a/core/iscsitarget/ietd.confd b/main/iscsitarget/ietd.confd
index 3621326b1a..3621326b1a 100644
--- a/core/iscsitarget/ietd.confd
+++ b/main/iscsitarget/ietd.confd
diff --git a/core/iscsitarget/ietd.initd b/main/iscsitarget/ietd.initd
index 6ea9a4b51e..6ea9a4b51e 100644
--- a/core/iscsitarget/ietd.initd
+++ b/main/iscsitarget/ietd.initd
diff --git a/core/iscsitarget/iscsitarget-0.4.15-isns-set-scn-flag.patch b/main/iscsitarget/iscsitarget-0.4.15-isns-set-scn-flag.patch
index 4db90793d7..4db90793d7 100644
--- a/core/iscsitarget/iscsitarget-0.4.15-isns-set-scn-flag.patch
+++ b/main/iscsitarget/iscsitarget-0.4.15-isns-set-scn-flag.patch
diff --git a/core/iscsitarget/iscsitarget-0.4.17-build.patch b/main/iscsitarget/iscsitarget-0.4.17-build.patch
index ee676a9608..ee676a9608 100644
--- a/core/iscsitarget/iscsitarget-0.4.17-build.patch
+++ b/main/iscsitarget/iscsitarget-0.4.17-build.patch
diff --git a/extra/jpeg/APKBUILD b/main/jpeg/APKBUILD
index c795091a4d..c795091a4d 100644
--- a/extra/jpeg/APKBUILD
+++ b/main/jpeg/APKBUILD
diff --git a/extra/json4lua/APKBUILD b/main/json4lua/APKBUILD
index bceb0ca836..bceb0ca836 100644
--- a/extra/json4lua/APKBUILD
+++ b/main/json4lua/APKBUILD
diff --git a/extra/ksymoops/APKBUILD b/main/ksymoops/APKBUILD
index d8cc04fdf7..d8cc04fdf7 100644
--- a/extra/ksymoops/APKBUILD
+++ b/main/ksymoops/APKBUILD
diff --git a/extra/less/APKBUILD b/main/less/APKBUILD
index 0567914a5e..0567914a5e 100644
--- a/extra/less/APKBUILD
+++ b/main/less/APKBUILD
diff --git a/extra/less/less.post-deinstall b/main/less/less.post-deinstall
index 99b57c4635..99b57c4635 100644
--- a/extra/less/less.post-deinstall
+++ b/main/less/less.post-deinstall
diff --git a/extra/lftp/APKBUILD b/main/lftp/APKBUILD
index 239573c121..239573c121 100644
--- a/extra/lftp/APKBUILD
+++ b/main/lftp/APKBUILD
diff --git a/extra/lha/APKBUILD b/main/lha/APKBUILD
index 705e51e077..705e51e077 100644
--- a/extra/lha/APKBUILD
+++ b/main/lha/APKBUILD
diff --git a/extra/libao/APKBUILD b/main/libao/APKBUILD
index a82ba46587..a82ba46587 100644
--- a/extra/libao/APKBUILD
+++ b/main/libao/APKBUILD
diff --git a/extra/libart-lgpl/APKBUILD b/main/libart-lgpl/APKBUILD
index 3ac38769a0..3ac38769a0 100644
--- a/extra/libart-lgpl/APKBUILD
+++ b/main/libart-lgpl/APKBUILD
diff --git a/extra/libassuan/APKBUILD b/main/libassuan/APKBUILD
index 2b2498c49e..2b2498c49e 100644
--- a/extra/libassuan/APKBUILD
+++ b/main/libassuan/APKBUILD
diff --git a/extra/libcap/APKBUILD b/main/libcap/APKBUILD
index 36c09984c2..731729c03a 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 0000000000..88c5fcc6c8
--- /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 13185722c9..13185722c9 100644
--- a/extra/libconfig/APKBUILD
+++ b/main/libconfig/APKBUILD
diff --git a/extra/libexif/APKBUILD b/main/libexif/APKBUILD
index c9f244b09d..c9f244b09d 100644
--- a/extra/libexif/APKBUILD
+++ b/main/libexif/APKBUILD
diff --git a/extra/libgcrypt/APKBUILD b/main/libgcrypt/APKBUILD
index efe95c1abf..efe95c1abf 100644
--- a/extra/libgcrypt/APKBUILD
+++ b/main/libgcrypt/APKBUILD
diff --git a/extra/iaxmodem/nocxx.patch b/main/libgcrypt/nocxx.patch
index beb1ab9006..beb1ab9006 100644
--- a/extra/iaxmodem/nocxx.patch
+++ b/main/libgcrypt/nocxx.patch
diff --git a/extra/libgpg-error/APKBUILD b/main/libgpg-error/APKBUILD
index 24cac43606..24cac43606 100644
--- a/extra/libgpg-error/APKBUILD
+++ b/main/libgpg-error/APKBUILD
diff --git a/extra/libgcrypt/nocxx.patch b/main/libgpg-error/nocxx.patch
index beb1ab9006..beb1ab9006 100644
--- a/extra/libgcrypt/nocxx.patch
+++ b/main/libgpg-error/nocxx.patch
diff --git a/extra/libiconv/APKBUILD b/main/libiconv/APKBUILD
index 6cd441ca6e..6cd441ca6e 100644
--- a/extra/libiconv/APKBUILD
+++ b/main/libiconv/APKBUILD
diff --git a/extra/libid3tag/APKBUILD b/main/libid3tag/APKBUILD
index 9410e353c6..9410e353c6 100644
--- a/extra/libid3tag/APKBUILD
+++ b/main/libid3tag/APKBUILD
diff --git a/extra/libidn/APKBUILD b/main/libidn/APKBUILD
index afcb59c788..afcb59c788 100644
--- a/extra/libidn/APKBUILD
+++ b/main/libidn/APKBUILD
diff --git a/extra/libksba/APKBUILD b/main/libksba/APKBUILD
index 4704937002..4704937002 100644
--- a/extra/libksba/APKBUILD
+++ b/main/libksba/APKBUILD
diff --git a/extra/libmcrypt/APKBUILD b/main/libmcrypt/APKBUILD
index 905d880f6f..905d880f6f 100644
--- a/extra/libmcrypt/APKBUILD
+++ b/main/libmcrypt/APKBUILD
diff --git a/extra/libnet/APKBUILD b/main/libnet/APKBUILD
index e756acc0ec..e756acc0ec 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 0f4c65094d..0f4c65094d 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 e6f9bbc6dd..e6f9bbc6dd 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 7f3aee35a9..7f3aee35a9 100644
--- a/extra/libnetfilter_conntrack/APKBUILD
+++ b/main/libnetfilter_conntrack/APKBUILD
diff --git a/extra/libnfnetlink/APKBUILD b/main/libnfnetlink/APKBUILD
index 63519aec0c..63519aec0c 100644
--- a/extra/libnfnetlink/APKBUILD
+++ b/main/libnfnetlink/APKBUILD
diff --git a/extra/libogg/APKBUILD b/main/libogg/APKBUILD
index d7920f8868..8cfbf96871 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/libgpg-error/nocxx.patch b/main/libogg/nocxx.patch
index beb1ab9006..beb1ab9006 100644
--- a/extra/libgpg-error/nocxx.patch
+++ b/main/libogg/nocxx.patch
diff --git a/core/libpcap/APKBUILD b/main/libpcap/APKBUILD
index ebe0996161..ebe0996161 100644
--- a/core/libpcap/APKBUILD
+++ b/main/libpcap/APKBUILD
diff --git a/core/libpcap/libpcap-1.0.0-LDFLAGS.patch b/main/libpcap/libpcap-1.0.0-LDFLAGS.patch
index b2fe8d6fc1..b2fe8d6fc1 100644
--- a/core/libpcap/libpcap-1.0.0-LDFLAGS.patch
+++ b/main/libpcap/libpcap-1.0.0-LDFLAGS.patch
diff --git a/core/libpcap/libpcap-any.patch b/main/libpcap/libpcap-any.patch
index 7754513b88..7754513b88 100644
--- a/core/libpcap/libpcap-any.patch
+++ b/main/libpcap/libpcap-any.patch
diff --git a/extra/libpng/APKBUILD b/main/libpng/APKBUILD
index 3d97159ebc..3d97159ebc 100644
--- a/extra/libpng/APKBUILD
+++ b/main/libpng/APKBUILD
diff --git a/extra/libpri/APKBUILD b/main/libpri/APKBUILD
index d4d90a8103..d4d90a8103 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 27ed1b8d43..27ed1b8d43 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 7bf31c7ac1..7bf31c7ac1 100644
--- a/extra/libpri/libpri-cflags.patch
+++ b/main/libpri/libpri-cflags.patch
diff --git a/extra/libsamplerate/APKBUILD b/main/libsamplerate/APKBUILD
index 786d6c1e9a..786d6c1e9a 100644
--- a/extra/libsamplerate/APKBUILD
+++ b/main/libsamplerate/APKBUILD
diff --git a/extra/libsndfile/APKBUILD b/main/libsndfile/APKBUILD
index 471c45a657..471c45a657 100644
--- a/extra/libsndfile/APKBUILD
+++ b/main/libsndfile/APKBUILD
diff --git a/extra/libtasn1/APKBUILD b/main/libtasn1/APKBUILD
index 27f71e8056..27f71e8056 100644
--- a/extra/libtasn1/APKBUILD
+++ b/main/libtasn1/APKBUILD
diff --git a/extra/libtheora/APKBUILD b/main/libtheora/APKBUILD
index e3b3999a3d..e3b3999a3d 100644
--- a/extra/libtheora/APKBUILD
+++ b/main/libtheora/APKBUILD
diff --git a/core/libtool/APKBUILD b/main/libtool/APKBUILD
index 3d2ab55f01..3d2ab55f01 100644
--- a/core/libtool/APKBUILD
+++ b/main/libtool/APKBUILD
diff --git a/extra/libusb-compat/APKBUILD b/main/libusb-compat/APKBUILD
index 23e16cfa57..23e16cfa57 100644
--- a/extra/libusb-compat/APKBUILD
+++ b/main/libusb-compat/APKBUILD
diff --git a/extra/libusb/APKBUILD b/main/libusb/APKBUILD
index 7234ad31df..7234ad31df 100644
--- a/extra/libusb/APKBUILD
+++ b/main/libusb/APKBUILD
diff --git a/extra/libvorbis/APKBUILD b/main/libvorbis/APKBUILD
index c4c0713435..c4c0713435 100644
--- a/extra/libvorbis/APKBUILD
+++ b/main/libvorbis/APKBUILD
diff --git a/extra/libxml2/APKBUILD b/main/libxml2/APKBUILD
index a135ade72c..a135ade72c 100644
--- a/extra/libxml2/APKBUILD
+++ b/main/libxml2/APKBUILD
diff --git a/extra/libogg/nocxx.patch b/main/libxml2/nocxx.patch
index beb1ab9006..beb1ab9006 100644
--- a/extra/libogg/nocxx.patch
+++ b/main/libxml2/nocxx.patch
diff --git a/extra/libxslt/APKBUILD b/main/libxslt/APKBUILD
index 8f6ce29380..8f6ce29380 100644
--- a/extra/libxslt/APKBUILD
+++ b/main/libxslt/APKBUILD
diff --git a/extra/lighttpd/APKBUILD b/main/lighttpd/APKBUILD
index 0abe6dea70..0abe6dea70 100644
--- a/extra/lighttpd/APKBUILD
+++ b/main/lighttpd/APKBUILD
diff --git a/extra/lighttpd/lighttpd.conf b/main/lighttpd/lighttpd.conf
index 778a4062b6..778a4062b6 100644
--- a/extra/lighttpd/lighttpd.conf
+++ b/main/lighttpd/lighttpd.conf
diff --git a/extra/lighttpd/lighttpd.confd b/main/lighttpd/lighttpd.confd
index 70d4170555..70d4170555 100644
--- a/extra/lighttpd/lighttpd.confd
+++ b/main/lighttpd/lighttpd.confd
diff --git a/extra/lighttpd/lighttpd.initd b/main/lighttpd/lighttpd.initd
index 80aaacc5e5..80aaacc5e5 100644
--- a/extra/lighttpd/lighttpd.initd
+++ b/main/lighttpd/lighttpd.initd
diff --git a/extra/lighttpd/lighttpd.logrotate b/main/lighttpd/lighttpd.logrotate
index 76f0ef3ff5..76f0ef3ff5 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 5b116a6375..5b116a6375 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 4682680d6b..4682680d6b 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 3c36577739..3c36577739 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 1cb3770f9b..1cb3770f9b 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 ca1369af79..ca1369af79 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 2a88806ae0..2a88806ae0 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 63daa75081..63daa75081 100644
--- a/extra/lighttpd/spawn-fcgi.initd
+++ b/main/lighttpd/spawn-fcgi.initd
diff --git a/extra/links/APKBUILD b/main/links/APKBUILD
index 2d11cf9dba..2d11cf9dba 100644
--- a/extra/links/APKBUILD
+++ b/main/links/APKBUILD
diff --git a/core/linux-grsec/0001-linux-2.6.28.5-ipgre-strict-binding.patch b/main/linux-grsec/0001-linux-2.6.28.5-ipgre-strict-binding.patch
index fd0cfeb2a2..fd0cfeb2a2 100644
--- a/core/linux-grsec/0001-linux-2.6.28.5-ipgre-strict-binding.patch
+++ b/main/linux-grsec/0001-linux-2.6.28.5-ipgre-strict-binding.patch
diff --git a/core/linux-grsec/0002-linux-2.6.28.5-ipgre-optimize-hash-lookup.patch b/main/linux-grsec/0002-linux-2.6.28.5-ipgre-optimize-hash-lookup.patch
index fbfef33b9b..fbfef33b9b 100644
--- a/core/linux-grsec/0002-linux-2.6.28.5-ipgre-optimize-hash-lookup.patch
+++ b/main/linux-grsec/0002-linux-2.6.28.5-ipgre-optimize-hash-lookup.patch
diff --git a/core/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index dc1a47858f..dc1a47858f 100644
--- a/core/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
diff --git a/core/linux-grsec/grsecurity-2.1.14-2.6.29.6-200907122214.patch b/main/linux-grsec/grsecurity-2.1.14-2.6.29.6-200907122214.patch
index 5206a9e479..5206a9e479 100644
--- a/core/linux-grsec/grsecurity-2.1.14-2.6.29.6-200907122214.patch
+++ b/main/linux-grsec/grsecurity-2.1.14-2.6.29.6-200907122214.patch
diff --git a/core/linux-grsec/kernelconfig b/main/linux-grsec/kernelconfig
index 425e5cedae..425e5cedae 100644
--- a/core/linux-grsec/kernelconfig
+++ b/main/linux-grsec/kernelconfig
diff --git a/core/linux-grsec/linux-grsec.post-install b/main/linux-grsec/linux-grsec.post-install
index 626046f64c..626046f64c 100644
--- a/core/linux-grsec/linux-grsec.post-install
+++ b/main/linux-grsec/linux-grsec.post-install
diff --git a/core/linux-grsec/linux-grsec.post-upgrade b/main/linux-grsec/linux-grsec.post-upgrade
index 1e3bdc8536..1e3bdc8536 120000
--- a/core/linux-grsec/linux-grsec.post-upgrade
+++ b/main/linux-grsec/linux-grsec.post-upgrade
diff --git a/core/linux-grsec/net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch b/main/linux-grsec/net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch
index 97983d79d2..97983d79d2 100644
--- a/core/linux-grsec/net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch
+++ b/main/linux-grsec/net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch
diff --git a/core/linux-headers/APKBUILD b/main/linux-headers/APKBUILD
index 25bb30b382..25bb30b382 100644
--- a/core/linux-headers/APKBUILD
+++ b/main/linux-headers/APKBUILD
diff --git a/core/linux-headers/linux-nbma-mroute-v4-2.6.29.diff b/main/linux-headers/linux-nbma-mroute-v4-2.6.29.diff
index a79adc2815..a79adc2815 100644
--- a/core/linux-headers/linux-nbma-mroute-v4-2.6.29.diff
+++ b/main/linux-headers/linux-nbma-mroute-v4-2.6.29.diff
diff --git a/extra/lm_sensors/APKBUILD b/main/lm_sensors/APKBUILD
index 0327dc7751..0327dc7751 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 fb163abc23..fb163abc23 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 9271c6bac2..9271c6bac2 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 18fb353706..18fb353706 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 d82841aebd..d82841aebd 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 cb99dce3f0..cb99dce3f0 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 d593f84144..d593f84144 100644
--- a/extra/lm_sensors/sensors.install
+++ b/main/lm_sensors/sensors.install
diff --git a/extra/logrotate/APKBUILD b/main/logrotate/APKBUILD
index e29b27e1ea..e29b27e1ea 100644
--- a/extra/logrotate/APKBUILD
+++ b/main/logrotate/APKBUILD
diff --git a/extra/lpc/APKBUILD b/main/lpc/APKBUILD
index af2b8a089d..af2b8a089d 100644
--- a/extra/lpc/APKBUILD
+++ b/main/lpc/APKBUILD
diff --git a/extra/lua/APKBUILD b/main/lua/APKBUILD
index 5e41bc03ad..5e41bc03ad 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 d051a21cb6..d051a21cb6 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 29ac4c3bf4..29ac4c3bf4 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 7b85aeafdf..7b85aeafdf 100644
--- a/extra/luaposix/APKBUILD
+++ b/main/luaposix/APKBUILD
diff --git a/extra/luasql-postgres/APKBUILD b/main/luasql-postgres/APKBUILD
index 36756ca657..36756ca657 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 a8650c5511..a8650c5511 100644
--- a/extra/luasql-postgres/config.new
+++ b/main/luasql-postgres/config.new
diff --git a/core/lvm2/APKBUILD b/main/lvm2/APKBUILD
index d113a383c4..d113a383c4 100644
--- a/core/lvm2/APKBUILD
+++ b/main/lvm2/APKBUILD
diff --git a/core/lvm2/lvm.initd b/main/lvm2/lvm.initd
index 022cbb1e0d..022cbb1e0d 100644
--- a/core/lvm2/lvm.initd
+++ b/main/lvm2/lvm.initd
diff --git a/extra/lzo/APKBUILD b/main/lzo/APKBUILD
index a9f2b912e1..a9f2b912e1 100644
--- a/extra/lzo/APKBUILD
+++ b/main/lzo/APKBUILD
diff --git a/core/m4/APKBUILD b/main/m4/APKBUILD
index 65a998eafb..65a998eafb 100644
--- a/core/m4/APKBUILD
+++ b/main/m4/APKBUILD
diff --git a/core/make/APKBUILD b/main/make/APKBUILD
index 5d2141402d..5d2141402d 100644
--- a/core/make/APKBUILD
+++ b/main/make/APKBUILD
diff --git a/extra/man-pages/APKBUILD b/main/man-pages/APKBUILD
index b47b21cbfd..b47b21cbfd 100644
--- a/extra/man-pages/APKBUILD
+++ b/main/man-pages/APKBUILD
diff --git a/extra/man/APKBUILD b/main/man/APKBUILD
index c6940dbf3b..c6940dbf3b 100644
--- a/extra/man/APKBUILD
+++ b/main/man/APKBUILD
diff --git a/extra/man/man-troff.patch b/main/man/man-troff.patch
index e08e9316b2..e08e9316b2 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 00d40dd9af..00d40dd9af 100755
--- a/extra/man/whatis.periodic.daily
+++ b/main/man/whatis.periodic.daily
diff --git a/extra/md5/APKBUILD b/main/md5/APKBUILD
index 93e3747a92..93e3747a92 100644
--- a/extra/md5/APKBUILD
+++ b/main/md5/APKBUILD
diff --git a/core/mdadm/APKBUILD b/main/mdadm/APKBUILD
index bc98d6e33e..bc98d6e33e 100644
--- a/core/mdadm/APKBUILD
+++ b/main/mdadm/APKBUILD
diff --git a/core/mdadm/mdadm-raid.initd b/main/mdadm/mdadm-raid.initd
index ea84088886..ea84088886 100644
--- a/core/mdadm/mdadm-raid.initd
+++ b/main/mdadm/mdadm-raid.initd
diff --git a/core/mdadm/mdadm.confd b/main/mdadm/mdadm.confd
index f1ed9c41d2..f1ed9c41d2 100644
--- a/core/mdadm/mdadm.confd
+++ b/main/mdadm/mdadm.confd
diff --git a/core/mdadm/mdadm.initd b/main/mdadm/mdadm.initd
index 747661e8ee..747661e8ee 100644
--- a/core/mdadm/mdadm.initd
+++ b/main/mdadm/mdadm.initd
diff --git a/extra/mini_httpd/APKBUILD b/main/mini_httpd/APKBUILD
index 4f7167e709..4f7167e709 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 397a331ad3..397a331ad3 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 4460a539ef..4460a539ef 100644
--- a/extra/mini_httpd/mini_httpd.initd
+++ b/main/mini_httpd/mini_httpd.initd
diff --git a/core/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index d6dda34715..d6dda34715 100644
--- a/core/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
diff --git a/extra/mlmmj/APKBUILD b/main/mlmmj/APKBUILD
index 96649fd6b6..96649fd6b6 100644
--- a/extra/mlmmj/APKBUILD
+++ b/main/mlmmj/APKBUILD
diff --git a/core/module-init-tools/APKBUILD b/main/module-init-tools/APKBUILD
index 1441c2fd4e..1441c2fd4e 100644
--- a/core/module-init-tools/APKBUILD
+++ b/main/module-init-tools/APKBUILD
diff --git a/core/mpfr/APKBUILD b/main/mpfr/APKBUILD
index c58f2cac78..c58f2cac78 100644
--- a/core/mpfr/APKBUILD
+++ b/main/mpfr/APKBUILD
diff --git a/extra/mpg123/APKBUILD b/main/mpg123/APKBUILD
index 4a13dea81a..4a13dea81a 100644
--- a/extra/mpg123/APKBUILD
+++ b/main/mpg123/APKBUILD
diff --git a/core/mtools/APKBUILD b/main/mtools/APKBUILD
index b556426163..b556426163 100644
--- a/core/mtools/APKBUILD
+++ b/main/mtools/APKBUILD
diff --git a/extra/mysql/APKBUILD b/main/mysql/APKBUILD
index de03c127da..de03c127da 100644
--- a/extra/mysql/APKBUILD
+++ b/main/mysql/APKBUILD
diff --git a/extra/mysql/mysql.initd b/main/mysql/mysql.initd
index 8f841646b8..8f841646b8 100644
--- a/extra/mysql/mysql.initd
+++ b/main/mysql/mysql.initd
diff --git a/extra/mysql/mysql.mycnf b/main/mysql/mysql.mycnf
index 6df0334eff..6df0334eff 100644
--- a/extra/mysql/mysql.mycnf
+++ b/main/mysql/mysql.mycnf
diff --git a/extra/nano/APKBUILD b/main/nano/APKBUILD
index ab2a8bfc56..ab2a8bfc56 100644
--- a/extra/nano/APKBUILD
+++ b/main/nano/APKBUILD
diff --git a/core/nasm/APKBUILD b/main/nasm/APKBUILD
index cc5d60ae5d..cc5d60ae5d 100644
--- a/core/nasm/APKBUILD
+++ b/main/nasm/APKBUILD
diff --git a/extra/ncftp/APKBUILD b/main/ncftp/APKBUILD
index 4a43f4582c..4a43f4582c 100644
--- a/extra/ncftp/APKBUILD
+++ b/main/ncftp/APKBUILD
diff --git a/extra/ncftp/ncftp.post-install b/main/ncftp/ncftp.post-install
index e1ccb7b839..e1ccb7b839 100644
--- a/extra/ncftp/ncftp.post-install
+++ b/main/ncftp/ncftp.post-install
diff --git a/core/ncurses/APKBUILD b/main/ncurses/APKBUILD
index 451c502610..6bd01f640d 100644
--- a/core/ncurses/APKBUILD
+++ b/main/ncurses/APKBUILD
@@ -1,10 +1,11 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ncurses
 pkgver=5.7
 pkgrel=0
 pkgdesc="Console display library"
 url="http://www.gnu.org/software/ncurses/"
 license=MIT
-depends=uclibc
+depends=
 
 source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
 	"
diff --git a/extra/neon/APKBUILD b/main/neon/APKBUILD
index 76d099e471..76d099e471 100644
--- a/extra/neon/APKBUILD
+++ b/main/neon/APKBUILD
diff --git a/extra/net-snmp/APKBUILD b/main/net-snmp/APKBUILD
index 6a28088d57..ac497cb9b3 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 ad48a1d94d..ad48a1d94d 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 49beda58d8..49beda58d8 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 d9cee614ea..d9cee614ea 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 bf56233ab6..bf56233ab6 100644
--- a/extra/net-snmp/snmptrapd.initd
+++ b/main/net-snmp/snmptrapd.initd
diff --git a/extra/newt/APKBUILD b/main/newt/APKBUILD
index dc81b8b670..dc81b8b670 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 b9f86e6b60..b9f86e6b60 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 b9225f9663..b9225f9663 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 1ebbd99b57..1ebbd99b57 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 94a73d366f..94a73d366f 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 98a143a654..98a143a654 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 dc0b839271..dc0b839271 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 e9711d914d..e9711d914d 100644
--- a/extra/nfs-utils/nfs.initd
+++ b/main/nfs-utils/nfs.initd
diff --git a/extra/ngircd/APKBUILD b/main/ngircd/APKBUILD
index 2f618a0776..2f618a0776 100644
--- a/extra/ngircd/APKBUILD
+++ b/main/ngircd/APKBUILD
diff --git a/extra/ngircd/ngircd.initd b/main/ngircd/ngircd.initd
index 807d844e8d..807d844e8d 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 062e37ae4f..062e37ae4f 100644
--- a/extra/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
diff --git a/extra/nmap/APKBUILD b/main/nmap/APKBUILD
index bb04078768..bb04078768 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 3253fc26b3..3253fc26b3 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 5575e696de..5575e696de 100644
--- a/extra/ntfs-3g/APKBUILD
+++ b/main/ntfs-3g/APKBUILD
diff --git a/extra/libxml2/nocxx.patch b/main/ntfs-3g/nocxx.patch
index beb1ab9006..beb1ab9006 100644
--- a/extra/libxml2/nocxx.patch
+++ b/main/ntfs-3g/nocxx.patch
diff --git a/extra/oidentd/APKBUILD b/main/oidentd/APKBUILD
index 130283f72a..130283f72a 100644
--- a/extra/oidentd/APKBUILD
+++ b/main/oidentd/APKBUILD
diff --git a/extra/oidentd/oidentd.conf b/main/oidentd/oidentd.conf
index 03b28d8278..03b28d8278 100644
--- a/extra/oidentd/oidentd.conf
+++ b/main/oidentd/oidentd.conf
diff --git a/extra/oidentd/oidentd.confd b/main/oidentd/oidentd.confd
index 3116889e67..3116889e67 100644
--- a/extra/oidentd/oidentd.confd
+++ b/main/oidentd/oidentd.confd
diff --git a/extra/oidentd/oidentd.initd b/main/oidentd/oidentd.initd
index c40b058dac..c40b058dac 100644
--- a/extra/oidentd/oidentd.initd
+++ b/main/oidentd/oidentd.initd
diff --git a/extra/openldap/APKBUILD b/main/openldap/APKBUILD
index bb4db8296e..bb4db8296e 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 c05790e3e2..c05790e3e2 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 448249a3b5..448249a3b5 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 1d6affdfee..1d6affdfee 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 b208a9f5f2..b208a9f5f2 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 2240ad3f30..2240ad3f30 100644
--- a/extra/openldap/slapd.confd
+++ b/main/openldap/slapd.confd
diff --git a/extra/openldap/slapd.initd b/main/openldap/slapd.initd
index 1637d3335a..1637d3335a 100644
--- a/extra/openldap/slapd.initd
+++ b/main/openldap/slapd.initd
diff --git a/extra/openldap/slurpd.initd b/main/openldap/slurpd.initd
index f5aa2ead5a..f5aa2ead5a 100644
--- a/extra/openldap/slurpd.initd
+++ b/main/openldap/slurpd.initd
diff --git a/extra/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
index c72d0d269c..c72d0d269c 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 67b44ab5d2..67b44ab5d2 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 60e4827d6f..60e4827d6f 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 c3bece169e..c3bece169e 100644
--- a/extra/opennhrp/opennhrp.confd
+++ b/main/opennhrp/opennhrp.confd
diff --git a/extra/opennhrp/opennhrp.initd b/main/opennhrp/opennhrp.initd
index ac7ea6a572..ac7ea6a572 100755
--- a/extra/opennhrp/opennhrp.initd
+++ b/main/opennhrp/opennhrp.initd
diff --git a/core/openntpd/APKBUILD b/main/openntpd/APKBUILD
index 38c11ca514..38c11ca514 100644
--- a/core/openntpd/APKBUILD
+++ b/main/openntpd/APKBUILD
diff --git a/core/openntpd/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff b/main/openntpd/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff
index adca55614a..adca55614a 100644
--- a/core/openntpd/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff
+++ b/main/openntpd/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff
diff --git a/core/openntpd/openntpd.conf.d b/main/openntpd/openntpd.conf.d
index 6b938dc766..6b938dc766 100644
--- a/core/openntpd/openntpd.conf.d
+++ b/main/openntpd/openntpd.conf.d
diff --git a/core/openntpd/openntpd.pre-install b/main/openntpd/openntpd.pre-install
index 32c6f51293..32c6f51293 100644
--- a/core/openntpd/openntpd.pre-install
+++ b/main/openntpd/openntpd.pre-install
diff --git a/core/openntpd/openntpd.rc b/main/openntpd/openntpd.rc
index 81648dc03f..81648dc03f 100644
--- a/core/openntpd/openntpd.rc
+++ b/main/openntpd/openntpd.rc
diff --git a/core/openrc/APKBUILD b/main/openrc/APKBUILD
index 415f24a580..415f24a580 100644
--- a/core/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
diff --git a/core/openrc/hostname.initd b/main/openrc/hostname.initd
index 995e4b95d8..995e4b95d8 100644
--- a/core/openrc/hostname.initd
+++ b/main/openrc/hostname.initd
diff --git a/core/openrc/hwdrivers.initd b/main/openrc/hwdrivers.initd
index 3d0ebf12b5..3d0ebf12b5 100644
--- a/core/openrc/hwdrivers.initd
+++ b/main/openrc/hwdrivers.initd
diff --git a/core/openrc/keymaps.initd b/main/openrc/keymaps.initd
index 8ee019c69d..8ee019c69d 100644
--- a/core/openrc/keymaps.initd
+++ b/main/openrc/keymaps.initd
diff --git a/core/openrc/modloop.initd b/main/openrc/modloop.initd
index c32e1f49f5..c32e1f49f5 100644
--- a/core/openrc/modloop.initd
+++ b/main/openrc/modloop.initd
diff --git a/core/openrc/modules.initd b/main/openrc/modules.initd
index ef7d1f15f1..ef7d1f15f1 100644
--- a/core/openrc/modules.initd
+++ b/main/openrc/modules.initd
diff --git a/core/openrc/networking.initd b/main/openrc/networking.initd
index 2269e6f04f..2269e6f04f 100644
--- a/core/openrc/networking.initd
+++ b/main/openrc/networking.initd
diff --git a/core/openrc/openrc-0.4.3-mkmntdirs.patch b/main/openrc/openrc-0.4.3-mkmntdirs.patch
index 01512ad7c0..01512ad7c0 100644
--- a/core/openrc/openrc-0.4.3-mkmntdirs.patch
+++ b/main/openrc/openrc-0.4.3-mkmntdirs.patch
diff --git a/core/openrc/openrc-hwclock.patch b/main/openrc/openrc-hwclock.patch
index 593e9ba82f..593e9ba82f 100644
--- a/core/openrc/openrc-hwclock.patch
+++ b/main/openrc/openrc-hwclock.patch
diff --git a/core/openrc/openrc.post-install b/main/openrc/openrc.post-install
index 1d0201d3aa..1d0201d3aa 100644
--- a/core/openrc/openrc.post-install
+++ b/main/openrc/openrc.post-install
diff --git a/core/openrc/openrc.post-upgrade b/main/openrc/openrc.post-upgrade
index b09f2f240c..b09f2f240c 100644
--- a/core/openrc/openrc.post-upgrade
+++ b/main/openrc/openrc.post-upgrade
diff --git a/core/openssh/APKBUILD b/main/openssh/APKBUILD
index b81ae46efe..b81ae46efe 100644
--- a/core/openssh/APKBUILD
+++ b/main/openssh/APKBUILD
diff --git a/core/openssh/sshd.confd b/main/openssh/sshd.confd
index 28952b4a28..28952b4a28 100644
--- a/core/openssh/sshd.confd
+++ b/main/openssh/sshd.confd
diff --git a/core/openssh/sshd.initd b/main/openssh/sshd.initd
index 2a5d4ae259..2a5d4ae259 100644
--- a/core/openssh/sshd.initd
+++ b/main/openssh/sshd.initd
diff --git a/core/openssl/APKBUILD b/main/openssl/APKBUILD
index 46d1e064b4..46d1e064b4 100644
--- a/core/openssl/APKBUILD
+++ b/main/openssl/APKBUILD
diff --git a/core/openssl/openssl-0.9.8k-padlock-sha.patch b/main/openssl/openssl-0.9.8k-padlock-sha.patch
index 63b27cea36..63b27cea36 100644
--- a/core/openssl/openssl-0.9.8k-padlock-sha.patch
+++ b/main/openssl/openssl-0.9.8k-padlock-sha.patch
diff --git a/core/openssl/openssl-0.9.8k-quote-cc.patch b/main/openssl/openssl-0.9.8k-quote-cc.patch
index 5a61662886..5a61662886 100644
--- a/core/openssl/openssl-0.9.8k-quote-cc.patch
+++ b/main/openssl/openssl-0.9.8k-quote-cc.patch
diff --git a/core/openssl/openssl-bb-basename.patch b/main/openssl/openssl-bb-basename.patch
index 441c7b91e3..441c7b91e3 100644
--- a/core/openssl/openssl-bb-basename.patch
+++ b/main/openssl/openssl-bb-basename.patch
diff --git a/extra/openvpn/APKBUILD b/main/openvpn/APKBUILD
index 3b927139d1..3b927139d1 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 e042124ea4..e042124ea4 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 a6e4529e1c..a6e4529e1c 100644
--- a/extra/openvpn/openvpn.initd
+++ b/main/openvpn/openvpn.initd
diff --git a/extra/p7zip/APKBUILD b/main/p7zip/APKBUILD
index 38d6760282..38d6760282 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 d06708b4bb..d06708b4bb 100644
--- a/extra/p7zip/p7zip-cc-cxx.patch
+++ b/main/p7zip/p7zip-cc-cxx.patch
diff --git a/core/parted/APKBUILD b/main/parted/APKBUILD
index a606b75796..a606b75796 100644
--- a/core/parted/APKBUILD
+++ b/main/parted/APKBUILD
diff --git a/extra/ntfs-3g/nocxx.patch b/main/parted/nocxx.patch
index beb1ab9006..beb1ab9006 100644
--- a/extra/ntfs-3g/nocxx.patch
+++ b/main/parted/nocxx.patch
diff --git a/core/pax-utils/APKBUILD b/main/pax-utils/APKBUILD
index 4d0308e859..4d0308e859 100644
--- a/core/pax-utils/APKBUILD
+++ b/main/pax-utils/APKBUILD
diff --git a/core/paxctl/APKBUILD b/main/paxctl/APKBUILD
index b8ac414d76..b8ac414d76 100644
--- a/core/paxctl/APKBUILD
+++ b/main/paxctl/APKBUILD
diff --git a/extra/pciutils/APKBUILD b/main/pciutils/APKBUILD
index 1c41b6d07b..1c41b6d07b 100644
--- a/extra/pciutils/APKBUILD
+++ b/main/pciutils/APKBUILD
diff --git a/extra/pcmciautils/APKBUILD b/main/pcmciautils/APKBUILD
index f11f6e06bf..f11f6e06bf 100644
--- a/extra/pcmciautils/APKBUILD
+++ b/main/pcmciautils/APKBUILD
diff --git a/extra/pcre/APKBUILD b/main/pcre/APKBUILD
index f2749d6a3e..f2749d6a3e 100644
--- a/extra/pcre/APKBUILD
+++ b/main/pcre/APKBUILD
diff --git a/extra/perl-archive-zip/APKBUILD b/main/perl-archive-zip/APKBUILD
index 2f78683eec..2f78683eec 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 e0cc0b30d1..e0cc0b30d1 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 352e26e728..352e26e728 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 b35d517dea..b35d517dea 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 0b1e8ea995..0b1e8ea995 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 4acae98480..4acae98480 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 929d587227..929d587227 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 7d3edc3ab1..7d3edc3ab1 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 0b0909c5dc..0b0909c5dc 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 431f52a989..431f52a989 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 fb7ea01255..fb7ea01255 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 f8e350c1da..f8e350c1da 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 f25ce2164c..f25ce2164c 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 c8ef7ea723..c8ef7ea723 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 7fc9d69ed3..7fc9d69ed3 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 be3f83df06..be3f83df06 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 6a3c884616..6a3c884616 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 372398d65f..372398d65f 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 0e133c30e7..0e133c30e7 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 1bbfe33fec..1bbfe33fec 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 2ce850ee4d..2ce850ee4d 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 d959c43d0a..d959c43d0a 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 9e0bc32ca4..9e0bc32ca4 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 8ee87e58b7..8ee87e58b7 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 df47aee249..df47aee249 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 1c02dfe164..1c02dfe164 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 59ece194b0..59ece194b0 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 4cd3b727e7..4cd3b727e7 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 e95b8411c9..e95b8411c9 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 7dc23116ce..7dc23116ce 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 74d2ecbe19..74d2ecbe19 100644
--- a/extra/perl-xml-simple/APKBUILD
+++ b/main/perl-xml-simple/APKBUILD
diff --git a/core/perl/APKBUILD b/main/perl/APKBUILD
index 656e09ca5f..656e09ca5f 100644
--- a/core/perl/APKBUILD
+++ b/main/perl/APKBUILD
diff --git a/extra/pgcluster/APKBUILD b/main/pgcluster/APKBUILD
index 9d92b9b65b..9d92b9b65b 100644
--- a/extra/pgcluster/APKBUILD
+++ b/main/pgcluster/APKBUILD
diff --git a/extra/pgcluster/pgcluster.confd b/main/pgcluster/pgcluster.confd
index 9e1376eec7..9e1376eec7 100644
--- a/extra/pgcluster/pgcluster.confd
+++ b/main/pgcluster/pgcluster.confd
diff --git a/extra/pgcluster/pgcluster.initd b/main/pgcluster/pgcluster.initd
index fb5cdfdf35..fb5cdfdf35 100644
--- a/extra/pgcluster/pgcluster.initd
+++ b/main/pgcluster/pgcluster.initd
diff --git a/extra/pgpool/APKBUILD b/main/pgpool/APKBUILD
index 980b3019a8..980b3019a8 100644
--- a/extra/pgpool/APKBUILD
+++ b/main/pgpool/APKBUILD
diff --git a/extra/pgpool/pgpool.initd b/main/pgpool/pgpool.initd
index d577cf9e16..d577cf9e16 100644
--- a/extra/pgpool/pgpool.initd
+++ b/main/pgpool/pgpool.initd
diff --git a/extra/php-apc/APKBUILD b/main/php-apc/APKBUILD
index d3460aaa56..d3460aaa56 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 eb8a7e8f2c..eb8a7e8f2c 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 8e72f404c3..8e72f404c3 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 7f939e8b88..7f939e8b88 100644
--- a/extra/php-fileinfo/magic.patch
+++ b/main/php-fileinfo/magic.patch
diff --git a/extra/php/APKBUILD b/main/php/APKBUILD
index f1a36a24e9..f1a36a24e9 100644
--- a/extra/php/APKBUILD
+++ b/main/php/APKBUILD
diff --git a/extra/pinentry/APKBUILD b/main/pinentry/APKBUILD
index 5322ebe7a2..5322ebe7a2 100644
--- a/extra/pinentry/APKBUILD
+++ b/main/pinentry/APKBUILD
diff --git a/extra/pingu/APKBUILD b/main/pingu/APKBUILD
index fdd91972ab..fdd91972ab 100644
--- a/extra/pingu/APKBUILD
+++ b/main/pingu/APKBUILD
diff --git a/extra/pingu/pingu.initd b/main/pingu/pingu.initd
index 39301f80e4..39301f80e4 100644
--- a/extra/pingu/pingu.initd
+++ b/main/pingu/pingu.initd
diff --git a/core/pkgconfig/APKBUILD b/main/pkgconfig/APKBUILD
index 73a44f414a..73a44f414a 100644
--- a/core/pkgconfig/APKBUILD
+++ b/main/pkgconfig/APKBUILD
diff --git a/core/popt/APKBUILD b/main/popt/APKBUILD
index 6e95f26b50..a46f218c2e 100644
--- a/core/popt/APKBUILD
+++ b/main/popt/APKBUILD
@@ -1,15 +1,16 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=popt
 pkgver=1.14
 pkgrel=0
 pkgdesc="A commandline option parser"
 url="http://rpm5.org"
 license="custom"
-depends="uclibc"
+depends=
 source="http://rpm5.org/files/$pkgname/$pkgname-$pkgver.tar.gz"
 subpackages="$pkgname-doc $pkgname-dev"
 
-build () 
-{ 
+build ()
+{
 	cd $srcdir/$pkgname-$pkgver
 	./configure --prefix=/usr 
 	make || return 1
diff --git a/extra/portmap/APKBUILD b/main/portmap/APKBUILD
index 7539f314aa..7539f314aa 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 c6af8f8c80..c6af8f8c80 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 c2756c992b..c2756c992b 100644
--- a/extra/portmap/portmap.confd
+++ b/main/portmap/portmap.confd
diff --git a/extra/portmap/portmap.initd b/main/portmap/portmap.initd
index 65d23d7484..65d23d7484 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 b0dcfb9c5c..b0dcfb9c5c 100644
--- a/extra/portmap/portmap.pre-install
+++ b/main/portmap/portmap.pre-install
diff --git a/extra/postfix/APKBUILD b/main/postfix/APKBUILD
index 71a9199c07..71a9199c07 100644
--- a/extra/postfix/APKBUILD
+++ b/main/postfix/APKBUILD
diff --git a/extra/postfix/dynamicmaps.cf b/main/postfix/dynamicmaps.cf
index dfe2110552..dfe2110552 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 630abedc3b..630abedc3b 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 b8d23833b6..b8d23833b6 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 b8d23833b6..b8d23833b6 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 f15b00cf75..f15b00cf75 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 b8d23833b6..b8d23833b6 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 b2396b3aea..b2396b3aea 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 98e01db0bb..98e01db0bb 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 22414ef615..22414ef615 100644
--- a/extra/postfix/postfix.pre-install
+++ b/main/postfix/postfix.pre-install
diff --git a/extra/postgresql/APKBUILD b/main/postgresql/APKBUILD
index a2d921ed14..a2d921ed14 100644
--- a/extra/postgresql/APKBUILD
+++ b/main/postgresql/APKBUILD
diff --git a/extra/postgresql/postgresql.confd b/main/postgresql/postgresql.confd
index 56561b0c40..56561b0c40 100644
--- a/extra/postgresql/postgresql.confd
+++ b/main/postgresql/postgresql.confd
diff --git a/extra/postgresql/postgresql.initd b/main/postgresql/postgresql.initd
index 3863a49aa4..3863a49aa4 100644
--- a/extra/postgresql/postgresql.initd
+++ b/main/postgresql/postgresql.initd
diff --git a/core/ppp/APKBUILD b/main/ppp/APKBUILD
index c50ea10c0a..c50ea10c0a 100644
--- a/core/ppp/APKBUILD
+++ b/main/ppp/APKBUILD
diff --git a/core/ppp/ip-down b/main/ppp/ip-down
index 3a88c496b8..3a88c496b8 100644
--- a/core/ppp/ip-down
+++ b/main/ppp/ip-down
diff --git a/core/ppp/ip-up b/main/ppp/ip-up
index 57e09c0047..57e09c0047 100644
--- a/core/ppp/ip-up
+++ b/main/ppp/ip-up
diff --git a/core/ppp/options b/main/ppp/options
index 63691842c9..63691842c9 100644
--- a/core/ppp/options
+++ b/main/ppp/options
diff --git a/core/ppp/plog b/main/ppp/plog
index 84d2c7340c..84d2c7340c 100644
--- a/core/ppp/plog
+++ b/main/ppp/plog
diff --git a/core/ppp/poff b/main/ppp/poff
index 8b4dffc59e..8b4dffc59e 100644
--- a/core/ppp/poff
+++ b/main/ppp/poff
diff --git a/core/ppp/pon b/main/ppp/pon
index 36885050b5..36885050b5 100644
--- a/core/ppp/pon
+++ b/main/ppp/pon
diff --git a/core/ppp/pon.1 b/main/ppp/pon.1
index bb3220564b..bb3220564b 100644
--- a/core/ppp/pon.1
+++ b/main/ppp/pon.1
diff --git a/extra/pth/APKBUILD b/main/pth/APKBUILD
index ce5cc5e126..ce5cc5e126 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 1c8200a4cb..1c8200a4cb 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 7a4a5ab300..7a4a5ab300 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 3914dea7ac..3914dea7ac 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 d5d38b99ca..d5d38b99ca 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 f345db8c8e..f345db8c8e 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 aaa3fc64d0..aaa3fc64d0 100644
--- a/extra/quagga/APKBUILD
+++ b/main/quagga/APKBUILD
diff --git a/extra/quagga/bgpd.initd b/main/quagga/bgpd.initd
index b6104235c3..b6104235c3 100644
--- a/extra/quagga/bgpd.initd
+++ b/main/quagga/bgpd.initd
diff --git a/extra/quagga/ospf6d.initd b/main/quagga/ospf6d.initd
index 6edafe5f74..6edafe5f74 100644
--- a/extra/quagga/ospf6d.initd
+++ b/main/quagga/ospf6d.initd
diff --git a/extra/quagga/ospfd.initd b/main/quagga/ospfd.initd
index f67ca2c154..f67ca2c154 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 72ee89929c..72ee89929c 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 e558d30a6e..e558d30a6e 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 53636d6b57..53636d6b57 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 2c1b868d15..2c1b868d15 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 ad562df000..ad562df000 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 c1c670d201..c1c670d201 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 2643891dc7..2643891dc7 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 987d6ec4b6..987d6ec4b6 100644
--- a/extra/quagga/ripd.initd
+++ b/main/quagga/ripd.initd
diff --git a/extra/quagga/ripngd.initd b/main/quagga/ripngd.initd
index 9bf2ff2a87..9bf2ff2a87 100644
--- a/extra/quagga/ripngd.initd
+++ b/main/quagga/ripngd.initd
diff --git a/extra/quagga/zebra.confd b/main/quagga/zebra.confd
index a5256acd04..a5256acd04 100644
--- a/extra/quagga/zebra.confd
+++ b/main/quagga/zebra.confd
diff --git a/extra/quagga/zebra.initd b/main/quagga/zebra.initd
index f0cc008432..f0cc008432 100644
--- a/extra/quagga/zebra.initd
+++ b/main/quagga/zebra.initd
diff --git a/extra/razor/APKBUILD b/main/razor/APKBUILD
index 7034208641..7034208641 100644
--- a/extra/razor/APKBUILD
+++ b/main/razor/APKBUILD
diff --git a/core/readline/APKBUILD b/main/readline/APKBUILD
index 3c26ba1274..3c26ba1274 100644
--- a/core/readline/APKBUILD
+++ b/main/readline/APKBUILD
diff --git a/extra/roundcubemail/APKBUILD b/main/roundcubemail/APKBUILD
index f56de7b77c..f56de7b77c 100644
--- a/extra/roundcubemail/APKBUILD
+++ b/main/roundcubemail/APKBUILD
diff --git a/extra/rrdtool/APKBUILD b/main/rrdtool/APKBUILD
index 541a54e85e..541a54e85e 100644
--- a/extra/rrdtool/APKBUILD
+++ b/main/rrdtool/APKBUILD
diff --git a/extra/rsync/APKBUILD b/main/rsync/APKBUILD
index 4b0e8f1205..4b0e8f1205 100644
--- a/extra/rsync/APKBUILD
+++ b/main/rsync/APKBUILD
diff --git a/extra/rsync/rsyncd.conf b/main/rsync/rsyncd.conf
index b6dd5994d4..b6dd5994d4 100644
--- a/extra/rsync/rsyncd.conf
+++ b/main/rsync/rsyncd.conf
diff --git a/extra/rsync/rsyncd.confd b/main/rsync/rsyncd.confd
index c3d897ed2f..c3d897ed2f 100644
--- a/extra/rsync/rsyncd.confd
+++ b/main/rsync/rsyncd.confd
diff --git a/extra/rsync/rsyncd.initd b/main/rsync/rsyncd.initd
index 1b20282296..1b20282296 100644
--- a/extra/rsync/rsyncd.initd
+++ b/main/rsync/rsyncd.initd
diff --git a/extra/rsync/rsyncd.logrotate b/main/rsync/rsyncd.logrotate
index 34bcf72d21..34bcf72d21 100644
--- a/extra/rsync/rsyncd.logrotate
+++ b/main/rsync/rsyncd.logrotate
diff --git a/extra/ruby/APKBUILD b/main/ruby/APKBUILD
index ffeb781502..ffeb781502 100644
--- a/extra/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
diff --git a/extra/rubygems/APKBUILD b/main/rubygems/APKBUILD
index 8ba7c48834..8ba7c48834 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 3b76ad3f99..3b76ad3f99 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 5854fa5d81..5854fa5d81 100644
--- a/extra/run-parts/APKBUILD
+++ b/main/run-parts/APKBUILD
diff --git a/extra/samba/APKBUILD b/main/samba/APKBUILD
index c28a6e2de3..c28a6e2de3 100644
--- a/extra/samba/APKBUILD
+++ b/main/samba/APKBUILD
diff --git a/extra/samba/samba.confd b/main/samba/samba.confd
index 3788c3c173..3788c3c173 100644
--- a/extra/samba/samba.confd
+++ b/main/samba/samba.confd
diff --git a/extra/samba/samba.initd b/main/samba/samba.initd
index d2d395a989..d2d395a989 100644
--- a/extra/samba/samba.initd
+++ b/main/samba/samba.initd
diff --git a/extra/screen/APKBUILD b/main/screen/APKBUILD
index ffa48fa208..ffa48fa208 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 4a90f49b91..4a90f49b91 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 99ba1e6f8b..99ba1e6f8b 100644
--- a/extra/sed/APKBUILD
+++ b/main/sed/APKBUILD
diff --git a/extra/sed/sed.post-deinstall b/main/sed/sed.post-deinstall
index 99b57c4635..99b57c4635 100644
--- a/extra/sed/sed.post-deinstall
+++ b/main/sed/sed.post-deinstall
diff --git a/extra/sfic/APKBUILD b/main/sfic/APKBUILD
index 3f781b4dee..3f781b4dee 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 54538aac1a..54538aac1a 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 1c0a51d8a6..1c0a51d8a6 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 9dda676c57..9dda676c57 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 9c98a3bfda..9c98a3bfda 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 d2537e8a12..d2537e8a12 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 e601c96a52..e601c96a52 100644
--- a/extra/shorewall-perl/APKBUILD
+++ b/main/shorewall-perl/APKBUILD
diff --git a/extra/shorewall-shell/APKBUILD b/main/shorewall-shell/APKBUILD
index 643562f209..643562f209 100644
--- a/extra/shorewall-shell/APKBUILD
+++ b/main/shorewall-shell/APKBUILD
diff --git a/extra/shorewall/APKBUILD b/main/shorewall/APKBUILD
index 735973cc26..735973cc26 100644
--- a/extra/shorewall/APKBUILD
+++ b/main/shorewall/APKBUILD
diff --git a/extra/sic/APKBUILD b/main/sic/APKBUILD
index 72e197ea08..72e197ea08 100644
--- a/extra/sic/APKBUILD
+++ b/main/sic/APKBUILD
diff --git a/extra/slang/APKBUILD b/main/slang/APKBUILD
index c1fe962000..c1fe962000 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 d7ed5a8d65..d7ed5a8d65 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 35b4820651..35b4820651 100644
--- a/extra/snort/APKBUILD
+++ b/main/snort/APKBUILD
diff --git a/extra/snort/nocxx.patch b/main/snort/nocxx.patch
index beb1ab9006..beb1ab9006 100644
--- a/extra/snort/nocxx.patch
+++ b/main/snort/nocxx.patch
diff --git a/extra/snort/snort.confd b/main/snort/snort.confd
index d4d240ac96..d4d240ac96 100644
--- a/extra/snort/snort.confd
+++ b/main/snort/snort.confd
diff --git a/extra/snort/snort.initd b/main/snort/snort.initd
index a5c2b05c47..a5c2b05c47 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 e1555163a7..e1555163a7 100644
--- a/extra/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
diff --git a/extra/sntpc/APKBUILD b/main/sntpc/APKBUILD
index 6df6a6efd0..6df6a6efd0 100644
--- a/extra/sntpc/APKBUILD
+++ b/main/sntpc/APKBUILD
diff --git a/extra/sntpc/sntpc.confd b/main/sntpc/sntpc.confd
index a92e4be868..a92e4be868 100644
--- a/extra/sntpc/sntpc.confd
+++ b/main/sntpc/sntpc.confd
diff --git a/extra/sntpc/sntpc.initd b/main/sntpc/sntpc.initd
index a97e51bdbd..a97e51bdbd 100644
--- a/extra/sntpc/sntpc.initd
+++ b/main/sntpc/sntpc.initd
diff --git a/extra/spamassassin/APKBUILD b/main/spamassassin/APKBUILD
index 3da01a62f2..3da01a62f2 100644
--- a/extra/spamassassin/APKBUILD
+++ b/main/spamassassin/APKBUILD
diff --git a/extra/spamassassin/spamd.conf b/main/spamassassin/spamd.conf
index b6fca036f2..b6fca036f2 100644
--- a/extra/spamassassin/spamd.conf
+++ b/main/spamassassin/spamd.conf
diff --git a/extra/spamassassin/spamd.init b/main/spamassassin/spamd.init
index 89723889f4..89723889f4 100644
--- a/extra/spamassassin/spamd.init
+++ b/main/spamassassin/spamd.init
diff --git a/extra/sqlite/APKBUILD b/main/sqlite/APKBUILD
index 40a5cd7e44..40a5cd7e44 100644
--- a/extra/sqlite/APKBUILD
+++ b/main/sqlite/APKBUILD
diff --git a/extra/sqlite/license.txt b/main/sqlite/license.txt
index 118c5d5e60..118c5d5e60 100644
--- a/extra/sqlite/license.txt
+++ b/main/sqlite/license.txt
diff --git a/extra/squid/APKBUILD b/main/squid/APKBUILD
index ac840cbbd5..ac840cbbd5 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 5ac174dee2..5ac174dee2 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 14a9ee84bd..14a9ee84bd 100644
--- a/extra/squid/squid.confd
+++ b/main/squid/squid.confd
diff --git a/extra/squid/squid.initd b/main/squid/squid.initd
index bbdc2bed2a..bbdc2bed2a 100644
--- a/extra/squid/squid.initd
+++ b/main/squid/squid.initd
diff --git a/extra/squid/squid.logrotate b/main/squid/squid.logrotate
index fb3279e013..fb3279e013 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 88df6d26f9..88df6d26f9 100644
--- a/extra/squid/squid.post-install
+++ b/main/squid/squid.post-install
diff --git a/extra/ssmtp/APKBUILD b/main/ssmtp/APKBUILD
index 2f63b689f9..2f63b689f9 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 fca144fa68..fca144fa68 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 dd4baf9f8a..dd4baf9f8a 100644
--- a/extra/ssmtp/generate_config.patch
+++ b/main/ssmtp/generate_config.patch
diff --git a/extra/strace/APKBUILD b/main/strace/APKBUILD
index eb1f88c2fa..eb1f88c2fa 100644
--- a/extra/strace/APKBUILD
+++ b/main/strace/APKBUILD
diff --git a/extra/subversion/APKBUILD b/main/subversion/APKBUILD
index 538f77d0be..538f77d0be 100644
--- a/extra/subversion/APKBUILD
+++ b/main/subversion/APKBUILD
diff --git a/extra/subversion/subversion.pre-install b/main/subversion/subversion.pre-install
index fb516ee5a0..fb516ee5a0 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 b487a40975..b487a40975 100644
--- a/extra/subversion/svnserve.confd
+++ b/main/subversion/svnserve.confd
diff --git a/extra/subversion/svnserve.initd b/main/subversion/svnserve.initd
index 036d0187e7..036d0187e7 100644
--- a/extra/subversion/svnserve.initd
+++ b/main/subversion/svnserve.initd
diff --git a/core/sudo/APKBUILD b/main/sudo/APKBUILD
index 75fd70f3c9..75fd70f3c9 100644
--- a/core/sudo/APKBUILD
+++ b/main/sudo/APKBUILD
diff --git a/extra/sysfsutils/APKBUILD b/main/sysfsutils/APKBUILD
index e462aec705..e462aec705 100644
--- a/extra/sysfsutils/APKBUILD
+++ b/main/sysfsutils/APKBUILD
diff --git a/extra/sysklogd/APKBUILD b/main/sysklogd/APKBUILD
index e3fe8badc5..e3fe8badc5 100644
--- a/extra/sysklogd/APKBUILD
+++ b/main/sysklogd/APKBUILD
diff --git a/extra/sysklogd/LICENSE b/main/sysklogd/LICENSE
index 7e9b5d59c3..7e9b5d59c3 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 40b8817d4e..40b8817d4e 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 ad311a512c..ad311a512c 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 8c3f571f3c..8c3f571f3c 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 6175cdfe78..6175cdfe78 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 c973573911..c973573911 100644
--- a/extra/sysklogd/sysklogd.confd
+++ b/main/sysklogd/sysklogd.confd
diff --git a/extra/sysklogd/sysklogd.initd b/main/sysklogd/sysklogd.initd
index 59db00fc99..59db00fc99 100644
--- a/extra/sysklogd/sysklogd.initd
+++ b/main/sysklogd/sysklogd.initd
diff --git a/extra/sysklogd/sysklogd.logrotate b/main/sysklogd/sysklogd.logrotate
index 29afd15bd4..29afd15bd4 100644
--- a/extra/sysklogd/sysklogd.logrotate
+++ b/main/sysklogd/sysklogd.logrotate
diff --git a/core/syslinux/APKBUILD b/main/syslinux/APKBUILD
index e7036c0f87..e7036c0f87 100644
--- a/core/syslinux/APKBUILD
+++ b/main/syslinux/APKBUILD
diff --git a/core/syslinux/syslinux-3.72-nopie.patch b/main/syslinux/syslinux-3.72-nopie.patch
index 2662d17b43..2662d17b43 100644
--- a/core/syslinux/syslinux-3.72-nopie.patch
+++ b/main/syslinux/syslinux-3.72-nopie.patch
diff --git a/extra/sysstat/APKBUILD b/main/sysstat/APKBUILD
index f9a1408b7f..f9a1408b7f 100644
--- a/extra/sysstat/APKBUILD
+++ b/main/sysstat/APKBUILD
diff --git a/extra/tar/APKBUILD b/main/tar/APKBUILD
index 7e713be6c9..7e713be6c9 100644
--- a/extra/tar/APKBUILD
+++ b/main/tar/APKBUILD
diff --git a/extra/tar/tar.post-deinstall b/main/tar/tar.post-deinstall
index 99b57c4635..99b57c4635 100644
--- a/extra/tar/tar.post-deinstall
+++ b/main/tar/tar.post-deinstall
diff --git a/extra/tcl/APKBUILD b/main/tcl/APKBUILD
index 32a9eff63f..32a9eff63f 100644
--- a/extra/tcl/APKBUILD
+++ b/main/tcl/APKBUILD
diff --git a/extra/tcpdump/APKBUILD b/main/tcpdump/APKBUILD
index ad9f5323f4..ad9f5323f4 100644
--- a/extra/tcpdump/APKBUILD
+++ b/main/tcpdump/APKBUILD
diff --git a/extra/tcpproxy/APKBUILD b/main/tcpproxy/APKBUILD
index fb7d1226d7..a06aacb39a 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 a7fd4292db..a7fd4292db 100644
--- a/extra/tcpproxy/tcpproxy.initd
+++ b/main/tcpproxy/tcpproxy.initd
diff --git a/core/texinfo/APKBUILD b/main/texinfo/APKBUILD
index 27d408059a..a8484bf43b 100644
--- a/core/texinfo/APKBUILD
+++ b/main/texinfo/APKBUILD
@@ -1,10 +1,12 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=texinfo
 pkgver=4.13a
 pkgrel=1
 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file"
 url="http://www.gnu.org/software/texinfo/"
 license='GPL3'
-depends='uclibc ncurses'
+depends=
+makedepends="ncurses-dev"
 source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"
 subpackages="$pkgname-doc"
 
diff --git a/extra/tiff/APKBUILD b/main/tiff/APKBUILD
index c580a84a30..c580a84a30 100644
--- a/extra/tiff/APKBUILD
+++ b/main/tiff/APKBUILD
diff --git a/extra/tinyproxy/APKBUILD b/main/tinyproxy/APKBUILD
index 046daa8307..046daa8307 100644
--- a/extra/tinyproxy/APKBUILD
+++ b/main/tinyproxy/APKBUILD
diff --git a/extra/tinyproxy/tinyproxy.initd b/main/tinyproxy/tinyproxy.initd
index bee5d041fb..bee5d041fb 100644
--- a/extra/tinyproxy/tinyproxy.initd
+++ b/main/tinyproxy/tinyproxy.initd
diff --git a/extra/tinyproxy/tinyproxy.post-install b/main/tinyproxy/tinyproxy.post-install
index ef518c6162..ef518c6162 100755
--- a/extra/tinyproxy/tinyproxy.post-install
+++ b/main/tinyproxy/tinyproxy.post-install
diff --git a/extra/tinyproxy/tinyproxy.pre-install b/main/tinyproxy/tinyproxy.pre-install
index d324b044e3..d324b044e3 100755
--- a/extra/tinyproxy/tinyproxy.pre-install
+++ b/main/tinyproxy/tinyproxy.pre-install
diff --git a/extra/tmux/APKBUILD b/main/tmux/APKBUILD
index 7edc932264..7edc932264 100644
--- a/extra/tmux/APKBUILD
+++ b/main/tmux/APKBUILD
diff --git a/extra/tmux/build.patch b/main/tmux/build.patch
index b16c4f4cab..b16c4f4cab 100644
--- a/extra/tmux/build.patch
+++ b/main/tmux/build.patch
diff --git a/extra/transmission/APKBUILD b/main/transmission/APKBUILD
index 0942c1b2a3..0942c1b2a3 100644
--- a/extra/transmission/APKBUILD
+++ b/main/transmission/APKBUILD
diff --git a/extra/transmission/transmission-daemon.confd b/main/transmission/transmission-daemon.confd
index c1f338f07c..c1f338f07c 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 af9461cc60..af9461cc60 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 44a14760f6..44a14760f6 100644
--- a/extra/transmission/transmission.pre-install
+++ b/main/transmission/transmission.pre-install
diff --git a/core/uclibc++/APKBUILD b/main/uclibc++/APKBUILD
index 98f2d11388..e6545e482f 100644
--- a/core/uclibc++/APKBUILD
+++ b/main/uclibc++/APKBUILD
@@ -5,8 +5,8 @@ pkgrel=3
 pkgdesc="Embedded C++ library"
 url="http://cxx.uclibc.org/"
 license='GPL-2'
-depends="uclibc"
-makedepends="g++"
+depends=
+makedepends=
 subpackages="$pkgname-dev"
 source="http://cxx.uclibc.org/src/uClibc++-$pkgver.tar.bz2
 	associative_base.patch
diff --git a/core/uclibc++/associative_base.patch b/main/uclibc++/associative_base.patch
index 3453c996a4..3453c996a4 100644
--- a/core/uclibc++/associative_base.patch
+++ b/main/uclibc++/associative_base.patch
diff --git a/core/uclibc++/uclibc++-gcc-4.3.patch b/main/uclibc++/uclibc++-gcc-4.3.patch
index 37d45a5d5a..37d45a5d5a 100644
--- a/core/uclibc++/uclibc++-gcc-4.3.patch
+++ b/main/uclibc++/uclibc++-gcc-4.3.patch
diff --git a/core/uclibc++/uclibc++config b/main/uclibc++/uclibc++config
index 181bd4e7cf..181bd4e7cf 100644
--- a/core/uclibc++/uclibc++config
+++ b/main/uclibc++/uclibc++config
diff --git a/core/uclibc/0001-ldd-segfault-fix.patch b/main/uclibc/0001-ldd-segfault-fix.patch
index 4384fa548c..4384fa548c 100644
--- a/core/uclibc/0001-ldd-segfault-fix.patch
+++ b/main/uclibc/0001-ldd-segfault-fix.patch
diff --git a/core/uclibc/0001-linuxthreads-fixes-from-Will-Newton-will.newton-AT-g.patch b/main/uclibc/0001-linuxthreads-fixes-from-Will-Newton-will.newton-AT-g.patch
index 6b54d25f28..6b54d25f28 100644
--- a/core/uclibc/0001-linuxthreads-fixes-from-Will-Newton-will.newton-AT-g.patch
+++ b/main/uclibc/0001-linuxthreads-fixes-from-Will-Newton-will.newton-AT-g.patch
diff --git a/core/uclibc/APKBUILD b/main/uclibc/APKBUILD
index 22914f15a6..22914f15a6 100644
--- a/core/uclibc/APKBUILD
+++ b/main/uclibc/APKBUILD
diff --git a/core/uclibc/ppoll.patch b/main/uclibc/ppoll.patch
index e73733e216..e73733e216 100644
--- a/core/uclibc/ppoll.patch
+++ b/main/uclibc/ppoll.patch
diff --git a/core/uclibc/pthread-new-aliasing-fix.diff b/main/uclibc/pthread-new-aliasing-fix.diff
index 2b2b37723a..2b2b37723a 100644
--- a/core/uclibc/pthread-new-aliasing-fix.diff
+++ b/main/uclibc/pthread-new-aliasing-fix.diff
diff --git a/core/uclibc/uclibc-0.9.30.1-pthread_getattr_np.patch b/main/uclibc/uclibc-0.9.30.1-pthread_getattr_np.patch
index 28469be236..28469be236 100644
--- a/core/uclibc/uclibc-0.9.30.1-pthread_getattr_np.patch
+++ b/main/uclibc/uclibc-0.9.30.1-pthread_getattr_np.patch
diff --git a/core/uclibc/uclibc-0.9.30.1-resolv.patch b/main/uclibc/uclibc-0.9.30.1-resolv.patch
index 55b7d991e1..55b7d991e1 100644
--- a/core/uclibc/uclibc-0.9.30.1-resolv.patch
+++ b/main/uclibc/uclibc-0.9.30.1-resolv.patch
diff --git a/core/uclibc/uclibc-fork-hook.diff b/main/uclibc/uclibc-fork-hook.diff
index 0126918836..0126918836 100644
--- a/core/uclibc/uclibc-fork-hook.diff
+++ b/main/uclibc/uclibc-fork-hook.diff
diff --git a/core/uclibc/uclibc-i386-floating-stacks.diff b/main/uclibc/uclibc-i386-floating-stacks.diff
index 553195e69f..553195e69f 100644
--- a/core/uclibc/uclibc-i386-floating-stacks.diff
+++ b/main/uclibc/uclibc-i386-floating-stacks.diff
diff --git a/core/uclibc/uclibc-resolv-cname-fix.diff b/main/uclibc/uclibc-resolv-cname-fix.diff
index 041e150f35..041e150f35 100644
--- a/core/uclibc/uclibc-resolv-cname-fix.diff
+++ b/main/uclibc/uclibc-resolv-cname-fix.diff
diff --git a/core/uclibc/uclibcconfig b/main/uclibc/uclibcconfig
index 8cc64d90a8..8cc64d90a8 100644
--- a/core/uclibc/uclibcconfig
+++ b/main/uclibc/uclibcconfig
diff --git a/extra/udev/APKBUILD b/main/udev/APKBUILD
index d25b5faa49..d25b5faa49 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 1a0259798b..1a0259798b 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 839565a5ba..839565a5ba 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 96beb845bb..96beb845bb 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 87c3a6ac93..87c3a6ac93 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 26774ab4ac..26774ab4ac 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 8eaea11769..8eaea11769 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 3814bb5656..3814bb5656 100644
--- a/extra/uiconv/APKBUILD
+++ b/main/uiconv/APKBUILD
diff --git a/extra/unarj/APKBUILD b/main/unarj/APKBUILD
index b2e0c72607..b2e0c72607 100644
--- a/extra/unarj/APKBUILD
+++ b/main/unarj/APKBUILD
diff --git a/extra/unfs3/APKBUILD b/main/unfs3/APKBUILD
index 28de301571..28de301571 100644
--- a/extra/unfs3/APKBUILD
+++ b/main/unfs3/APKBUILD
diff --git a/extra/unixodbc/APKBUILD b/main/unixodbc/APKBUILD
index cd72a16537..cd72a16537 100644
--- a/extra/unixodbc/APKBUILD
+++ b/main/unixodbc/APKBUILD
diff --git a/extra/unrar/APKBUILD b/main/unrar/APKBUILD
index 67f33fac05..67f33fac05 100644
--- a/extra/unrar/APKBUILD
+++ b/main/unrar/APKBUILD
diff --git a/extra/usbutils/APKBUILD b/main/usbutils/APKBUILD
index 7dc7905c30..7dc7905c30 100644
--- a/extra/usbutils/APKBUILD
+++ b/main/usbutils/APKBUILD
diff --git a/extra/v86d/APKBUILD b/main/v86d/APKBUILD
index 8bcdcf6181..8bcdcf6181 100644
--- a/extra/v86d/APKBUILD
+++ b/main/v86d/APKBUILD
diff --git a/extra/v86d/modprobe.uvesafb b/main/v86d/modprobe.uvesafb
index 5e46e10883..5e46e10883 100644
--- a/extra/v86d/modprobe.uvesafb
+++ b/main/v86d/modprobe.uvesafb
diff --git a/extra/vala/APKBUILD b/main/vala/APKBUILD
index 1a03977a05..1a03977a05 100644
--- a/extra/vala/APKBUILD
+++ b/main/vala/APKBUILD
diff --git a/extra/valgrind/APKBUILD b/main/valgrind/APKBUILD
index dcba298373..dcba298373 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 db6551996e..db6551996e 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 3dee6bda28..3dee6bda28 100644
--- a/extra/vim/APKBUILD
+++ b/main/vim/APKBUILD
diff --git a/extra/vim/vimrc b/main/vim/vimrc
index e301734245..e301734245 100644
--- a/extra/vim/vimrc
+++ b/main/vim/vimrc
diff --git a/extra/vsftpd/APKBUILD b/main/vsftpd/APKBUILD
index fef929cad6..fef929cad6 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 22161907cd..22161907cd 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 0abb80c6e8..0abb80c6e8 100644
--- a/extra/vsftpd/vsftpd.confd
+++ b/main/vsftpd/vsftpd.confd
diff --git a/extra/vsftpd/vsftpd.initd b/main/vsftpd/vsftpd.initd
index 9e8b124b00..9e8b124b00 100644
--- a/extra/vsftpd/vsftpd.initd
+++ b/main/vsftpd/vsftpd.initd
diff --git a/extra/wget/APKBUILD b/main/wget/APKBUILD
index b6581fa48a..b6581fa48a 100644
--- a/extra/wget/APKBUILD
+++ b/main/wget/APKBUILD
diff --git a/extra/wget/wget.post-deinstall b/main/wget/wget.post-deinstall
index 99b57c4635..99b57c4635 100644
--- a/extra/wget/wget.post-deinstall
+++ b/main/wget/wget.post-deinstall
diff --git a/core/wireless_tools/APKBUILD b/main/wireless_tools/APKBUILD
index fe8c72ef91..fe8c72ef91 100644
--- a/core/wireless_tools/APKBUILD
+++ b/main/wireless_tools/APKBUILD
diff --git a/core/xfsprogs/APKBUILD b/main/xfsprogs/APKBUILD
index 6efce7220e..6efce7220e 100644
--- a/core/xfsprogs/APKBUILD
+++ b/main/xfsprogs/APKBUILD
diff --git a/core/xfsprogs/xfsprogs-3.0.0-gzip.patch b/main/xfsprogs/xfsprogs-3.0.0-gzip.patch
index 40f80023d4..40f80023d4 100644
--- a/core/xfsprogs/xfsprogs-3.0.0-gzip.patch
+++ b/main/xfsprogs/xfsprogs-3.0.0-gzip.patch
diff --git a/core/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD
index 59521d59c7..59521d59c7 100644
--- a/core/xtables-addons-grsec/APKBUILD
+++ b/main/xtables-addons-grsec/APKBUILD
diff --git a/core/xtables-addons/APKBUILD b/main/xtables-addons/APKBUILD
index febbcdd72e..febbcdd72e 100644
--- a/core/xtables-addons/APKBUILD
+++ b/main/xtables-addons/APKBUILD
diff --git a/extra/xvidcore/APKBUILD b/main/xvidcore/APKBUILD
index 64858bf8df..64858bf8df 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 5ddad23b95..5ddad23b95 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 d85fb117b0..d85fb117b0 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 14a8821b04..14a8821b04 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 4998c35b76..4998c35b76 100644
--- a/extra/zip/APKBUILD
+++ b/main/zip/APKBUILD
diff --git a/core/zlib/APKBUILD b/main/zlib/APKBUILD
index f497f2c114..f497f2c114 100644
--- a/core/zlib/APKBUILD
+++ b/main/zlib/APKBUILD
diff --git a/extra/zonenotify/APKBUILD b/main/zonenotify/APKBUILD
index 9709eba4ee..9709eba4ee 100644
--- a/extra/zonenotify/APKBUILD
+++ b/main/zonenotify/APKBUILD
diff --git a/core/util-vserver/APKBUILD b/testing/util-vserver/APKBUILD
index dbce95df84..dbce95df84 100644
--- a/core/util-vserver/APKBUILD
+++ b/testing/util-vserver/APKBUILD
diff --git a/core/util-vserver/util-vserver-0.30.215-touch-t.patch b/testing/util-vserver/util-vserver-0.30.215-touch-t.patch
index 237f4a97ee..237f4a97ee 100644
--- a/core/util-vserver/util-vserver-0.30.215-touch-t.patch
+++ b/testing/util-vserver/util-vserver-0.30.215-touch-t.patch