Mon Aug 5 10:10:15 2013 UTC ()
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!


(tron)
diff -r1.8 -r1.8.2.1 pkgsrc/databases/mysql55-client/Makefile
diff -r1.28 -r1.28.2.1 pkgsrc/databases/mysql55-client/Makefile.common
diff -r1.23 -r1.23.2.1 pkgsrc/databases/mysql55-client/distinfo
diff -r1.12 -r1.12.2.1 pkgsrc/databases/mysql55-server/Makefile
cvs diff -r1.8 -r1.8.2.1 pkgsrc/databases/mysql55-client/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-client/Attic/Makefile 2013/06/04 13:31:21 1.8
+++ pkgsrc/databases/mysql55-client/Attic/Makefile 2013/08/05 10:10:15 1.8.2.1
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.8 2013/06/04 13:31:21 adam Exp $ 1# $NetBSD: Makefile,v 1.8.2.1 2013/08/05 10:10:15 tron Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-client-/} 3PKGNAME= ${DISTNAME:S/-/-client-/}
 4PKGREVISION= 1
4SVR4_PKGNAME= mysqc 5SVR4_PKGNAME= mysqc
5COMMENT= MySQL 5, a free SQL database (client) 6COMMENT= MySQL 5, a free SQL database (client)
6 7
7CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*} 8CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*}
8 9
9.include "Makefile.common" 10.include "Makefile.common"
10 11
11CMAKE_ARGS+= -DWITHOUT_SERVER=ON 12CMAKE_ARGS+= -DWITHOUT_SERVER=ON
12CMAKE_ARGS+= -DWITH_UNIT_TESTS=OFF 13CMAKE_ARGS+= -DWITH_UNIT_TESTS=OFF
13UNWRAP_FILES+= scripts/mysql_config 14UNWRAP_FILES+= scripts/mysql_config
14INFO_FILES= yes 15INFO_FILES= yes
15INSTALL_DIRS+= client include libmysql man scripts tests 16INSTALL_DIRS+= client include libmysql man scripts tests
16 17
cvs diff -r1.28 -r1.28.2.1 pkgsrc/databases/mysql55-client/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-client/Attic/Makefile.common 2013/06/04 13:31:21 1.28
+++ pkgsrc/databases/mysql55-client/Attic/Makefile.common 2013/08/05 10:10:15 1.28.2.1
@@ -1,21 +1,23 @@ @@ -1,21 +1,23 @@
1# $NetBSD: Makefile.common,v 1.28 2013/06/04 13:31:21 adam Exp $ 1# $NetBSD: Makefile.common,v 1.28.2.1 2013/08/05 10:10:15 tron Exp $
2# 2#
3# used by databases/mysql55-client/Makefile 3# used by databases/mysql55-client/Makefile
4# used by databases/mysql55-server/Makefile 4# used by databases/mysql55-server/Makefile
5 5
6DISTNAME= mysql-5.5.32 6DISTNAME= mysql-5.5.32
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/} 8MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/}
 9# XXX: distfile got changed; remove the following line on next update
 10DIST_SUBDIR= mysql
9 11
10MAINTAINER?= pkgsrc-users@NetBSD.org 12MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.mysql.com/ 13HOMEPAGE= http://www.mysql.com/
12LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
13 15
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql55-client/distinfo 16DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql55-client/distinfo
15PATCHDIR?= ${.CURDIR}/../../databases/mysql55-client/patches 17PATCHDIR?= ${.CURDIR}/../../databases/mysql55-client/patches
16 18
17USE_CMAKE= yes 19USE_CMAKE= yes
18USE_GNU_READLINE= yes 20USE_GNU_READLINE= yes
19USE_LANGUAGES= c c++ 21USE_LANGUAGES= c c++
20USE_TOOLS+= bash gmake perl:run 22USE_TOOLS+= bash gmake perl:run
21 23
@@ -103,14 +105,15 @@ CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ @@ -103,14 +105,15 @@ CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ
103.endif 105.endif
104 106
105LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql 107LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
106 108
107SUBST_CLASSES+= scr 109SUBST_CLASSES+= scr
108SUBST_STAGE.scr= pre-configure 110SUBST_STAGE.scr= pre-configure
109SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \ 111SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \
110 scripts/mysql_secure_installation.sh \ 112 scripts/mysql_secure_installation.sh \
111 support-files/mysql.server.sh 113 support-files/mysql.server.sh
112SUBST_SED.scr= -e "s,chown,${CHOWN},g" 114SUBST_SED.scr= -e "s,chown,${CHOWN},g"
113SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" 115SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
114SUBST_MESSAGE.scr= Fixing scripts. 116SUBST_MESSAGE.scr= Fixing scripts.
115 117
 118.include "../../devel/readline/buildlink3.mk"
