Use more canonical names for patches.

No functionaly changes.
Don't bump PORTREVISION.

Feature safe: yes

13 files changed, 11 insertions, 11 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 55f492d5e6c0..2c5fb23f60a9 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -560,7 +560,7 @@ FETCH_ARGS=	-pRr
 MASTER_SITES+=	https://github.com/chaoslawful/drizzle-nginx-module/tarball/v${NGINX_DRIZZLE_VERSION}/:drizzle
 DISTFILES+=	chaoslawful-drizzle-nginx-module-v${NGINX_DRIZZLE_VERSION}-${GIT_DRIZZLE_VERSION}.tar.gz:drizzle
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-chaoslawful-drizzle-nginx-module::config
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-chaoslawful-drizzle-nginx-module-config
 .endif
 
 .if ${PORT_OPTIONS:MENCRYPTSESSION}
@@ -622,7 +622,7 @@ NGINX_NAXSI_VERSION=	0.46-1
 MASTER_SITES+=	http://naxsi.googlecode.com/files/:naxsi
 DISTFILES+=	naxsi-${NGINX_NAXSI_VERSION}.tgz:naxsi
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_src
-EXTRA_PATCHES+=	 ${PATCHDIR}/extra-patch-naxsi_src::naxsi_runtime.c
+EXTRA_PATCHES+=	 ${PATCHDIR}/extra-patch-naxsi_src-naxsi_runtime.c
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_REWRITE} || defined(USE_HTTP_REWRITE)
@@ -639,7 +639,7 @@ PASSENGER_VERSION=	3.0.17
 MASTER_SITES+=	RF/passenger/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-passenger::build::nginx.rb
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-passenger-build-nginx.rb
 .if empty(PORT_OPTIONS:MDEBUG)
 CONFIGURE_ENV+=	OPTIMIZE="yes"
 CFLAGS+=	-DNDEBUG
@@ -652,7 +652,7 @@ NGINX_POSTGRES_VERSION=	0.9
 MASTER_SITES+=	http://labs.frickle.com/files/:postgres
 DISTFILES+=	ngx_postgres-${NGINX_POSTGRES_VERSION}.tar.gz:postgres
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_postgres-${NGINX_POSTGRES_VERSION}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_postgres::config
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_postgres-config
 .endif
 
 .if ${PORT_OPTIONS:MRDS_CSV}
