6 files changed, 111 insertions, 18 deletions

diff --git a/benchmarks/sysbench/Makefile b/benchmarks/sysbench/Makefile
index 6e4f6a891550..1952984571a2 100644
--- a/benchmarks/sysbench/Makefile
+++ b/benchmarks/sysbench/Makefile
@@ -2,14 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	sysbench
-PORTVERSION=	0.4.12
-PORTREVISION=	3
+PORTVERSION=	0.5
 CATEGORIES=	benchmarks databases
-MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
-#		Project gone from sourceforge, both site and downloads
-#		Something exists on launchpad (https://code.launchpad.net/sysbench)
-#		maybe the port swould be switched there, however there are no
-#		direct downloads
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modular, cross-platform, and multi-threaded benchmark tool
@@ -17,11 +11,12 @@ COMMENT=	Modular, cross-platform, and multi-threaded benchmark tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf libtool
-GNU_CONFIGURE=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	akopytov
+GH_TAGNAME=	a099b20
 
-PLIST_FILES=	bin/sysbench
-PORTDOCS=	manual.html
+USES=		autoreconf libtool lua
+GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	LARGEFILE MYSQL PGSQL DOCS
 OPTIONS_DEFAULT=	LARGEFILE MYSQL
@@ -30,11 +25,18 @@ LARGEFILE_DESC=			Largefile support
 LARGEFILE_CONFIGURE_ENABLE=	largefile
 
 MYSQL_CONFIGURE_ON=	--with-mysql
-MYSQL_CONFIGURE_OFF=	--with-mysql=no
-MYSQL_USE=		MYSQL=yes
+MYSQL_CONFIGURE_OFF=	--without-mysql
+MYSQL_USES=	mysql
 
 PGSQL_CONFIGURE_ON=	--with-pgsql
-PGSQL_CONFIGURE_OFF=	--with-pgsql=no
-PGSQL_USES=		pgsql
+PGSQL_USES=	pgsql
+
+post-configure:
+	@${REINPLACE_CMD} -e 's/^program_transform_name/#/' \
+	${WRKSRC}/Makefile ${WRKSRC}/sysbench/Makefile
+
+post-install:
+	${MKDIR} ${STAGEDIR}${DATADIR}/tests
+	(cd ${WRKSRC}/sysbench/tests && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tests)
 
 .include <bsd.port.mk>
diff --git a/benchmarks/sysbench/distinfo b/benchmarks/sysbench/distinfo
index eb06ffac0deb..b3209ba78411 100644
--- a/benchmarks/sysbench/distinfo
+++ b/benchmarks/sysbench/distinfo
@@ -1,2 +1,3 @@
-SHA256 (sysbench-0.4.12.tar.gz) = 83fa7464193e012c91254e595a89894d8e35b4a38324b52a5974777e3823ea9e
-SIZE (sysbench-0.4.12.tar.gz) = 421932
+TIMESTAMP = 1495555427
+SHA256 (akopytov-sysbench-0.5-a099b20_GH0.tar.gz) = 24fa63f4ec2fdaed45d98344e9e0c4a66702b847b822af99e78ab4d30637feb2
+SIZE (akopytov-sysbench-0.5-a099b20_GH0.tar.gz) = 265815
diff --git a/benchmarks/sysbench/files/patch-autogen.sh b/benchmarks/sysbench/files/patch-autogen.sh
new file mode 100644
index 000000000000..87f65de1b917
--- /dev/null
+++ b/benchmarks/sysbench/files/patch-autogen.sh
@@ -0,0 +1,8 @@
+--- autogen.sh.orig	2016-07-21 09:27:35 UTC
++++ autogen.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ # Taken from lighthttpd server (BSD). Thanks Jan!
+ # Run this to generate all the initial makefiles, etc.
+ 
diff --git a/benchmarks/sysbench/files/patch-sysbench_Makefile.am b/benchmarks/sysbench/files/patch-sysbench_Makefile.am
new file mode 100644
index 000000000000..a733c14197e3
--- /dev/null
+++ b/benchmarks/sysbench/files/patch-sysbench_Makefile.am
@@ -0,0 +1,11 @@
+--- sysbench/Makefile.am.orig	2016-07-21 09:27:35 UTC
++++ sysbench/Makefile.am
+@@ -44,7 +44,7 @@ endif
+ 
+ if USE_LUA
+ #lua_ldadd = scripting/lua/src/liblua.a -lm @LIBADD_DLOPEN@
+-lua_ldadd = scripting/lua/src/liblua.a -lm -ldl
++lua_ldadd = scripting/lua/src/liblua.a -lm 
+ endif
+ 
+ sysbench_SOURCES = sysbench.c sysbench.h sb_timer.c sb_timer.h \
diff --git a/benchmarks/sysbench/pkg-descr b/benchmarks/sysbench/pkg-descr
index b25bbe577134..0dfb688cb966 100644
--- a/benchmarks/sysbench/pkg-descr
+++ b/benchmarks/sysbench/pkg-descr
@@ -18,4 +18,4 @@ Primarily written for MySQL server benchmarking, SysBench will be
 further extended to support multiple database backends, distributed
 benchmarks and third-party plug-in modules.
 
