[pkgsrc/trunk]: pkgsrc/databases/mysql51-server Add mysqlmanager, ndb-cluster...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/databases/mysql51-server Add mysqlmanager, ndb-cluster...
From: taca <taca%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 09:13:39 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/9df091637851
branches:  trunk
changeset: 573650:9df091637851
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Mar 21 14:41:41 2010 +0000

description:
Add mysqlmanager, ndb-cluster and pstack PKG_OPTIONS.
These are control some optional functions for mysql51-server (leaf package).

Bump PKGREVISION.

diffstat:

 databases/mysql51-server/Makefile         |  31 ++++++++++++----
 databases/mysql51-server/PLIST            |  59 +++++++++++++++++++++++++++++-
 databases/mysql51-server/distinfo         |   6 ++-
 databases/mysql51-server/patches/patch-ab |   4 +-
 databases/mysql51-server/patches/patch-at |  22 +++++++++++
 databases/mysql51-server/patches/patch-au |  22 +++++++++++
 6 files changed, 130 insertions(+), 14 deletions(-)

diffs (246 lines):

diff -r 9a07b4ff0e4b -r 9df091637851 databases/mysql51-server/Makefile
--- a/databases/mysql51-server/Makefile Sun Mar 21 14:40:15 2010 +0000
+++ b/databases/mysql51-server/Makefile Sun Mar 21 14:41:41 2010 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/03/16 19:24:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/03/21 14:41:41 taca Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
-PKGREVISION=           1
+PKGREVISION=           2
 SVR4_PKGNAME=          mysqs
 COMMENT=               MySQL 5, a free SQL database (server)
 
@@ -14,23 +14,38 @@
 MAKE_JOBS_SAFE=                no
 
 CONFIGURE_ARGS+=       --with-libwrap
-CONFIGURE_ARGS+=       --with-raid
-CONFIGURE_ARGS+=       --without-berkeley-db
-CONFIGURE_ARGS+=       --without-mysqlfs
 CONFIGURE_ARGS+=       --with-mysqld-user=${MYSQL_USER}
 
 .if !empty(PKG_OPTIONS:Membedded-server)
 CONFIGURE_ARGS+=       --with-embedded-privilege-control
 CONFIGURE_ARGS+=       --with-embedded-server
-#CONFIGURE_ARGS+=      --with-mysqld-ldflags=-all-static
 CONFIGURE_ARGS+=       --with-pic
 PLIST.embedded=                yes
 .endif
 
-PLIST_VARS+=           embedded
+.if !empty(PKG_OPTIONS:Mndb-cluster)
+CONFIGURE_ARGS+=       --with-plugins=innobase,ndbcluster
+REPLACE_PERL+=         storage/ndb/tools/ndb_error_reporter \
+                       storage/ndb/tools/ndb_size.pl
+PLIST.ndb=             yes
+.else
+CONFIGURE_ARGS+=       --with-plugins=innobase
+.endif
+
+.if !empty(PKG_OPTIONS:Mpstack)
+CONFIGURE_ARGS+=       --with-pstack
+PLIST.pstack=          yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mmysqlmanager)
+CONFIGURE_ARGS+=       --with-mysqlmanager
+PLIST.manager=         yes
+.endif
+
+PLIST_VARS+=           embedded manager ndb pstack
 
 PTHREAD_OPTS+=         require
-CONFIGURE_ARGS+=       --with-pthreads
+CONFIGURE_ARGS+=       --with-pthread
 
 PKG_GROUPS=            ${MYSQL_GROUP}
 PKG_USERS=             ${MYSQL_USER}:${MYSQL_GROUP}
diff -r 9a07b4ff0e4b -r 9df091637851 databases/mysql51-server/PLIST
--- a/databases/mysql51-server/PLIST    Sun Mar 21 14:40:15 2010 +0000
+++ b/databases/mysql51-server/PLIST    Sun Mar 21 14:41:41 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/03/21 14:41:41 taca Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -15,10 +15,58 @@
 bin/mysqld_multi
 bin/mysqld_safe
 ${PLIST.embedded}bin/mysqltest_embedded
+${PLIST.ndb}bin/ndb_config
+${PLIST.ndb}bin/ndb_delete_all
+${PLIST.ndb}bin/ndb_desc
+${PLIST.ndb}bin/ndb_drop_index
+${PLIST.ndb}bin/ndb_drop_table
+${PLIST.ndb}bin/ndb_error_reporter
+${PLIST.ndb}bin/ndb_mgm
+${PLIST.ndb}bin/ndb_print_backup_file
+${PLIST.ndb}bin/ndb_print_schema_file
+${PLIST.ndb}bin/ndb_print_sys_file
+${PLIST.ndb}bin/ndb_restore
+${PLIST.ndb}bin/ndb_select_all
+${PLIST.ndb}bin/ndb_select_count
+${PLIST.ndb}bin/ndb_show_tables
+${PLIST.ndb}bin/ndb_size.pl
+${PLIST.ndb}bin/ndb_test_platform
+${PLIST.ndb}bin/ndb_waiter
 bin/perror
 bin/replace
 bin/resolve_stack_dump
 bin/resolveip
