Sun Mar 21 14:41:41 2010 UTC ()
Add mysqlmanager, ndb-cluster and pstack PKG_OPTIONS.
These are control some optional functions for mysql51-server (leaf package).

Bump PKGREVISION.


(taca)
diff -r1.2 -r1.3 pkgsrc/databases/mysql51-server/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-server/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-server/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-server/patches/patch-ab
diff -r0 -r1.1 pkgsrc/databases/mysql51-server/patches/patch-at
diff -r0 -r1.1 pkgsrc/databases/mysql51-server/patches/patch-au
cvs diff -r1.2 -r1.3 pkgsrc/databases/mysql51-server/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-server/Attic/Makefile 2010/03/16 19:24:54 1.2
+++ pkgsrc/databases/mysql51-server/Attic/Makefile 2010/03/21 14:41:41 1.3
@@ -1,46 +1,61 @@ @@ -1,46 +1,61 @@
1# $NetBSD: Makefile,v 1.2 2010/03/16 19:24:54 wiz Exp $ 1# $NetBSD: Makefile,v 1.3 2010/03/21 14:41:41 taca Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4PKGREVISION= 1 4PKGREVISION= 2
5SVR4_PKGNAME= mysqs 5SVR4_PKGNAME= mysqs
6COMMENT= MySQL 5, a free SQL database (server) 6COMMENT= MySQL 5, a free SQL database (server)
7 7
8CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*} 8CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*}
9 9
10PKG_DESTDIR_SUPPORT= user-destdir 10PKG_DESTDIR_SUPPORT= user-destdir
11 11
12.include "../../databases/mysql51-client/Makefile.common" 12.include "../../databases/mysql51-client/Makefile.common"
13 13
14MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
15 15
16CONFIGURE_ARGS+= --with-libwrap 16CONFIGURE_ARGS+= --with-libwrap
17CONFIGURE_ARGS+= --with-raid 
18CONFIGURE_ARGS+= --without-berkeley-db 
19CONFIGURE_ARGS+= --without-mysqlfs 
20CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER} 17CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER}
21 18
22.if !empty(PKG_OPTIONS:Membedded-server) 19.if !empty(PKG_OPTIONS:Membedded-server)
23CONFIGURE_ARGS+= --with-embedded-privilege-control 20CONFIGURE_ARGS+= --with-embedded-privilege-control
24CONFIGURE_ARGS+= --with-embedded-server 21CONFIGURE_ARGS+= --with-embedded-server
25#CONFIGURE_ARGS+= --with-mysqld-ldflags=-all-static 
26CONFIGURE_ARGS+= --with-pic 22CONFIGURE_ARGS+= --with-pic
27PLIST.embedded= yes 23PLIST.embedded= yes
28.endif 24.endif
29 25
30PLIST_VARS+= embedded 26.if !empty(PKG_OPTIONS:Mndb-cluster)
 27CONFIGURE_ARGS+= --with-plugins=innobase,ndbcluster
 28REPLACE_PERL+= storage/ndb/tools/ndb_error_reporter \
 29 storage/ndb/tools/ndb_size.pl
 30PLIST.ndb= yes
 31.else
 32CONFIGURE_ARGS+= --with-plugins=innobase
 33.endif
 34
 35.if !empty(PKG_OPTIONS:Mpstack)
 36CONFIGURE_ARGS+= --with-pstack
 37PLIST.pstack= yes
 38.endif
 39
 40.if !empty(PKG_OPTIONS:Mmysqlmanager)
 41CONFIGURE_ARGS+= --with-mysqlmanager
 42PLIST.manager= yes
 43.endif
 44
 45PLIST_VARS+= embedded manager ndb pstack
