From owner-svn-ports-head@FreeBSD.ORG Tue Jul 31 17:50:51 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6BCAE106564A; Tue, 31 Jul 2012 17:50:51 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 542318FC0A; Tue, 31 Jul 2012 17:50:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6VHopvh053839; Tue, 31 Jul 2012 17:50:51 GMT (envelope-from osa@svn.freebsd.org) Received: (from osa@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6VHopS8053830; Tue, 31 Jul 2012 17:50:51 GMT (envelope-from osa@svn.freebsd.org) Message-Id: <201207311750.q6VHopS8053830@svn.freebsd.org> From: "Sergey A. Osokin" Date: Tue, 31 Jul 2012 17:50:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301802 - in head/www: nginx nginx-devel nginx-devel/files nginx/files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 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: Tue, 31 Jul 2012 17:50:51 -0000 Author: osa Date: Tue Jul 31 17:50:50 2012 New Revision: 301802 URL: http://svn.freebsd.org/changeset/ports/301802 Log: Update: o) third-party rtmp module from 0.1.10 to 0.2.3; (*) o) prefix path for third-party sflow module. Requested by: Rudolph Sand aka r dot sand at new-net dot net (*) Added: head/www/nginx-devel/files/extra-patch-ngx_http_sflow_config.h (contents, props changed) head/www/nginx/files/extra-patch-ngx_http_sflow_config.h (contents, props changed) Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/distinfo head/www/nginx-devel/files/extra-patch-ngx_rtmp_exec_module.c head/www/nginx/Makefile head/www/nginx/distinfo head/www/nginx/files/extra-patch-ngx_rtmp_exec_module.c Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue Jul 31 17:35:29 2012 (r301801) +++ head/www/nginx-devel/Makefile Tue Jul 31 17:50:50 2012 (r301802) @@ -669,8 +669,8 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/a .endif .if ${PORT_OPTIONS:MRTMP} -NGINX_RTMP_VERSION= 0.1.10 -GIT_RTMP_VERSION= 0-g80db4c4 +NGINX_RTMP_VERSION= 0.2.3 +GIT_RTMP_VERSION= 0-gf7f24ba FETCH_ARGS= -pRr MASTER_SITES+= https://github.com/arut/nginx-rtmp-module/tarball/v${NGINX_RTMP_VERSION}/:rtmp DISTFILES+= arut-rtmp-nginx-module-v${NGINX_RTMP_VERSION}-${GIT_RTMP_VERSION}.tar.gz:rtmp @@ -694,7 +694,8 @@ NGINX_SFLOW_VERSION= 0.9.6 MASTER_SITES+= http://nginx-sflow-module.googlecode.com/files/:sflow DISTFILES+= nginx-sflow-module-${NGINX_SFLOW_VERSION}.tar.gz:sflow CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-sflow-module-${NGINX_SFLOW_VERSION} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_sflow_config.c +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_sflow_config.c \ + ${PATCHDIR}/extra-patch-ngx_http_sflow_config.h .endif .if ${PORT_OPTIONS:MSLOWFS_CACHE} @@ -916,6 +917,11 @@ post-patch: 's!%%PREFIX%%!${LOCALBASE}!g' \ ${WRKDIR}/ngx_postgres-${NGINX_POSTGRES_VERSION}/config .endif +.if ${PORT_OPTIONS:MSFLOW} + @${REINPLACE_CMD} \ + 's!%%PREFIX%%!${LOCALBASE}!g' \ + ${WRKDIR}/nginx-sflow-module-${NGINX_SFLOW_VERSION}/ngx_http_sflow_config.h +.endif .if ${PORT_OPTIONS:MSUPERVISORD} ( cd ${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION} && \ ${PATCH} -p0 < \ Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Tue Jul 31 17:35:29 2012 (r301801) +++ head/www/nginx-devel/distinfo Tue Jul 31 17:50:50 2012 (r301802) @@ -78,8 +78,8 @@ SHA256 (agentzh-rds-json-nginx-module-v0 SIZE (agentzh-rds-json-nginx-module-v0.12rc10-0-g74c21b3.tar.gz) = 32794 SHA256 (agentzh-redis2-nginx-module-v0.08rc4-0-g5044f16.tar.gz) = 0f60a71ee043b854d773beb16000f59cb9b4183c8ec3dec6be504de463c688e2 SIZE (agentzh-redis2-nginx-module-v0.08rc4-0-g5044f16.tar.gz) = 28039 -SHA256 (arut-rtmp-nginx-module-v0.1.10-0-g80db4c4.tar.gz) = 09129fdf3591f9162e250fa0481e2ba44e5b3f9aea5cad709217822f63876037 -SIZE (arut-rtmp-nginx-module-v0.1.10-0-g80db4c4.tar.gz) = 949482 +SHA256 (arut-rtmp-nginx-module-v0.2.3-0-gf7f24ba.tar.gz) = fed761fe630c9bd3814296a01f4a0f8d8eeb87e04cc0eff9bf74df26c7888dba +SIZE (arut-rtmp-nginx-module-v0.2.3-0-gf7f24ba.tar.gz) = 964973 SHA256 (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 7ade6dc6d18b5ab3c2e21a4a1139359e351525ac03f34e2508e5704f157024bd SIZE (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 37053 SHA256 (nginx-sflow-module-0.9.6.tar.gz) = 5e80d1f8e5ba0963445d8245e09de0cf289936ae9feecb11c5e3a77d021f1ad0 Added: head/www/nginx-devel/files/extra-patch-ngx_http_sflow_config.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-ngx_http_sflow_config.h Tue Jul 31 17:50:50 2012 (r301802) @@ -0,0 +1,11 @@ +--- ../nginx-sflow-module-0.9.6/ngx_http_sflow_config.h.orig 2012-07-31 21:36:49.000000000 +0400 ++++ ../nginx-sflow-module-0.9.6/ngx_http_sflow_config.h 2012-07-31 21:37:20.000000000 +0400 +@@ -17,7 +17,7 @@ + -----------------___________________________------------------ + */ + +-#define SFWB_DEFAULT_CONFIGFILE "/etc/hsflowd.auto" ++#define SFWB_DEFAULT_CONFIGFILE "%%PREFIX%%/etc/hsflowd.auto" + #define SFWB_SEPARATORS " \t\r\n=" + #define SFWB_QUOTES "'\" \t\r\n" + /* SFWB_MAX LINE LEN must be enough to hold the whole list of targets */ Modified: head/www/nginx-devel/files/extra-patch-ngx_rtmp_exec_module.c ============================================================================== --- head/www/nginx-devel/files/extra-patch-ngx_rtmp_exec_module.c Tue Jul 31 17:35:29 2012 (r301801) +++ head/www/nginx-devel/files/extra-patch-ngx_rtmp_exec_module.c Tue Jul 31 17:50:50 2012 (r301802) @@ -1,5 +1,5 @@ ---- ../arut-nginx-rtmp-module-80db4c4/ngx_rtmp_exec_module.c.orig 2012-06-14 15:14:50.000000000 +0400 -+++ ../arut-nginx-rtmp-module-80db4c4/ngx_rtmp_exec_module.c 2012-06-14 15:15:06.000000000 +0400 +--- ../arut-nginx-rtmp-module-f7f24ba/ngx_rtmp_exec_module.c.orig 2012-07-31 20:59:43.000000000 +0400 ++++ ../arut-nginx-rtmp-module-f7f24ba/ngx_rtmp_exec_module.c 2012-07-31 21:00:28.000000000 +0400 @@ -4,7 +4,11 @@ Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Tue Jul 31 17:35:29 2012 (r301801) +++ head/www/nginx/Makefile Tue Jul 31 17:50:50 2012 (r301802) @@ -668,8 +668,8 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/a .endif .if ${PORT_OPTIONS:MRTMP} -NGINX_RTMP_VERSION= 0.1.10 -GIT_RTMP_VERSION= 0-g80db4c4 +NGINX_RTMP_VERSION= 0.2.3 +GIT_RTMP_VERSION= 0-gf7f24ba FETCH_ARGS= -pRr MASTER_SITES+= https://github.com/arut/nginx-rtmp-module/tarball/v${NGINX_RTMP_VERSION}/:rtmp DISTFILES+= arut-rtmp-nginx-module-v${NGINX_RTMP_VERSION}-${GIT_RTMP_VERSION}.tar.gz:rtmp @@ -693,7 +693,8 @@ NGINX_SFLOW_VERSION= 0.9.6 MASTER_SITES+= http://nginx-sflow-module.googlecode.com/files/:sflow DISTFILES+= nginx-sflow-module-${NGINX_SFLOW_VERSION}.tar.gz:sflow CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-sflow-module-${NGINX_SFLOW_VERSION} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_sflow_config.c +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_sflow_config.c \ + ${PATCHDIR}/extra-patch-ngx_http_sflow_config.h .endif .if ${PORT_OPTIONS:MSLOWFS_CACHE} @@ -907,6 +908,11 @@ post-patch: 's!%%PREFIX%%!${LOCALBASE}!g' \ ${WRKDIR}/ngx_postgres-${NGINX_POSTGRES_VERSION}/config .endif +.if ${PORT_OPTIONS:MSFLOW} + @${REINPLACE_CMD} \ + 's!%%PREFIX%%!${LOCALBASE}!g' \ + ${WRKDIR}/nginx-sflow-module-${NGINX_SFLOW_VERSION}/ngx_http_sflow_config.h +.endif .if ${PORT_OPTIONS:MSUPERVISORD} ( cd ${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION} && \ ${PATCH} -p0 < \ Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Tue Jul 31 17:35:29 2012 (r301801) +++ head/www/nginx/distinfo Tue Jul 31 17:50:50 2012 (r301802) @@ -78,8 +78,8 @@ SHA256 (agentzh-rds-json-nginx-module-v0 SIZE (agentzh-rds-json-nginx-module-v0.12rc10-0-g74c21b3.tar.gz) = 32794 SHA256 (agentzh-redis2-nginx-module-v0.08rc4-0-g5044f16.tar.gz) = 0f60a71ee043b854d773beb16000f59cb9b4183c8ec3dec6be504de463c688e2 SIZE (agentzh-redis2-nginx-module-v0.08rc4-0-g5044f16.tar.gz) = 28039 -SHA256 (arut-rtmp-nginx-module-v0.1.10-0-g80db4c4.tar.gz) = 09129fdf3591f9162e250fa0481e2ba44e5b3f9aea5cad709217822f63876037 -SIZE (arut-rtmp-nginx-module-v0.1.10-0-g80db4c4.tar.gz) = 949482 +SHA256 (arut-rtmp-nginx-module-v0.2.3-0-gf7f24ba.tar.gz) = fed761fe630c9bd3814296a01f4a0f8d8eeb87e04cc0eff9bf74df26c7888dba +SIZE (arut-rtmp-nginx-module-v0.2.3-0-gf7f24ba.tar.gz) = 964973 SHA256 (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 7ade6dc6d18b5ab3c2e21a4a1139359e351525ac03f34e2508e5704f157024bd SIZE (agentzh-set-misc-nginx-module-v0.22rc8-0-g658c235.tar.gz) = 37053 SHA256 (nginx-sflow-module-0.9.6.tar.gz) = 5e80d1f8e5ba0963445d8245e09de0cf289936ae9feecb11c5e3a77d021f1ad0 Added: head/www/nginx/files/extra-patch-ngx_http_sflow_config.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-ngx_http_sflow_config.h Tue Jul 31 17:50:50 2012 (r301802) @@ -0,0 +1,11 @@ +--- ../nginx-sflow-module-0.9.6/ngx_http_sflow_config.h.orig 2012-07-31 21:36:49.000000000 +0400 ++++ ../nginx-sflow-module-0.9.6/ngx_http_sflow_config.h 2012-07-31 21:37:20.000000000 +0400 +@@ -17,7 +17,7 @@ + -----------------___________________________------------------ + */ + +-#define SFWB_DEFAULT_CONFIGFILE "/etc/hsflowd.auto" ++#define SFWB_DEFAULT_CONFIGFILE "%%PREFIX%%/etc/hsflowd.auto" + #define SFWB_SEPARATORS " \t\r\n=" + #define SFWB_QUOTES "'\" \t\r\n" + /* SFWB_MAX LINE LEN must be enough to hold the whole list of targets */ Modified: head/www/nginx/files/extra-patch-ngx_rtmp_exec_module.c ============================================================================== --- head/www/nginx/files/extra-patch-ngx_rtmp_exec_module.c Tue Jul 31 17:35:29 2012 (r301801) +++ head/www/nginx/files/extra-patch-ngx_rtmp_exec_module.c Tue Jul 31 17:50:50 2012 (r301802) @@ -1,5 +1,5 @@ ---- ../arut-nginx-rtmp-module-80db4c4/ngx_rtmp_exec_module.c.orig 2012-06-14 15:14:50.000000000 +0400 -+++ ../arut-nginx-rtmp-module-80db4c4/ngx_rtmp_exec_module.c 2012-06-14 15:15:06.000000000 +0400 +--- ../arut-nginx-rtmp-module-f7f24ba/ngx_rtmp_exec_module.c.orig 2012-07-31 20:59:43.000000000 +0400 ++++ ../arut-nginx-rtmp-module-f7f24ba/ngx_rtmp_exec_module.c 2012-07-31 21:00:28.000000000 +0400 @@ -4,7 +4,11 @@