Merge git://git.alpinelinux.org/fab/aports

<fabian_a> there are some updates and a new aport

12 files changed, 95 insertions, 47 deletions

diff --git a/main/halberd/APKBUILD b/main/halberd/APKBUILD
index b12213b2b..433ecc123 100644
--- a/main/halberd/APKBUILD
+++ b/main/halberd/APKBUILD
@@ -13,7 +13,7 @@ makedepends="python-dev"
 install=""
 subpackages="$pkgname-doc"
 source="http://$pkgname.superadditive.com/dist/$pkgname-$pkgver.tar.gz
-		$pkgname-sslwrap.patch"
+	$pkgname-sslwrap.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
@@ -33,9 +33,9 @@ package() {
 }
 
 doc() {
-    # The man page is not picked-up automatically
+	# The man page is not picked-up automatically
 	mkdir -p "$subpkgdir"/usr/share/man || return 1
-    mv "$_builddir"/man/man* "$subpkgdir"/usr/share/man/ || return 1
+	mv "$_builddir"/man/man* "$subpkgdir"/usr/share/man/ || return 1
 }
 
 md5sums="d60d0fba8f379ea72c623ad1dd6052c3  halberd-0.2.4.tar.gz
diff --git a/main/htop/APKBUILD b/main/htop/APKBUILD
index 93ff982c1..ac4a843b5 100644
--- a/main/htop/APKBUILD
+++ b/main/htop/APKBUILD
@@ -1,27 +1,29 @@
-# Maintainer:Carlo Landmeter
+# Maintainer: Carlo Landmeter <clandmeter@gmail.com> 
 pkgname=htop
 pkgver=1.0.2
 pkgrel=0
-pkgdesc="An interactive process viewer for Linux"
+pkgdesc="An interactive process viewer"
 url="http://htop.sourceforge.net"
 arch="all"
-license='GPL'
-depends=
+license="GPL2"
+depends=""
 makedepends="ncurses-dev"
-source="http://surfnet.dl.sourceforge.net/sourceforge/htop/$pkgname-$pkgver.tar.gz"
-
 subpackages="$pkgname-doc"
+source="http://surfnet.dl.sourceforge.net/sourceforge/htop/$pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr --mandir=/usr/share/man
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
 	make || return 1
 }
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install || return 1
 }
 
 md5sums="0d01cca8df3349c74569cefebbd9919e  htop-1.0.2.tar.gz"
diff --git a/main/perl-net-cidr/APKBUILD b/main/perl-net-cidr/APKBUILD
index 1304a2746..cd01f8a3b 100644
--- a/main/perl-net-cidr/APKBUILD
+++ b/main/perl-net-cidr/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-net-cidr
-pkgver=0.14
+pkgver=0.17
 pkgrel=0
 pkgdesc="Manipulate IPv4/IPv6 netblocks in CIDR notation"
 url="http://search.cpan.org/dist/Net-CIDR/"
@@ -11,7 +11,7 @@ depends="perl"
 makedepends="perl-dev"
 install=""
 subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/M/MR/MRSAM/testing/Net-CIDR-$pkgver.tar.gz"
