Split databases/mariadb into -client, -scripts, and -server ports

Upgrade to version 5.2.6 [1]

Bring default compilation options into line with standard mariadb releases,
per http://kb.askmonty.org/v/generic-build-instructions [1]

Submitted by:	maintainer [1]
Approved by:	maintainer

5 files changed, 114 insertions, 76 deletions

diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile
index 936ace8bc922..6f3b49aa450e 100644
--- a/databases/mariadb-server/Makefile
+++ b/databases/mariadb-server/Makefile
@@ -6,9 +6,9 @@
 
 PORTNAME=	mariadb
 PKGNAMESUFFIX?=	-server
-PORTVERSION=	5.2.5
+PORTVERSION=	5.2.6
 PORTREVISION?=	0
-CATEGORIES=	databases
+CATEGORIES=	databases ipv6
 MASTER_SITES=	http://www.percona.com/downloads/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
 		http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
 		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
@@ -22,16 +22,11 @@ MASTER_SITES=	http://www.percona.com/downloads/MariaDB/${PORTNAME}-${PORTVERSION
 MAINTAINER=	dgeo@centrale-marseille.fr
 COMMENT?=	Database server - drop-in replacement for MySQL
 
-IGNORE=		Post repo-copy, not ready for use yet
-
 CONFLICTS?=	mysql-server-[0-9]*
 
 GNU_CONFIGURE=	yes
 
 .if !defined(MARIADB_SCRIPTS_SLAVE)
-CONFIGURE_ARGS+=	--with-libevent=${LOCALBASE}
-LIB_DEPENDS+=	event-1.4:${PORTSDIR}/devel/libevent
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 DATADIR=	${PREFIX}/share/mysql
@@ -40,12 +35,16 @@ USE_LDCONFIG=	${PREFIX}/lib/mysql
 USERS=		mysql
 GROUPS=		mysql
 
-OPTIONS=	SSL "Activate SSL support (yassl)" Off \
+OPTIONS+=	STATIC "Build statically linked" On \
+		SSL "Activate SSL support (yassl)" On \
 		OPENSSL "Use OpenSSL instead of bundled yassl" Off
 
 MAKE_JOBS_SAFE=	yes
 
 .if !defined(MARIADB_CLIENT_SLAVE)
+CONFIGURE_ARGS+=	--with-libevent=${LOCALBASE}
+LIB_DEPENDS+=	event-1.4:${PORTSDIR}/devel/libevent
+
 MAN1=	innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \
 	myisamlog.1 myisampack.1 mysql.server.1 mysql_client_test_embedded.1 \
 	mysql_install_db.1 mysql_tzinfo_to_sql.1 mysql_waitpid.1 mysqld_safe.1 \
@@ -56,21 +55,21 @@ LICENSE=	GPLv2
 
 INFO=		mysql
 
-CONFIGURE_ARGS=	--with-embedded-server
+CONFIGURE_ARGS+=	--with-embedded-server --enable-local-infile
 USE_RC_SUBR=	mysql-server
 
 OPTIONS+=	ARIADB "Aria storage engine" On \
 		ARCHIVE "Archive storage plugin" On \
 		BLACKHOLE "Blackhole storage engine" On \
+		SPHINX "SE client for Sphinx search daemon" On \
+		FEDX "FederatedX storage engine (Federated replacement)" On \
 		FEDERATED "Federated (old) storage engine" Off \
-		FEDERATEDX "FederatedX storage engine (Federated replacement)" On \
-		INNODB "InnoDB (old) engine" Off \
 		XTRADB "XtraDB (InnoDB replacement) engine" On \
+		INNODB "InnoDB (old) engine" Off \
 		OQGRAPH "Open Query Graph Computation engine" Off \
 		PBXT "MVCC-based transactional engine" Off \
 		PARTITION "Partitioning support" Off \
