[Midnightbsd-cvs] mports [17614] trunk/benchmarks/dkftpbench: drop autotools requirement for dkftpbench

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Sep 27 23:17:53 EDT 2014 

Revision: 17614
          http://svnweb.midnightbsd.org/mports/?rev=17614
Author:   laffer1
Date:     2014-09-27 23:17:53 -0400 (Sat, 27 Sep 2014)
Log Message:
-----------
drop autotools requirement for dkftpbench

Modified Paths:
--------------
    trunk/benchmarks/dkftpbench/Makefile
    trunk/benchmarks/dkftpbench/pkg-descr

Added Paths:
-----------
    trunk/benchmarks/dkftpbench/files/patch-Platoon.h

Removed Paths:
-------------
    trunk/benchmarks/dkftpbench/files/patch-Makefile.am

Modified: trunk/benchmarks/dkftpbench/Makefile
===================================================================
--- trunk/benchmarks/dkftpbench/Makefile	2014-09-28 03:14:57 UTC (rev 17613)
+++ trunk/benchmarks/dkftpbench/Makefile	2014-09-28 03:17:53 UTC (rev 17614)
@@ -2,7 +2,7 @@
 
 PORTNAME=	dkftpbench
 PORTVERSION=	0.45
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	benchmarks ftp
 MASTER_SITES=	http://www.kegel.com/dkftpbench/
 
@@ -13,6 +13,10 @@
 
 GNU_CONFIGURE=	yes
 
-USE_AUTOTOOLS=	automake14 autoconf
+post-patch:
+	@${REINPLACE_CMD} \
+		-e '/^noinst_PROGRAMS =/s/=.*/=/' \
+		-e '/^lib_LIBRARIES =/s/=.*/=/' \
+		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>

Deleted: trunk/benchmarks/dkftpbench/files/patch-Makefile.am
===================================================================
--- trunk/benchmarks/dkftpbench/files/patch-Makefile.am	2014-09-28 03:14:57 UTC (rev 17613)
+++ trunk/benchmarks/dkftpbench/files/patch-Makefile.am	2014-09-28 03:17:53 UTC (rev 17614)
@@ -1,159 +0,0 @@
---- Makefile.am.orig	Wed Jul 31 00:10:30 2002
-+++ Makefile.am	Fri Oct 22 08:46:31 2004
-@@ -8,36 +8,9 @@
- #----------------------------------------------------------------------
- # List everything we build; break list into three kinds of executables
- 
--# Unattended unit tests
--TESTS = \
--	ftp_client_proto_test \
--	nbbio_test \
--	Poller_test \
--	Sked_test
--
--# Following tests are not yet unattended
--HAND_TESTS = \
--	robouser_test \
--	ftp_client_pipe_test
--
- # Real programs 
- bin_PROGRAMS = dkftpbench
- 
--noinst_PROGRAMS = $(TESTS) $(HAND_TESTS) dklimits Poller_bench profile
--
--lib_LIBRARIES = libPoller.a
--pkginclude_HEADERS = \
--	Poller.h \
--	Poller_devpoll.h \
--	Poller_poll.h \
--	Poller_select.h \
--	Poller_sigio.h \
--	Poller_sigfd.h \
--	Poller_kqueue.h
--
--# No info yet
--info_TEXINFOS = 
--
- EXTRA_DIST = \
- 	inet_aton.c \
- 	bakeoff.html \
-@@ -87,16 +60,6 @@
- # For each thing we build, list its sources, and anything special about
- # how to build it
- 
--libPoller_a_SOURCES = \
--	Poller.h \
--	Poller_sigfd.cc \
--	Poller_sigio.cc \
--	Poller_poll.cc \
--	Poller_select.cc \
--	Poller_devpoll.cc \
--	Poller_kqueue.cc \
--	Poller.cc
--
- dkftpbench_SOURCES = \
- 	CHECK.h \
- 	Poller.h \
-@@ -128,90 +91,6 @@
- 	Poller.cc \
- 	Sked.cc
- 
--dklimits_SOURCES = \
--	dklimits.c
--
--ftp_client_proto_test_SOURCES = \
--	dprint.cc \
--	ftp_client_proto.cc \
--	ftp_client_proto_test.cc
--
--ftp_client_pipe_test_SOURCES = \
--	dprint.cc \
--	eclock.cc \
--	ftp_client_pipe.cc \
--	ftp_client_pipe_test.cc \
--	ftp_client_proto.cc \
--	Poller_poll.cc \
--	Poller.cc \
--	nbbio.cc \
--	Sked.cc
--
--nbbio_test_SOURCES = \
--	dprint.cc \
--	nbbio.cc \
--	nbbio_test.cc
--
--robouser_test_SOURCES = \
--	dprint.cc \
--	eclock.cc \
--	ftp_client_pipe.cc \
--	ftp_client_proto.cc \
--	nbbio.cc \
--	robouser.cc \
--	Platoon.cc \
--	robouser_test.cc \
--	CHECK.cc \
--	Poller_poll.cc \
--	Poller.cc \
--	Sked.cc
--
--Poller_bench_SOURCES = \
--	dprint.cc \
--	eclock.cc \
--	CHECK.cc \
--	Poller.h \
--	Poller.cc \
--	Poller_devpoll.cc \
--	Poller_devpoll.h \
--	Poller_poll.h \
--	Poller_poll.cc \
--	Poller_bench.cc \
--	Poller_select.h \
--	Poller_select.cc \
--	Poller_sigio.h \
--	Poller_sigio.cc \
--	Poller_sigfd.h \
--	Poller_sigfd.cc \
--	Poller_kqueue.h \
--	Poller_kqueue.cc
--	
--Poller_test_SOURCES = \
--	dprint.cc \
--	CHECK.cc \
--	eclock.cc \
--	Poller.h \
--	Poller.cc \
--	Poller_sigfd.cc \
--	Poller_sigfd.h \
--	Poller_sigio.cc \
--	Poller_sigio.h \
--	Poller_devpoll.cc \
--	Poller_devpoll.h \
--	Poller_poll.h \
--	Poller_poll.cc \
--	Poller_test.cc \
--	Poller_select.h \
--	Poller_select.cc \
--	Poller_kqueue.h \
--	Poller_kqueue.cc
--
--Sked_test_SOURCES = \
--	dprint.cc \
--	eclock.cc \
--	Sked.cc \
--	Sked_test.cc
--
- #------- start of corba.  Not fully autoconfisticated yet ---------
- 
- CorbaPlatoon_srv.cc: CorbaPlatoon.idl
-@@ -242,11 +121,6 @@
- 	/bin/rm -f *.o CorbaPlatoon.hh CorbaPlatoon{_srv,Dyn_srv}.cc
- 
- #---- end of corba --------------------------------------------------------
--
--#--------------------------------------------------------------------------
--# Program to do fine-grained profiling of Linux kernel.  From the net...
--
--profile_SOURCES = profile.c
- 
- #--------------------------------------------------------------------------
- # Extract documentation from sources.

