svn commit: r366062 - in head/benchmarks/dkftpbench: . files

[Alexey Dokuchaev]

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 at FreeBSD.org
 COMMENT=	FTP benchmark program
 
-PLIST_FILES=	bin/dkftpbench
-
 GNU_CONFIGURE=	yes
-
 USE_AUTOTOOLS=	automake14 autoconf
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1000000
-BROKEN=		does not build on FreeBSD 10 or better
-.endif
+PLIST_FILES=	bin/dkftpbench
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

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 <list.h>
++#include <list>
+ 
+ /* 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<robouser_t *> m_deadlist;
++	std::list<robouser_t *> m_deadlist;
+ 
+ 	/** Health: count of bytes fetched so far from all files */
+ 	size_t m_bytesFetched;