Add mysqld embedded server library and fix pkg-plist.

3 files changed, 28 insertions, 3 deletions

diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 1a5b01889296..0a4397bb9abf 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.0.77
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-5.0
@@ -104,6 +104,12 @@ CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.1.* mysql-server-6.*
 
 USE_RC_SUBR=	mysql-server.sh
 
+.if !defined(WITHOUT_INNODB)
+PLIST_SUB+=	INNODB=""
+.else
+PLIST_SUB+=	INNODB="@comment "
+.endif
+
 .if defined(WITH_NDB)
 PLIST_SUB+=	NDB=""
 .else
@@ -116,6 +122,10 @@ MAN1=		myisamchk.1 myisamlog.1 myisampack.1 \
 
 INFO=		mysql
 
+CONFIGURE_ARGS+=--with-embedded-server
+
+CFLAGS+=	-fPIC
+
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
@@ -142,13 +152,14 @@ pre-fetch:
 	@${ECHO} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ scripts @sql_server_dirs@ @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ scripts @sql_server_dirs@ libmysql @man_dirs@ @libmysqld_dirs@ support-files|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_upgrade_shell|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql mysql_system_tables.sql mysql_system_tables_data.sql|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/extra/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
+	@${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLTLIBRARIES|install-exec-am:|g" ${WRKSRC}/libmysql/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
 .if defined(WITH_PROC_SCOPE_PTH)
 	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc
diff --git a/databases/mysql50-server/files/patch-include_myisam.h b/databases/mysql50-server/files/patch-include_myisam.h
new file mode 100644
index 000000000000..450645400dd5
--- /dev/null
+++ b/databases/mysql50-server/files/patch-include_myisam.h
@@ -0,0 +1,11 @@
+--- include/myisam.h.orig	2009-02-16 23:04:54.000000000 +0100
++++ include/myisam.h	2009-02-16 23:10:08.000000000 +0100
+@@ -48,7 +48,7 @@
+   The following defines can be increased if necessary.
+   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
+ */
+-#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
++#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
+ #define MI_MAX_KEY_SEG              16              /* Max segments for key */
+ 
+ #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist
index 8a9f5d8c0695..21be85b76f32 100644
--- a/databases/mysql50-server/pkg-plist
+++ b/databases/mysql50-server/pkg-plist
@@ -1,11 +1,13 @@
 @stopdaemon mysql-server
 bin/comp_err
-bin/innochecksum
+%%INNODB%%bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
+bin/mysqltest_embedded
+bin/mysql_client_test_embedded
 bin/mysql_install_db
 bin/mysql_tzinfo_to_sql
 bin/mysql_upgrade_shell
@@ -61,6 +63,7 @@ lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmyisam.a
 lib/mysql/libmyisammrg.a
+lib/mysql/libmysqld.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 %%NDB%%lib/mysql/libndbclient.a