6 files changed, 113 insertions, 136 deletions

diff --git a/benchmarks/sysbench/Makefile b/benchmarks/sysbench/Makefile
index 1952984571a2..dc77894befbc 100644
--- a/benchmarks/sysbench/Makefile
+++ b/benchmarks/sysbench/Makefile
@@ -2,41 +2,37 @@
 # $FreeBSD$
 
 PORTNAME=	sysbench
-PORTVERSION=	0.5
+PORTVERSION=	1.0.7
 CATEGORIES=	benchmarks databases
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Modular, cross-platform, and multi-threaded benchmark tool
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Scriptable database and system performance benchmark
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	akopytov
-GH_TAGNAME=	a099b20
-
-USES=		autoreconf libtool lua
-GNU_CONFIGURE=	yes
+BUILD_DEPENDS=	xxd:editors/vim
+LIB_DEPENDS=	libck.so:devel/concurrencykit \
+		libluajit-5.1.so:lang/luajit
 
-OPTIONS_DEFINE=	LARGEFILE MYSQL PGSQL DOCS
-OPTIONS_DEFAULT=	LARGEFILE MYSQL
+OPTIONS_DEFINE=	LFS MYSQL PGSQL
+OPTIONS_DEFAULT=LFS MYSQL
 
-LARGEFILE_DESC=			Largefile support
-LARGEFILE_CONFIGURE_ENABLE=	largefile
-
-MYSQL_CONFIGURE_ON=	--with-mysql
-MYSQL_CONFIGURE_OFF=	--without-mysql
-MYSQL_USES=	mysql
+CONFIGURE_ARGS=	--with-system-ck --with-system-luajit
+GNU_CONFIGURE=	yes
+USES=		autoreconf gmake libtool pkgconfig
 
-PGSQL_CONFIGURE_ON=	--with-pgsql
-PGSQL_USES=	pgsql
+GH_ACCOUNT=	akopytov
+USE_GITHUB=	yes
 
-post-configure:
-	@${REINPLACE_CMD} -e 's/^program_transform_name/#/' \
-	${WRKSRC}/Makefile ${WRKSRC}/sysbench/Makefile
+LFS_CONFIGURE_ENABLE=	largefile
+MYSQL_CONFIGURE_WITH=	mysql
+MYSQL_USES=		mysql
+PGSQL_CONFIGURE_WITH=	pgsql
+PGSQL_USES=		pgsql
 
-post-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}/tests
-	(cd ${WRKSRC}/sysbench/tests && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tests)
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| doc||' ${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e 's|__linux__|__FreeBSD__|' ${WRKSRC}/src/sb_util.h
 
 .include <bsd.port.mk>
diff --git a/benchmarks/sysbench/distinfo b/benchmarks/sysbench/distinfo
index b3209ba78411..76e94e533f11 100644
--- a/benchmarks/sysbench/distinfo
+++ b/benchmarks/sysbench/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495555427
-SHA256 (akopytov-sysbench-0.5-a099b20_GH0.tar.gz) = 24fa63f4ec2fdaed45d98344e9e0c4a66702b847b822af99e78ab4d30637feb2
-SIZE (akopytov-sysbench-0.5-a099b20_GH0.tar.gz) = 265815
+TIMESTAMP = 1495635272
+SHA256 (akopytov-sysbench-1.0.7_GH0.tar.gz) = db91521e70b0d1a6fccc60a8d4acadacb3f9328e8ab6802ae82f93393a688d43
+SIZE (akopytov-sysbench-1.0.7_GH0.tar.gz) = 1494571
diff --git a/benchmarks/sysbench/files/patch-autogen.sh b/benchmarks/sysbench/files/patch-autogen.sh
deleted file mode 100644
index 87f65de1b917..000000000000
--- a/benchmarks/sysbench/files/patch-autogen.sh
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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
deleted file mode 100644
index a733c14197e3..000000000000
--- a/benchmarks/sysbench/files/patch-sysbench_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 0dfb688cb966..abaff7418c8c 100644
--- a/benchmarks/sysbench/pkg-descr
+++ b/benchmarks/sysbench/pkg-descr
@@ -1,21 +1,13 @@
-SysBench is a modular, cross-platform and multi-threaded benchmark tool
-for evaluating OS parameters that are important for a system running a
-database under intensive load.
-
-The idea of this benchmark suite is to quickly get an impression about
-system performance without setting up complex database benchmarks or
-even without installing a database at all.
-
-Current features allow to test the following system parameters:
-
-    * file I/O performance
-    * scheduler performance
-    * memory allocation and transfer speed
-    * POSIX threads implementation performance
-    * database server performance (OLTP benchmark)
-
-Primarily written for MySQL server benchmarking, SysBench will be
-further extended to support multiple database backends, distributed
-benchmarks and third-party plug-in modules.
+sysbench is a scriptable multi-threaded benchmark tool based on LuaJIT. It is
+most frequently used for database benchmarks, but can also be used to create
+arbitrarily complex workloads that do not involve a database server.
+
+sysbench comes with the following bundled benchmarks:
+- oltp_*.lua: a collection of OLTP-like database benchmarks
+- fileio: a filesystem-level benchmark
+- cpu: a simple CPU benchmark
+- memory: a memory access benchmark
+- threads: a thread-based scheduler benchmark
+- mutex: a POSIX mutex benchmark
 
 WWW: https://github.com/akopytov/sysbench
