aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorosa <osa@FreeBSD.org>2012-08-01 01:50:50 +0800
committerosa <osa@FreeBSD.org>2012-08-01 01:50:50 +0800
commit2beafb5410347c3b6ac66d325c9b13627dd8f67b (patch)
treed752d8a6bdb853ae7514463fb813bd66d740e5d5 /www
parent5ca367937e5ddd6b8e7f356a04b6215f40cb6ec8 (diff)
downloadfreebsd-ports-gnome-2beafb5410347c3b6ac66d325c9b13627dd8f67b.tar.gz
freebsd-ports-gnome-2beafb5410347c3b6ac66d325c9b13627dd8f67b.tar.zst
freebsd-ports-gnome-2beafb5410347c3b6ac66d325c9b13627dd8f67b.zip
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 (*)
Diffstat (limited to 'www')
-rw-r--r--www/nginx-devel/Makefile12
-rw-r--r--www/nginx-devel/distinfo4
-rw-r--r--www/nginx-devel/files/extra-patch-ngx_http_sflow_config.h11
-rw-r--r--www/nginx-devel/files/extra-patch-ngx_rtmp_exec_module.c4
-rw-r--r--www/nginx/Makefile12
-rw-r--r--www/nginx/distinfo4
-rw-r--r--www/nginx/files/extra-patch-ngx_http_sflow_config.h11
-rw-r--r--www/nginx/files/extra-patch-ngx_rtmp_exec_module.c4
8 files changed, 48 insertions, 14 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index cf64a1bd5ed4..fad8b6619e9b 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -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 < \
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 7fa29830ffe2..e8d0d7b9b722 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -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
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_sflow_config.h b/www/nginx-devel/files/extra-patch-ngx_http_sflow_config.h
new file mode 100644
index 000000000000..8e3c4cbbbbc1
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-ngx_http_sflow_config.h
@@ -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 */
diff --git a/www/nginx-devel/files/extra-patch-ngx_rtmp_exec_module.c b/www/nginx-devel/files/extra-patch-ngx_rtmp_exec_module.c
index c8e724a5d035..113d974a8614 100644
--- a/www/nginx-devel/files/extra-patch-ngx_rtmp_exec_module.c
+++ b/www/nginx-devel/files/extra-patch-ngx_rtmp_exec_module.c
@@ -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 @@
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 540dc43d1a15..bf726d7a15e0 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -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 < \
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 83f54c1829c2..f6e693e8543d 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -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
diff --git a/www/nginx/files/extra-patch-ngx_http_sflow_config.h b/www/nginx/files/extra-patch-ngx_http_sflow_config.h
new file mode 100644
index 000000000000..8e3c4cbbbbc1
--- /dev/null
+++ b/www/nginx/files/extra-patch-ngx_http_sflow_config.h
@@ -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 */
diff --git a/www/nginx/files/extra-patch-ngx_rtmp_exec_module.c b/www/nginx/files/extra-patch-ngx_rtmp_exec_module.c
index c8e724a5d035..113d974a8614 100644
--- a/www/nginx/files/extra-patch-ngx_rtmp_exec_module.c
+++ b/www/nginx/files/extra-patch-ngx_rtmp_exec_module.c
@@ -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 @@
generated by cgit (git 2.34.1) at 2024-11-25 09:29:49 +0800