31 46
32PTHREAD_OPTS+= require 47PTHREAD_OPTS+= require
33CONFIGURE_ARGS+= --with-pthreads 48CONFIGURE_ARGS+= --with-pthread
34 49
35PKG_GROUPS= ${MYSQL_GROUP} 50PKG_GROUPS= ${MYSQL_GROUP}
36PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP} 51PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}
37 52
38PKG_GECOS.${MYSQL_USER}= MySQL database administrator 53PKG_GECOS.${MYSQL_USER}= MySQL database administrator
39PKG_HOME.${MYSQL_USER}= ${MYSQL_DATADIR} 54PKG_HOME.${MYSQL_USER}= ${MYSQL_DATADIR}
40PKG_SHELL.${MYSQL_USER}= ${SH} 55PKG_SHELL.${MYSQL_USER}= ${SH}
41 56
42RCD_SCRIPTS= mysqld 57RCD_SCRIPTS= mysqld
43 58
44FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} \ 59FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} \
45 MYSQL_DATADIR=${MYSQL_DATADIR} \ 60 MYSQL_DATADIR=${MYSQL_DATADIR} \
46 MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} 61 MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-server/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-server/Attic/PLIST 2010/03/04 16:28:58 1.1.1.1
+++ pkgsrc/databases/mysql51-server/Attic/PLIST 2010/03/21 14:41:41 1.2
@@ -1,52 +1,107 @@ @@ -1,52 +1,107 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $ 1@comment $NetBSD: PLIST,v 1.2 2010/03/21 14:41:41 taca Exp $
2bin/innochecksum 2bin/innochecksum
3bin/my_print_defaults 3bin/my_print_defaults
4bin/myisam_ftdump 4bin/myisam_ftdump
5bin/myisamchk 5bin/myisamchk
6bin/myisamlog 6bin/myisamlog
7bin/myisampack 7bin/myisampack
8bin/mysql.server 8bin/mysql.server
9bin/mysql_client_test 9bin/mysql_client_test
10${PLIST.embedded}bin/mysql_client_test_embedded 10${PLIST.embedded}bin/mysql_client_test_embedded
11bin/mysql_install_db 11bin/mysql_install_db
12bin/mysql_secure_installation 12bin/mysql_secure_installation
13bin/mysql_tzinfo_to_sql 13bin/mysql_tzinfo_to_sql
14bin/mysql_waitpid 14bin/mysql_waitpid
15bin/mysqld_multi 15bin/mysqld_multi
16bin/mysqld_safe 16bin/mysqld_safe
17${PLIST.embedded}bin/mysqltest_embedded 17${PLIST.embedded}bin/mysqltest_embedded
 18${PLIST.ndb}bin/ndb_config
 19${PLIST.ndb}bin/ndb_delete_all
 20${PLIST.ndb}bin/ndb_desc
 21${PLIST.ndb}bin/ndb_drop_index
 22${PLIST.ndb}bin/ndb_drop_table
 23${PLIST.ndb}bin/ndb_error_reporter
 24${PLIST.ndb}bin/ndb_mgm
 25${PLIST.ndb}bin/ndb_print_backup_file
 26${PLIST.ndb}bin/ndb_print_schema_file
 27${PLIST.ndb}bin/ndb_print_sys_file
 28${PLIST.ndb}bin/ndb_restore
 29${PLIST.ndb}bin/ndb_select_all
 30${PLIST.ndb}bin/ndb_select_count
 31${PLIST.ndb}bin/ndb_show_tables
 32${PLIST.ndb}bin/ndb_size.pl
 33${PLIST.ndb}bin/ndb_test_platform
 34${PLIST.ndb}bin/ndb_waiter