@@ -699,7 +699,7 @@ FETCH_ARGS=	-pRr
 MASTER_SITES+=	https://github.com/agentzh/set-misc-nginx-module/tarball/v${NGINX_SET_MISC_VERSION}/:setmisc
 DISTFILES+=	agentzh-set-misc-nginx-module-v${NGINX_SET_MISC_VERSION}-${GIT_SET_MISC_VERSION}.tar.gz:setmisc
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-set-misc-nginx-module-${GIT_SET_MISC_VERSION:S/^0-g//}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-agentzh-set-misc-nginx-module::config
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-agentzh-set-misc-nginx-module-config
 .endif
 
 .if ${PORT_OPTIONS:MSFLOW}
@@ -853,7 +853,7 @@ FETCH_ARGS=	-pRr
 MASTER_SITES+=	https://github.com/calio/iconv-nginx-module/tarball/v${NGINX_ICONV_VERSION}/:iconv
 DISTFILES+=	calio-iconv-nginx-module-v${NGINX_ICONV_VERSION}-${GIT_ICONV_VERSION}.tar.gz:iconv
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/calio-iconv-nginx-module-${GIT_ICONV_VERSION:S/^0-g//}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-calio-iconv-nginx-module::config
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
 .endif
 
 PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
diff --git a/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module::config b/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module-config
index 7a69743ee592..7a69743ee592 100644
--- a/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module::config
+++ b/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module-config
diff --git a/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module::config b/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module-config
index 0b138a51fba2..0b138a51fba2 100644
--- a/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module::config
+++ b/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module-config
diff --git a/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config b/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module-config
index 0710bebf5d0e..0710bebf5d0e 100644
--- a/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config
+++ b/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module-config
diff --git a/www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c b/www/nginx-devel/files/extra-patch-naxsi_src-naxsi_runtime.c
index e06d1b4cdfd4..e06d1b4cdfd4 100644
--- a/www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c
+++ b/www/nginx-devel/files/extra-patch-naxsi_src-naxsi_runtime.c
diff --git a/www/nginx-devel/files/extra-patch-ngx_postgres::config b/www/nginx-devel/files/extra-patch-ngx_postgres-config
index cfba3278ca87..cfba3278ca87 100644
--- a/www/nginx-devel/files/extra-patch-ngx_postgres::config
+++ b/www/nginx-devel/files/extra-patch-ngx_postgres-config
diff --git a/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
index b1372e156e24..b1372e156e24 100644
--- a/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb
+++ b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index feda2a7c5673..a1edca4d721c 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -562,7 +562,7 @@ FETCH_ARGS=	-pRr
 MASTER_SITES+=	https://github.com/chaoslawful/drizzle-nginx-module/tarball/v${NGINX_DRIZZLE_VERSION}/:drizzle
 DISTFILES+=	chaoslawful-drizzle-nginx-module-v${NGINX_DRIZZLE_VERSION}-${GIT_DRIZZLE_VERSION}.tar.gz:drizzle
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-chaoslawful-drizzle-nginx-module::config
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-chaoslawful-drizzle-nginx-module-config
 .endif
 
 .if ${PORT_OPTIONS:MENCRYPTSESSION}
@@ -641,7 +641,7 @@ PASSENGER_VERSION=	3.0.17
 MASTER_SITES+=	RF/passenger/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-passenger::build::nginx.rb
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-passenger-build-nginx.rb
 .if empty(PORT_OPTIONS:MDEBUG)
 CONFIGURE_ENV+=	OPTIMIZE="yes"
 CFLAGS+=	-DNDEBUG
@@ -654,7 +654,7 @@ NGINX_POSTGRES_VERSION=	0.9
 MASTER_SITES+=	http://labs.frickle.com/files/:postgres
 DISTFILES+=	ngx_postgres-${NGINX_POSTGRES_VERSION}.tar.gz:postgres
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_postgres-${NGINX_POSTGRES_VERSION}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_postgres::config
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-ngx_postgres-config
 .endif
 
 .if ${PORT_OPTIONS:MRDS_CSV}
@@ -701,7 +701,7 @@ FETCH_ARGS=	-pRr
 MASTER_SITES+=	https://github.com/agentzh/set-misc-nginx-module/tarball/v${NGINX_SET_MISC_VERSION}/:setmisc
 DISTFILES+=	agentzh-set-misc-nginx-module-v${NGINX_SET_MISC_VERSION}-${GIT_SET_MISC_VERSION}.tar.gz:setmisc
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-set-misc-nginx-module-${GIT_SET_MISC_VERSION:S/^0-g//}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-agentzh-set-misc-nginx-module::config
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-agentzh-set-misc-nginx-module-config
 .endif
 
 .if ${PORT_OPTIONS:MSFLOW}
@@ -847,7 +847,7 @@ FETCH_ARGS=	-pRr
 MASTER_SITES+=	https://github.com/calio/iconv-nginx-module/tarball/v${NGINX_ICONV_VERSION}/:iconv
 DISTFILES+=	calio-iconv-nginx-module-v${NGINX_ICONV_VERSION}-${GIT_ICONV_VERSION}.tar.gz:iconv
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/calio-iconv-nginx-module-${GIT_ICONV_VERSION:S/^0-g//}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-calio-iconv-nginx-module::config
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
 .endif
 
 PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
diff --git a/www/nginx/files/extra-patch-agentzh-set-misc-nginx-module::config b/www/nginx/files/extra-patch-agentzh-set-misc-nginx-module-config
index 7a69743ee592..7a69743ee592 100644
--- a/www/nginx/files/extra-patch-agentzh-set-misc-nginx-module::config
+++ b/www/nginx/files/extra-patch-agentzh-set-misc-nginx-module-config
diff --git a/www/nginx/files/extra-patch-calio-iconv-nginx-module::config b/www/nginx/files/extra-patch-calio-iconv-nginx-module-config
index 0b138a51fba2..0b138a51fba2 100644
--- a/www/nginx/files/extra-patch-calio-iconv-nginx-module::config
+++ b/www/nginx/files/extra-patch-calio-iconv-nginx-module-config
diff --git a/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module::config b/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module-config
index 0710bebf5d0e..0710bebf5d0e 100644
--- a/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module::config
+++ b/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module-config
diff --git a/www/nginx/files/extra-patch-ngx_postgres::config b/www/nginx/files/extra-patch-ngx_postgres-config
index cfba3278ca87..cfba3278ca87 100644
--- a/www/nginx/files/extra-patch-ngx_postgres::config
+++ b/www/nginx/files/extra-patch-ngx_postgres-config
diff --git a/www/nginx/files/extra-patch-passenger::build::nginx.rb b/www/nginx/files/extra-patch-passenger-build-nginx.rb
index b1372e156e24..b1372e156e24 100644
--- a/www/nginx/files/extra-patch-passenger::build::nginx.rb
+++ b/www/nginx/files/extra-patch-passenger-build-nginx.rb