Added: trunk/benchmarks/dkftpbench/files/patch-Platoon.h
===================================================================
--- trunk/benchmarks/dkftpbench/files/patch-Platoon.h	                        (rev 0)
+++ trunk/benchmarks/dkftpbench/files/patch-Platoon.h	2014-09-28 03:17:53 UTC (rev 17614)
@@ -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;


Property changes on: trunk/benchmarks/dkftpbench/files/patch-Platoon.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/benchmarks/dkftpbench/pkg-descr
===================================================================
--- trunk/benchmarks/dkftpbench/pkg-descr	2014-09-28 03:14:57 UTC (rev 17613)
+++ trunk/benchmarks/dkftpbench/pkg-descr	2014-09-28 03:17:53 UTC (rev 17614)
@@ -1,8 +1,9 @@
-dkftpbench is an FTP benchmark program inspired by SPECweb99. The result of the
-benchmark is a number-of-simultaneous-users rating; after running the benchmark 
-properly, you have a good idea how many simultaneous dialup clients a server 
-can support. The target bandwidth per client is set at 28.8 kilobits/second to 
-model dialup users; this is important for servers on the real Internet, which 
-often serve thousands of clients on only 10 MBits/sec of bandwidth.
+dkftpbench is an FTP benchmark program inspired by SPECweb99.  The result of
+the benchmark is a number-of-simultaneous-users rating; after running the
+benchmark properly, you have a good idea how many simultaneous dialup clients
+a server can support.  The target bandwidth per client is set at 28.8
+kilobits/second to model dialup users; this is important for servers on the
+real Internet, which often serve thousands of clients on only 10 MBits/sec of
+bandwidth.
 
-WWW:	http://www.kegel.com/dkftpbench/
+WWW: http://www.kegel.com/dkftpbench/

More information about the Midnightbsd-cvs mailing list