8 files changed, 75 insertions, 70 deletions
diff --git a/main/arpon/APKBUILD b/main/arpon/APKBUILD
index 169d51492..c04a8db09 100644
--- a/main/arpon/APKBUILD
+++ b/main/arpon/APKBUILD
@@ -6,18 +6,17 @@ pkgrel=0
 pkgdesc="Arp handler inspectiON is a handler daemon with tools to handle all ARP aspects"
 url="http://arpon.sourceforge.net/"
 arch="all"
-license="GPL"
+license="BSD"
 depends=""
 makedepends="libdnet-dev libpcap-dev libnet-dev cmake"
-install=
+install=""
 subpackages="$pkgname-doc"
 source="http://arpon.sourceforge.net/tarball/ArpON-$pkgver.tar.gz
-	arpon.initd
-	arpon.confd
-	"
+		arpon.initd
+		arpon.confd
+		"
 
 _builddir="$srcdir"/ArpON-$pkgver/build
-
 prepare() {
 	mkdir -p "$_builddir"
 	cd "$_builddir"
@@ -31,7 +30,7 @@ build() {
 
 package() {
 	cd "$_builddir"
-	make install DESTDIR="$pkgdir"
+	make install DESTDIR="$pkgdir" || return 1
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
diff --git a/main/collectd/APKBUILD b/main/collectd/APKBUILD
index d77563209..ac9de77ca 100644
--- a/main/collectd/APKBUILD
+++ b/main/collectd/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=collectd
-pkgver=5.2.0
+pkgver=5.2.1
 pkgrel=0
 pkgdesc="The system statistics collection daemon"
 url="http://collectd.org"
 arch="all"
-license="GPL"
+license="GPL2"
 depends=
 makedepends="pkgconfig curl-dev net-snmp-dev postgresql-dev perl-dev
 	libgcrypt-dev mysql-dev zlib-dev openssl-dev iptables-dev rrdtool-dev"
@@ -90,5 +90,9 @@ mysql()		{ _plugin mysql; }
 network()	{ _plugin network; }
 rrdtool()	{ _plugin rrdtool; }
 
-md5sums="d8544f3881937c21ab3409dd3f6449f4  collectd-5.2.0.tar.bz2
+md5sums="350934cfea62d37e10191816744f0eb7  collectd-5.2.1.tar.bz2
 13a36ae2f92634b5619ab94224e1b77d  collectd.initd"
+sha256sums="d82a5c302d2cfa0c3f7a3c7b7e37fb3faf42b17d2addae036cb819b6b25b9d98  collectd-5.2.1.tar.bz2
+418d43a5ab08a8097dd2ac5c1e839df64032e96c295f89fa3b8df08a08c3dc35  collectd.initd"
+sha512sums="f97c9367ed45dc01f187ee8ec2cfdb27e26380b1369383c4d2b5569fc13ec660ffaf074a4b2929c1fb6633ad97aef87ef2fe2a633da5527bb26703f8ca625736  collectd-5.2.1.tar.bz2
+fd3ba6914d1e95f255f43165f7d38405736799037d08300378678fa3a9c628b14b6a867d8e0367798cd488105547ef8eca4bef7e4b7de1814a12aa0072e4cbee  collectd.initd"
diff --git a/main/dosfstools/APKBUILD b/main/dosfstools/APKBUILD
index 817359b44..31779a00f 100644
--- a/main/dosfstools/APKBUILD
+++ b/main/dosfstools/APKBUILD
@@ -1,28 +1,30 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dosfstools
-pkgver=3.0.15
+pkgver=3.0.16
 pkgrel=0
 pkgdesc="DOS filesystem utilities"
 url="http://www.daniel-baumann.ch/software/dosfstools/"
 arch="all"
-license="GPL-2"
-depends=
+license="GPL3+"
+depends=""
 makedepends="libiconv-dev"
 subpackages="$pkgname-doc"
-source="http://ftp.de.debian.org/debian/pool/main/d/$pkgname/${pkgname}_${pkgver}.orig.tar.xz"
+source="http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.orig.tar.xz"
 
+_builddir="$srcdir"/$pkgname-$pkgver
 build() { 
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make OPTFLAGS="$CFLAGS" LDFLAGS="-liconv $LDFLAGS" || return 1
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make PREFIX="$pkgdir" \
 		MANDIR="$pkgdir"/usr/share/man \
 		DOCDIR="$pkgdir"/usr/share/doc \
-		install
+		install  || return 1
 }
-md5sums="64d2020bd8e92105dfad30feee72a3ec  dosfstools_3.0.15.orig.tar.xz"
-sha256sums="bbbeabd630f20c9d10592b2cc974926b15e8e010e29d49f308d5464528e2dfc1  dosfstools_3.0.15.orig.tar.xz"
-sha512sums="3b18601cfbea254c2f650f1b65caf08d4bcc8a08c6812802898afed93e70652f7cd2d93a5e83d836ffe2f5563b5c067c784dddd7fdd643879143a3c7d00e296d  dosfstools_3.0.15.orig.tar.xz"
+
+md5sums="27aca18aeb8bb0851ccaeb47e7416a6e  dosfstools-3.0.16.orig.tar.xz"
+sha256sums="450b422d89a305bcca76b1af076c51944a5cc0f1707727ee8ef64e969dd4e956  dosfstools-3.0.16.orig.tar.xz"
+sha512sums="09bf955e1c693addad5991dbf18ef3ac39ea194585397a80a1f39c3d5d87e2af6f4ed4775f2c78986bce9a853c89ff1e6fccccf096764282edf7df4c5f188b70  dosfstools-3.0.16.orig.tar.xz"
diff --git a/main/py-configshell/APKBUILD b/main/py-configshell/APKBUILD
index 299357e2e..e504979c7 100644
--- a/main/py-configshell/APKBUILD
+++ b/main/py-configshell/APKBUILD
@@ -1,42 +1,22 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=py-configshell
 _realname=configshell
-pkgver=1.1_p4
+pkgver=1.1_p7
 _ver=${pkgver/_rc/rc}
 _ver=${_ver/_p/.fb}
-pkgrel=2
+pkgrel=0
 pkgdesc="Python library that provides a framework for building simple but nice CLI-based applications"
 url="https://github.com/agrover/configshell-fb"
 arch="noarch"
-license="AGPLv3"
+license="AGPL3"
 depends="python"
 depends_dev="python-dev py-simpleparse py-urwid"
 makedepends="$depends_dev"
 install=""
-subpackages=
-source="http://dev.alpinelinux.org/archive/configshell/$_realname-$_ver.tar.gz"
-
-_giturl="https://github.com/agrover/configshell-fb"
-_gittag=v$_ver
-
-_builddir="$srcdir"/$_realname
-
-snapshot() {
-	mkdir -p "$srcdir"
-	cd "${SRCDEST:-$srcdir}"
-	if ! [ -d $_realname-fb.git ]; then
-		git clone --bare  $_giturl || return 1
-		cd $_realname-fb.git
-	else
-		cd $_realname-fb.git
-		git fetch || return 1
-	fi
-	
-	git archive --prefix=$_realname/ -o "$SRCDEST"/$_realname-$_ver.tar.gz $_gittag
-	scp "$SRCDEST"/$_realname-$_ver.tar.gz dev.alpinelinux.org:/archive/$_realname/
-}
-
+subpackages=""
+source="https://github.com/agrover/configshell-fb/archive/v$_ver.tar.gz"
 
+_builddir="$srcdir"/$_realname-fb-$_ver
 prepare() {
 	local i
 	cd "$_builddir"
@@ -49,12 +29,14 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	python setup.py build
+	python setup.py build || return 1
 }
 
 package() {
 	cd "$_builddir"
-	python setup.py install --skip-build --root="$pkgdir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="69abc1134f16a14d481518a5378cf1b1  configshell-1.1.fb4.tar.gz"
+md5sums="c14768baf1216f2ce272d7a9e261909c  v1.1.fb7.tar.gz"
+sha256sums="ab5576b7c4ff91390aea0b1edb7de5eada209da054022a10e8eab71252e2dc55  v1.1.fb7.tar.gz"
+sha512sums="1fa8eed68c3bfa261dcb1ad7d724844bf1845f11fe8fa1587972e2cd6aa91750504e3438cc9b349c382b590bfe54e1ffbc616aa76927e32c4651123f6f756e37  v1.1.fb7.tar.gz"
diff --git a/main/py-irc/APKBUILD b/main/py-irc/APKBUILD
index d94a16b33..ff68a9684 100644
--- a/main/py-irc/APKBUILD
+++ b/main/py-irc/APKBUILD
@@ -1,20 +1,21 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=py-irc
-pkgver=3.0.1
+_pkgname=irc
+pkgver=8.0.1
 pkgrel=0
-pkgdesc="python irc client library"
+pkgdesc="A python irc client library"
 url="http://python-irclib.sourceforge.net/"
 arch="noarch"
-license="LGPL"
+license="LGPL2+"
 depends=""
 depends_dev="python"
-makedepends="$depends_dev py-hgtools"
+makedepends="$depends_dev py-hgtools py-setuptools"
 install=""
-subpackages=""
-source="http://pypi.python.org/packages/source/i/irc/irc-${pkgver}.zip"
+subpackages="$pkgname-scripts"
+source="http://pypi.python.org/packages/source/i/irc/$_pkgname-${pkgver}.zip"
 
-_builddir="$srcdir"/irc-$pkgver
+_builddir="$srcdir"/$_pkgname-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
@@ -35,4 +36,15 @@ package() {
 	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="d69203c3d92867a99d669339f0ec87cb  irc-3.0.1.zip"
+scripts() {
+	_files="dccreceive.py dccsend.py irccat.py irccat2.py \
+			servermap.py testbot.py"
+	for _file in $_files; do
+		install -Dm644 "$_builddir"/scripts/$_file \
+			"$subpkgdir"/usr/share/doc/"$pkgname"/scripts/$_file || return 1
+	done
+}
+
+md5sums="0d4073d11845cac2d9eef60505f3c5fc  irc-8.0.1.zip"
+sha256sums="d7b0703f8fd94d67eac8136e4f8d8a4975b24f492766ba4372256932f44caf19  irc-8.0.1.zip"
+sha512sums="6df02af77f0f7580f7ca1af273a46fe546c5c0aa55b75e2a689994f4547e6eed54c121e7d38b301f7874c98affe13a32bd5ff27401b9de90b02291a4e703c85c  irc-8.0.1.zip"
diff --git a/main/py-yaml/APKBUILD b/main/py-yaml/APKBUILD
index d9cb46889..5c8151418 100644
--- a/main/py-yaml/APKBUILD
+++ b/main/py-yaml/APKBUILD
@@ -8,14 +8,14 @@ pkgdesc="Python bindings for YAML"
 url="http://pyyaml.org"
 arch="all"
 license="MIT"
-depends=
-depends_dev=
+depends=""
+depends_dev=""
 makedepends="yaml-dev python-dev"
 install=""
 subpackages=""
 source="http://pyyaml.org/download/pyyaml/$_pkgname-$pkgver.tar.gz"
-_builddir="$srcdir"/$_pkgname-$pkgver
 
+_builddir="$srcdir"/$_pkgname-$pkgver
 build() {
 	cd "$_builddir"
 	python setup.py build || return 1
@@ -27,3 +27,5 @@ package() {
 }
 
 md5sums="74c94a383886519e9e7b3dd1ee540247  PyYAML-3.10.tar.gz"
+sha256sums="e713da45c96ca53a3a8b48140d4120374db622df16ab71759c9ceb5b8d46fe7c  PyYAML-3.10.tar.gz"
+sha512sums="57536fd9e5515916189c37487e0da583c8e9f79dd52dedb18342f65aefb6c063c4f141326ae7b49411d0cfdfd493bb0516f5c53737c76a69c7050a74a2834a33  PyYAML-3.10.tar.gz"
diff --git a/main/wget/APKBUILD b/main/wget/APKBUILD
index 4f950cd64..072352fd8 100644
--- a/main/wget/APKBUILD
+++ b/main/wget/APKBUILD
@@ -6,28 +6,32 @@ pkgrel=0
 pkgdesc="A network utility to retrieve files from the Web"
 url="http://www.gnu.org/software/wget/wget.html"
 arch="all"
-license="GPL3"
-depends=
+license="GPL3+"
+depends=""
 makedepends="openssl-dev"
 subpackages="$pkgname-doc"
 install="wget.post-deinstall"
 source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
 
+_builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	./configure --prefix=/usr \
+	cd "$_builddir"
+	./configure \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--with-ssl=openssl \
-		--disable-nls
+		--disable-nls \
+		|| return 1
 	make || return 1
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
 }
 
 md5sums="12edc291dba8127f2e9696e69f36299e  wget-1.14.tar.gz"
+sha256sums="f3a6898e3a765bb94435b04a6668db9e5d19b3e90e0c69a503a2773ae936c269  wget-1.14.tar.gz"
+sha512sums="e01291318b44ee1022e39589933411c453372e8026b1641dd7caa1adb132c94bdcf6f6ff291f4b6dc2b46eb0e48c80c60231cd86247db17954ee73053422cb27  wget-1.14.tar.gz"
diff --git a/main/wipe/APKBUILD b/main/wipe/APKBUILD
index ac59ea345..68163531c 100644
--- a/main/wipe/APKBUILD
+++ b/main/wipe/APKBUILD
@@ -3,10 +3,10 @@
 pkgname=wipe
 pkgver=0.22
 pkgrel=0
-pkgdesc="tool for securely erasing files from magnetic media"
+pkgdesc="A tool for securely erasing files from magnetic media"
 url="http://lambda-diode.com/software/wipe/"
 arch="all"
-license="GPL"
+license="GPL2"
 depends=""
 depends_dev=""
 makedepends="$depends_dev"