2 files changed, 32 insertions, 10 deletions

diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile
index 0e45a79f1004..12294e54eb08 100644
--- a/databases/mariadb-server/Makefile
+++ b/databases/mariadb-server/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mariadb
 PORTVERSION=	5.3.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
 		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
@@ -49,13 +49,15 @@ OPENSSL_DESC=	Use OpenSSL instead of bundled yassl
 
 .if !defined(MARIADB_CLIENT_SLAVE)
 CONFIGURE_ARGS+=	--with-libevent=${LOCALBASE}
-LIB_DEPENDS+=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS+=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
+CFLAGS+=	-I${LOCALBASE}/include/event2/compat \
+		-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib/event2
 
-MAN1=	innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \
+MANS=	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 \
 	mysqltest_embedded.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
-MAN8=	mysqld.8 mysqlmanager.8
 
 INFO=		mysql
 
@@ -84,7 +86,6 @@ MAXKEY_DESC=		Change max key length from 1000 to 4000
 OPTIONS_DEFAULT+=	ARIADB ARCHIVE BLACKHOLE SPHINX FEDX XTRADB HANDLERSOCKET
 .endif	# .if !defined(MARIADB_CLIENT_SLAVE)
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} >= 1000000
@@ -274,18 +275,20 @@ 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
 
 post-patch:
+	@${REINPLACE_CMD} -e "s|-levent|-levent-2.0|g" ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s|%%SUBDIRS%%|${MDB_SERVER_SUBDIRS}|" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s|%%MANS%%|${MAN1}|" ${WRKSRC}/man/Makefile.in
+	@${REINPLACE_CMD} -e "s|%%MANS%%|${MANS}|" ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e "s|^\(install:\).*|\1|" ${WRKSRC}/mysql-test/Makefile.in ${WRKSRC}/sql-bench/Makefile.in
 	@${REINPLACE_CMD} -e "s|^\(aclocal_DATA =\).*|\1|" ${WRKSRC}/support-files/Makefile.in
 	@${REINPLACE_CMD} -e "s|^\(pkginclude_HEADERS =\).*|\1|" ${WRKSRC}/cmd-line-utils/libedit/Makefile.in
 	@${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
+	@${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/libservices/Makefile.in \
+		${WRKSRC}/mysys/Makefile.in ${WRKSRC}/strings/Makefile.in \
+		${WRKSRC}/dbug/Makefile.in ${WRKSRC}/storage/myisam/Makefile.in \
+		${WRKSRC}/storage/heap/Makefile.in ${WRKSRC}/storage/maria/Makefile.in \
+		${WRKSRC}/storage/myisammrg/Makefile.in ${WRKSRC}/vio/Makefile.in
 
-.if empty(PORT_OPTIONS:MSTATIC)
-post-install:
-	@${CAT} ${PKGMESSAGE}
-.endif
 .endif	# .if !defined(MARIADB_CLIENT_SLAVE)
 .endif	# .if !defined(MARIADB_SCRIPTS_SLAVE)
 
diff --git a/databases/mariadb-server/pkg-plist b/databases/mariadb-server/pkg-plist
index 50de285b971d..e59983698667 100644
--- a/databases/mariadb-server/pkg-plist
+++ b/databases/mariadb-server/pkg-plist
@@ -344,6 +344,25 @@ lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libvio.a
 libexec/mysqld
+man/man1/innochecksum.1.gz
+man/man1/my_print_defaults.1.gz
+man/man1/myisam_ftdump.1.gz
+man/man1/myisamchk.1.gz
+man/man1/myisamlog.1.gz
+man/man1/myisampack.1.gz
+man/man1/mysql.server.1.gz
+man/man1/mysql_client_test_embedded.1.gz
+man/man1/mysql_install_db.1.gz
+man/man1/mysql_tzinfo_to_sql.1.gz
+man/man1/mysql_waitpid.1.gz
+man/man1/mysqld_safe.1.gz
+man/man1/mysqltest_embedded.1.gz
+man/man1/perror.1.gz
+man/man1/replace.1.gz
+man/man1/resolve_stack_dump.1.gz
+man/man1/resolveip.1.gz
+man/man8/mysqld.8.gz
+man/man8/mysqlmanager.8.gz
 @dirrm %%DATADIR%%/ukrainian
 @dirrm %%DATADIR%%/swedish
 @dirrm %%DATADIR%%/spanish