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

7 files changed, 32 insertions, 29 deletions

diff --git a/testing/clucene/APKBUILD b/testing/clucene/APKBUILD
index 19efb69691..c9738e1f5c 100644
--- a/testing/clucene/APKBUILD
+++ b/testing/clucene/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=clucene
 pkgver=2.3.3.4
-pkgrel=0
+pkgrel=1
 pkgdesc="A C++ port of Lucene"
 url="http://www.sourceforge.net/projects/clucene"
 arch="all"
diff --git a/testing/drizzle/APKBUILD b/testing/drizzle/APKBUILD
index 9ade8d14cb..62d4de4d3a 100644
--- a/testing/drizzle/APKBUILD
+++ b/testing/drizzle/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 pkgname=drizzle
-pkgver=2011.03.13
-pkgrel=3
+pkgver=7.1.33
+pkgrel=0
 pkgdesc="A MySQL-derived RDBMS for cloud usage and webapps"
 url="http://launchpad.net/drizzle"
 arch=""
@@ -14,7 +14,7 @@ makedepends="$depends_dev"
 install="drizzle.post-install"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-client $pkgname-libs $pkgname-plugins"
 source="
-	http://launchpad.net/drizzle/elliott/2011-03-14/+download/drizzle7-$pkgver.tar.gz
+	https://launchpad.net/drizzle/${pkgver%.*}/$pkgver/+download/drizzle-$pkgver-stable.tar.gz
 	drizzle.initd
 	"
 
@@ -63,5 +63,5 @@ plugins() {
 	mv "$pkgdir"/usr/lib/drizzle7 "$subpkgdir"/usr/lib
 }
 
-md5sums="e152edfec45779c0bd34ece707aa022d  drizzle7-2011.03.13.tar.gz
+md5sums="80dbbbdb3ba0ae0059e77cc59e05e45b  drizzle-7.1.33-stable.tar.gz
 03b05074b95a241c4d07dfd8661baf9f  drizzle.initd"
diff --git a/testing/gnash/APKBUILD b/testing/gnash/APKBUILD
index 432bbd652f..fee29705b8 100644
--- a/testing/gnash/APKBUILD
+++ b/testing/gnash/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=gnash
 pkgver=0.8.10
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU flash player implementation"
 url="http://www.gnashdev.org/"
 arch="all"
