Convert post-patch target to EXTRA_PATCHES entries for patches for third-party modules.

No functionally changes.
Do not bump PORTREVISIONs.

Spotted by:	Maxim Dounin aka mdounin at mdounin dot ru

Feature safe:	yes

2 files changed, 8 insertions, 32 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 955ced27cbde..75ed89ddf5d2 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -260,12 +260,14 @@ NGINX_H264_MODULE_VERSION=	2.2.7
 MASTER_SITES+=	http://h264.code-shop.com/download/:mp4streaming
 DISTFILES+=	nginx_mod_h264_streaming-${NGINX_H264_MODULE_VERSION}.tar.gz:mp4streaming
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_mod_h264_streaming-${NGINX_H264_MODULE_VERSION}
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_streaming_module.c
 .endif
 
 .if defined(WITH_HTTP_NOTICE_MODULE)
 MASTER_SITES+=	http://xph.us/dist/nginx-notice/:notice2
 DISTFILES+=	nginx-notice-2.tar.gz:notice2
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-notice-2
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_notice_module.c
 .endif
 
 .if defined(WITH_HTTP_PERL_MODULE)
@@ -349,6 +351,7 @@ NGINX_UPSTREAM_HASH_VERSION=	0.3.1
 MASTER_SITES+=	http://wiki.nginx.org/images/1/11/:upstreamhash
 DISTFILES+=	Nginx_upstream_hash-${NGINX_UPSTREAM_HASH_VERSION}.tar.gz:upstreamhash
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_hash-${NGINX_UPSTREAM_HASH_VERSION}
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_upstream.h
 .endif
 
 .if defined(WITH_HTTP_UPSTREAM_KEEPALIVE)
@@ -414,6 +417,7 @@ NGINX_UDPLOG_MODULE_VERSION=	1.0.0
 MASTER_SITES+=	http://www.grid.net.ru/nginx/download/:udplog
 DISTFILES+=	nginx_udplog_module-${NGINX_UDPLOG_MODULE_VERSION}.tar.gz:udplog
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_udplog_module-${NGINX_UDPLOG_MODULE_VERSION}
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_udplog_module.c
 .endif
 
 .if defined(WITH_WWW)
@@ -471,14 +475,6 @@ post-patch:
 		's!$$HTTP_ACCESSKEY_MODULE!ngx_http_accesskey_module!' \
 		${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_MODULE_VERSION}/config
 .endif
-.if defined(WITH_HTTP_MP4_H264_MODULE)
-	@${PATCH} ${PATCH_ARGS} < \
-		${PATCHDIR}/extra-patch-ngx_http_streaming_module.c
-.endif
-.if defined(WITH_HTTP_NOTICE_MODULE)
-	@${PATCH} ${PATCH_ARGS} < \
-		${PATCHDIR}/extra-patch-ngx_http_notice_module.c
-.endif
 .if defined(WITH_PASSENGER_MODULE)
 	@${REINPLACE_CMD} 's!g++!${CXX}!' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/Rakefile
@@ -486,10 +482,6 @@ post-patch:
 		s!-lpthread!${PTHREAD_LIBS}!g' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info.rb
 .endif
-.if defined(WITH_HTTP_UPSTREAM_HASH)
-	@${PATCH} ${PATCH_ARGS} < \
-		${PATCHDIR}/extra-patch-ngx_http_upstream.h
-.endif
 .if defined(WITH_SUPERVISORD_MODULE)
 	( cd ${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION} && \
 		${PATCH} -p0 < \
@@ -498,10 +490,6 @@ post-patch:
 		${PATCH} -p0 < \
 			${WRKDIR}/ngx_supervisord-${NGINX_SUPERVISORD_MODULE_VERSION}/patches/ngx_http_upstream_init_busy-0.8.17.patch )
 .endif
-.if defined(WITH_UDPLOG_MODULE)
-	@${PATCH} ${PATCH_ARGS} < \
-		${PATCHDIR}/extra-patch-ngx_http_udplog_module.c
-.endif
 
 do-build:
 	@cd ${WRKSRC} && ${MAKE}
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index aa3004aeb760..110af733ab63 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -186,6 +186,7 @@ MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:echo/}
 MASTER_SITE_SUBDIR+=	osa/:echo
 DISTFILES+=	ngx_echo_module-${NGINX_ECHO_MODULE_VERSION}.tar.gz:echo
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_echo_module-${NGINX_ECHO_MODULE_VERSION}
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_echo_time.c
 .endif
 
 .if defined(WITH_HEADERS_MORE_MODULE)
@@ -252,12 +253,14 @@ NGINX_H264_MODULE_VERSION=	2.2.7
 MASTER_SITES+=	http://h264.code-shop.com/download/:mp4streaming
 DISTFILES+=	nginx_mod_h264_streaming-${NGINX_H264_MODULE_VERSION}.tar.gz:mp4streaming
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_mod_h264_streaming-${NGINX_H264_MODULE_VERSION}
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_streaming_module.c
 .endif
 
 .if defined(WITH_HTTP_NOTICE_MODULE)
 MASTER_SITES+=	http://xph.us/dist/nginx-notice/:notice2
 DISTFILES+=	nginx-notice-2.tar.gz:notice2
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-notice-2
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_notice_module.c
 .endif
 
 .if defined(WITH_HTTP_PERL_MODULE)
@@ -341,6 +344,7 @@ NGINX_UPSTREAM_HASH_VERSION=	0.3.1
 MASTER_SITES+=	http://wiki.nginx.org/images/1/11/:upstreamhash
 DISTFILES+=	Nginx_upstream_hash-${NGINX_UPSTREAM_HASH_VERSION}.tar.gz:upstreamhash
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_hash-${NGINX_UPSTREAM_HASH_VERSION}
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_http_upstream.h
 .endif
 
 .if defined(WITH_HTTP_UPSTREAM_KEEPALIVE)
@@ -463,18 +467,6 @@ post-patch:
 		's!$$HTTP_ACCESSKEY_MODULE!ngx_http_accesskey_module!' \
 		${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_MODULE_VERSION}/config
 .endif
-.if defined(WITH_ECHO_MODULE)
-	@${PATCH} ${PATCH_ARGS} < \
-		${PATCHDIR}/extra-patch-ngx_http_echo_time.c
-.endif
-.if defined(WITH_HTTP_MP4_H264_MODULE)
-	@${PATCH} ${PATCH_ARGS} < \
-		${PATCHDIR}/extra-patch-ngx_http_streaming_module.c
-.endif
-.if defined(WITH_HTTP_NOTICE_MODULE)
-	@${PATCH} ${PATCH_ARGS} < \
-		${PATCHDIR}/extra-patch-ngx_http_notice_module.c
-.endif
 .if defined(WITH_PASSENGER_MODULE)
 	@${REINPLACE_CMD} 's!g++!${CXX}!' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/Rakefile
@@ -482,10 +474,6 @@ post-patch:
 		s!-lpthread!${PTHREAD_LIBS}!g' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info.rb
 .endif
-.if defined(WITH_HTTP_UPSTREAM_HASH)
-	@${PATCH} ${PATCH_ARGS} < \
-		${PATCHDIR}/extra-patch-ngx_http_upstream.h
-.endif
 .if defined(WITH_SUPERVISORD_MODULE)
 	( cd ${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION} && \
 		${PATCH} -p0 < \