Attachment 151521 Details for Bug 196643 – tsung.patch

[patch] tsung.patch

tsung.patch (text/plain), 13.44 KB, created by linpct on 2015-01-13 04:26:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: linpct

Created: 2015-01-13 04:26:32 UTC

Size: 13.44 KB

patch

obsolete

>diff -ruN tsung.orig/Makefile tsung/Makefile
>--- tsung.orig/Makefile	2015-01-07 02:06:53.000000000 +0800
>+++ tsung/Makefile	2015-01-10 01:17:13.000000000 +0800
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/benchmarks/tsung/Makefile 371171 2014-10-19 07:38:11Z mva $
> 
> PORTNAME=	tsung
>-PORTVERSION=	1.5.0
>+PORTVERSION=	1.5.1
> CATEGORIES=	benchmarks sysutils
> MASTER_SITES=	http://tsung.erlang-projects.org/dist/
> 
>@@ -26,7 +26,8 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|MAN_DIR   = $$(datadir)/man/man1/|MAN_DIR   = $$(prefix)/man/man1/| ; \
>-		s|CONFDIR   = $$(docdir)/examples|CONFDIR   = $$(prefix)/share/examples/tsung|' \
>+		s|CONFDIR   = $$(docdir)/examples|CONFDIR   = $$(prefix)/share/examples/tsung| ; \
>+		s|install: doc|install: tsung doc|' \
> 		${WRKSRC}/Makefile.in
> 
> .include <bsd.port.mk>
>diff -ruN tsung.orig/distinfo tsung/distinfo
>--- tsung.orig/distinfo	2015-01-07 02:06:53.000000000 +0800
>+++ tsung/distinfo	2015-01-10 01:06:58.000000000 +0800
>@@ -1,2 +1,2 @@
>-SHA256 (tsung-1.5.0.tar.gz) = 9af5c1cc5bc064f85c11cbfdff42f4a36fdea53c51a30354d75f553c8c6ee83f
>-SIZE (tsung-1.5.0.tar.gz) = 925026
>+SHA256 (tsung-1.5.1.tar.gz) = 551457ffe89d1c5b7d064b13fe82e6bff00523ccc7a00367b0ae38cad0c2282b
>+SIZE (tsung-1.5.1.tar.gz) = 1422049
>diff -ruN tsung.orig/pkg-plist tsung/pkg-plist
>--- tsung.orig/pkg-plist	2015-01-07 02:06:53.000000000 +0800
>+++ tsung/pkg-plist	2015-01-10 01:21:05.000000000 +0800
>@@ -1,9 +1,7 @@
> bin/tsplot
> bin/tsung
> bin/tsung-recorder
>-lib/erlang/lib/tsung-%%PORTVERSION%%/BUILD_OPTIONS
> lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/ELDAPv3.beam
>-lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/builder.beam
> lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/eldap.beam
> lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/gen_ts_transport.beam
> lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/mochijson2.beam
>@@ -16,6 +14,7 @@
> lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/mochiweb_xpath_functions.beam
> lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/mochiweb_xpath_parser.beam
> lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/mochiweb_xpath_utils.beam
>+lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/mqtt_frame.beam
> lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/oauth.beam
> lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/oauth_hmac_sha1.beam
> lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/oauth_http.beam
>@@ -53,6 +52,7 @@
> lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/ts_ldap.beam
> lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/ts_ldap_common.beam
> lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/ts_mon_cache.beam
>+lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/ts_mqtt.beam
> lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/ts_mysql.beam
> lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/ts_pgsql.beam
> lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/ts_plugin.beam
>@@ -78,6 +78,7 @@
> lib/erlang/lib/tsung-%%PORTVERSION%%/ebin/websocket.beam
> lib/erlang/lib/tsung-%%PORTVERSION%%/include/ELDAPv3.hrl
> lib/erlang/lib/tsung-%%PORTVERSION%%/include/eldap.hrl
>+lib/erlang/lib/tsung-%%PORTVERSION%%/include/mqtt.hrl
> lib/erlang/lib/tsung-%%PORTVERSION%%/include/rabbit.hrl
> lib/erlang/lib/tsung-%%PORTVERSION%%/include/rabbit_framing.hrl
> lib/erlang/lib/tsung-%%PORTVERSION%%/include/ts_amqp.hrl
>@@ -88,6 +89,7 @@
> lib/erlang/lib/tsung-%%PORTVERSION%%/include/ts_job.hrl
> lib/erlang/lib/tsung-%%PORTVERSION%%/include/ts_ldap.hrl
> lib/erlang/lib/tsung-%%PORTVERSION%%/include/ts_macros.hrl
>+lib/erlang/lib/tsung-%%PORTVERSION%%/include/ts_mqtt.hrl
> lib/erlang/lib/tsung-%%PORTVERSION%%/include/ts_mysql.hrl
> lib/erlang/lib/tsung-%%PORTVERSION%%/include/ts_os_mon.hrl
> lib/erlang/lib/tsung-%%PORTVERSION%%/include/ts_pgsql.hrl
>@@ -96,21 +98,6 @@
> lib/erlang/lib/tsung-%%PORTVERSION%%/include/ts_recorder.hrl
> lib/erlang/lib/tsung-%%PORTVERSION%%/include/ts_shell.hrl
> lib/erlang/lib/tsung-%%PORTVERSION%%/include/ts_websocket.hrl
>-lib/erlang/lib/tsung-%%PORTVERSION%%/priv/tsung.boot
>-lib/erlang/lib/tsung-%%PORTVERSION%%/priv/tsung.rel
>-lib/erlang/lib/tsung-%%PORTVERSION%%/priv/tsung.script
>-lib/erlang/lib/tsung-%%PORTVERSION%%/priv/tsung_controller.boot
>-lib/erlang/lib/tsung-%%PORTVERSION%%/priv/tsung_controller.rel
>-lib/erlang/lib/tsung-%%PORTVERSION%%/priv/tsung_controller.script
>-lib/erlang/lib/tsung-%%PORTVERSION%%/priv/tsung_controller_load.boot
>-lib/erlang/lib/tsung-%%PORTVERSION%%/priv/tsung_controller_load.script
>-lib/erlang/lib/tsung-%%PORTVERSION%%/priv/tsung_load.boot
>-lib/erlang/lib/tsung-%%PORTVERSION%%/priv/tsung_load.script
>-lib/erlang/lib/tsung-%%PORTVERSION%%/priv/tsung_recorder.boot
>-lib/erlang/lib/tsung-%%PORTVERSION%%/priv/tsung_recorder.rel
>-lib/erlang/lib/tsung-%%PORTVERSION%%/priv/tsung_recorder.script
>-lib/erlang/lib/tsung-%%PORTVERSION%%/priv/tsung_recorder_load.boot
>-lib/erlang/lib/tsung-%%PORTVERSION%%/priv/tsung_recorder_load.script
> lib/erlang/lib/tsung-%%PORTVERSION%%/src/gen_ts_transport.erl
> lib/erlang/lib/tsung-%%PORTVERSION%%/src/ts_amqp.erl
> lib/erlang/lib/tsung-%%PORTVERSION%%/src/ts_bosh.erl
>@@ -134,6 +121,7 @@
> lib/erlang/lib/tsung-%%PORTVERSION%%/src/ts_ldap.erl
> lib/erlang/lib/tsung-%%PORTVERSION%%/src/ts_ldap_common.erl
> lib/erlang/lib/tsung-%%PORTVERSION%%/src/ts_mon_cache.erl
>+lib/erlang/lib/tsung-%%PORTVERSION%%/src/ts_mqtt.erl
> lib/erlang/lib/tsung-%%PORTVERSION%%/src/ts_mysql.erl
> lib/erlang/lib/tsung-%%PORTVERSION%%/src/ts_pgsql.erl
> lib/erlang/lib/tsung-%%PORTVERSION%%/src/ts_plugin.erl
>@@ -153,10 +141,7 @@
> lib/erlang/lib/tsung-%%PORTVERSION%%/src/ts_utils.erl
> lib/erlang/lib/tsung-%%PORTVERSION%%/src/ts_webdav.erl
> lib/erlang/lib/tsung-%%PORTVERSION%%/src/ts_websocket.erl
>-lib/erlang/lib/tsung-%%PORTVERSION%%/src/tsung.app.src
> lib/erlang/lib/tsung-%%PORTVERSION%%/src/tsung.erl
>-lib/erlang/lib/tsung-%%PORTVERSION%%/src/tsung.rel.src
>-lib/erlang/lib/tsung_controller-%%PORTVERSION%%/BUILD_OPTIONS
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/ebin/ts_config.beam
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/ebin/ts_config_amqp.beam
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/ebin/ts_config_fs.beam
>@@ -164,6 +149,7 @@
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/ebin/ts_config_jabber.beam
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/ebin/ts_config_job.beam
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/ebin/ts_config_ldap.beam
>+lib/erlang/lib/tsung_controller-%%PORTVERSION%%/ebin/ts_config_mqtt.beam
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/ebin/ts_config_mysql.beam
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/ebin/ts_config_pgsql.beam
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/ebin/ts_config_raw.beam
>@@ -190,6 +176,7 @@
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/ebin/tsung_controller.beam
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/include/ELDAPv3.hrl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/include/eldap.hrl
>+lib/erlang/lib/tsung_controller-%%PORTVERSION%%/include/mqtt.hrl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/include/rabbit.hrl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/include/rabbit_framing.hrl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/include/ts_amqp.hrl
>@@ -200,6 +187,7 @@
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/include/ts_job.hrl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/include/ts_ldap.hrl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/include/ts_macros.hrl
>+lib/erlang/lib/tsung_controller-%%PORTVERSION%%/include/ts_mqtt.hrl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/include/ts_mysql.hrl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/include/ts_os_mon.hrl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/include/ts_pgsql.hrl
>@@ -208,11 +196,6 @@
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/include/ts_recorder.hrl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/include/ts_shell.hrl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/include/ts_websocket.hrl
>-lib/erlang/lib/tsung_controller-%%PORTVERSION%%/priv/tsung_controller.boot
>-lib/erlang/lib/tsung_controller-%%PORTVERSION%%/priv/tsung_controller.rel
>-lib/erlang/lib/tsung_controller-%%PORTVERSION%%/priv/tsung_controller.script
>-lib/erlang/lib/tsung_controller-%%PORTVERSION%%/priv/tsung_controller_load.boot
>-lib/erlang/lib/tsung_controller-%%PORTVERSION%%/priv/tsung_controller_load.script
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/src/ts_config.erl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/src/ts_config_amqp.erl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/src/ts_config_fs.erl
>@@ -220,6 +203,7 @@
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/src/ts_config_jabber.erl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/src/ts_config_job.erl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/src/ts_config_ldap.erl
>+lib/erlang/lib/tsung_controller-%%PORTVERSION%%/src/ts_config_mqtt.erl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/src/ts_config_mysql.erl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/src/ts_config_pgsql.erl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/src/ts_config_raw.erl
>@@ -242,10 +226,7 @@
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/src/ts_timer.erl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/src/ts_user_server.erl
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/src/ts_user_server_sup.erl
>-lib/erlang/lib/tsung_controller-%%PORTVERSION%%/src/tsung_controller.app.src
> lib/erlang/lib/tsung_controller-%%PORTVERSION%%/src/tsung_controller.erl
>-lib/erlang/lib/tsung_controller-%%PORTVERSION%%/src/tsung_controller.rel.src
>-lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/BUILD_OPTIONS
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/ebin/ts_client_proxy.beam
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/ebin/ts_client_proxy_sup.beam
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/ebin/ts_proxy_http.beam
>@@ -258,6 +239,7 @@
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/ebin/tsung_recorder.beam
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/include/ELDAPv3.hrl
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/include/eldap.hrl
>+lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/include/mqtt.hrl
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/include/rabbit.hrl
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/include/rabbit_framing.hrl
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/include/ts_amqp.hrl
>@@ -268,6 +250,7 @@
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/include/ts_job.hrl
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/include/ts_ldap.hrl
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/include/ts_macros.hrl
>+lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/include/ts_mqtt.hrl
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/include/ts_mysql.hrl
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/include/ts_os_mon.hrl
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/include/ts_pgsql.hrl
>@@ -276,11 +259,6 @@
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/include/ts_recorder.hrl
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/include/ts_shell.hrl
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/include/ts_websocket.hrl
>-lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/priv/tsung_recorder.boot
>-lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/priv/tsung_recorder.rel
>-lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/priv/tsung_recorder.script
>-lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/priv/tsung_recorder_load.boot
>-lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/priv/tsung_recorder_load.script
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/src/ts_client_proxy.erl
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/src/ts_client_proxy_sup.erl
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/src/ts_proxy_http.erl
>@@ -289,9 +267,7 @@
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/src/ts_proxy_recorder.erl
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/src/ts_proxy_webdav.erl
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/src/ts_recorder_sup.erl
>-lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/src/tsung_recorder.app.src
> lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/src/tsung_recorder.erl
>-lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/src/tsung_recorder.rel.src
> lib/tsung/bin/log2tsung.pl
> lib/tsung/bin/tsung-rrd.pl
> lib/tsung/bin/tsung_percentile.pl
>@@ -301,14 +277,6 @@
> man/man1/tsplot.1.gz
> man/man1/tsung-recorder.1.gz
> man/man1/tsung.1.gz
>-%%PORTDOCS%%%%DOCSDIR%%/IDXDOC.css
>-%%PORTDOCS%%%%DOCSDIR%%/images/connected.png
>-%%PORTDOCS%%%%DOCSDIR%%/images/ldap-hierarchy.png
>-%%PORTDOCS%%%%DOCSDIR%%/images/ldap-results.png
>-%%PORTDOCS%%%%DOCSDIR%%/images/logo_tsung.png
>-%%PORTDOCS%%%%DOCSDIR%%/images/tsung-graph.png
>-%%PORTDOCS%%%%DOCSDIR%%/images/tsung-report.png
>-%%PORTDOCS%%%%DOCSDIR%%/user_manual.html
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/amqp.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fs-nfs.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/http-digest.xml
>@@ -316,6 +284,7 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/http_distributed.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/http_setdynvars.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/http_simple.xml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/http_tag.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/jabber.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/jabber_muc.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/jabber_node.xml
>@@ -323,10 +292,12 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/jabber_register.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/jabber_roster.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ldap.xml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mqtt.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mysql.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgsql.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thinks.xml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thinks2.xml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/websocket.xml
> %%DATADIR%%/templates/dygraph-combined.js
> %%DATADIR%%/templates/footer.thtml
> %%DATADIR%%/templates/graph.thtml
>@@ -340,3 +311,6 @@
> %%DATADIR%%/tsung_plotter/pgsql.plots.en.conf
> %%DATADIR%%/tsung_plotter/pgsql.plots.fr.conf
> %%DATADIR%%/tsung_plotter/stats.conf
>+@dir lib/erlang/lib/tsung-%%PORTVERSION%%/priv
>+@dir lib/erlang/lib/tsung_controller-%%PORTVERSION%%/priv
>+@dir lib/erlang/lib/tsung_recorder-%%PORTVERSION%%/priv

Actions: View | Diff

Attachments on bug 196643: 151521