-		SPHINX "SE client for Sphinx search daemon" On \
-		NDB "Enable NDB support (imply PARTITION)" Off \
+		NDB "Enable NDB support (implies PARTITION)" Off \
 		EXAMPLES "Example engine,daemon and ftsearch plugins" Off
 .endif	# .if !defined(MARIADB_CLIENT_SLAVE)
 
@@ -79,6 +78,9 @@ OPTIONS+=	ARIADB "Aria storage engine" On \
 .if ${ARCH} == "i386" || ${ARCH} == "amd64"
 CONFIGURE_ARGS+=	--enable-assembler
 .endif
+.if ${ARCH} == "i386"
+CONFIGURE_ARGS+=	--with-big-tables
+.endif
 .if defined(WITH_SSL)
 .if defined(WITH_OPENSSL)
 USE_OPENSSL=	yes
@@ -90,59 +92,67 @@ MDB_EXTRA_SUBDIRS=	extra
 .else
 CONFIGURE_ARGS+=	--without-ssl
 .endif
+.if defined(WITH_STATIC)
+CONFIGURE_ARGS+=	--with-client-ldflags="-static -all-static"
+.endif
+.if defined(WITH_THREADSAFE)
+CONFIGURE_ARGS+=	--enable-thread-safe-client
+.endif
 
 .if !defined(MARIADB_CLIENT_SLAVE)
 .if defined(WITH_ARIADB)
 PLIST_SUB+=	ARIADB=""
 CONFIGURE_ARGS+=	--with-plugin-aria --with-aria-tmp-tables
+PLUGINS+=	aria
 .else
 CONFIGURE_ARGS+=	--without-plugin-aria
 PLIST_SUB+=	ARIADB="@comment "
 .endif
 .if defined(WITH_SPHINX)
 PLIST_SUB+=	SPHINX=""
+PLUGINS+=	sphinx
 .else
 CONFIGURE_ARGS+=	--without-plugin-sphinx
 PLIST_SUB+=	SPHINX="@comment "
 .endif
-.if defined(WITH_ARIADB)
-PLIST_SUB+=	ARIADB=""
-.else
-CONFIGURE_ARGS+=	--without-plugin-aria
-PLIST_SUB+=	ARIADB="@comment "
-.endif
 .if defined(WITH_ARCHIVE)
 PLIST_SUB+=	ARCHIVE=""
+PLUGINS+=	archive
 .else
 CONFIGURE_ARGS+=	--without-plugin-archive
 PLIST_SUB+=	ARCHIVE="@comment "
 .endif
 .if defined(WITH_BLACKHOLE)
 PLIST_SUB+=	BLACKHOLE=""
+PLUGINS+=	blackhole
 .else
 CONFIGURE_ARGS+=	--without-plugin-blackhole
 PLIST_SUB+=	BLACKHOLE="@comment "
 .endif
 .if defined(WITH_FEDERATED)
 PLIST_SUB+=	FEDERATED=""
+PLUGINS+=	federated
 .else
 CONFIGURE_ARGS+=	--without-plugin-federated
 PLIST_SUB+=	FEDERATED="@comment "
 .endif
-.if defined(WITH_FEDERATEDX)
+.if defined(WITH_FEDX)
 PLIST_SUB+=	FEDERATEDX=""
+PLUGINS+=	federatedx
 .else
 CONFIGURE_ARGS+=	--without-plugin-federatedx
 PLIST_SUB+=	FEDERATEDX="@comment "
 .endif
 .if defined(WITH_INNODB)
 PLIST_SUB+=	INNODB=""
+PLUGINS+=	innodb_plugin
 .else
 CONFIGURE_ARGS+=	--without-plugin-innodb_plugin
 PLIST_SUB+=	INNODB="@comment "
 .endif
 .if defined(WITH_XTRADB)
 PLIST_SUB+=	XTRADB=""
+PLUGINS+=	xtradb
 .else
 CONFIGURE_ARGS+=	--without-plugin-xtradb
 PLIST_SUB+=	XTRADB="@comment "
