diff --git a/srcpkgs/mysql/libmysqlclient-devel.template b/srcpkgs/mysql/libmysqlclient-devel.template index 213313b6c7..369d61cb5e 100644 --- a/srcpkgs/mysql/libmysqlclient-devel.template +++ b/srcpkgs/mysql/libmysqlclient-devel.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package includes development libraries and header files." -revision=1 - Add_dependency run libstdc++-devel Add_dependency run libmysqlclient diff --git a/srcpkgs/mysql/libmysqlclient.template b/srcpkgs/mysql/libmysqlclient.template index e7df7d3f14..aaa82321e1 100644 --- a/srcpkgs/mysql/libmysqlclient.template +++ b/srcpkgs/mysql/libmysqlclient.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package includes the client library." -revision=1 - Add_dependency run glibc Add_dependency run zlib Add_dependency run openssl diff --git a/srcpkgs/mysql/libndbclient-devel.template b/srcpkgs/mysql/libndbclient-devel.template index e1e4eb4bf2..5c2ababc90 100644 --- a/srcpkgs/mysql/libndbclient-devel.template +++ b/srcpkgs/mysql/libndbclient-devel.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package includes the NDB development files." -revision=1 - Add_dependency run glibc Add_dependency run libndbclient diff --git a/srcpkgs/mysql/libndbclient.template b/srcpkgs/mysql/libndbclient.template index c3812ed7d3..7a3960109c 100644 --- a/srcpkgs/mysql/libndbclient.template +++ b/srcpkgs/mysql/libndbclient.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package includes the NDB client library." -revision=1 - Add_dependency run glibc Add_dependency run zlib diff --git a/srcpkgs/mysql/patches/gcc-4.5-workaround.patch b/srcpkgs/mysql/patches/gcc-4.5-workaround.patch deleted file mode 100644 index 81fa19e660..0000000000 --- a/srcpkgs/mysql/patches/gcc-4.5-workaround.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- Makefile.in.orig 2010-04-16 21:38:30.707429111 +0200 -+++ Makefile.in 2010-04-16 21:39:03.620439149 +0200 -@@ -1132,24 +1132,7 @@ abi_check_all: $(TEST_PREPROCESSOR_HEADE - $(MAKE) abi_headers="$^" do_abi_check - - do_abi_check: -- set -ex; \ -- for file in $(abi_headers); do \ -- @CC@ -E -nostdinc -dI \ -- -I$(top_srcdir)/include \ -- -I$(top_srcdir)/include/mysql \ -- -I$(top_srcdir)/sql \ -- -I$(top_builddir)/include \ -- -I$(top_builddir)/include/mysql \ -- -I$(top_builddir)/sql \ -- $$file 2>/dev/null | \ -- @SED@ -e '/^# /d' \ -- -e '/^[ ]*$$/d' \ -- -e '/^#pragma GCC set_debug_pwd/d' \ -- -e '/^#ident/d' > \ -- $(top_builddir)/abi_check.out; \ -- @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \ -- @RM@ $(top_builddir)/abi_check.out; \ -- done -+ @echo "Skipping do_abi_check!" - - # Don't update the files from bitkeeper - %::SCCS/s.% diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template index e7393e07f1..84aaed12e7 100644 --- a/srcpkgs/mysql/template +++ b/srcpkgs/mysql/template @@ -1,6 +1,6 @@ # Template file for 'mysql' pkgname=mysql -version=5.1.45 +version=5.1.51 distfiles="http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.1/mysql-${version}.tar.gz" build_style=gnu_configure configure_args="--localstatedir=/var --sysconfdir=/etc/mysql @@ -14,7 +14,7 @@ configure_args="--localstatedir=/var --sysconfdir=/etc/mysql --libexecdir=/usr/sbin --without-readline" short_desc="The world's most popular open source database" maintainer="Juan RP " -checksum=7dc2fabbdd8ab1d2878ee749be9c56ffc9efe970f7f0f094aa94b18b3cd15a72 +checksum=39d962222f068c426d4616950f0e8451d947a132f0c42af17a2fc8b3b5a42882 long_desc=" MySQL is the world's most popular open source database software, with over 100 million copies of its software downloaded or distributed throughout