18bin/perror 35bin/perror
19bin/replace 36bin/replace
20bin/resolve_stack_dump 37bin/resolve_stack_dump
21bin/resolveip 38bin/resolveip
 39${PLIST.ndb}include/mysql/storage/ndb/mgmapi/mgmapi.h
 40${PLIST.ndb}include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters.h
 41${PLIST.ndb}include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters_debug.h
 42${PLIST.ndb}include/mysql/storage/ndb/mgmapi/mgmapi_debug.h
 43${PLIST.ndb}include/mysql/storage/ndb/mgmapi/mgmapi_error.h
 44${PLIST.ndb}include/mysql/storage/ndb/mgmapi/ndb_logevent.h
 45${PLIST.ndb}include/mysql/storage/ndb/mgmapi/ndbd_exit_codes.h
 46${PLIST.ndb}include/mysql/storage/ndb/ndb_constants.h
 47${PLIST.ndb}include/mysql/storage/ndb/ndb_init.h
 48${PLIST.ndb}include/mysql/storage/ndb/ndb_types.h
 49${PLIST.ndb}include/mysql/storage/ndb/ndb_version.h
 50${PLIST.ndb}include/mysql/storage/ndb/ndbapi/Ndb.hpp
 51${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbApi.hpp
 52${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbBlob.hpp
 53${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbDictionary.hpp
 54${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbError.hpp
 55${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbEventOperation.hpp
 56${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbIndexOperation.hpp
 57${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbIndexScanOperation.hpp
 58${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbIndexStat.hpp
 59${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbOperation.hpp
 60${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbPool.hpp
 61${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbRecAttr.hpp
 62${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbReceiver.hpp
 63${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbScanFilter.hpp
 64${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbScanOperation.hpp
 65${PLIST.ndb}include/mysql/storage/ndb/ndbapi/NdbTransaction.hpp
 66${PLIST.ndb}include/mysql/storage/ndb/ndbapi/ndb_cluster_connection.hpp
 67${PLIST.ndb}include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h
 68${PLIST.ndb}include/mysql/storage/ndb/ndbapi/ndbapi_limits.h
 69${PLIST.ndb}include/mysql/storage/ndb/ndbapi/ndberror.h
22lib/mysql/libdbug.a 70lib/mysql/libdbug.a
23lib/mysql/libheap.a 71lib/mysql/libheap.a
24lib/mysql/libmyisam.a 72lib/mysql/libmyisam.a
25lib/mysql/libmyisammrg.a 73lib/mysql/libmyisammrg.a
26${PLIST.embedded}lib/mysql/libmysqld.a 74${PLIST.embedded}lib/mysql/libmysqld.a
27lib/mysql/libmystrings.a 75lib/mysql/libmystrings.a
28lib/mysql/libmysys.a 76lib/mysql/libmysys.a
 77${PLIST.ndb}lib/mysql/libndbclient.la
29lib/mysql/libvio.a 78lib/mysql/libvio.a
30lib/mysql/plugin/ha_archive.la 79lib/mysql/plugin/ha_archive.la
31lib/mysql/plugin/ha_blackhole.la 80lib/mysql/plugin/ha_blackhole.la
32lib/mysql/plugin/ha_example.la 81lib/mysql/plugin/ha_example.la
33lib/mysql/plugin/ha_federated.la 82lib/mysql/plugin/ha_federated.la
34lib/mysql/plugin/ha_innodb.la 
35lib/mysql/plugin/ha_innodb_plugin.la 83lib/mysql/plugin/ha_innodb_plugin.la
36libexec/mysqld 84libexec/mysqld
 85${PLIST.manager}libexec/mysqlmanager
 86${PLIST.ndb}libexec/ndb_cpcd
 87${PLIST.ndb}libexec/ndb_mgmd
 88${PLIST.ndb}libexec/ndbd
37man/man1/mysqld_multi.1 89man/man1/mysqld_multi.1
38man/man8/mysqld.8 90man/man8/mysqld.8
39man/man8/mysqlmanager.8 91man/man8/mysqlmanager.8
 92${PLIST.ndb}man/man8/ndb_mgmd.8
 93${PLIST.ndb}man/man8/ndbd.8
 94${PLIST.ndb}man/man8/ndbmtd.8
40mysql-test/lib/My/SafeProcess/my_safe_process 95mysql-test/lib/My/SafeProcess/my_safe_process
41share/aclocal/mysql.m4 96share/aclocal/mysql.m4
42share/examples/rc.d/mysqld 97share/examples/rc.d/mysqld
43share/mysql-test/collections/README 98share/mysql-test/collections/README
44share/mysql-test/collections/README.experimental 99share/mysql-test/collections/README.experimental
45share/mysql-test/collections/default.daily 100share/mysql-test/collections/default.daily
46share/mysql-test/collections/default.experimental 101share/mysql-test/collections/default.experimental
47share/mysql-test/collections/default.push 102share/mysql-test/collections/default.push
48share/mysql-test/collections/default.weekly 103share/mysql-test/collections/default.weekly
49share/mysql-test/extra/binlog_tests/binlog.test 104share/mysql-test/extra/binlog_tests/binlog.test
50share/mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test 105share/mysql-test/extra/binlog_tests/binlog_failure_mixing_engines.test
51share/mysql-test/extra/binlog_tests/binlog_insert_delayed.test 106share/mysql-test/extra/binlog_tests/binlog_insert_delayed.test
52share/mysql-test/extra/binlog_tests/binlog_truncate.test 107share/mysql-test/extra/binlog_tests/binlog_truncate.test
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-server/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-server/Attic/distinfo 2010/03/04 16:28:58 1.1.1.1
+++ pkgsrc/databases/mysql51-server/Attic/distinfo 2010/03/21 14:41:41 1.2
@@ -1,26 +1,28 @@ @@ -1,26 +1,28 @@
1$NetBSD: distinfo,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $ 1$NetBSD: distinfo,v 1.2 2010/03/21 14:41:41 taca Exp $
2 2
3SHA1 (mysql-5.1.44.tar.gz) = 265fbca02b2ef62926e2845d5fdf394298eb3206 3SHA1 (mysql-5.1.44.tar.gz) = 265fbca02b2ef62926e2845d5fdf394298eb3206
4RMD160 (mysql-5.1.44.tar.gz) = f98d25322893b422ee708d683ee73ec9e17ad40a 4RMD160 (mysql-5.1.44.tar.gz) = f98d25322893b422ee708d683ee73ec9e17ad40a
5Size (mysql-5.1.44.tar.gz) = 23400457 bytes 5Size (mysql-5.1.44.tar.gz) = 23400457 bytes
6SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506 6SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506
7SHA1 (patch-ab) = 08af120fa27fe9cf7902b630158a4337f2f9c726 7SHA1 (patch-ab) = 39ca30e2e78645bb6975d057ace30e8c91e6e405
8SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c 8SHA1 (patch-ac) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c
9SHA1 (patch-ad) = 5fd4db0e04a97289f38a5467bbae5041f4082b51 9SHA1 (patch-ad) = 5fd4db0e04a97289f38a5467bbae5041f4082b51
10SHA1 (patch-ae) = c7f8c12c64835650b80aed4fef44d44b15f3f11e 10SHA1 (patch-ae) = c7f8c12c64835650b80aed4fef44d44b15f3f11e
11SHA1 (patch-af) = 1e13ba542b4fc2a1d59fc822d06c76bc4e92dc23 11SHA1 (patch-af) = 1e13ba542b4fc2a1d59fc822d06c76bc4e92dc23
12SHA1 (patch-ag) = c510685dd71e4e3a632c9bf01e4e36eb42945d9e 12SHA1 (patch-ag) = c510685dd71e4e3a632c9bf01e4e36eb42945d9e
13SHA1 (patch-ah) = a608060cee7aadaf8bcde84016a73131a75dea32 13SHA1 (patch-ah) = a608060cee7aadaf8bcde84016a73131a75dea32
14SHA1 (patch-ai) = 4c5acf2b0e05765a1fe9e30558d163886e1aa492 14SHA1 (patch-ai) = 4c5acf2b0e05765a1fe9e30558d163886e1aa492
15SHA1 (patch-aj) = 6dd73cd38840e1faf103ffb02ae7c0e53475ee04 15SHA1 (patch-aj) = 6dd73cd38840e1faf103ffb02ae7c0e53475ee04
16SHA1 (patch-ak) = 5c0bd81635dcea038499f1b03180c22220b0009e 16SHA1 (patch-ak) = 5c0bd81635dcea038499f1b03180c22220b0009e
17SHA1 (patch-al) = f12aeaca414126e190c5324e15ccefc07fc66ba9 17SHA1 (patch-al) = f12aeaca414126e190c5324e15ccefc07fc66ba9
18SHA1 (patch-am) = 2cf10915f5dc3caf11bb8c7c7255842da646b247 18SHA1 (patch-am) = 2cf10915f5dc3caf11bb8c7c7255842da646b247
19SHA1 (patch-an) = 7b627ceb6212641b7e0de9fd7142bc95e4dcb8cb 19SHA1 (patch-an) = 7b627ceb6212641b7e0de9fd7142bc95e4dcb8cb
20SHA1 (patch-ao) = 7895abad117d5c6901c2241209c5747e6c490e7d 20SHA1 (patch-ao) = 7895abad117d5c6901c2241209c5747e6c490e7d
21SHA1 (patch-ap) = f356d4d26acdf0532fe70a49d0292878f600ff51 21SHA1 (patch-ap) = f356d4d26acdf0532fe70a49d0292878f600ff51
22SHA1 (patch-aq) = 8e6029d36b290b9ffd964c38afe4352a9107be40 22SHA1 (patch-aq) = 8e6029d36b290b9ffd964c38afe4352a9107be40
23SHA1 (patch-ar) = ed9c062adce41a840db1e908ab0657db6de540ae 23SHA1 (patch-ar) = ed9c062adce41a840db1e908ab0657db6de540ae
24SHA1 (patch-as) = 8167416a083a011ded19d176bc488c94d9eb7abf 24SHA1 (patch-as) = 8167416a083a011ded19d176bc488c94d9eb7abf
 25SHA1 (patch-at) = 307a0785190f8bc175226ce83288cc85f7da4631
 26SHA1 (patch-au) = 51291771b994d199fb6de6a17dd7809a7bf39b68
25SHA1 (patch-aw) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec 27SHA1 (patch-aw) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec
26SHA1 (patch-ax) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a 28SHA1 (patch-ax) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/mysql51-server/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/databases/mysql51-server/patches/Attic/patch-ab 2010/03/04 16:28:58 1.1.1.1
+++ pkgsrc/databases/mysql51-server/patches/Attic/patch-ab 2010/03/21 14:41:41 1.2
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-ab,v 1.1.1.1 2010/03/04 16:28:58 taca Exp $ 1$NetBSD: patch-ab,v 1.2 2010/03/21 14:41:41 taca Exp $
2 2
3--- Makefile.in.orig 2010-02-04 11:46:48.000000000 +0000 3--- Makefile.in.orig 2010-02-04 11:46:48.000000000 +0000
4+++ Makefile.in 4+++ Makefile.in
5@@ -407,14 +407,10 @@ AUTOMAKE_OPTIONS = foreign 5@@ -407,14 +407,10 @@ AUTOMAKE_OPTIONS = foreign
6 EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ 6 EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
7 README COPYING EXCEPTIONS-CLIENT CMakeLists.txt 7 README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
8  8
9-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ 9-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
10- @readline_topdir@ sql-common scripts \ 10- @readline_topdir@ sql-common scripts \
11- @pstack_dir@ \ 11- @pstack_dir@ \
12- @sql_union_dirs@ unittest \ 12- @sql_union_dirs@ unittest \
13- @sql_server@ @man_dirs@ tests \ 13- @sql_server@ @man_dirs@ tests \
14- netware @libmysqld_dirs@ \ 14- netware @libmysqld_dirs@ \
15- mysql-test support-files sql-bench @tools_dirs@ \ 15- mysql-test support-files sql-bench @tools_dirs@ \
16- win 16- win
17+SUBDIRS = . include scripts @pstack_dir@ \ 17+SUBDIRS = . include scripts @pstack_dir@ \
18+ strings mysys dbug extra regex storage plugin \ 18+ strings mysys dbug extra regex storage plugin \
19+ libmysql @sql_server@ @man_dirs@ tests \ 19+ libmysql @sql_server@ @man_dirs@ tests \
20+ @libmysqld_dirs@ mysql-test support-files 20+ @libmysqld_dirs@ mysql-test support-files @tools_dirs@
21  21
22 DIST_SUBDIRS = . include Docs zlib \ 22 DIST_SUBDIRS = . include Docs zlib \
23 cmd-line-utils sql-common scripts \ 23 cmd-line-utils sql-common scripts \
File Added: pkgsrc/databases/mysql51-server/patches/Attic/patch-at
$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
File Added: pkgsrc/databases/mysql51-server/patches/Attic/patch-au
$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)