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

<fabian_a> there are some updates and a new aport

6 files changed, 27 insertions, 25 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
 }