From owner-svn-ports-head@freebsd.org Tue May 23 16:10:27 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 23C05D7A881; Tue, 23 May 2017 16:10:27 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB0281439; Tue, 23 May 2017 16:10:26 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4NGAPCo093691; Tue, 23 May 2017 16:10:25 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4NGAPNr093685; Tue, 23 May 2017 16:10:25 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201705231610.v4NGAPNr093685@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Tue, 23 May 2017 16:10:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441537 - in head/benchmarks/sysbench: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 May 2017 16:10:27 -0000 Author: matthew Date: Tue May 23 16:10:25 2017 New Revision: 441537 URL: https://svnweb.freebsd.org/changeset/ports/441537 Log: Update the sysbench port to build from https://github.com/akopytov/sysbench . Tests are now written in lua and the port has been updated to reflect that. In addition to the changes in D7388, silenced portlint by: - regenerated distinfo by 'make makesum' - regenerated patch files by 'make makepatch' Submitted by: sam@samgwydir.com Differential Revision: https://reviews.freebsd.org/D7388 Added: head/benchmarks/sysbench/files/ head/benchmarks/sysbench/files/patch-autogen.sh (contents, props changed) head/benchmarks/sysbench/files/patch-sysbench_Makefile.am (contents, props changed) head/benchmarks/sysbench/pkg-plist (contents, props changed) Modified: head/benchmarks/sysbench/Makefile head/benchmarks/sysbench/distinfo head/benchmarks/sysbench/pkg-descr Modified: head/benchmarks/sysbench/Makefile ============================================================================== --- head/benchmarks/sysbench/Makefile Tue May 23 16:00:45 2017 (r441536) +++ head/benchmarks/sysbench/Makefile Tue May 23 16:10:25 2017 (r441537) @@ -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 mu 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 Modified: head/benchmarks/sysbench/distinfo ============================================================================== --- head/benchmarks/sysbench/distinfo Tue May 23 16:00:45 2017 (r441536) +++ head/benchmarks/sysbench/distinfo Tue May 23 16:10:25 2017 (r441537) @@ -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 Added: head/benchmarks/sysbench/files/patch-autogen.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/benchmarks/sysbench/files/patch-autogen.sh Tue May 23 16:10:25 2017 (r441537) @@ -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. + Added: head/benchmarks/sysbench/files/patch-sysbench_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/benchmarks/sysbench/files/patch-sysbench_Makefile.am Tue May 23 16:10:25 2017 (r441537) @@ -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 \ Modified: head/benchmarks/sysbench/pkg-descr ============================================================================== --- head/benchmarks/sysbench/pkg-descr Tue May 23 16:00:45 2017 (r441536) +++ head/benchmarks/sysbench/pkg-descr Tue May 23 16:10:25 2017 (r441537) @@ -18,4 +18,4 @@ Primarily written for MySQL server bench 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 Added: head/benchmarks/sysbench/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/benchmarks/sysbench/pkg-plist Tue May 23 16:10:25 2017 (r441537) @@ -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