diff options
Diffstat (limited to 'www/nginx-devel')
| -rw-r--r-- | www/nginx-devel/Makefile | 10 | ||||
| -rw-r--r-- | www/nginx-devel/Makefile.extmod | 8 | ||||
| -rw-r--r-- | www/nginx-devel/distinfo | 8 | ||||
| -rw-r--r-- | www/nginx-devel/files/extra-patch-nginx-gridfs-config | 13 |
4 files changed, 24 insertions, 15 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 5d72b971a92b..7411f385a5e0 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME?= nginx PORTVERSION= 1.22.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -250,10 +250,6 @@ pre-everything:: .endif @${ECHO_MSG} -post-extract-GRIDFS-on: - @${RMDIR} ${WRKSRC_gridfs}/mongo-c-driver/ - @${MV} ${WRKSRC_mongo_c} ${WRKSRC_gridfs}/mongo-c-driver - pre-patch-HTTPV3-on: @${MV} ${WRKSRC}/README ${WRKSRC}/README.1st @@ -274,9 +270,9 @@ post-patch-FASTDFS-on: 's!%%PREFIX%%!${PREFIX}!g;s!%%LOCALBASE%%!${LOCALBASE}!g' \ ${WRKSRC_fastdfs}/src/config -# Respect CFLAGS by remove needless --std=c99 flag post-patch-GRIDFS-on: - @${REINPLACE_CMD} 's!--std=c99!-DMONGO_HAVE_STDINT!' ${WRKSRC_gridfs}/config + @${REINPLACE_CMD} 's!%%LOCALBASE%%!${LOCALBASE}!g' \ + ${WRKSRC_gridfs}/nginx-gridfs/config post-patch-HTTP_AUTH_KRB5-on: @${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!g; \ diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index f79a820ca936..2a5b8510de74 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -77,9 +77,11 @@ FORMINPUT_IMPLIES= DEVEL_KIT FORMINPUT_GH_TUPLE= calio:form-input-nginx-module:v0.12:forminput FORMINPUT_VARS= DSO_EXTMODS+=forminput -GRIDFS_GH_TUPLE= technowledgy:nginx_http_gridfs_module:7970bab:gridfs \ - 10gen-archive:mongo-c-driver-legacy:f06669b:mongo_c -GRIDFS_VARS= DSO_EXTMODS+=gridfs +GRIDFS_GH_TUPLE= nieoding:nginx-gridfs:059bdc3:gridfs +GRIDFS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-gridfs-config +GRIDFS_LIB_DEPENDS= libbson-1.0.so:devel/libbson \ + libmongoc-1.0.so:devel/mongo-c-driver +GRIDFS_VARS= DSO_EXTMODS+=gridfs GRIDFS_SUBDIR=/nginx-gridfs HEADERS_MORE_GH_TUPLE= openresty:headers-more-nginx-module:55fbdab:headers_more HEADERS_MORE_VARS= DSO_EXTMODS+=headers_more diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index fa0b71c57841..b8a9b804f690 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1655173321 +TIMESTAMP = 1655477847 SHA256 (nginx-1.22.0.tar.gz) = b33d569a6f11a01433a57ce17e83935e953ad4dc77cdd4d40f896c88ac26eb53 SIZE (nginx-1.22.0.tar.gz) = 1073322 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -41,10 +41,8 @@ SHA256 (openresty-encrypted-session-nginx-module-v0.09_GH0.tar.gz) = fe9b95acf97 SIZE (openresty-encrypted-session-nginx-module-v0.09_GH0.tar.gz) = 11847 SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106 SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090 -SHA256 (technowledgy-nginx_http_gridfs_module-7970bab_GH0.tar.gz) = 3c53190c24a578c0d6d340d290cd87f139a651372c78b7518b617a037db60582 -SIZE (technowledgy-nginx_http_gridfs_module-7970bab_GH0.tar.gz) = 20495 -SHA256 (10gen-archive-mongo-c-driver-legacy-f06669b_GH0.tar.gz) = cbd6b34aadea40b43db431590808a9e12d813f896ad2b1dcffb820872ef97b21 -SIZE (10gen-archive-mongo-c-driver-legacy-f06669b_GH0.tar.gz) = 79396 +SHA256 (nieoding-nginx-gridfs-059bdc3_GH0.tar.gz) = 9b059b5ae7b602d12d32d5ebe2700827ea625f22c0fb3b9956242e11de63845b +SIZE (nieoding-nginx-gridfs-059bdc3_GH0.tar.gz) = 4674 SHA256 (openresty-headers-more-nginx-module-55fbdab_GH0.tar.gz) = ed996dc994ba31ae071e05f12bfac6ff86ee03a2e7d4263346b919870d8135ac SIZE (openresty-headers-more-nginx-module-55fbdab_GH0.tar.gz) = 28139 SHA256 (dvershinin-nginx_accept_language_module-5683967_GH0.tar.gz) = a58feb576f2231498b8a3863d3c6fba45c7d48bc48735fa714e07a7bfbedb6e3 diff --git a/www/nginx-devel/files/extra-patch-nginx-gridfs-config b/www/nginx-devel/files/extra-patch-nginx-gridfs-config new file mode 100644 index 000000000000..062086ba01ff --- /dev/null +++ b/www/nginx-devel/files/extra-patch-nginx-gridfs-config @@ -0,0 +1,13 @@ +--- ../nginx-gridfs-059bdc3/nginx-gridfs/config.orig 2022-06-17 10:37:42.109106000 -0400 ++++ ../nginx-gridfs-059bdc3/nginx-gridfs/config 2022-06-17 10:39:00.558419000 -0400 +@@ -1,7 +1,7 @@ + ngx_module_type=HTTP + ngx_module_name=ngx_http_gridfs_module +-ngx_module_incs="/usr/include/libmongoc-1.0 /usr/include/libbson-1.0" ++ngx_module_incs="%%LOCALBASE%%/include/libmongoc-1.0 %%LOCALBASE%%/include/libbson-1.0" + ngx_module_libs="-lmongoc-1.0 -lbson-1.0" + ngx_module_srcs="$ngx_addon_dir/ngx_http_gridfs_module.c" + . auto/module +-ngx_addon_name=$ngx_module_name +\ No newline at end of file ++ngx_addon_name=$ngx_module_name |