@@ -151,6 +161,7 @@ PLIST_SUB+=	XTRADB="@comment "
 CONFIGURE_ARGS+=	--with-plugin-oqgraph
 PLIST_SUB+=	OQGRAPH=""
 LIB_DEPENDS+=	boost_system.4:${PORTSDIR}/devel/boost-libs
+PLUGINS+=	oqgraph
 .else
 CONFIGURE_ARGS+=	--without-plugin-oqgraph
 PLIST_SUB+=	OQGRAPH="@comment "
@@ -158,6 +169,7 @@ PLIST_SUB+=	OQGRAPH="@comment "
 .if defined(WITH_PBXT)
 CONFIGURE_ARGS+=	--with-plugin-pbxt
 PLIST_SUB+=	PBXT=""
+PLUGINS+=	pbxt
 .else
 CONFIGURE_ARGS+=	--without-plugin-pbxt
 PLIST_SUB+=	PBXT="@comment "
@@ -172,15 +184,23 @@ PLIST_SUB+=	EXAMPLES="@comment "
 CONFIGURE_ARGS+=	--with-plugin-ndbcluster
 WITH_PARTITION=yes
 PLIST_SUB+=	NDB=""
+PLUGINS+=	ndbcluster
 .else
 CONFIGURE_ARGS+=	--without-plugin-ndbcluster
 PLIST_SUB+=	NDB="@comment "
 .endif
 .if defined(WITH_PARTITION)
 CONFIGURE_ARGS+=	--with-plugin-partition
+PLUGINS+=	partition
 .else
 CONFIGURE_ARGS+=	--without-plugin-partition
 .endif
+.if defined(WITH_STATIC)
+CONFIGURE_ARGS+=	--with-mysqld-ldflags="-static -all-static" --with-plugins="${PLUGINS}"
+PLIST_SUB+=	STATIC="@comment "
+.else
+PLIST_SUB+=	STATIC=""
+.endif
 .endif	# .if !defined(MARIADB_CLIENT_SLAVE)
 
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
@@ -188,11 +208,26 @@ CONFIGURE_ARGS+=	--with-charset=${WITH_CHARSET}
 .endif
 .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
 CONFIGURE_ARGS+=	--with-extra-charsets=${WITH_XCHARSET}
+.else
+CONFIGURE_ARGS+=	--with-extra-charsets=complex
 .endif
 .if defined(WITH_COLLATION) && ${WITH_COLLATION} != ""
 CONFIGURE_ARGS+=	--with-collation=${WITH_COLLATION}
 .endif
 
+.if defined(WITH_STATIC) && ( defined(WITH_OPENSSL) || defined(WITH_NDB) )
+pre-extract:
+	@${ECHO} ''
+	@${ECHO} "WITH_STATIC is not compatible with WITH_OPENSSL or WITH_NDB"
+	@${ECHO} ''
+	@${FALSE}
+.endif
+
+.if !defined(MARIADB_CLIENT_SLAVE)
+.if !defined(WITH_STATIC)
+SUB_FILES=	pkg-message
+.endif
+
 pre-fetch:
 	@${ECHO} ''
 	@${ECHO} '	The following configuration options can be set in /etc/make.conf'
@@ -202,10 +237,9 @@ pre-fetch:
 	@${ECHO} "	WITH_CHARSET=charset"
 	@${ECHO} "		Primary built-in charset (default: latin1, selected: ${WITH_CHARSET})."
 	@${ECHO} "	WITH_XCHARSET=list"
-	@${ECHO} "		Other built-in charsets (default: none, selected: ${WITH_XCHARSET})."
+	@${ECHO} "		Other built-in charsets (default: complex, selected: ${WITH_XCHARSET})."
 	@${ECHO} ''
 
-.if !defined(MARIADB_CLIENT_SLAVE)
 EXTRA_PATCHES=	${FILESDIR}/scripts__Makefile.in
 MDB_SERVER_SUBDIRS=	include @docs_dirs@ sql-common libservices mysys strings dbug ${MDB_EXTRA_SUBDIRS} unittest cmd-line-utils libmysql scripts @sql_server_dirs@ @sql_server@ @man_dirs@ @libmysqld_dirs@ support-files
 
