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

6 files changed, 30 insertions, 60 deletions

diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index d9aaf42f..c8b04b37 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dovecot
-pkgver=1.2.8
+pkgver=1.2.9
 pkgrel=0
 pkgdesc="IMAP and POP3 server"
 url="http://www.dovecot.org/"
@@ -65,5 +65,5 @@ sqlite() {
 	_mv $(cd "$pkgdir" && find usr -name '*sqlite.so')
 }
 
-md5sums="c6d6c061413d299ccea7b55c3e4faa0a  dovecot-1.2.8.tar.gz
+md5sums="036ff97fb248dae3bd4b796a0644634f  dovecot-1.2.9.tar.gz
 c58b474dca20e6e60fa4f1f5b9c726e1  dovecot.initd"
diff --git a/main/espeak/APKBUILD b/main/espeak/APKBUILD
index bf005e00..c31ce381 100644
--- a/main/espeak/APKBUILD
+++ b/main/espeak/APKBUILD
@@ -1,42 +1,25 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=espeak
-pkgver=1.40.02
+pkgver=1.42.04
 pkgrel=0
 pkgdesc="Speech synthesizer for English and other languages"
 url="http://espeak.sourceforge.net/"
 license="GPL-3"
 subpackages="$pkgname-dev"
-depends="uclibc uclibc++"
-makedepends="uclibc++-dev"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-source.zip
-	$pkgname-$pkgver-uclibc++.patch"
+depends=
+makedepends=
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-source.zip"
 
-build() {
-	local s="$srcdir"/$pkgname-$pkgver-source
-	cd "$s"
-	for i in ../*.patch; do
-		msg "Applying $i..."
-		patch -p1 < $i || return 1
-	done
-
-	export CXX=g++-uc
-
-	cd src
-	make CXXFLAGS="${CXXFLAGS}" AUDIO=none all || return 1
+_builddir="$srcdir"/$pkgname-$pkgver-source
 
-	msg "Fixing byte order of phoneme data files"
-	cd "$s"/platforms/big_endian
-	make
-	./espeak-phoneme-data "$s"/espeak-data
-	cp -f phondata phonindex phontab "$s"/espeak-data
-
-	cd "$s"/src
-	make DESTDIR="$pkgdir" AUDIO=none install || return 1
+build() {
+	cd "$_builddir"/src
+	make AUDIO=none || return 1
+}
 
-	cd "$s"
-	install -d "$pkgdir"/usr/share/espeak-data
-	cp -r dictsource "$pkgdir"/usr/share/espeak-data
+package() {
+	cd "$_builddir"/src
+	make AUDIO=none DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="708954b44c526e8174df8b88a6382738  espeak-1.40.02-source.zip
-c13bb95088c5777b4d3e5ea10ca37517  espeak-1.40.02-uclibc++.patch"
+md5sums="a4cbbe5f2e2a37ccc0aa1a687a6e4c11  espeak-1.42.04-source.zip"
diff --git a/main/espeak/espeak-1.40.02-uclibc++.patch b/main/espeak/espeak-1.40.02-uclibc++.patch
deleted file mode 100644
index 68992205..00000000
--- a/main/espeak/espeak-1.40.02-uclibc++.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- espeak-1.40.02-source.orig/src/Makefile	2008-12-26 10:11:49 +0000
-+++ espeak-1.40.02-source/src/Makefile	2008-12-26 10:27:48 +0000
-@@ -60,15 +60,15 @@
- 
- SRCS1=$(speak_SOURCES)
- OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
--LIBS1=-lstdc++ $(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
-+LIBS1=-lm $(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
- 
- SRCS2=$(libespeak_SOURCES)
- OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
--LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread
-+LIBS2=-lm $(LIB_AUDIO) -lpthread
- 
- SRCS3 = espeak.cpp
- OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
--LIBS3=-lstdc++ -L . -lespeak
-+LIBS3=-L . -lespeak -lpthread
- 
- CXXFLAGS=-O2
- 
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index 1e162bc3..64cf90ff 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=git
-pkgver=1.6.5.6
+pkgver=1.6.5.7
 pkgrel=0
 pkgdesc="GIT - the stupid content tracker"
 url="http://git.or.cz/"
@@ -42,5 +42,5 @@ perl() {
 }
 
 
-md5sums="03aefaaecae7a236b88d04d1a83698d9  git-1.6.5.6.tar.bz2
+md5sums="0c2eb426cf596755d6d57a83c9a78be7  git-1.6.5.7.tar.bz2
 e63a201556c4f089de790805c09a2e5b  bb-tar.patch"
diff --git a/main/iptables/APKBUILD b/main/iptables/APKBUILD
index b941bb55..ff6f898c 100644
--- a/main/iptables/APKBUILD
+++ b/main/iptables/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
 pkgname=iptables
-pkgver=1.4.5
+pkgver=1.4.6
 pkgrel=0
 pkgdesc="Linux kernel firewall, NAT and packet mangling tools"
 url="http://www.iptables.org/"
@@ -32,6 +32,10 @@ build() {
 		--enable-libipq \
 		--enable-shared 
 	make || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
 	make -j1 install DESTDIR="$pkgdir"
 
 	mkdir -p "$pkgdir"/usr/include/libiptc \
@@ -60,7 +64,7 @@ ip6tables() {
 		"$subpkgdir"/etc/init.d/ip6tables
 }
 
-md5sums="44f13990132c20299c1994cd6f425140  iptables-1.4.5.tar.bz2
+md5sums="c67cf30e281a924def6426be0973df56  iptables-1.4.6.tar.bz2
 ec3e80a1b0ea3e13e4e60824b7ebd1b9  iptables-1.4.2-include-in.patch
 2202ac150a5dfe32a8363b0ad565ee1d  iptables.initd
 956ebf5ab69e5a1e1d3983541eab643b  iptables.confd"
diff --git a/main/libgcrypt/APKBUILD b/main/libgcrypt/APKBUILD
index efe95c1a..644c2696 100644
--- a/main/libgcrypt/APKBUILD
+++ b/main/libgcrypt/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libgcrypt
-pkgver=1.4.4
-pkgrel=1
+pkgver=1.4.5
+pkgrel=0
 pkgdesc="general purpose crypto library based on the code used in GnuPG"
 url="http://www.gnupg.org"
 license="LGPL"
@@ -21,7 +21,11 @@ build () {
 		--disable-static
 
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make -j1 DESTDIR="$pkgdir" install || return 1
 	rm -f ${pkgdir}/usr/share/info/dir
 }
-md5sums="34105aa927e23c217741966496b97e67  libgcrypt-1.4.4.tar.bz2"
+md5sums="cc2017ad09b4543f8b3b5e9a53cfd89d  libgcrypt-1.4.5.tar.bz2"