+${PLIST.ndb}include/mysql/storage/ndb/mgmapi/mgmapi.h
+${PLIST.ndb}include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters.h
+${PLIST.ndb}include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters_debug.h
+${PLIST.ndb}include/mysql/storage/ndb/mgmapi/mgmapi_debug.h
+${PLIST.ndb}include/mysql/storage/ndb/mgmapi/mgmapi_error.h
+${PLIST.ndb}include/mysql/storage/ndb/mgmapi/ndb_logevent.h
+${PLIST.ndb}include/mysql/storage/ndb/mgmapi/ndbd_exit_codes.h
+${PLIST.ndb}include/mysql/storage/ndb/ndb_constants.h
+${PLIST.ndb}include/mysql/storage/ndb/ndb_init.h
+${PLIST.ndb}include/mysql/storage/ndb/ndb_types.h
+${PLIST.ndb}include/mysql/storage/ndb/ndb_version.h
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/Ndb.hpp
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbApi.hpp
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbBlob.hpp
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbDictionary.hpp
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbError.hpp
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbEventOperation.hpp
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbIndexOperation.hpp
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbIndexScanOperation.hpp
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbIndexStat.hpp
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbOperation.hpp
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbPool.hpp
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbRecAttr.hpp
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbReceiver.hpp
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbScanFilter.hpp
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbScanOperation.hpp
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbTransaction.hpp
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/ndb_cluster_connection.hpp
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/ndbapi_limits.h
+${PLIST.ndb}include/mysql/storage/ndb/ndbapi/ndberror.h
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmyisam.a
@@ -26,17 +74,24 @@
 ${PLIST.embedded}lib/mysql/libmysqld.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
+${PLIST.ndb}lib/mysql/libndbclient.la
 lib/mysql/libvio.a
 lib/mysql/plugin/ha_archive.la
 lib/mysql/plugin/ha_blackhole.la
 lib/mysql/plugin/ha_example.la
 lib/mysql/plugin/ha_federated.la
-lib/mysql/plugin/ha_innodb.la
 lib/mysql/plugin/ha_innodb_plugin.la
 libexec/mysqld
+${PLIST.manager}libexec/mysqlmanager
+${PLIST.ndb}libexec/ndb_cpcd
+${PLIST.ndb}libexec/ndb_mgmd
+${PLIST.ndb}libexec/ndbd
 man/man1/mysqld_multi.1
 man/man8/mysqld.8
 man/man8/mysqlmanager.8
+${PLIST.ndb}man/man8/ndb_mgmd.8
+${PLIST.ndb}man/man8/ndbd.8
+${PLIST.ndb}man/man8/ndbmtd.8
 mysql-test/lib/My/SafeProcess/my_safe_process
 share/aclocal/mysql.m4
 share/examples/rc.d/mysqld
diff -r 9a07b4ff0e4b -r 9df091637851 databases/mysql51-server/distinfo
--- a/databases/mysql51-server/distinfo Sun Mar 21 14:40:15 2010 +0000
+++ b/databases/mysql51-server/distinfo Sun Mar 21 14:41:41 2010 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+$NetBSD: distinfo,v 1.2 2010/03/21 14:41:41 taca Exp $
 
 SHA1 (mysql-5.1.44.tar.gz) = 265fbca02b2ef62926e2845d5fdf394298eb3206
 RMD160 (mysql-5.1.44.tar.gz) = f98d25322893b422ee708d683ee73ec9e17ad40a
 Size (mysql-5.1.44.tar.gz) = 23400457 bytes
 SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
-SHA1 (patch-ab) = 08af120fa27fe9cf7902b630158a4337f2f9c726
+SHA1 (patch-ab) = 39ca30e2e78645bb6975d057ace30e8c91e6e405
 SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c
 SHA1 (patch-ad) = 5fd4db0e04a97289f38a5467bbae5041f4082b51
 SHA1 (patch-ae) = c7f8c12c64835650b80aed4fef44d44b15f3f11e
@@ -22,5 +22,7 @@
 SHA1 (patch-aq) = 8e6029d36b290b9ffd964c38afe4352a9107be40
 SHA1 (patch-ar) = ed9c062adce41a840db1e908ab0657db6de540ae
 SHA1 (patch-as) = 8167416a083a011ded19d176bc488c94d9eb7abf
