diff options
| -rw-r--r-- | databases/mysql-client/Makefile.common | 4 | ||||
| -rw-r--r-- | databases/mysql-client/buildlink3.mk | 5 | ||||
| -rw-r--r-- | databases/mysql-client/distinfo | 9 | ||||
| -rw-r--r-- | databases/mysql-client/patches/patch-au | 13 | ||||
| -rw-r--r-- | databases/mysql-server/distinfo | 9 | ||||
| -rw-r--r-- | databases/mysql-server/patches/patch-au | 13 |
6 files changed, 12 insertions, 41 deletions
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common index f122415f762..2981d2ef318 100644 --- a/databases/mysql-client/Makefile.common +++ b/databases/mysql-client/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.46 2005/07/16 01:19:08 jlam Exp $ +# $NetBSD: Makefile.common,v 1.47 2005/08/12 13:03:05 xtraeme Exp $ -DISTNAME= mysql-4.0.24 +DISTNAME= mysql-4.0.25 CATEGORIES= databases MASTER_SITES= http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.0/ \ ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \ diff --git a/databases/mysql-client/buildlink3.mk b/databases/mysql-client/buildlink3.mk index 78f54c24c50..5398641c4da 100644 --- a/databases/mysql-client/buildlink3.mk +++ b/databases/mysql-client/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2005/07/14 03:35:41 schmonz Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2005/08/12 13:03:05 xtraeme Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MYSQL_CLIENT_BUILDLINK3_MK:= ${MYSQL_CLIENT_BUILDLINK3_MK}+ @@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmysql-client} BUILDLINK_PACKAGES+= mysql-client .if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.mysql-client+= mysql-client>=4.0.18nb1 -BUILDLINK_RECOMMENDED.mysql-client?= mysql-client>=4.0.24 +BUILDLINK_DEPENDS.mysql-client+= mysql-client>=4.0.25 BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql-client BUILDLINK_LIBDIRS.mysql-client?= lib/mysql BUILDLINK_INCDIRS.mysql-client?= include/mysql diff --git a/databases/mysql-client/distinfo b/databases/mysql-client/distinfo index 6c526e67b05..c837d8fb07c 100644 --- a/databases/mysql-client/distinfo +++ b/databases/mysql-client/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.18 2005/03/15 15:43:28 xtraeme Exp $ +$NetBSD: distinfo,v 1.19 2005/08/12 13:03:05 xtraeme Exp $ -SHA1 (mysql-4.0.24.tar.gz) = 523de9f374d4e8c08d5e6520ced05a32dfa2d35d -RMD160 (mysql-4.0.24.tar.gz) = 595a162be1bc4e09eab7bc751c9c02214ba41ed7 -Size (mysql-4.0.24.tar.gz) = 16885399 bytes +SHA1 (mysql-4.0.25.tar.gz) = 65315c7659c75fcc9f3d9f749dbed26581f6da9c +RMD160 (mysql-4.0.25.tar.gz) = 9c32ff5b7332712929eb2eb8eb58ae1f4be7ad46 +Size (mysql-4.0.25.tar.gz) = 11159288 bytes SHA1 (patch-af) = 2f3bab4108c002420e243a4ca6c9c0c3d4bdd21b -SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91 SHA1 (patch-av) = 684c1e2ff1f96652225045653c25707850fe0ff2 SHA1 (patch-aw) = 23d54ceddd0631aa93b32666853965a5fc7bdfab SHA1 (patch-ax) = 0ee6c30cc814d9404625191ac3b248ba9d9e094a diff --git a/databases/mysql-client/patches/patch-au b/databases/mysql-client/patches/patch-au deleted file mode 100644 index b837660f022..00000000000 --- a/databases/mysql-client/patches/patch-au +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-au,v 1.1 2004/11/09 06:11:48 xtraeme Exp $ - ---- include/my_global.h.orig 2003-10-17 07:29:15.000000000 +0200 -+++ include/my_global.h 2003-12-11 15:13:14.000000000 +0100 -@@ -250,7 +250,7 @@ - # endif - #endif /* TIME_WITH_SYS_TIME */ - #ifdef HAVE_UNISTD_H --#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) -+#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) && !defined(__NetBSD__) - #define crypt unistd_crypt - #endif - #include <unistd.h> diff --git a/databases/mysql-server/distinfo b/databases/mysql-server/distinfo index 5b145ce4010..093f81c310f 100644 --- a/databases/mysql-server/distinfo +++ b/databases/mysql-server/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.30 2005/03/15 15:43:28 xtraeme Exp $ +$NetBSD: distinfo,v 1.31 2005/08/12 13:03:05 xtraeme Exp $ -SHA1 (mysql-4.0.24.tar.gz) = 523de9f374d4e8c08d5e6520ced05a32dfa2d35d -RMD160 (mysql-4.0.24.tar.gz) = 595a162be1bc4e09eab7bc751c9c02214ba41ed7 -Size (mysql-4.0.24.tar.gz) = 16885399 bytes +SHA1 (mysql-4.0.25.tar.gz) = 65315c7659c75fcc9f3d9f749dbed26581f6da9c +RMD160 (mysql-4.0.25.tar.gz) = 9c32ff5b7332712929eb2eb8eb58ae1f4be7ad46 +Size (mysql-4.0.25.tar.gz) = 11159288 bytes SHA1 (patch-aa) = d753d777adfa3d1357a285c0c18dfd0f6fc988b6 SHA1 (patch-af) = 038b5d570265e1f821de6502d05f94225eba5672 SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96 @@ -11,6 +11,5 @@ SHA1 (patch-aq) = 899f90143ed9f36b769e099cadd01b867423d3d7 SHA1 (patch-ar) = d7c44e5bbed3c58e7516de5e155a82417818a39a SHA1 (patch-as) = d5ee30fad87682d3ed4315e41788c5ae6f68ba6e SHA1 (patch-at) = 62d5ccb0fdb5488b98979f2bb53d6029d0bd3d27 -SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91 SHA1 (patch-aw) = c82aa82430b42eaed2b6f4d588306e663e386ce1 SHA1 (patch-ax) = 29b3087d240dbbb8a780816a115759994c6f4639 diff --git a/databases/mysql-server/patches/patch-au b/databases/mysql-server/patches/patch-au deleted file mode 100644 index 039ac4a2940..00000000000 --- a/databases/mysql-server/patches/patch-au +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-au,v 1.4 2004/10/28 01:08:15 xtraeme Exp $ - ---- include/my_global.h.orig 2003-10-17 07:29:15.000000000 +0200 -+++ include/my_global.h 2003-12-11 15:13:14.000000000 +0100 -@@ -250,7 +250,7 @@ - # endif - #endif /* TIME_WITH_SYS_TIME */ - #ifdef HAVE_UNISTD_H --#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) -+#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) && !defined(__NetBSD__) - #define crypt unistd_crypt - #endif - #include <unistd.h> |