-WWW: http://sysbench.sourceforge.net/
+WWW: https://github.com/akopytov/sysbench
diff --git a/benchmarks/sysbench/pkg-plist b/benchmarks/sysbench/pkg-plist
new file mode 100644
index 000000000000..5884737093a7
--- /dev/null
+++ b/benchmarks/sysbench/pkg-plist
@@ -0,0 +1,71 @@
+bin/sysbench
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%DATADIR%%/tests/CMakeLists.txt
+%%DATADIR%%/tests/Makefile
+%%DATADIR%%/tests/Makefile.am
+%%DATADIR%%/tests/Makefile.in
+%%DATADIR%%/tests/cpu/.deps/%%LUA_LIBDIR%%sbcpu_a-sb_cpu.Po
+%%DATADIR%%/tests/cpu/CMakeLists.txt
+%%DATADIR%%/tests/cpu/Makefile
+%%DATADIR%%/tests/cpu/Makefile.am
+%%DATADIR%%/tests/cpu/Makefile.in
+%%DATADIR%%/tests/cpu/%%LUA_LIBDIR%%sbcpu.a
+%%DATADIR%%/tests/cpu/%%LUA_LIBDIR%%sbcpu_a-sb_cpu.o
+%%DATADIR%%/tests/cpu/sb_cpu.c
+%%DATADIR%%/tests/db/Makefile
+%%DATADIR%%/tests/db/Makefile.am
+%%DATADIR%%/tests/db/Makefile.in
+%%DATADIR%%/tests/db/bulk_insert.lua
+%%DATADIR%%/tests/db/common.lua
+%%DATADIR%%/tests/db/delete.lua
+%%DATADIR%%/tests/db/insert.lua
+%%DATADIR%%/tests/db/oltp.lua
+%%DATADIR%%/tests/db/oltp_simple.lua
+%%DATADIR%%/tests/db/parallel_prepare.lua
+%%DATADIR%%/tests/db/select.lua
+%%DATADIR%%/tests/db/select_random_points.lua
+%%DATADIR%%/tests/db/select_random_ranges.lua
+%%DATADIR%%/tests/db/update_index.lua
+%%DATADIR%%/tests/db/update_non_index.lua
+%%DATADIR%%/tests/fileio/.deps/%%LUA_LIBDIR%%sbfileio_a-crc32.Po
+%%DATADIR%%/tests/fileio/.deps/%%LUA_LIBDIR%%sbfileio_a-sb_fileio.Po
+%%DATADIR%%/tests/fileio/CMakeLists.txt
+%%DATADIR%%/tests/fileio/Makefile
+%%DATADIR%%/tests/fileio/Makefile.am
+%%DATADIR%%/tests/fileio/Makefile.in
+%%DATADIR%%/tests/fileio/crc32.c
+%%DATADIR%%/tests/fileio/crc32.h
+%%DATADIR%%/tests/fileio/crc32tbl.h
+%%DATADIR%%/tests/fileio/%%LUA_LIBDIR%%sbfileio.a
+%%DATADIR%%/tests/fileio/%%LUA_LIBDIR%%sbfileio_a-crc32.o
+%%DATADIR%%/tests/fileio/%%LUA_LIBDIR%%sbfileio_a-sb_fileio.o
+%%DATADIR%%/tests/fileio/sb_fileio.c
+%%DATADIR%%/tests/memory/.deps/%%LUA_LIBDIR%%sbmemory_a-sb_memory.Po
+%%DATADIR%%/tests/memory/CMakeLists.txt
+%%DATADIR%%/tests/memory/Makefile
+%%DATADIR%%/tests/memory/Makefile.am
+%%DATADIR%%/tests/memory/Makefile.in
+%%DATADIR%%/tests/memory/%%LUA_LIBDIR%%sbmemory.a
+%%DATADIR%%/tests/memory/%%LUA_LIBDIR%%sbmemory_a-sb_memory.o
+%%DATADIR%%/tests/memory/sb_memory.c
+%%DATADIR%%/tests/mutex/.deps/%%LUA_LIBDIR%%sbmutex_a-sb_mutex.Po
+%%DATADIR%%/tests/mutex/CMakeLists.txt
+%%DATADIR%%/tests/mutex/Makefile
+%%DATADIR%%/tests/mutex/Makefile.am
+%%DATADIR%%/tests/mutex/Makefile.in
+%%DATADIR%%/tests/mutex/%%LUA_LIBDIR%%sbmutex.a
+%%DATADIR%%/tests/mutex/%%LUA_LIBDIR%%sbmutex_a-sb_mutex.o
+%%DATADIR%%/tests/mutex/sb_mutex.c
+%%DATADIR%%/tests/sb_cpu.h
+%%DATADIR%%/tests/sb_fileio.h
+%%DATADIR%%/tests/sb_memory.h
+%%DATADIR%%/tests/sb_mutex.h
+%%DATADIR%%/tests/sb_threads.h
+%%DATADIR%%/tests/threads/.deps/%%LUA_LIBDIR%%sbthreads_a-sb_threads.Po
+%%DATADIR%%/tests/threads/CMakeLists.txt
+%%DATADIR%%/tests/threads/Makefile
+%%DATADIR%%/tests/threads/Makefile.am
+%%DATADIR%%/tests/threads/Makefile.in
+%%DATADIR%%/tests/threads/%%LUA_LIBDIR%%sbthreads.a
+%%DATADIR%%/tests/threads/%%LUA_LIBDIR%%sbthreads_a-sb_threads.o
+%%DATADIR%%/tests/threads/sb_threads.c