diff --git a/benchmarks/sysbench/pkg-plist b/benchmarks/sysbench/pkg-plist
index 5884737093a7..a2eb0ab76660 100644
--- a/benchmarks/sysbench/pkg-plist
+++ b/benchmarks/sysbench/pkg-plist
@@ -1,71 +1,79 @@
 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
+%%DATADIR%%/bulk_insert.lua
+%%DATADIR%%/oltp_common.lua
+%%DATADIR%%/oltp_delete.lua
+%%DATADIR%%/oltp_insert.lua
+%%DATADIR%%/oltp_point_select.lua
+%%DATADIR%%/oltp_read_only.lua
+%%DATADIR%%/oltp_read_write.lua
+%%DATADIR%%/oltp_update_index.lua
+%%DATADIR%%/oltp_update_non_index.lua
+%%DATADIR%%/oltp_write_only.lua
+%%DATADIR%%/select_random_points.lua
+%%DATADIR%%/select_random_ranges.lua
+%%DATADIR%%/tests/include/api_sql_common.sh
+%%DATADIR%%/tests/include/config.sh
+%%DATADIR%%/tests/include/drv_common.sh
+%%DATADIR%%/tests/include/mysql_common.sh
+%%DATADIR%%/tests/include/oltp_legacy/bulk_insert.lua
+%%DATADIR%%/tests/include/oltp_legacy/common.lua
+%%DATADIR%%/tests/include/oltp_legacy/delete.lua
+%%DATADIR%%/tests/include/oltp_legacy/insert.lua
+%%DATADIR%%/tests/include/oltp_legacy/oltp.lua
+%%DATADIR%%/tests/include/oltp_legacy/oltp_simple.lua
+%%DATADIR%%/tests/include/oltp_legacy/parallel_prepare.lua
+%%DATADIR%%/tests/include/oltp_legacy/select.lua
+%%DATADIR%%/tests/include/oltp_legacy/select_random_points.lua
+%%DATADIR%%/tests/include/oltp_legacy/select_random_ranges.lua
+%%DATADIR%%/tests/include/oltp_legacy/update_index.lua
+%%DATADIR%%/tests/include/oltp_legacy/update_non_index.lua
+%%DATADIR%%/tests/include/pgsql_common.sh
+%%DATADIR%%/tests/include/script_bulk_insert_common.sh
+%%DATADIR%%/tests/include/script_oltp_common.sh
+%%DATADIR%%/tests/include/script_oltp_legacy_common.sh
+%%DATADIR%%/tests/include/script_select_random_common.sh
+%%DATADIR%%/tests/include/script_select_random_legacy_common.sh
+%%DATADIR%%/tests/t/1st.t
+%%DATADIR%%/tests/t/api_basic.t
+%%DATADIR%%/tests/t/api_histogram.t
+%%DATADIR%%/tests/t/api_legacy_basic.t
+%%DATADIR%%/tests/t/api_legacy_rand.t
+%%DATADIR%%/tests/t/api_legacy_sql.t
+%%DATADIR%%/tests/t/api_rand.t
+%%DATADIR%%/tests/t/api_reports.t
+%%DATADIR%%/tests/t/api_sql_mysql.t
+%%DATADIR%%/tests/t/api_sql_pgsql.t
+%%DATADIR%%/tests/t/cmd_cleanup.t
+%%DATADIR%%/tests/t/cmd_help.t
+%%DATADIR%%/tests/t/cmd_prepare.t
+%%DATADIR%%/tests/t/cmd_run.t
+%%DATADIR%%/tests/t/cmdline.t
+%%DATADIR%%/tests/t/commands.t
+%%DATADIR%%/tests/t/drivers.t
+%%DATADIR%%/tests/t/drv_mysql.t
+%%DATADIR%%/tests/t/drv_pgsql.t
+%%DATADIR%%/tests/t/help_drv_mysql.t
+%%DATADIR%%/tests/t/help_drv_pgsql.t
+%%DATADIR%%/tests/t/opt_help.t
+%%DATADIR%%/tests/t/opt_histogram.t
+%%DATADIR%%/tests/t/opt_report_checkpoints.t
+%%DATADIR%%/tests/t/opt_report_interval.t
+%%DATADIR%%/tests/t/opt_version.t
+%%DATADIR%%/tests/t/script_bulk_insert_mysql.t
+%%DATADIR%%/tests/t/script_bulk_insert_pgsql.t
+%%DATADIR%%/tests/t/script_oltp_help.t
+%%DATADIR%%/tests/t/script_oltp_insert_mysql.t
+%%DATADIR%%/tests/t/script_oltp_insert_pgsql.t
+%%DATADIR%%/tests/t/script_oltp_point_select_mysql.t
+%%DATADIR%%/tests/t/script_oltp_point_select_pgsql.t
+%%DATADIR%%/tests/t/script_oltp_read_write_mysql.t
+%%DATADIR%%/tests/t/script_oltp_read_write_pgsql.t
+%%DATADIR%%/tests/t/script_select_random_mysql.t
+%%DATADIR%%/tests/t/script_select_random_pgsql.t
+%%DATADIR%%/tests/t/test_cpu.t
+%%DATADIR%%/tests/t/test_fileio.t
+%%DATADIR%%/tests/t/test_memory.t
+%%DATADIR%%/tests/t/test_mutex.t
+%%DATADIR%%/tests/t/test_threads.t
+%%DATADIR%%/tests/t/tests.t
+%%DATADIR%%/tests/test_run.sh