@@ -218,8 +252,10 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|^\(install-data-am:\) install-pkgincludeHEADERS|\1|g" ${WRKSRC}/extra/Makefile.in ${WRKSRC}/include/Makefile.in
 	@${REINPLACE_CMD} -e "s|^\(install-exec-am:\) install-pkglibLTLIBRARIES|\1|g" ${WRKSRC}/libmysql/Makefile.in
 
+.if !defined(WITH_STATIC)
 post-install:
-	@${CAT} pkg-message
+	@${CAT} ${PKGMESSAGE}
+.endif
 .endif	# .if !defined(MARIADB_CLIENT_SLAVE)
 .endif	# .if !defined(MARIADB_SCRIPTS_SLAVE)
 
diff --git a/databases/mariadb-server/distinfo b/databases/mariadb-server/distinfo
index 621b0937ac65..63587ecec290 100644
--- a/databases/mariadb-server/distinfo
+++ b/databases/mariadb-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mariadb-5.2.5.tar.gz) = 1e137f23d8bf430beeed01aed8b3beecff3a7d65ec4bfd291bfcf6668f21c5a1
-SIZE (mariadb-5.2.5.tar.gz) = 24925585
+SHA256 (mariadb-5.2.6.tar.gz) = 4cf77b7978328e54ce58a2a8c3380e38d8a0039fd2e29d5fa148adbb6b4134c0
+SIZE (mariadb-5.2.6.tar.gz) = 25086148
diff --git a/databases/mariadb-server/files/pkg-message.in b/databases/mariadb-server/files/pkg-message.in
new file mode 100644
index 000000000000..831367e52575
--- /dev/null
+++ b/databases/mariadb-server/files/pkg-message.in
@@ -0,0 +1,7 @@
+
+Some optional plugins (those in %%LOCALBASE%%/lib/mysql/plugin/*.so)
+must be loaded in <datadir>/my.cnf. For example:
+
+[mysqld]
+plugin-load=ha_oqgraph.so:ha_federatedx.so
+
diff --git a/databases/mariadb-server/pkg-message b/databases/mariadb-server/pkg-message
deleted file mode 100644
index d1d9d9292c7e..000000000000
--- a/databases/mariadb-server/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-Some optional plugins (those in ${LOCALBASE}/lib/mysql/plugin/*.so)
-must be loaded in <datadir>/my.cnf. For example:
-
-[mysqld]
-plugin-load=ha_xtradb.so:ha_federatedx.so
diff --git a/databases/mariadb-server/pkg-plist b/databases/mariadb-server/pkg-plist
index d0c3637b0c54..5f77cf9e2f77 100644
--- a/databases/mariadb-server/pkg-plist
+++ b/databases/mariadb-server/pkg-plist
@@ -3,7 +3,7 @@
 %%ARIADB%%bin/aria_ftdump
 %%ARIADB%%bin/aria_pack
 %%ARIADB%%bin/aria_read_log
-bin/innochecksum
+%%XTRADB%%bin/innochecksum
 bin/msql2mysql
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -96,57 +96,57 @@ lib/mysql/libmysys.a
 %%NDB%%lib/mysql/libndbclient.so
 %%NDB%%lib/mysql/libndbclient.so.3
 lib/mysql/libvio.a
-lib/mysql/plugin/dialog.a
-lib/mysql/plugin/dialog.la
-lib/mysql/plugin/dialog.so
-lib/mysql/plugin/dialog.so.0
-%%ARCHIVE%%lib/mysql/plugin/ha_archive.a
-%%ARCHIVE%%lib/mysql/plugin/ha_archive.la
-%%ARCHIVE%%lib/mysql/plugin/ha_archive.so
-%%ARCHIVE%%lib/mysql/plugin/ha_archive.so.0
-%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.a
-%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.la
-%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so
-%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so.0
-%%EXAMPLES%%lib/mysql/plugin/ha_example.a
-%%EXAMPLES%%lib/mysql/plugin/ha_example.la
-%%EXAMPLES%%lib/mysql/plugin/ha_example.so
-%%EXAMPLES%%lib/mysql/plugin/ha_example.so.0
-%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.a
-%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.la
-%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so
-%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so.0
-%%EXAMPLES%%lib/mysql/plugin/mypluglib.a
-%%EXAMPLES%%lib/mysql/plugin/mypluglib.la
-%%EXAMPLES%%lib/mysql/plugin/mypluglib.so
-%%EXAMPLES%%lib/mysql/plugin/mypluglib.so.0
-%%FEDERATED%%lib/mysql/plugin/ha_federated.a
-%%FEDERATED%%lib/mysql/plugin/ha_federated.la
-%%FEDERATED%%lib/mysql/plugin/ha_federated.so
-%%FEDERATED%%lib/mysql/plugin/ha_federated.so.0
-%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.a
-%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.la
-%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so
-%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so.0
-%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.a
-%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.la
-%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so
-%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so.0
+%%STATIC%%lib/mysql/plugin/dialog.a
+%%STATIC%%lib/mysql/plugin/dialog.la
+%%STATIC%%lib/mysql/plugin/dialog.so
+%%STATIC%%lib/mysql/plugin/dialog.so.0
+%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.a
+%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.la
+%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so
+%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so.0
+%%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.a
+%%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.la
+%%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so
+%%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so.0
+%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/ha_example.a
+%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/ha_example.la
+%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/ha_example.so
+%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/ha_example.so.0
+%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.a
+%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.la
+%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so
+%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so.0
+%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/mypluglib.a
+%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/mypluglib.la
+%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/mypluglib.so
+%%STATIC%%%%EXAMPLES%%lib/mysql/plugin/mypluglib.so.0
+%%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.a
+%%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.la
+%%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.so
+%%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.so.0
+%%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.a
+%%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.la
+%%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so
+%%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so.0
+%%STATIC%%%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.a
+%%STATIC%%%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.la
+%%STATIC%%%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so
+%%STATIC%%%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so.0
 %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.la
 %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
 %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so.0
-%%SPHINX%%lib/mysql/plugin/ha_sphinx.a
-%%SPHINX%%lib/mysql/plugin/ha_sphinx.la
-%%SPHINX%%lib/mysql/plugin/ha_sphinx.so
-%%SPHINX%%lib/mysql/plugin/ha_sphinx.so.0
+%%STATIC%%%%SPHINX%%lib/mysql/plugin/ha_sphinx.a
+%%STATIC%%%%SPHINX%%lib/mysql/plugin/ha_sphinx.la
+%%STATIC%%%%SPHINX%%lib/mysql/plugin/ha_sphinx.so
+%%STATIC%%%%SPHINX%%lib/mysql/plugin/ha_sphinx.so.0
 %%SPHINX%%lib/mysql/plugin/sphinx.a
 %%SPHINX%%lib/mysql/plugin/sphinx.la
 %%SPHINX%%lib/mysql/plugin/sphinx.so
 %%SPHINX%%lib/mysql/plugin/sphinx.so.0
-%%XTRADB%%lib/mysql/plugin/ha_xtradb.a
-%%XTRADB%%lib/mysql/plugin/ha_xtradb.la
-%%XTRADB%%lib/mysql/plugin/ha_xtradb.so
-%%XTRADB%%lib/mysql/plugin/ha_xtradb.so.0
+%%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.a
+%%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.la
+%%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.so
+%%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.so.0
 libexec/mysqld
 %%NDB%%libexec/ndb_cpcd
 %%NDB%%libexec/ndb_mgmd
@@ -248,5 +248,5 @@ libexec/mysqld
 %%NDB%%@dirrm include/mysql/storage/ndb
 %%NDB%%@dirrm include/mysql/storage
 @dirrmtry include/mysql
-@dirrm lib/mysql/plugin
+@dirrmtry lib/mysql/plugin
 @dirrmtry lib/mysql