From owner-svn-ports-head@FreeBSD.ORG Mon Aug 25 11:08:24 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 97C026F1; Mon, 25 Aug 2014 11:08:24 +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 6A3623DCC; Mon, 25 Aug 2014 11:08:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PB8OQt025544; Mon, 25 Aug 2014 11:08:24 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PB8OSw025542; Mon, 25 Aug 2014 11:08:24 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201408251108.s7PB8OSw025542@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Mon, 25 Aug 2014 11:08:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366062 - in head/benchmarks/dkftpbench: . 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.18-1 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: Mon, 25 Aug 2014 11:08:24 -0000 Author: danfe Date: Mon Aug 25 11:08:23 2014 New Revision: 366062 URL: http://svnweb.freebsd.org/changeset/ports/366062 QAT: https://qat.redports.org/buildarchive/r366062/ Log: Unbreak the build under modern environments and cleanup Makefile while here. Added: head/benchmarks/dkftpbench/files/patch-Platoon.h (contents, props changed) Modified: head/benchmarks/dkftpbench/Makefile Modified: head/benchmarks/dkftpbench/Makefile ============================================================================== --- head/benchmarks/dkftpbench/Makefile Mon Aug 25 11:06:22 2014 (r366061) +++ head/benchmarks/dkftpbench/Makefile Mon Aug 25 11:08:23 2014 (r366062) @@ -10,16 +10,9 @@ MASTER_SITES= http://www.kegel.com/dkftp MAINTAINER= novel@FreeBSD.org COMMENT= FTP benchmark program -PLIST_FILES= bin/dkftpbench - GNU_CONFIGURE= yes - USE_AUTOTOOLS= automake14 autoconf -.include - -.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1000000 -BROKEN= does not build on FreeBSD 10 or better -.endif +PLIST_FILES= bin/dkftpbench -.include +.include Added: head/benchmarks/dkftpbench/files/patch-Platoon.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/benchmarks/dkftpbench/files/patch-Platoon.h Mon Aug 25 11:08:23 2014 (r366062) @@ -0,0 +1,26 @@ +--- Platoon.h.orig 2002-02-13 05:06:01 UTC ++++ Platoon.h +@@ -1,13 +1,11 @@ + #ifndef Platoon_H + #define Platoon_H + #include "robouser.h" +-#include ++#include + + /* FIXME: 'reasonable' upper bound on number of users CPU can handle */ + #define Platoon_MAXUSERS (1 << 16) + +-enum robouser_t::state_t; +- + /**---------------------------------------------------------------------- + Platoon of robousers. + ----------------------------------------------------------------------*/ +@@ -150,7 +148,7 @@ private: + robouser_t *m_users[Platoon_MAXUSERS]; + + /** List of dead robousers waiting to be reaped */ +- list m_deadlist; ++ std::list m_deadlist; + + /** Health: count of bytes fetched so far from all files */ + size_t m_bytesFetched;