116.include "../../devel/zlib/buildlink3.mk" 119.include "../../devel/zlib/buildlink3.mk"
cvs diff -r1.23 -r1.23.2.1 pkgsrc/databases/mysql55-client/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-client/Attic/distinfo 2013/06/04 13:31:21 1.23
+++ pkgsrc/databases/mysql55-client/Attic/distinfo 2013/08/05 10:10:15 1.23.2.1
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.23 2013/06/04 13:31:21 adam Exp $ 1$NetBSD: distinfo,v 1.23.2.1 2013/08/05 10:10:15 tron Exp $
2 2
3SHA1 (mysql-5.5.32.tar.gz) = 7c42f3e31d9ad961d007394c12fd1b76dfb05eb1 3SHA1 (mysql/mysql-5.5.32.tar.gz) = 4f9accac6de6fcca4d729a3b0f98fc76ffb73867
4RMD160 (mysql-5.5.32.tar.gz) = 7d7171de61900150315699f51b8802ba16c7b1f8 4RMD160 (mysql/mysql-5.5.32.tar.gz) = e59a9166a93fd873ef4fc7afa70204dc16c1f662
5Size (mysql-5.5.32.tar.gz) = 24625029 bytes 5Size (mysql/mysql-5.5.32.tar.gz) = 24589274 bytes
6SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6 6SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
7SHA1 (patch-CMakeLists.txt) = 0c4263762d2d9fafd84b25038cae57a87fed339d 7SHA1 (patch-CMakeLists.txt) = 0c4263762d2d9fafd84b25038cae57a87fed339d
8SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf 8SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
9SHA1 (patch-client_mysqladmin.cc) = 382486c2f336eed87052e682b52d1acf444452a0 9SHA1 (patch-client_mysqladmin.cc) = 382486c2f336eed87052e682b52d1acf444452a0
10SHA1 (patch-client_mysqlbinlog.cc) = e38abe026c10a07808ccd24b596cf13c5079e206 10SHA1 (patch-client_mysqlbinlog.cc) = e38abe026c10a07808ccd24b596cf13c5079e206
11SHA1 (patch-client_sql_string.cc) = 1547b8d3889af2831c89b97aecdbe8158711a600 11SHA1 (patch-client_sql_string.cc) = 1547b8d3889af2831c89b97aecdbe8158711a600
12SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09 12SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09
13SHA1 (patch-include_CMakeLists.txt) = 4781c69315624fb5567ae70cee87f1ddb3f89847 13SHA1 (patch-include_CMakeLists.txt) = 4781c69315624fb5567ae70cee87f1ddb3f89847
14SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5 14SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5
15SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af 15SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af
16SHA1 (patch-include_my_pthread.h) = 109d376b4cf5b64c5243f9e91300667441131f86 16SHA1 (patch-include_my_pthread.h) = 109d376b4cf5b64c5243f9e91300667441131f86
17SHA1 (patch-include_myisam.h) = 475070d41b06c04c6ae692743fc1b0244afe0a88 17SHA1 (patch-include_myisam.h) = 475070d41b06c04c6ae692743fc1b0244afe0a88
18SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb892 18SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb892
cvs diff -r1.12 -r1.12.2.1 pkgsrc/databases/mysql55-server/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-server/Attic/Makefile 2013/06/04 13:31:21 1.12
+++ pkgsrc/databases/mysql55-server/Attic/Makefile 2013/08/05 10:10:15 1.12.2.1
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.12 2013/06/04 13:31:21 adam Exp $ 1# $NetBSD: Makefile,v 1.12.2.1 2013/08/05 10:10:15 tron Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
 4PKGREVISION= 2
4SVR4_PKGNAME= mysqs 5SVR4_PKGNAME= mysqs
5COMMENT= MySQL 5, a free SQL database (server) 6COMMENT= MySQL 5, a free SQL database (server)
6 7
7CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*} 8CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*}
8 9
9.include "../../databases/mysql55-client/Makefile.common" 10.include "../../databases/mysql55-client/Makefile.common"
10 11
11INFO_FILES= yes 12INFO_FILES= yes
12CMAKE_ARGS+= -DWITH_LIBWRAP=ON 13CMAKE_ARGS+= -DWITH_LIBWRAP=ON
13CMAKE_ARGS+= -DINSTALL_INFODIR=${PKGINFODIR} 14CMAKE_ARGS+= -DINSTALL_INFODIR=${PKGINFODIR}
14 15
15.if !empty(PKG_OPTIONS:Membedded-server) 16.if !empty(PKG_OPTIONS:Membedded-server)
16CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON 17CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
@@ -66,16 +67,15 @@ REPLACE_PERL+= mysql-test/mtr @@ -66,16 +67,15 @@ REPLACE_PERL+= mysql-test/mtr
66REPLACE_PERL+= sql-bench/*.sh 67REPLACE_PERL+= sql-bench/*.sh
67 68
68INSTALLATION_DIRS= bin 69INSTALLATION_DIRS= bin
69 70
70.include "../../mk/compiler.mk" 71.include "../../mk/compiler.mk"
71 72
72.if !empty(PKGSRC_COMPILER:Msunpro) 73.if !empty(PKGSRC_COMPILER:Msunpro)
73CFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ 74CFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
74CXXFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ 75CXXFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
75.endif 76.endif
76 77
77BUILDLINK_AUTO_DIRS.mysql-client= no 78BUILDLINK_AUTO_DIRS.mysql-client= no
78.include "../../databases/mysql55-client/buildlink3.mk" 79.include "../../databases/mysql55-client/buildlink3.mk"
79.include "../../devel/readline/buildlink3.mk" 
80.include "../../security/tcp_wrappers/buildlink3.mk" 80.include "../../security/tcp_wrappers/buildlink3.mk"
81.include "../../mk/bsd.pkg.mk" 81.include "../../mk/bsd.pkg.mk"