sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update:

Browse source 
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	(*)
This commit is contained in:
Sergey A. Osokin 2012-07-31 17:50:50 +00:00
parent 63ae642bd6
commit 3ae6fd417b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=301802
8 changed files with 48 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
www/nginx-devel/Makefile
View file

@ -669,8 +669,8 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-redis2-nginx-module-${GIT_REDIS2_
.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 < \

4
www/nginx-devel/distinfo
View file

@ -78,8 +78,8 @@ SHA256 (agentzh-rds-json-nginx-module-v0.12rc10-0-g74c21b3.tar.gz) = 903b4c88b43
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

11
www/nginx-devel/files/extra-patch-ngx_http_sflow_config.h Normal file
View file

@ -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 */

4
www/nginx-devel/files/extra-patch-ngx_rtmp_exec_module.c
View file

@ -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 @@

12
www/nginx/Makefile
View file

@ -668,8 +668,8 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-redis2-nginx-module-${GIT_REDIS2_
.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 < \

4
www/nginx/distinfo
View file

@ -78,8 +78,8 @@ SHA256 (agentzh-rds-json-nginx-module-v0.12rc10-0-g74c21b3.tar.gz) = 903b4c88b43
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

11
www/nginx/files/extra-patch-ngx_http_sflow_config.h Normal file
View file

@ -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 */

4
www/nginx/files/extra-patch-ngx_rtmp_exec_module.c
View file

@ -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 @@