+source="http://search.cpan.org/CPAN/authors/id/M/MR/MRSAM/Net-CIDR-$pkgver.tar.gz"
 
 _builddir="$srcdir"/Net-CIDR-$pkgver
 prepare() {
@@ -36,4 +36,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="52081c62fe551a205127025c09698ec5  Net-CIDR-0.14.tar.gz"
+md5sums="c4632887a13663c7ba769bd6ba1b3c26  Net-CIDR-0.17.tar.gz"
diff --git a/main/perl-net-dns/APKBUILD b/main/perl-net-dns/APKBUILD
index 0f252655d..0ce69e6b0 100644
--- a/main/perl-net-dns/APKBUILD
+++ b/main/perl-net-dns/APKBUILD
@@ -3,16 +3,17 @@
 pkgname=perl-net-dns
 _realname=Net-DNS
 pkgver=0.72
-pkgrel=1
+pkgrel=0
 pkgdesc="Perl interface to the DNS resolver"
-url="http://search.cpan.org/~olaf/Net-DNS-0.66"
+url="http://www.net-dns.org/"
 arch="all"
-license="unknown"
+license="GPL+ or Artistic"
 depends="perl"
 makedepends="perl-dev"
-install=
+install=""
 subpackages="$pkgname-doc"
 source="http://www.cpan.org/authors/id/N/NL/NLNETLABS/${_realname}-$pkgver.tar.gz"
+source="http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/$_realname-$pkgver.tar.gz"
 
 _builddir="$srcdir/$_realname-$pkgver"
 build() {
diff --git a/main/perl-netaddr-ip/APKBUILD b/main/perl-netaddr-ip/APKBUILD
index cc10000bc..fd7adcaa2 100644
--- a/main/perl-netaddr-ip/APKBUILD
+++ b/main/perl-netaddr-ip/APKBUILD
@@ -2,20 +2,19 @@
 # Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-netaddr-ip
 _realname=NetAddr-IP
-pkgver=4.065
+pkgver=4.066
 pkgrel=0
 pkgdesc="Perl extension for managing IPv4 and IPv6 addresses and subnets"
 url="http://search.cpan.org/~miker/NetAddr-IP-$pkgver/"
 arch="all"
-license="Unknown"
+license="GPL2 and Artistic"
 depends="perl"
 makedepends="perl-dev"
-install=
+install=""
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/$_realname-$pkgver.tar.gz"
 
 _builddir="$srcdir/$_realname-$pkgver"
-
 prepare() {
 	return 0
 }
@@ -33,4 +32,4 @@ package() {
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-md5sums="f4efa7e90820ecf7ce2b3d9144f2568f  NetAddr-IP-4.065.tar.gz"
+md5sums="7c6cf77d3c02fa0baf77b6a97f2a670a  NetAddr-IP-4.066.tar.gz"
diff --git a/main/ruby-json/APKBUILD b/main/ruby-json/APKBUILD
index de8bbf046..ada4e4ce9 100644
--- a/main/ruby-json/APKBUILD
+++ b/main/ruby-json/APKBUILD
@@ -8,13 +8,13 @@ url="http://json-jruby.rubyforge.org/"
 arch="all"
 license="MIT"
 depends="ruby"
-depends_dev=
+depends_dev=""
 makedepends="$depends_dev ruby-gems ruby-dev"
 install=""
 subpackages=""
 source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem"
 
-_builddir="$srcdir"/$_realname-$pkgver
+_builddir="$srcdir"/$_gemname-$pkgver
 build() {
 	return 0
 }
diff --git a/testing/cmus/APKBUILD b/testing/cmus/APKBUILD
index 1507e0a08..955733d56 100644
--- a/testing/cmus/APKBUILD
+++ b/testing/cmus/APKBUILD
@@ -1,26 +1,28 @@
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-
+# Maintainer: 
 pkgname=cmus
-pkgver=2.4.3
+pkgver=2.5.0
 pkgrel=0
-pkgdesc='A very feature-rich ncurses-based music player'
-url='http://cmus.sourceforge.net/'
-license='GPL'
-arch='all'
-makedepends='alsa-lib-dev faad2-dev flac-dev libiconv-dev libmad-dev libogg-dev libvorbis-dev ncurses-dev wavpack-dev'
+pkgdesc="A very feature-rich ncurses-based music player"
+url="http://cmus.sourceforge.net/"
+license="GPL2+"
+arch="all"
+makedepends="alsa-lib-dev faad2-dev flac-dev libiconv-dev libmad-dev
+             libogg-dev libvorbis-dev ncurses-dev wavpack-dev"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2"
 
+_builddir="$srcdir"/$pkgname-v$pkgver
 build() {
-    LDFLAGS="$LDFLAGS -liconv"
-    cd "$srcdir"/$pkgname-v$pkgver
-    CC=gcc ./configure prefix=/usr
-    make
+	cd "$_builddir"
+	LDFLAGS="$LDFLAGS -liconv"
+	CC=gcc ./configure prefix=/usr || return 1
+	make || return 1
 }
 
 package() {
-    cd "$srcdir"/$pkgname-v$pkgver
-    make DESTDIR="$pkgdir" install
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="75452cf007637214c4ab5444e076114b  cmus-v2.4.3.tar.bz2"
+md5sums="9af16d324060447996ed25e1a9c1c7d8  cmus-v2.5.0.tar.bz2"
diff --git a/testing/dnstop/APKBUILD b/testing/dnstop/APKBUILD
new file mode 100644
index 000000000..eb9d8b904
--- /dev/null
+++ b/testing/dnstop/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+pkgname=dnstop
+pkgver=20121017
+pkgrel=0
+pkgdesc="A DNS traffic capture utility"
+url="http://dns.measurement-factory.com/tools/dnstop/"
+arch="all"
+license="BSD"
+depends=""
+depends_dev=""
+makedepends="libpcap-dev ncurses-dev"
+install=""
+subpackages="$pkgname-doc"
+source="http://dns.measurement-factory.com/tools/dnstop/src/$pkgname-$pkgver.tar.gz"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	mkdir -p "$pkgdir"/usr/bin "$pkgdir"/usr/share/man/man8
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="0407f08e5788b59268048d00cdddd5b6  dnstop-20121017.tar.gz"
diff --git a/testing/mbuffer/APKBUILD b/testing/mbuffer/APKBUILD
index be1584abc..068021a03 100644
--- a/testing/mbuffer/APKBUILD
+++ b/testing/mbuffer/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=mbuffer
-pkgver=20120505
+pkgver=20121111
 pkgrel=0
 pkgdesc="Measuring Buffer is an enhanced version of buffer"
 url="http://www.maier-komor.de/mbuffer.html"
@@ -42,4 +42,4 @@ package() {
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="f7fec4cb7525fd403a09a263b9c84934  mbuffer-20120505.tgz"
+md5sums="c5ff2276797bffca68a7510fa20c9f41  mbuffer-20121111.tgz"
diff --git a/testing/py-dulwich/APKBUILD b/testing/py-dulwich/APKBUILD
index 7d09c23b9..71bc25ae9 100644
--- a/testing/py-dulwich/APKBUILD
+++ b/testing/py-dulwich/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py-dulwich
 _pkgname=dulwich
-pkgver=0.8.5
+pkgver=0.8.7
 pkgrel=0
 pkgdesc="A python implementation of the Git file formats and protocols"
 url="http://www.samba.org/~jelmer/dulwich/"
@@ -27,4 +27,4 @@ package() {
 	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="544724f9ac9fe6f9865526917ad284d9  dulwich-0.8.5.tar.gz"
+md5sums="60d8b8e974970f2c3cbae5dc9fe0f645  dulwich-0.8.7.tar.gz"
diff --git a/testing/rpm/APKBUILD b/testing/rpm/APKBUILD
index eb8697a8c..d41bb7705 100644
--- a/testing/rpm/APKBUILD
+++ b/testing/rpm/APKBUILD
@@ -3,10 +3,10 @@
 pkgname=rpm
 pkgver=4.10.2
 pkgrel=0
-pkgdesc="the RPM package manager"
+pkgdesc="The RPM package manager"
 url="http://www.rpm.org/"
 arch="all"
-license="GPL"
+license="GPL2 LGPL2+"
 depends=""
 depends_dev="nspr-dev nss-dev db-dev lua-dev zlib-dev bzip2-dev xz-dev libelf-dev file-dev popt-dev
 	     libcap-dev acl-dev"
diff --git a/testing/sipvicious/APKBUILD b/testing/sipvicious/APKBUILD
index 87b08988a..55fdbb85b 100644
--- a/testing/sipvicious/APKBUILD
+++ b/testing/sipvicious/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=sipvicious
-pkgver=0.2.7
+pkgver=0.2.8
 pkgrel=0
 pkgdesc="Tools for auditing SIP based VoIP systems"
 url="http://code.google.com/p/sipvicious/"
@@ -31,4 +31,4 @@ package() {
 	done
 }
 
-md5sums="a30c9865d3eac5518d5fd9ced25424f1  sipvicious-0.2.7.tar.gz"
+md5sums="5893b53ff97b89a06383ff6a78b62f36  sipvicious-0.2.8.tar.gz"