@@ -29,6 +29,8 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
+	# append system-mt to avoid underlinking
+	sed -i -e 's/^[[:space:]]\+boost_libs="\(.*\)"/boost_libs="\1 system-mt"/' configure
 }
 
 build() {
diff --git a/testing/pdns/APKBUILD b/testing/pdns/APKBUILD
index a55655e64c..cc625b0851 100644
--- a/testing/pdns/APKBUILD
+++ b/testing/pdns/APKBUILD
@@ -1,10 +1,8 @@
 # Contributor: Matt Smith <mcs@darkregion.net>
 # Maintainer:  Matt Smith <mcs@darkregion.net>
 pkgname=pdns
-pkgver=3.0
-_extver=rc1
-_realver=$pkgver-$_extver
-pkgrel=3
+pkgver=3.1
+pkgrel=0
 pkgdesc="PowerDNS Authoritative Server"
 url="http://www.powerdns.com/"
 arch="all"
@@ -24,13 +22,13 @@ subpackages="$pkgname-doc
 	"
 pkgusers="pdns"
 pkggroups="pdns"
-source="http://powerdnssec.org/downloads/$pkgname-$_realver.tar.gz
+source="http://downloads.powerdns.com/releases/pdns-$pkgver.tar.gz
 	0010-disable-execinfo.patch
 	pdns.initd
 	pdns.conf
 	"
 
-_builddir="$srcdir/$pkgname-$_realver"
+_builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
 	local i
@@ -106,7 +104,7 @@ _mv_backend() {
 		"$subpkgdir"/usr/lib/pdns/ || return 1
 }
 
-md5sums="99a457688dcc246faa43dfb64c65c424  pdns-3.0-rc1.tar.gz
+md5sums="7dedae65403b31a795b2d53a512947fd  pdns-3.1.tar.gz
 fd4d14c30bae793072ba7f3fa6cca80e  0010-disable-execinfo.patch
 db146742b8f5bd91494690ee01f29862  pdns.initd
 351bac7f784a1a40e768466d9e6f1a79  pdns.conf"
diff --git a/testing/wxformbuilder/APKBUILD b/testing/wxformbuilder/APKBUILD
index c14d6b71d9..cc486c477b 100644
--- a/testing/wxformbuilder/APKBUILD
+++ b/testing/wxformbuilder/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wxformbuilder
-pkgver=3.0.57
+pkgver=3.1.70
 pkgrel=0
 pkgdesc="RAD tool for wxWidgets GUI design"
 url="http://sourceforge.net/apps/wordpress/wxformbuilder"
@@ -12,10 +12,10 @@ depends_dev=""
 makedepends="$depends_dev wxgtk-dev"
 install=""
 subpackages=""
-source="http://downloads.sourceforge.net/project/wxformbuilder/wxformbuilder-src/$pkgver/wxformbuilder-$pkgver.tar.gz
+source="http://downloads.sourceforge.net/project/wxformbuilder/wxformbuilder/$pkgver/wxFormBuilder_v${pkgver}-src.tar.bz2
 	libdl.patch"
 
-_builddir="$srcdir"/wxformbuilder_$pkgver
+_builddir="$srcdir"/wxformbuilder
 prepare() {
 	local i
 	cd "$_builddir"
@@ -24,10 +24,13 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
+	sed -i -e 's/\r//' create_build_files.sh \
+		install/linux/wxfb_export.sh
 }
 
 build() {
 	cd "$_builddir"
+	./create_build_files.sh || return 1
 	make CONFIG=Release || return 1
 }
 
@@ -37,5 +40,5 @@ package() {
 	install/linux/wxfb_export.sh "$pkgdir"/usr || return 1
 }
 
-md5sums="77dd368b2ec4ec5a583e1ab60c344a12  wxformbuilder-3.0.57.tar.gz
-a4917ec9c4afbb848a07e6a44f6c4924  libdl.patch"
+md5sums="1c2d53a344333bd2389f9f07a5321d5e  wxFormBuilder_v3.1.70-src.tar.bz2
+304bb4f7dd668fd42abc7d9ae986610a  libdl.patch"
diff --git a/testing/wxformbuilder/icon_48x48_wxformbuilder.png b/testing/wxformbuilder/icon_48x48_wxformbuilder.png
new file mode 100644
index 0000000000..db33a0adef
--- /dev/null
+++ b/testing/wxformbuilder/icon_48x48_wxformbuilder.png
diff --git a/testing/wxformbuilder/libdl.patch b/testing/wxformbuilder/libdl.patch
index cc0be82ae8..41aa10e383 100644
--- a/testing/wxformbuilder/libdl.patch
+++ b/testing/wxformbuilder/libdl.patch
@@ -1,11 +1,11 @@
---- ./src/Makefile.orig
-+++ ./src/Makefile
-@@ -5,6 +5,8 @@
-   CONFIG=Release
- endif
- 
-+LDFLAGS += -ldl
-+
- ifeq ($(CONFIG),Release)
-   BINDIR := ../output/bin
-   LIBDIR := ..
+--- ./src/premake.lua.orig
++++ ./src/premake.lua
+@@ -58,7 +58,7 @@
+ 	package.libpaths = { "../output/lib/wxformbuilder", "../sdk/lib" }

+ end

+ -- Set the libraries it links to.

+-package.links = { "wxFlatNotebook", "wxPropGrid", "wxScintilla", "TiCPP", "plugin-interface" }

++package.links = { "wxFlatNotebook", "wxPropGrid", "wxScintilla", "TiCPP", "plugin-interface", "dl" }

+ 

+ -- Add libraries and build options for stack trace in MinGW

+ if ( windows and ( (string.find( target or "", ".*-gcc" )) or (target == "gnu") ) ) then