Pullup ticket #4200 - requested by spz

databases/mysql55-client: distfile update
databases/mysql55-server: distfile update

Revisions pulled up:
- databases/mysql55-client/Makefile                             1.10 via patch
- databases/mysql55-client/Makefile.common                      1.29
- databases/mysql55-client/distinfo                             1.24
- databases/mysql55-server/Makefile                             1.14 via patch

---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Wed Jul 17 21:22:40 UTC 2013

   Modified Files:
   	pkgsrc/databases/mysql55-client: Makefile Makefile.common distinfo
   	pkgsrc/databases/mysql55-server: Makefile

   Log Message:
   Distfile got changed (licence clause in mans). Revision bump.
   Don't use mk/readline.buildlink3.mk! Must be devel/readline/buildlink3.mk!

4 files changed, 12 insertions, 8 deletions

diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index b00cb10524d..cc043a9eb87 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2013/06/04 13:31:21 adam Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2013/08/05 10:10:15 tron Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
+PKGREVISION=	1
 SVR4_PKGNAME=	mysqc
 COMMENT=	MySQL 5, a free SQL database (client)
 
diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index 913161ab0b6..717ed9f43de 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2013/06/04 13:31:21 adam Exp $
+# $NetBSD: Makefile.common,v 1.28.2.1 2013/08/05 10:10:15 tron Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
@@ -6,6 +6,8 @@
 DISTNAME=	mysql-5.5.32
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
+# XXX: distfile got changed; remove the following line on next update
+DIST_SUBDIR=	mysql
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mysql.com/
@@ -113,4 +115,5 @@ SUBST_SED.scr=		-e "s,chown,${CHOWN},g"
 SUBST_SED.scr+=		-e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
 SUBST_MESSAGE.scr=	Fixing scripts.
 
+.include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index d96f76e9b68..56f4c045372 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2013/06/04 13:31:21 adam Exp $
+$NetBSD: distinfo,v 1.23.2.1 2013/08/05 10:10:15 tron Exp $
 
-SHA1 (mysql-5.5.32.tar.gz) = 7c42f3e31d9ad961d007394c12fd1b76dfb05eb1
-RMD160 (mysql-5.5.32.tar.gz) = 7d7171de61900150315699f51b8802ba16c7b1f8
-Size (mysql-5.5.32.tar.gz) = 24625029 bytes
+SHA1 (mysql/mysql-5.5.32.tar.gz) = 4f9accac6de6fcca4d729a3b0f98fc76ffb73867
+RMD160 (mysql/mysql-5.5.32.tar.gz) = e59a9166a93fd873ef4fc7afa70204dc16c1f662
+Size (mysql/mysql-5.5.32.tar.gz) = 24589274 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
 SHA1 (patch-CMakeLists.txt) = 0c4263762d2d9fafd84b25038cae57a87fed339d
 SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index cabfbd3afe6..8821012ff6e 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2013/06/04 13:31:21 adam Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2013/08/05 10:10:15 tron Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
+PKGREVISION=	2
 SVR4_PKGNAME=	mysqs
 COMMENT=	MySQL 5, a free SQL database (server)
 
@@ -76,6 +77,5 @@ CXXFLAGS+=		-D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
 
 BUILDLINK_AUTO_DIRS.mysql-client=	no
 .include "../../databases/mysql55-client/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"