Merge branch 'master' of git://git.alpinelinux.org/aports

8 files changed, 54 insertions, 29 deletions

diff --git a/main/cdrkit/APKBUILD b/main/cdrkit/APKBUILD
index a5ca8d77..929f06fa 100644
--- a/main/cdrkit/APKBUILD
+++ b/main/cdrkit/APKBUILD
@@ -1,19 +1,22 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cdrkit
-pkgver=1.1.9
-pkgrel=1
+pkgver=1.1.10
+pkgrel=0
 pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction"
 url="http://cdrkit.org/"
 license="GPL2"
-depends="libcap file bzip2 zlib"
+depends="file bzip2"
 makedepends="cmake libcap-dev bzip2-dev zlib-dev"
 source="http://$pkgname.org/releases/$pkgname-$pkgver.tar.gz"
 subpackages="$pkgname-doc"
 
-build () 
-{ 
+build() {
 	cd "$srcdir/cdrkit-$pkgver"
 	make || return 1
+}
+
+package() {
+	cd "$srcdir/cdrkit-$pkgver"
 	make PREFIX="$pkgdir/usr" install || return 1
 	cd "$pkgdir/usr/bin"
 	ln -s wodim cdrecord || return 1
@@ -28,4 +31,4 @@ build ()
 	ln -s genisoimage.1 mkhybrid.1 || return 1
 	ln -s icedax.1 cdda2wav.1 || return 1
 }
-md5sums="cbc0647e5d85f0e8fb3a692ba1d42edd  cdrkit-1.1.9.tar.gz"
+md5sums="3c25505d567113c269dc6e71640646d8  cdrkit-1.1.10.tar.gz"
diff --git a/main/db/APKBUILD b/main/db/APKBUILD
index 60144820..926b9713 100644
--- a/main/db/APKBUILD
+++ b/main/db/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=db
-pkgver=4.8.24
+pkgver=4.8.26
 _ver=${pkgver}
 pkgrel=0
 pkgdesc="The Berkeley DB embedded database system 4.8"
@@ -43,4 +43,4 @@ package() {
 		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-md5sums="147afdecf438ff99ade105a5272db158  db-4.8.24.tar.gz"
+md5sums="3476bac9ec0f3c40729c8a404151d5e3  db-4.8.26.tar.gz"
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index b7b92fa3..4aceb88b 100644
--- a/main/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dhcpcd
-pkgver=5.1.3
+pkgver=5.1.4
 pkgrel=0
 pkgdesc="RFC2131 compliant DHCP client"
 url="http://roy.marples.name/projects/dhcpcd/"
@@ -25,4 +25,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="f852090ad221b6331478f50fc1aa539e  dhcpcd-5.1.3.tar.bz2"
+md5sums="d18afc66efbea9a28e541e9b10fd284f  dhcpcd-5.1.4.tar.bz2"
diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
index a9871f34..22b0f8dc 100644
--- a/main/imagemagick/APKBUILD
+++ b/main/imagemagick/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=imagemagick
 pkgver=6.5.8.5
 _pkgver=${pkgver%.*}-${pkgver##*.}
-pkgrel=0
+pkgrel=1
 pkgdesc="A collection of tools and libraries for many image formats"
 url="http://www.imagemagick.org/"
 license="GPL"
@@ -33,7 +33,15 @@ build() {
 package() {
 	cd "$srcdir/ImageMagick-${_pkgver}"
 	make -j1 DESTDIR="$pkgdir" install
+	find "$pkgdir" -name '.packlist' -o -name 'perllocal.pod' -delete
+}
 
+dev() {
+	default_dev
+	mv "$subpkgdir"/usr/lib/ImageMagick-6.5.8/modules-Q16/coders/*.la \
+		"$pkgdir"/usr/lib/ImageMagick-6.5.8/modules-Q16/coders/
+	mv "$subpkgdir"/usr/lib/ImageMagick-6.5.8/modules-Q16/filters/*.la \
+		"$pkgdir"/usr/lib/ImageMagick-6.5.8/modules-Q16/filters/
 }
 
 md5sums="a710357778c9b0d68ffab3f300564399  ImageMagick-6.5.8-5.tar.gz"
diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD
index 821d304e..c031ed9c 100644
--- a/main/iproute2/APKBUILD
+++ b/main/iproute2/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=iproute2
-pkgver=2.6.29.1
-_realver=2.6.29-1
+pkgver=2.6.31
+_realver=2.6.31
 pkgrel=0
 pkgdesc="IP Routing Utilities"
 url="http://www.linux-foundation.org/en/Net:Iproute2"
@@ -10,20 +10,25 @@ depends=
 install="$pkgname.post-install $pkgname.post-deinstall"
 makedepends="bison flex bash"
 subpackages="$pkgname-doc"
-source="http://devresources.linux-foundation.org/dev/iproute2/download/$pkgname-$_realver.tar.bz2
-	$install"
+source="http://devresources.linux-foundation.org/dev/iproute2/download/$pkgname-$_realver.tar.bz2"
 
-build() {
+prepare() {
 	cd "$srcdir"/$pkgname-$_realver
 
 	sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
 	sed -i 's:/usr/local:/usr:' tc/m_ipt.c include/iptables.h || return 1
 	sed -i 's:=/share:=/usr/share:' Makefile || return 1
+}
 
+build() {
+	cd "$srcdir"/$pkgname-$_realver
 	./configure || return 1
 	make CCOPTS="-D_GNU_SOURCE $CFLAGS" LIBDIR=/lib || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$_realver
 	make -j1 DESTDIR="$pkgdir" install
 }
-md5sums="c1bc258a6c345905e79935ac7a3cc582  iproute2-2.6.29-1.tar.bz2
-da1571ff1c0241c5c7f333a48d908927  iproute2.post-install
-ed8271a16ef48a769c50c3b529411018  iproute2.post-deinstall"
+
+md5sums="230f35282a95451622f3e8394f9cd80a  iproute2-2.6.31.tar.bz2"
diff --git a/main/mercurial/APKBUILD b/main/mercurial/APKBUILD
index 0201df62..2023455f 100644
--- a/main/mercurial/APKBUILD
+++ b/main/mercurial/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mercurial
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=0
 pkgdesc="A scalable distributed SCM tool"
 url="http://www.selenic.com/mercurial"
@@ -10,7 +10,12 @@ makedepends="python-dev"
 subpackages="$pkgname-doc"
 source="http://www.selenic.com/$pkgname/release/$pkgname-$pkgver.tar.gz"
 
-build() { 
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+	python setup.py build
+}
+
+package() { 
 	cd "$srcdir"/$pkgname-$pkgver
 	python setup.py install --root="$pkgdir" || return 1
 	install -d "$pkgdir"/usr/share/man/man1 "$pkgdir"/usr/share/man/man5
@@ -24,4 +29,4 @@ build() {
 	install -Dm644 contrib/vim/HGAnnotate.vim \
 		"${vimpath}/syntax/HGAnnotate.vim" || return 1
 }
-md5sums="eacffecad59ec145e61a1edf332b3f1f  mercurial-1.4.1.tar.gz"
+md5sums="cf23b0887f0437c8601d5b89ae4663a6  mercurial-1.4.2.tar.gz"
diff --git a/main/mpd/APKBUILD b/main/mpd/APKBUILD
index 461f3475..eb2a76df 100644
--- a/main/mpd/APKBUILD
+++ b/main/mpd/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Sebastian Wicki <gandro@gmx.net>
 # Maintainer: Natanael Copa <natanael.copa@gmail.com>
 pkgname=mpd
-pkgver=0.15.6
+pkgver=0.15.7
 pkgrel=0
 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
 url="http://musicpd.org"
@@ -21,12 +21,15 @@ source="http://downloads.sourceforge.net/project/musicpd/mpd/${pkgver}/mpd-${pkg
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install
 
 	#provide a config that works by default
@@ -44,6 +47,6 @@ build() {
 		"$pkgdir"/var/lib/mpd/playlists \
 		"$pkgdir"/var/lib/mpd/music
 }
-md5sums="e0b7a11f86f8f021a92c49a96032ff39  mpd-0.15.6.tar.bz2
+md5sums="ecec7f0bdfe8024cc4daa53e4cc476a4  mpd-0.15.7.tar.bz2
 31d1515232d688d610d1664a0fb2a6a0  mpd.initd
 dbd301041953a5cf9c2b9de8f23eb6bb  mpd.confd"
diff --git a/main/patch/APKBUILD b/main/patch/APKBUILD
index 699bd08a..7090ee48 100644
--- a/main/patch/APKBUILD
+++ b/main/patch/APKBUILD
@@ -1,24 +1,25 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=patch
-pkgver=2.6
+pkgver=2.6.1
 pkgrel=0
 pkgdesc="Utility to apply diffs to files"
 url="http://www.gnu.org/software/patch/patch.html"
 license='GPL'
 depends=
 source="ftp://ftp.gnu.org/gnu/patch/patch-2.6.tar.bz2"
-
 subpackages="$pkgname-doc"
 
+_builddir="$srcdir"/$pkgname-2.6
+
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man
 	make || return 1
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make prefix="$pkgdir"/usr mandir="$pkgdir"/usr/share/man install
 }