From owner-svn-ports-all@FreeBSD.ORG Thu Jul 3 14:45:06 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AC4E2A6C; Thu, 3 Jul 2014 14:45:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 9943D20B8; Thu, 3 Jul 2014 14:45:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s63Ej6T5094872; Thu, 3 Jul 2014 14:45:06 GMT (envelope-from jhale@svn.freebsd.org) Received: (from jhale@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s63Ej6Ns094866; Thu, 3 Jul 2014 14:45:06 GMT (envelope-from jhale@svn.freebsd.org) Message-Id: <201407031445.s63Ej6Ns094866@svn.freebsd.org> From: "Jason E. Hale" Date: Thu, 3 Jul 2014 14:45:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360378 - in head/benchmarks/super-smack: . 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2014 14:45:06 -0000 Author: jhale Date: Thu Jul 3 14:45:05 2014 New Revision: 360378 URL: http://svnweb.freebsd.org/changeset/ports/360378 QAT: https://qat.redports.org/buildarchive/r360378/ Log: - Support staging - Update MASTER_SITES - Use options helpers - WWW disappeared, so use old site Added: head/benchmarks/super-smack/files/patch-Makefile.in (contents, props changed) Modified: head/benchmarks/super-smack/Makefile head/benchmarks/super-smack/pkg-descr Modified: head/benchmarks/super-smack/Makefile ============================================================================== --- head/benchmarks/super-smack/Makefile Thu Jul 3 14:36:33 2014 (r360377) +++ head/benchmarks/super-smack/Makefile Thu Jul 3 14:45:05 2014 (r360378) @@ -5,7 +5,7 @@ PORTNAME= super-smack PORTVERSION= 1.3 PORTREVISION= 2 CATEGORIES= benchmarks databases -MASTER_SITES= http://vegan.net/tony/supersmack/ +MASTER_SITES= GENTOO/distfiles MAINTAINER= ports@FreeBSD.org COMMENT= Benchmarking, stress testing, and load generation tool for Databases @@ -16,39 +16,23 @@ MAKE_JOBS_UNSAFE= yes PORTDOCS= README TUTORIAL -OPTIONS_MULTI= DB +OPTIONS_DEFINE= DOCS +OPTIONS_MULTI= DB OPTIONS_MULTI_DB= MYSQL PGSQL OPTIONS_DEFAULT= MYSQL -PGSQL_DESC= Enable PostgreSQL support -MYSQL_DESC= Enable MySQL support +MYSQL_USE= MYSQL=yes +MYSQL_CONFIGURE_ON= --with-mysql \ + --with-mysql-include=${LOCALBASE}/include/mysql \ + --with-mysql-lib=${LOCALBASE}/lib/mysql + +PGSQL_USES= pgsql +PGSQL_CONFIGURE_ON= --with-pgsql \ + --with-pgsql-include=${LOCALBASE}/include \ + --with-pgsql-lib=${LOCALBASE}/lib -NO_STAGE= yes - -OPTIONS_DEFINE= DOCS - -.include - -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -CONFIGURE_ARGS+=--with-mysql \ - --with-mysql-include=${LOCALBASE}/include/mysql \ - --with-mysql-lib=${LOCALBASE}/lib/mysql -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USES+= pgsql -CONFIGURE_ARGS+=--with-pgsql \ - --with-pgsql-include=${LOCALBASE}/include \ - --with-pgsql-lib=${LOCALBASE}/lib -.endif - -.if ${PORT_OPTIONS:MDOCS} post-install: - ${MKDIR} ${DOCSDIR} -.for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -.endfor -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Added: head/benchmarks/super-smack/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/benchmarks/super-smack/files/patch-Makefile.in Thu Jul 3 14:45:05 2014 (r360378) @@ -0,0 +1,13 @@ +--- ./Makefile.in.orig 2005-04-30 11:19:40.000000000 -0400 ++++ ./Makefile.in 2014-07-03 10:20:34.000000000 -0400 +@@ -379,8 +379,8 @@ + + + install-data-local: +- $(mkinstalldirs) $(SMACKS_DIR) $(DATADIR) +- cp -rp $(srcdir)/smacks/* $(SMACKS_DIR) ++ $(mkinstalldirs) $(DESTDIR)$(SMACKS_DIR) $(DESTDIR)$(DATADIR) ++ cp -rp $(srcdir)/smacks/* $(DESTDIR)$(SMACKS_DIR) + + dist-hook: + mkdir -p $(distdir)/smacks Modified: head/benchmarks/super-smack/pkg-descr ============================================================================== --- head/benchmarks/super-smack/pkg-descr Thu Jul 3 14:36:33 2014 (r360377) +++ head/benchmarks/super-smack/pkg-descr Thu Jul 3 14:45:05 2014 (r360378) @@ -2,5 +2,4 @@ Super Smack is a benchmarking, stress te for MySQL (and PostgreSQL). Super Smack was originally written by Sasha Pachev, and then hosted and maintained by Jeremy Zawodny. -Author: Tony Bourke -WWW: http://vegan.net/tony/supersmack/ +WWW: http://jeremy.zawodny.com/mysql/super-smack/