Thu Sep 3 09:48:07 2020 UTC ()
nginx: Replace hardcoded /usr/pkg for all modules.


(jperkin)
diff -r1.18 -r1.19 pkgsrc/www/nginx/Makefile.common
diff -r1.74 -r1.75 pkgsrc/www/nginx/distinfo
diff -r1.57 -r1.58 pkgsrc/www/nginx/options.mk
diff -r1.2 -r0 pkgsrc/www/nginx/patches/patch-auto_lib_pcre_conf
cvs diff -r1.18 -r1.19 pkgsrc/www/nginx/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/nginx/Attic/Makefile.common 2020/04/27 05:07:25 1.18
+++ pkgsrc/www/nginx/Attic/Makefile.common 2020/09/03 09:48:07 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.18 2020/04/27 05:07:25 rillig Exp $ 1# $NetBSD: Makefile.common,v 1.19 2020/09/03 09:48:07 jperkin Exp $
2# used by www/nginx/Makefile 2# used by www/nginx/Makefile
3# used by www/nginx-devel/Makefile 3# used by www/nginx-devel/Makefile
4 4
5# Used by both www/nginx and www/nginx-devel 5# Used by both www/nginx and www/nginx-devel
6# Do *not* add any version-specific data here, any change 6# Do *not* add any version-specific data here, any change
7# in this file will affect both packages 7# in this file will affect both packages
8 8
9CATEGORIES= www 9CATEGORIES= www
10MASTER_SITES= http://nginx.org/download/ 10MASTER_SITES= http://nginx.org/download/
11DISTFILES= ${DEFAULT_DISTFILES} 11DISTFILES= ${DEFAULT_DISTFILES}
12 12
13HOMEPAGE= https://nginx.org/ 13HOMEPAGE= https://nginx.org/
14COMMENT= Lightweight HTTP server and mail proxy server 14COMMENT= Lightweight HTTP server and mail proxy server
@@ -65,32 +65,26 @@ CONF_FILES+= ${EGDIR}/conf/naxsi_core.ru @@ -65,32 +65,26 @@ CONF_FILES+= ${EGDIR}/conf/naxsi_core.ru
65. endif 65. endif
66.endfor 66.endfor
67 67
68RCD_SCRIPTS= nginx 68RCD_SCRIPTS= nginx
69 69
70INSTALLATION_DIRS+= ${PKGMANDIR}/man8 sbin share/examples/nginx/conf \ 70INSTALLATION_DIRS+= ${PKGMANDIR}/man8 sbin share/examples/nginx/conf \
71 share/examples/nginx/html 71 share/examples/nginx/html
72MAKE_DIRS+= ${NGINX_PIDDIR} 72MAKE_DIRS+= ${NGINX_PIDDIR}
73OWN_DIRS= ${NGINX_LOGDIR} 73OWN_DIRS= ${NGINX_LOGDIR}
74OWN_DIRS_PERMS+= ${NGINX_DATADIR} ${NGINX_USER} ${NGINX_GROUP} 0700 74OWN_DIRS_PERMS+= ${NGINX_DATADIR} ${NGINX_USER} ${NGINX_GROUP} 0700
75 75
76BUILD_TARGET= build 76BUILD_TARGET= build
77 77
78SUBST_CLASSES+= prefix 
79SUBST_STAGE.prefix= pre-configure 
80SUBST_FILES.prefix= auto/lib/pcre/conf 
81SUBST_VARS.prefix= PREFIX 
82SUBST_NOOP_OK.prefix= yes # not needed for nginx>=17 
83 
84SUBST_CLASSES+= paths 78SUBST_CLASSES+= paths
85SUBST_STAGE.paths= pre-configure 79SUBST_STAGE.paths= pre-configure
86SUBST_FILES.paths= conf/nginx.conf 80SUBST_FILES.paths= conf/nginx.conf
87SUBST_SED.paths= -e 's,%%PKG_SYSCONFDIR%%,${PKG_SYSCONFDIR},g' 81SUBST_SED.paths= -e 's,%%PKG_SYSCONFDIR%%,${PKG_SYSCONFDIR},g'
88SUBST_SED.paths+= -e 's,%%NGINX_LOGDIR%%,${NGINX_LOGDIR},g' 82SUBST_SED.paths+= -e 's,%%NGINX_LOGDIR%%,${NGINX_LOGDIR},g'
89SUBST_SED.paths+= -e 's,%%NGINX_PIDDIR%%,${NGINX_PIDDIR},g' 83SUBST_SED.paths+= -e 's,%%NGINX_PIDDIR%%,${NGINX_PIDDIR},g'
90SUBST_SED.paths+= -e 's,%%NGINX_USER%%,${NGINX_USER},g' 84SUBST_SED.paths+= -e 's,%%NGINX_USER%%,${NGINX_USER},g'
91SUBST_SED.paths+= -e 's,%%NGINX_GROUP%%,${NGINX_GROUP},g' 85SUBST_SED.paths+= -e 's,%%NGINX_GROUP%%,${NGINX_GROUP},g'
92 86
93MESSAGE_SUBST+= NGINX_LOGDIR=${NGINX_LOGDIR} 87MESSAGE_SUBST+= NGINX_LOGDIR=${NGINX_LOGDIR}
94MESSAGE_SUBST+= NGINX_PIDDIR=${NGINX_PIDDIR} 88MESSAGE_SUBST+= NGINX_PIDDIR=${NGINX_PIDDIR}
95MESSAGE_SUBST+= NGINX_USER=${NGINX_USER} 89MESSAGE_SUBST+= NGINX_USER=${NGINX_USER}
96MESSAGE_SUBST+= NGINX_GROUP=${NGINX_GROUP} 90MESSAGE_SUBST+= NGINX_GROUP=${NGINX_GROUP}
cvs diff -r1.74 -r1.75 pkgsrc/www/nginx/distinfo (expand / switch to unified diff)