+SHA1 (patch-at) = 307a0785190f8bc175226ce83288cc85f7da4631
+SHA1 (patch-au) = 51291771b994d199fb6de6a17dd7809a7bf39b68
 SHA1 (patch-aw) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec
 SHA1 (patch-ax) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a
diff -r 9a07b4ff0e4b -r 9df091637851 databases/mysql51-server/patches/patch-ab
--- a/databases/mysql51-server/patches/patch-ab Sun Mar 21 14:40:15 2010 +0000
+++ b/databases/mysql51-server/patches/patch-ab Sun Mar 21 14:41:41 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $
+$NetBSD: patch-ab,v 1.2 2010/03/21 14:41:41 taca Exp $
 
 --- Makefile.in.orig   2010-02-04 11:46:48.000000000 +0000
 +++ Makefile.in
@@ -17,7 +17,7 @@
 +SUBDIRS = . include scripts @pstack_dir@ \
 +                      strings mysys dbug extra regex storage plugin \
 +                      libmysql @sql_server@ @man_dirs@ tests \
-+                      @libmysqld_dirs@ mysql-test support-files
++                      @libmysqld_dirs@ mysql-test support-files @tools_dirs@
  
  DIST_SUBDIRS = . include Docs zlib \
                        cmd-line-utils sql-common scripts \
diff -r 9a07b4ff0e4b -r 9df091637851 databases/mysql51-server/patches/patch-at
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql51-server/patches/patch-at Sun Mar 21 14:41:41 2010 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-at,v 1.1 2010/03/21 14:41:41 taca Exp $
+
+--- server-tools/instance-manager/Makefile.in.orig     2010-02-04 11:46:23.000000000 +0000
++++ server-tools/instance-manager/Makefile.in
+@@ -81,7 +81,7 @@ libnet_a_DEPENDENCIES = $(top_builddir)/
+ nodist_libnet_a_OBJECTS = net_serv.$(OBJEXT)
+ libnet_a_OBJECTS = $(nodist_libnet_a_OBJECTS)
+ LTLIBRARIES = $(noinst_LTLIBRARIES)
+-liboptions_la_DEPENDENCIES = $(top_builddir)/libmysql/get_password.lo
++liboptions_la_DEPENDENCIES =
+ am_liboptions_la_OBJECTS = liboptions_la-options.lo \
+       liboptions_la-priv.lo
+ liboptions_la_OBJECTS = $(am_liboptions_la_OBJECTS)
+@@ -467,7 +467,7 @@ liboptions_la_CXXFLAGS = $(CXXFLAGS) \
+       -DPROTOCOL_VERSION=@PROTOCOL_VERSION@
+ 
+ liboptions_la_SOURCES = options.h options.cc priv.h priv.cc
+-liboptions_la_LIBADD = $(top_builddir)/libmysql/get_password.lo
++liboptions_la_LIBADD = -lmysqlclient
+ 
+ # MySQL sometimes uses symlinks to reuse code 
+ # All symlinked files are grouped in libnet.a
diff -r 9a07b4ff0e4b -r 9df091637851 databases/mysql51-server/patches/patch-au
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql51-server/patches/patch-au Sun Mar 21 14:41:41 2010 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-au,v 1.1 2010/03/21 14:41:41 taca Exp $
+
+--- storage/innodb_plugin/include/os0sync.h.orig       2010-02-04 11:40:00.000000000 +0000
++++ storage/innodb_plugin/include/os0sync.h
+@@ -349,7 +349,7 @@ compare to, new_val is the value to swap
+       (atomic_cas_ulong(ptr, old_val, new_val) == old_val)
+ 
+ # define os_compare_and_swap_lint(ptr, old_val, new_val) \
+-      ((lint)atomic_cas_ulong((ulong_t*) ptr, old_val, new_val) == old_val)
++      ((lint)atomic_cas_ulong((unsigned long*) ptr, old_val, new_val) == old_val)
+ 
+ # ifdef HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS
+ #  if SIZEOF_PTHREAD_T == 4
+@@ -374,7 +374,7 @@ Returns the resulting value, ptr is poin
+ amount of increment. */
+ 
+ # define os_atomic_increment_lint(ptr, amount) \
+-      atomic_add_long_nv((ulong_t*) ptr, amount)
++      atomic_add_long_nv((unsigned long *) ptr, amount)
+ 
+ # define os_atomic_increment_ulint(ptr, amount) \
+       atomic_add_long_nv(ptr, amount)
Prev by Date: [pkgsrc/trunk]: pkgsrc/databases/mysql51-client Some clean up to CONFIGURE_AR...
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/php5 Limit packages to PHP80xa before 5.3
Previous by Thread: [pkgsrc/trunk]: pkgsrc/databases/mysql51-client Some clean up to CONFIGURE_AR...
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/php5 Limit packages to PHP80xa before 5.3
Indexes:
Home | Main Index | Thread Index | Old Index