--- pkgsrc/www/nginx/distinfo 2020/08/16 21:54:08 1.74
+++ pkgsrc/www/nginx/distinfo 2020/09/03 09:48:07 1.75
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.74 2020/08/16 21:54:08 wiz Exp $ 1$NetBSD: distinfo,v 1.75 2020/09/03 09:48:07 jperkin Exp $
2 2
3SHA1 (array-var-nginx-module-0.05.tar.gz) = c69fac77814947009ab783a471783b3c95a63a26 3SHA1 (array-var-nginx-module-0.05.tar.gz) = c69fac77814947009ab783a471783b3c95a63a26
4RMD160 (array-var-nginx-module-0.05.tar.gz) = 89bd4efc04864e3e90781588a337338951ec8733 4RMD160 (array-var-nginx-module-0.05.tar.gz) = 89bd4efc04864e3e90781588a337338951ec8733
5SHA512 (array-var-nginx-module-0.05.tar.gz) = 7c9fa9b76bc7cd2473ceae6d5ffb8de26993be9293ea967908d6c4550e086affa7016df4c936fb0b79f1142dc0aa1a5f2058d417e6433b5a3497a45d7e866e84 5SHA512 (array-var-nginx-module-0.05.tar.gz) = 7c9fa9b76bc7cd2473ceae6d5ffb8de26993be9293ea967908d6c4550e086affa7016df4c936fb0b79f1142dc0aa1a5f2058d417e6433b5a3497a45d7e866e84
6Size (array-var-nginx-module-0.05.tar.gz) = 11280 bytes 6Size (array-var-nginx-module-0.05.tar.gz) = 11280 bytes
7SHA1 (echo-nginx-module-0.61.tar.gz) = 58a0b5430497cf9e13be5f52e46cad6f48ec251a 7SHA1 (echo-nginx-module-0.61.tar.gz) = 58a0b5430497cf9e13be5f52e46cad6f48ec251a
8RMD160 (echo-nginx-module-0.61.tar.gz) = 65bfe167de019826c44479bd413324e1cf686bba 8RMD160 (echo-nginx-module-0.61.tar.gz) = 65bfe167de019826c44479bd413324e1cf686bba
9SHA512 (echo-nginx-module-0.61.tar.gz) = c90b81a4e85a8e9beeb5ff591dc91adb25fa4e0b6cb47086b577e5fa36db2368442dd011187675e358781956c364b949bc4d920ca2b534481b21c9987d2a9a3b 9SHA512 (echo-nginx-module-0.61.tar.gz) = c90b81a4e85a8e9beeb5ff591dc91adb25fa4e0b6cb47086b577e5fa36db2368442dd011187675e358781956c364b949bc4d920ca2b534481b21c9987d2a9a3b
10Size (echo-nginx-module-0.61.tar.gz) = 53155 bytes 10Size (echo-nginx-module-0.61.tar.gz) = 53155 bytes
11SHA1 (encrypted-session-nginx-module-0.08.tar.gz) = 0e36e7ae2553f1ac5566e60021c535efa065c8ab 11SHA1 (encrypted-session-nginx-module-0.08.tar.gz) = 0e36e7ae2553f1ac5566e60021c535efa065c8ab
12RMD160 (encrypted-session-nginx-module-0.08.tar.gz) = becf8617c53c463f49ad853532ce5e4a3b35e073 12RMD160 (encrypted-session-nginx-module-0.08.tar.gz) = becf8617c53c463f49ad853532ce5e4a3b35e073
13SHA512 (encrypted-session-nginx-module-0.08.tar.gz) = 80651951edd69d202e991a66f531bbe0398b4f062e822bb7748411f5f597eb1d5827102ba477bb6cd2793274adf6f6d60dd89fde7645174b091143251197af69 13SHA512 (encrypted-session-nginx-module-0.08.tar.gz) = 80651951edd69d202e991a66f531bbe0398b4f062e822bb7748411f5f597eb1d5827102ba477bb6cd2793274adf6f6d60dd89fde7645174b091143251197af69
14Size (encrypted-session-nginx-module-0.08.tar.gz) = 11802 bytes 14Size (encrypted-session-nginx-module-0.08.tar.gz) = 11802 bytes
@@ -45,15 +45,14 @@ RMD160 (nginx_http_push_module-1.2.7.tar @@ -45,15 +45,14 @@ RMD160 (nginx_http_push_module-1.2.7.tar
45SHA512 (nginx_http_push_module-1.2.7.tar.gz) = d8b0e79c2b9cf4dd0b3ba8bfeeca86795b1206ec2a468829e6fd20c2286c9a8f75ad135424590cfb3a9d9cded5cefde4f19ba9e36d63a0ff95487d7139732bd9 45SHA512 (nginx_http_push_module-1.2.7.tar.gz) = d8b0e79c2b9cf4dd0b3ba8bfeeca86795b1206ec2a468829e6fd20c2286c9a8f75ad135424590cfb3a9d9cded5cefde4f19ba9e36d63a0ff95487d7139732bd9
46Size (nginx_http_push_module-1.2.7.tar.gz) = 673406 bytes 46Size (nginx_http_push_module-1.2.7.tar.gz) = 673406 bytes
47SHA1 (ngx_devel_kit-0.3.1.tar.gz) = e15316e13a7b19a3d2502becbb26043a464a135a 47SHA1 (ngx_devel_kit-0.3.1.tar.gz) = e15316e13a7b19a3d2502becbb26043a464a135a
48RMD160 (ngx_devel_kit-0.3.1.tar.gz) = 5c52a463544294096611aa9dec1c76e937a1aa23 48RMD160 (ngx_devel_kit-0.3.1.tar.gz) = 5c52a463544294096611aa9dec1c76e937a1aa23
49SHA512 (ngx_devel_kit-0.3.1.tar.gz) = de1e3349d8dd08e5982279b2219dc8a8006739f0409b8e0f5c50d93434beff1fbafba43e9c5ac85a5fab90afc5c0a7244a340610339c36f82f2cba7233e72de9 49SHA512 (ngx_devel_kit-0.3.1.tar.gz) = de1e3349d8dd08e5982279b2219dc8a8006739f0409b8e0f5c50d93434beff1fbafba43e9c5ac85a5fab90afc5c0a7244a340610339c36f82f2cba7233e72de9
50Size (ngx_devel_kit-0.3.1.tar.gz) = 66542 bytes 50Size (ngx_devel_kit-0.3.1.tar.gz) = 66542 bytes
51SHA1 (set-misc-nginx-module-0.32.tar.gz) = 2433bb7a138c3b13812ec2af7070cdc67435918f 51SHA1 (set-misc-nginx-module-0.32.tar.gz) = 2433bb7a138c3b13812ec2af7070cdc67435918f
52RMD160 (set-misc-nginx-module-0.32.tar.gz) = eff9be78f884f7c3e09e88af6bdf4cdd9aaea05d 52RMD160 (set-misc-nginx-module-0.32.tar.gz) = eff9be78f884f7c3e09e88af6bdf4cdd9aaea05d
53SHA512 (set-misc-nginx-module-0.32.tar.gz) = 5590526f60c99630f99a49bfa9e3455baee6d58cd2a1419eab1367a838dafb87a50f5e2607aa8ac557b90dbf633dcf61069c997b3526cddc8f2fc45820a7bc3b 53SHA512 (set-misc-nginx-module-0.32.tar.gz) = 5590526f60c99630f99a49bfa9e3455baee6d58cd2a1419eab1367a838dafb87a50f5e2607aa8ac557b90dbf633dcf61069c997b3526cddc8f2fc45820a7bc3b
54Size (set-misc-nginx-module-0.32.tar.gz) = 29329 bytes 54Size (set-misc-nginx-module-0.32.tar.gz) = 29329 bytes
55SHA1 (patch-aa) = 47f0c19b47b115f00ea6e9432d5bb12058c3bc1c 55SHA1 (patch-aa) = 47f0c19b47b115f00ea6e9432d5bb12058c3bc1c
56SHA1 (patch-ab) = 7d126a4372aa8575ef01a4bfd9aec9898861c763 56SHA1 (patch-ab) = 7d126a4372aa8575ef01a4bfd9aec9898861c763
57SHA1 (patch-auto_cc_conf) = 5e6a479ba419cd16dedeb3b4c47dc685d126ef6a 57SHA1 (patch-auto_cc_conf) = 5e6a479ba419cd16dedeb3b4c47dc685d126ef6a
58SHA1 (patch-auto_lib_pcre_conf) = 8cf03fe38e7f75ef6892cc8b93be5cb18c381e97 
59SHA1 (patch-src_event_modules_ngx__eventport__module.c) = c8e919f48d68bd5bffc4ad11d9c79dc6da3a0de2 58SHA1 (patch-src_event_modules_ngx__eventport__module.c) = c8e919f48d68bd5bffc4ad11d9c79dc6da3a0de2
cvs diff -r1.57 -r1.58 pkgsrc/www/nginx/options.mk (expand / switch to unified diff)

--- pkgsrc/www/nginx/options.mk 2020/08/16 21:54:08 1.57
+++ pkgsrc/www/nginx/options.mk 2020/09/03 09:48:07 1.58
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.57 2020/08/16 21:54:08 wiz Exp $ 1# $NetBSD: options.mk,v 1.58 2020/09/03 09:48:07 jperkin Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx 3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
4PKG_SUPPORTED_OPTIONS= array-var auth-request dav debug echo encrypted-session \ 4PKG_SUPPORTED_OPTIONS= array-var auth-request dav debug echo encrypted-session \
5 form-input flv geoip gtools gzip headers-more http2 \ 5 form-input flv geoip gtools gzip headers-more http2 \
6 image-filter luajit mail-proxy memcache naxsi \ 6 image-filter luajit mail-proxy memcache naxsi \
7 pcre perl push realip rtmp secure-link set-misc slice \ 7 pcre perl push realip rtmp secure-link set-misc slice \
8 ssl status stream-ssl-preread sub uwsgi 8 ssl status stream-ssl-preread sub uwsgi
9PKG_SUGGESTED_OPTIONS= pcre ssl 9PKG_SUGGESTED_OPTIONS= pcre ssl
10 10
11PKG_OPTIONS_LEGACY_OPTS+= v2:http2 11PKG_OPTIONS_LEGACY_OPTS+= v2:http2
12 12
13PLIST_VARS+= naxsi perl uwsgi 13PLIST_VARS+= naxsi perl uwsgi
14 14
@@ -25,57 +25,77 @@ NAXSI_DISTNAME= naxsi-${NAXSI_VERSION} @@ -25,57 +25,77 @@ NAXSI_DISTNAME= naxsi-${NAXSI_VERSION}
25NAXSI_DISTFILE= ${NAXSI_DISTNAME}.tar.gz 25NAXSI_DISTFILE= ${NAXSI_DISTNAME}.tar.gz
26SITES.${NAXSI_DISTFILE}= -https://github.com/nbs-system/naxsi/archive/${NAXSI_VERSION}.tar.gz 26SITES.${NAXSI_DISTFILE}= -https://github.com/nbs-system/naxsi/archive/${NAXSI_VERSION}.tar.gz
27DISTFILES+= ${NAXSI_DISTFILE} 27DISTFILES+= ${NAXSI_DISTFILE}
28.endif 28.endif
29 29
30.if !empty(PKG_OPTIONS:Mdebug) 30.if !empty(PKG_OPTIONS:Mdebug)
31CONFIGURE_ARGS+= --with-debug 31CONFIGURE_ARGS+= --with-debug
32.endif 32.endif
33 33
34.if !empty(PKG_OPTIONS:Mssl) 34.if !empty(PKG_OPTIONS:Mssl)
35.include "../../security/openssl/buildlink3.mk" 35.include "../../security/openssl/buildlink3.mk"
36CONFIGURE_ARGS+= --with-mail_ssl_module 36CONFIGURE_ARGS+= --with-mail_ssl_module
37CONFIGURE_ARGS+= --with-http_ssl_module 37CONFIGURE_ARGS+= --with-http_ssl_module
 38SUBST_CLASSES+= fix-ssl
 39SUBST_STAGE.fix-ssl= pre-configure
 40SUBST_FILES.fix-ssl= auto/lib/openssl/conf
 41SUBST_SED.fix-ssl= -e 's,/usr/pkg,${BUILDLINK_PREFIX.openssl},g'
 42SUBST_NOOP_OK.fix-ssl= yes
38.endif 43.endif
39 44
40.if !empty(PKG_OPTIONS:Mpcre) 45.if !empty(PKG_OPTIONS:Mpcre)
41.include "../../devel/pcre/buildlink3.mk" 46.include "../../devel/pcre/buildlink3.mk"
42CONFIGURE_ARGS+= --with-pcre-jit 47CONFIGURE_ARGS+= --with-pcre-jit
 48SUBST_CLASSES+= fix-pcre
 49SUBST_STAGE.fix-pcre= pre-configure
 50SUBST_FILES.fix-pcre= auto/lib/pcre/conf
 51SUBST_SED.fix-pcre= -e 's,/usr/pkg,${BUILDLINK_PREFIX.pcre},g'
 52SUBST_NOOP_OK.fix-pcre= yes
43.else 53.else
44CONFIGURE_ARGS+= --without-pcre 54CONFIGURE_ARGS+= --without-pcre
45CONFIGURE_ARGS+= --without-http_rewrite_module 55CONFIGURE_ARGS+= --without-http_rewrite_module
46.endif 56.endif
47 57
48.if !empty(PKG_OPTIONS:Mdav) 58.if !empty(PKG_OPTIONS:Mdav)
49CONFIGURE_ARGS+= --with-http_dav_module 59CONFIGURE_ARGS+= --with-http_dav_module
50CONFIGURE_ARGS+= --add-module=../${DAV_EXT_DISTNAME} 60CONFIGURE_ARGS+= --add-module=../${DAV_EXT_DISTNAME}
51.include "../../textproc/libxslt/buildlink3.mk" 61.include "../../textproc/libxslt/buildlink3.mk"
52.include "../../textproc/libxml2/buildlink3.mk" 62.include "../../textproc/libxml2/buildlink3.mk"
 63SUBST_CLASSES+= fix-xslt
 64SUBST_STAGE.fix-xslt= pre-configure
 65SUBST_FILES.fix-xslt= auto/lib/libxslt/conf
 66SUBST_SED.fix-xslt= -e 's,/usr/pkg,${BUILDLINK_PREFIX.libxslt},g'
 67SUBST_NOOP_OK.fix-xslt= yes
53.endif 68.endif
54.if !empty(PKG_OPTIONS:Mdav) || make(makesum) || make(mdi) 69.if !empty(PKG_OPTIONS:Mdav) || make(makesum) || make(mdi)
55DAV_EXT_VERSION= 3.0.0 70DAV_EXT_VERSION= 3.0.0
56DAV_EXT_DISTNAME= nginx-dav-ext-module-3.0.0 71DAV_EXT_DISTNAME= nginx-dav-ext-module-3.0.0
57DAV_EXT_DISTFILE= ${DAV_EXT_DISTNAME}.tar.gz 72DAV_EXT_DISTFILE= ${DAV_EXT_DISTNAME}.tar.gz
58SITES.${DAV_EXT_DISTFILE}+= -https://github.com/arut/nginx-dav-ext-module/archive/v${DAV_EXT_VERSION}.tar.gz 73SITES.${DAV_EXT_DISTFILE}+= -https://github.com/arut/nginx-dav-ext-module/archive/v${DAV_EXT_VERSION}.tar.gz
59DISTFILES+= ${DAV_EXT_DISTFILE} 74DISTFILES+= ${DAV_EXT_DISTFILE}
60.endif 75.endif
61 76
62.if !empty(PKG_OPTIONS:Mflv) 77.if !empty(PKG_OPTIONS:Mflv)
63CONFIGURE_ARGS+= --with-http_flv_module 78CONFIGURE_ARGS+= --with-http_flv_module
64.endif 79.endif
65 80
66.if !empty(PKG_OPTIONS:Mgeoip) 81.if !empty(PKG_OPTIONS:Mgeoip)
67.include "../../net/GeoIP/buildlink3.mk" 82.include "../../net/GeoIP/buildlink3.mk"
68CONFIGURE_ARGS+= --with-http_geoip_module 83CONFIGURE_ARGS+= --with-http_geoip_module
 84SUBST_CLASSES+= fix-geo
 85SUBST_STAGE.fix-geo= pre-configure
 86SUBST_FILES.fix-geo= auto/lib/geoip/conf
 87SUBST_SED.fix-geo= -e 's,/usr/pkg,${BUILDLINK_PREFIX.GeoIP},g'
 88SUBST_NOOP_OK.fix-geo= yes
69.endif 89.endif
70 90
71.if !empty(PKG_OPTIONS:Mhttp2) 91.if !empty(PKG_OPTIONS:Mhttp2)
72CONFIGURE_ARGS+= --with-http_v2_module 92CONFIGURE_ARGS+= --with-http_v2_module
73.endif 93.endif
74 94
75.if !empty(PKG_OPTIONS:Msub) 95.if !empty(PKG_OPTIONS:Msub)
76CONFIGURE_ARGS+= --with-http_sub_module 96CONFIGURE_ARGS+= --with-http_sub_module
77.endif 97.endif
78 98
79.if !empty(PKG_OPTIONS:Mgtools) 99.if !empty(PKG_OPTIONS:Mgtools)
80CONFIGURE_ARGS+= --with-google_perftools_module 100CONFIGURE_ARGS+= --with-google_perftools_module
81.include "../../devel/gperftools/buildlink3.mk" 101.include "../../devel/gperftools/buildlink3.mk"
@@ -200,26 +220,31 @@ CONFIGURE_ARGS+= --without-http_uwsgi_mo @@ -200,26 +220,31 @@ CONFIGURE_ARGS+= --without-http_uwsgi_mo
200CONFIGURE_ARGS+= --add-module=../nchan-${PUSH_VERSION} 220CONFIGURE_ARGS+= --add-module=../nchan-${PUSH_VERSION}
201.endif 221.endif
202.if !empty(PKG_OPTIONS:Mpush) || make(makesum) || make(mdi) 222.if !empty(PKG_OPTIONS:Mpush) || make(makesum) || make(mdi)
203PUSH_VERSION= 1.2.7 223PUSH_VERSION= 1.2.7
204PUSH_DISTNAME= nginx_http_push_module-${PUSH_VERSION} 224PUSH_DISTNAME= nginx_http_push_module-${PUSH_VERSION}
205PUSH_DISTFILE= ${PUSH_DISTNAME}.tar.gz 225PUSH_DISTFILE= ${PUSH_DISTNAME}.tar.gz
206SITES.${PUSH_DISTFILE}= -https://github.com/slact/nchan/archive/v${PUSH_VERSION}.tar.gz 226SITES.${PUSH_DISTFILE}= -https://github.com/slact/nchan/archive/v${PUSH_VERSION}.tar.gz
207DISTFILES+= ${PUSH_DISTFILE} 227DISTFILES+= ${PUSH_DISTFILE}
208.endif 228.endif
209 229
210.if !empty(PKG_OPTIONS:Mimage-filter) 230.if !empty(PKG_OPTIONS:Mimage-filter)
211.include "../../graphics/gd/buildlink3.mk" 231.include "../../graphics/gd/buildlink3.mk"
212CONFIGURE_ARGS+= --with-http_image_filter_module 232CONFIGURE_ARGS+= --with-http_image_filter_module
 233SUBST_CLASSES+= fix-gd
 234SUBST_STAGE.fix-gd= pre-configure
 235SUBST_FILES.fix-gd= auto/lib/libgd/conf
 236SUBST_SED.fix-gd= -e 's,/usr/pkg,${BUILDLINK_PREFIX.gd},g'
 237SUBST_NOOP_OK.fix-gd= yes
213.endif 238.endif
214 239
215.if !empty(PKG_OPTIONS:Mslice) 240.if !empty(PKG_OPTIONS:Mslice)
216CONFIGURE_ARGS+= --with-http_slice_module 241CONFIGURE_ARGS+= --with-http_slice_module
217.endif 242.endif
218 243
219.if !empty(PKG_OPTIONS:Mstatus) 244.if !empty(PKG_OPTIONS:Mstatus)
220CONFIGURE_ARGS+= --with-http_stub_status_module 245CONFIGURE_ARGS+= --with-http_stub_status_module
221.endif 246.endif
222 247
223.if !empty(PKG_OPTIONS:Mperl) 248.if !empty(PKG_OPTIONS:Mperl)
224CONFIGURE_ARGS+= --with-http_perl_module 249CONFIGURE_ARGS+= --with-http_perl_module
225CONFIGURE_ARGS+= --with-perl=${PERL5:Q} 250CONFIGURE_ARGS+= --with-perl=${PERL5:Q}
File Deleted: pkgsrc/www/nginx/patches/Attic/patch-auto_lib_pcre_conf