Fri Jul 15 00:41:45 2022 UTC ()
nginx & nginx-devel: mark these packages conflict


(gutteridge)
diff -r1.120 -r1.121 pkgsrc/www/nginx/Makefile
diff -r1.86 -r1.87 pkgsrc/www/nginx-devel/Makefile
cvs diff -r1.120 -r1.121 pkgsrc/www/nginx/Makefile (switch to unified diff)

--- pkgsrc/www/nginx/Makefile 2022/07/14 16:09:42 1.120
+++ pkgsrc/www/nginx/Makefile 2022/07/15 00:41:45 1.121
@@ -1,121 +1,123 @@ @@ -1,121 +1,123 @@
1# $NetBSD: Makefile,v 1.120 2022/07/14 16:09:42 osa Exp $ 1# $NetBSD: Makefile,v 1.121 2022/07/15 00:41:45 gutteridge Exp $
2 2
3DISTNAME= nginx-1.22.0 3DISTNAME= nginx-1.22.0
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://nginx.org/download/ 6MASTER_SITES= http://nginx.org/download/
7DISTFILES= ${DEFAULT_DISTFILES} 7DISTFILES= ${DEFAULT_DISTFILES}
8 8
9MAINTAINER= osa@NetBSD.org 9MAINTAINER= osa@NetBSD.org
10HOMEPAGE= https://nginx.org/ 10HOMEPAGE= https://nginx.org/
11COMMENT= Lightweight HTTP server and mail proxy server 11COMMENT= Lightweight HTTP server and mail proxy server
12LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
13 13
 14CONFLICTS= nginx-devel-[0-9]*
 15
14.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
15 17
16NGINX_USER?= nginx 18NGINX_USER?= nginx
17NGINX_GROUP?= nginx 19NGINX_GROUP?= nginx
18NGINX_DATADIR?= ${VARBASE}/db/nginx 20NGINX_DATADIR?= ${VARBASE}/db/nginx
19NGINX_LOGDIR?= ${VARBASE}/log/nginx 21NGINX_LOGDIR?= ${VARBASE}/log/nginx
20NGINX_PIDDIR?= ${VARBASE}/run 22NGINX_PIDDIR?= ${VARBASE}/run
21 23
22BUILD_DEFS+= NGINX_DATADIR NGINX_LOGDIR NGINX_PIDDIR VARBASE 24BUILD_DEFS+= NGINX_DATADIR NGINX_LOGDIR NGINX_PIDDIR VARBASE
23 25
24PKG_USERS_VARS+= NGINX_USER 26PKG_USERS_VARS+= NGINX_USER
25PKG_GROUPS_VARS+= NGINX_GROUP 27PKG_GROUPS_VARS+= NGINX_GROUP
26PKG_GROUPS= ${NGINX_GROUP} 28PKG_GROUPS= ${NGINX_GROUP}
27PKG_USERS= ${NGINX_USER}:${NGINX_GROUP} 29PKG_USERS= ${NGINX_USER}:${NGINX_GROUP}
28 30
29PKG_GECOS.${NGINX_USER}= NGINX server user 31PKG_GECOS.${NGINX_USER}= NGINX server user
30PKG_HOME.${NGINX_USER}= ${NGINX_DATADIR} 32PKG_HOME.${NGINX_USER}= ${NGINX_DATADIR}
31PKG_SHELL.${NGINX_USER}= ${NOLOGIN} 33PKG_SHELL.${NGINX_USER}= ${NOLOGIN}
32 34
33USE_PKGLOCALEDIR= yes 35USE_PKGLOCALEDIR= yes
34HAS_CONFIGURE= yes 36HAS_CONFIGURE= yes
35CONFIGURE_ARGS+= --user=${NGINX_USER} 37CONFIGURE_ARGS+= --user=${NGINX_USER}
36CONFIGURE_ARGS+= --group=${NGINX_GROUP} 38CONFIGURE_ARGS+= --group=${NGINX_GROUP}
37CONFIGURE_ARGS+= --with-ld-opt=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib 39CONFIGURE_ARGS+= --with-ld-opt=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib
38CONFIGURE_ARGS+= --prefix=${PREFIX} 40CONFIGURE_ARGS+= --prefix=${PREFIX}
39CONFIGURE_ARGS+= --sbin-path=${PREFIX}/sbin 41CONFIGURE_ARGS+= --sbin-path=${PREFIX}/sbin
40CONFIGURE_ARGS+= --conf-path=${PKG_SYSCONFDIR}/nginx.conf 42CONFIGURE_ARGS+= --conf-path=${PKG_SYSCONFDIR}/nginx.conf
41CONFIGURE_ARGS+= --pid-path=${NGINX_PIDDIR}/nginx.pid 43CONFIGURE_ARGS+= --pid-path=${NGINX_PIDDIR}/nginx.pid
42CONFIGURE_ARGS+= --lock-path=${NGINX_DATADIR}/nginx.lock 44CONFIGURE_ARGS+= --lock-path=${NGINX_DATADIR}/nginx.lock
43CONFIGURE_ARGS+= --error-log-path=${NGINX_LOGDIR}/error.log 45CONFIGURE_ARGS+= --error-log-path=${NGINX_LOGDIR}/error.log
44CONFIGURE_ARGS+= --http-log-path=${NGINX_LOGDIR}/access.log 46CONFIGURE_ARGS+= --http-log-path=${NGINX_LOGDIR}/access.log
45CONFIGURE_ARGS+= --http-client-body-temp-path=${NGINX_DATADIR}/client_body_temp 47CONFIGURE_ARGS+= --http-client-body-temp-path=${NGINX_DATADIR}/client_body_temp
46CONFIGURE_ARGS+= --http-proxy-temp-path=${NGINX_DATADIR}/proxy_temp 48CONFIGURE_ARGS+= --http-proxy-temp-path=${NGINX_DATADIR}/proxy_temp
47CONFIGURE_ARGS+= --http-fastcgi-temp-path=${NGINX_DATADIR}/fstcgi_temp 49CONFIGURE_ARGS+= --http-fastcgi-temp-path=${NGINX_DATADIR}/fstcgi_temp
48CONFIGURE_ARGS+= --http-scgi-temp-path=${NGINX_DATADIR}/scgi_temp 50CONFIGURE_ARGS+= --http-scgi-temp-path=${NGINX_DATADIR}/scgi_temp
49 51
50PKG_SYSCONFSUBDIR= nginx 52PKG_SYSCONFSUBDIR= nginx
51 53
52.include "options.mk" 54.include "options.mk"
53 55
54EGDIR= ${PREFIX}/share/examples/nginx 56EGDIR= ${PREFIX}/share/examples/nginx
55EGFILES+= fastcgi.conf fastcgi_params koi-utf koi-win \ 57EGFILES+= fastcgi.conf fastcgi_params koi-utf koi-win \
56 mime.types nginx.conf win-utf 58 mime.types nginx.conf win-utf
57 59
58.for file in ${EGFILES} 60.for file in ${EGFILES}
59CONF_FILES+= ${EGDIR}/conf/${file} ${PKG_SYSCONFDIR}/${file} 61CONF_FILES+= ${EGDIR}/conf/${file} ${PKG_SYSCONFDIR}/${file}
60. if !empty(PKG_OPTIONS:Mnaxsi) 62. if !empty(PKG_OPTIONS:Mnaxsi)
61CONF_FILES+= ${EGDIR}/conf/naxsi_core.rules ${PKG_SYSCONFDIR}/naxsi_core.rules 63CONF_FILES+= ${EGDIR}/conf/naxsi_core.rules ${PKG_SYSCONFDIR}/naxsi_core.rules
62. endif 64. endif
63.endfor 65.endfor
64 66
65RCD_SCRIPTS= nginx 67RCD_SCRIPTS= nginx
66 68
67INSTALLATION_DIRS+= ${PKGMANDIR}/man8 sbin share/examples/nginx/conf \ 69INSTALLATION_DIRS+= ${PKGMANDIR}/man8 sbin share/examples/nginx/conf \
68 share/examples/nginx/html 70 share/examples/nginx/html
69MAKE_DIRS+= ${NGINX_PIDDIR} 71MAKE_DIRS+= ${NGINX_PIDDIR}
70OWN_DIRS= ${NGINX_LOGDIR} 72OWN_DIRS= ${NGINX_LOGDIR}
71OWN_DIRS_PERMS+= ${NGINX_DATADIR} ${NGINX_USER} ${NGINX_GROUP} 0700 73OWN_DIRS_PERMS+= ${NGINX_DATADIR} ${NGINX_USER} ${NGINX_GROUP} 0700
72 74
73BUILD_TARGET= build 75BUILD_TARGET= build
74 76
75SUBST_CLASSES+= paths 77SUBST_CLASSES+= paths
76SUBST_STAGE.paths= pre-configure 78SUBST_STAGE.paths= pre-configure
77SUBST_FILES.paths= conf/nginx.conf 79SUBST_FILES.paths= conf/nginx.conf
78SUBST_SED.paths= -e 's,%%PKG_SYSCONFDIR%%,${PKG_SYSCONFDIR},g' 80SUBST_SED.paths= -e 's,%%PKG_SYSCONFDIR%%,${PKG_SYSCONFDIR},g'
79SUBST_SED.paths+= -e 's,%%NGINX_LOGDIR%%,${NGINX_LOGDIR},g' 81SUBST_SED.paths+= -e 's,%%NGINX_LOGDIR%%,${NGINX_LOGDIR},g'
80SUBST_SED.paths+= -e 's,%%NGINX_PIDDIR%%,${NGINX_PIDDIR},g' 82SUBST_SED.paths+= -e 's,%%NGINX_PIDDIR%%,${NGINX_PIDDIR},g'
81SUBST_SED.paths+= -e 's,%%NGINX_USER%%,${NGINX_USER},g' 83SUBST_SED.paths+= -e 's,%%NGINX_USER%%,${NGINX_USER},g'
82SUBST_SED.paths+= -e 's,%%NGINX_GROUP%%,${NGINX_GROUP},g' 84SUBST_SED.paths+= -e 's,%%NGINX_GROUP%%,${NGINX_GROUP},g'
83 85
84MESSAGE_SUBST+= NGINX_LOGDIR=${NGINX_LOGDIR} 86MESSAGE_SUBST+= NGINX_LOGDIR=${NGINX_LOGDIR}
85MESSAGE_SUBST+= NGINX_PIDDIR=${NGINX_PIDDIR} 87MESSAGE_SUBST+= NGINX_PIDDIR=${NGINX_PIDDIR}
86MESSAGE_SUBST+= NGINX_USER=${NGINX_USER} 88MESSAGE_SUBST+= NGINX_USER=${NGINX_USER}
87MESSAGE_SUBST+= NGINX_GROUP=${NGINX_GROUP} 89MESSAGE_SUBST+= NGINX_GROUP=${NGINX_GROUP}
88 90
89.if ${OPSYS} == "Darwin" 91.if ${OPSYS} == "Darwin"
90SOEXT= bundle 92SOEXT= bundle
91.else 93.else
92SOEXT= so 94SOEXT= so
93.endif 95.endif
94PLIST_SUBST+= SOEXT=${SOEXT} 96PLIST_SUBST+= SOEXT=${SOEXT}
95 97
96do-install: 98do-install:
97 ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx 99 ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx
98.for file in ${EGFILES} 100.for file in ${EGFILES}
99 ${INSTALL_DATA} ${WRKSRC}/conf/${file} ${DESTDIR}${EGDIR}/conf/${file} 101 ${INSTALL_DATA} ${WRKSRC}/conf/${file} ${DESTDIR}${EGDIR}/conf/${file}
100.endfor 102.endfor
101 ${INSTALL_DATA} ${WRKSRC}/html/50x.html ${DESTDIR}${EGDIR}/html/50x.html 103 ${INSTALL_DATA} ${WRKSRC}/html/50x.html ${DESTDIR}${EGDIR}/html/50x.html
102 ${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html 104 ${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html
103 ${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 105 ${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
104.if !empty(PKG_OPTIONS:Mnaxsi) 106.if !empty(PKG_OPTIONS:Mnaxsi)
105 ${INSTALL_DATA} ${WRKDIR}/${NAXSI_DISTNAME}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf 107 ${INSTALL_DATA} ${WRKDIR}/${NAXSI_DISTNAME}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf
106.endif 108.endif
107.if !empty(PKG_OPTIONS:Mperl) 109.if !empty(PKG_OPTIONS:Mperl)
108 ${INSTALL_LIB_DIR} ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx 110 ${INSTALL_LIB_DIR} ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx
109 ${INSTALL_LIB} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.${SOEXT} \ 111 ${INSTALL_LIB} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.${SOEXT} \
110 ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx 112 ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx
111 ${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \ 113 ${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
112 ${DESTDIR}${PERL5_INSTALLVENDORARCH} 114 ${DESTDIR}${PERL5_INSTALLVENDORARCH}
113.endif 115.endif
114.if !empty(PKG_OPTIONS:Mdso) 116.if !empty(PKG_OPTIONS:Mdso)
115 ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/libexec/nginx 117 ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/libexec/nginx
116 (cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \ 118 (cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
117 -exec ${INSTALL_PROGRAM} {} ${DESTDIR}${PREFIX}/libexec/nginx \;) 119 -exec ${INSTALL_PROGRAM} {} ${DESTDIR}${PREFIX}/libexec/nginx \;)
118.endif 120.endif
119 121
120.include "../../devel/zlib/buildlink3.mk" 122.include "../../devel/zlib/buildlink3.mk"
121.include "../../mk/bsd.pkg.mk" 123.include "../../mk/bsd.pkg.mk"
cvs diff -r1.86 -r1.87 pkgsrc/www/nginx-devel/Makefile (switch to unified diff)

--- pkgsrc/www/nginx-devel/Makefile 2022/07/14 15:13:22 1.86
+++ pkgsrc/www/nginx-devel/Makefile 2022/07/15 00:41:45 1.87
@@ -1,130 +1,132 @@ @@ -1,130 +1,132 @@
1# $NetBSD: Makefile,v 1.86 2022/07/14 15:13:22 osa Exp $ 1# $NetBSD: Makefile,v 1.87 2022/07/15 00:41:45 gutteridge Exp $
2 2
3DISTNAME= nginx-1.23.0 3DISTNAME= nginx-1.23.0
4PKGNAME= ${DISTNAME:S/-/-devel-/1} 4PKGNAME= ${DISTNAME:S/-/-devel-/1}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= https://nginx.org/download/ 7MASTER_SITES= https://nginx.org/download/
8DISTFILES= ${DEFAULT_DISTFILES} 8DISTFILES= ${DEFAULT_DISTFILES}
9 9
10MAINTAINER= osa@NetBSD.org 10MAINTAINER= osa@NetBSD.org
11HOMEPAGE= https://nginx.org/ 11HOMEPAGE= https://nginx.org/
12COMMENT= Lightweight HTTP server and mail proxy server 12COMMENT= Lightweight HTTP server and mail proxy server
13LICENSE= 2-clause-bsd 13LICENSE= 2-clause-bsd
14 14
 15CONFLICTS= nginx-[0-9]*
 16
15.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
16 18
17NGINX_USER?= nginx 19NGINX_USER?= nginx
18NGINX_GROUP?= nginx 20NGINX_GROUP?= nginx
19NGINX_DATADIR?= ${VARBASE}/db/nginx 21NGINX_DATADIR?= ${VARBASE}/db/nginx
20NGINX_LOGDIR?= ${VARBASE}/log/nginx 22NGINX_LOGDIR?= ${VARBASE}/log/nginx
21NGINX_PIDDIR?= ${VARBASE}/run 23NGINX_PIDDIR?= ${VARBASE}/run
22 24
23BUILD_DEFS+= NGINX_DATADIR NGINX_LOGDIR NGINX_PIDDIR VARBASE 25BUILD_DEFS+= NGINX_DATADIR NGINX_LOGDIR NGINX_PIDDIR VARBASE
24 26
25PKG_USERS_VARS+= NGINX_USER 27PKG_USERS_VARS+= NGINX_USER
26PKG_GROUPS_VARS+= NGINX_GROUP 28PKG_GROUPS_VARS+= NGINX_GROUP
27PKG_GROUPS= ${NGINX_GROUP} 29PKG_GROUPS= ${NGINX_GROUP}
28PKG_USERS= ${NGINX_USER}:${NGINX_GROUP} 30PKG_USERS= ${NGINX_USER}:${NGINX_GROUP}
29 31
30PKG_GECOS.${NGINX_USER}= NGINX server user 32PKG_GECOS.${NGINX_USER}= NGINX server user
31PKG_HOME.${NGINX_USER}= ${NGINX_DATADIR} 33PKG_HOME.${NGINX_USER}= ${NGINX_DATADIR}
32PKG_SHELL.${NGINX_USER}= ${NOLOGIN} 34PKG_SHELL.${NGINX_USER}= ${NOLOGIN}
33 35
34USE_PKGLOCALEDIR= yes 36USE_PKGLOCALEDIR= yes
35HAS_CONFIGURE= yes 37HAS_CONFIGURE= yes
36CONFIGURE_ARGS+= --user=${NGINX_USER} 38CONFIGURE_ARGS+= --user=${NGINX_USER}
37CONFIGURE_ARGS+= --group=${NGINX_GROUP} 39CONFIGURE_ARGS+= --group=${NGINX_GROUP}
38CONFIGURE_ARGS+= --with-ld-opt=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib 40CONFIGURE_ARGS+= --with-ld-opt=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib
39CONFIGURE_ARGS+= --prefix=${PREFIX} 41CONFIGURE_ARGS+= --prefix=${PREFIX}
40CONFIGURE_ARGS+= --sbin-path=${PREFIX}/sbin 42CONFIGURE_ARGS+= --sbin-path=${PREFIX}/sbin
41CONFIGURE_ARGS+= --conf-path=${PKG_SYSCONFDIR}/nginx.conf 43CONFIGURE_ARGS+= --conf-path=${PKG_SYSCONFDIR}/nginx.conf
42CONFIGURE_ARGS+= --pid-path=${NGINX_PIDDIR}/nginx.pid 44CONFIGURE_ARGS+= --pid-path=${NGINX_PIDDIR}/nginx.pid
43CONFIGURE_ARGS+= --lock-path=${NGINX_DATADIR}/nginx.lock 45CONFIGURE_ARGS+= --lock-path=${NGINX_DATADIR}/nginx.lock
44CONFIGURE_ARGS+= --error-log-path=${NGINX_LOGDIR}/error.log 46CONFIGURE_ARGS+= --error-log-path=${NGINX_LOGDIR}/error.log
45CONFIGURE_ARGS+= --http-log-path=${NGINX_LOGDIR}/access.log 47CONFIGURE_ARGS+= --http-log-path=${NGINX_LOGDIR}/access.log
46CONFIGURE_ARGS+= --http-client-body-temp-path=${NGINX_DATADIR}/client_body_temp 48CONFIGURE_ARGS+= --http-client-body-temp-path=${NGINX_DATADIR}/client_body_temp
47CONFIGURE_ARGS+= --http-proxy-temp-path=${NGINX_DATADIR}/proxy_temp 49CONFIGURE_ARGS+= --http-proxy-temp-path=${NGINX_DATADIR}/proxy_temp
48CONFIGURE_ARGS+= --http-fastcgi-temp-path=${NGINX_DATADIR}/fstcgi_temp 50CONFIGURE_ARGS+= --http-fastcgi-temp-path=${NGINX_DATADIR}/fstcgi_temp
49CONFIGURE_ARGS+= --http-scgi-temp-path=${NGINX_DATADIR}/scgi_temp 51CONFIGURE_ARGS+= --http-scgi-temp-path=${NGINX_DATADIR}/scgi_temp
50 52
51PKG_SYSCONFSUBDIR= nginx 53PKG_SYSCONFSUBDIR= nginx
52 54
53.include "options.mk" 55.include "options.mk"
54 56
55EGDIR= ${PREFIX}/share/examples/nginx 57EGDIR= ${PREFIX}/share/examples/nginx
56EGFILES+= fastcgi.conf fastcgi_params koi-utf koi-win \ 58EGFILES+= fastcgi.conf fastcgi_params koi-utf koi-win \
57 mime.types nginx.conf win-utf 59 mime.types nginx.conf win-utf
58 60
59.for file in ${EGFILES} 61.for file in ${EGFILES}
60CONF_FILES+= ${EGDIR}/conf/${file} ${PKG_SYSCONFDIR}/${file} 62CONF_FILES+= ${EGDIR}/conf/${file} ${PKG_SYSCONFDIR}/${file}
61. if !empty(PKG_OPTIONS:Mnaxsi) 63. if !empty(PKG_OPTIONS:Mnaxsi)
62CONF_FILES+= ${EGDIR}/conf/naxsi_core.rules ${PKG_SYSCONFDIR}/naxsi_core.rules 64CONF_FILES+= ${EGDIR}/conf/naxsi_core.rules ${PKG_SYSCONFDIR}/naxsi_core.rules
63. endif 65. endif
64.endfor 66.endfor
65 67
66RCD_SCRIPTS= nginx 68RCD_SCRIPTS= nginx
67 69
68INSTALLATION_DIRS+= ${PKGMANDIR}/man8 sbin share/examples/nginx/conf \ 70INSTALLATION_DIRS+= ${PKGMANDIR}/man8 sbin share/examples/nginx/conf \
69 share/examples/nginx/html 71 share/examples/nginx/html
70MAKE_DIRS+= ${NGINX_PIDDIR} 72MAKE_DIRS+= ${NGINX_PIDDIR}
71OWN_DIRS= ${NGINX_LOGDIR} 73OWN_DIRS= ${NGINX_LOGDIR}
72OWN_DIRS_PERMS+= ${NGINX_DATADIR} ${NGINX_USER} ${NGINX_GROUP} 0700 74OWN_DIRS_PERMS+= ${NGINX_DATADIR} ${NGINX_USER} ${NGINX_GROUP} 0700
73 75
74BUILD_TARGET= build 76BUILD_TARGET= build
75 77
76SUBST_CLASSES+= paths 78SUBST_CLASSES+= paths
77SUBST_STAGE.paths= pre-configure 79SUBST_STAGE.paths= pre-configure
78SUBST_FILES.paths= conf/nginx.conf 80SUBST_FILES.paths= conf/nginx.conf
79SUBST_SED.paths= -e 's,%%PKG_SYSCONFDIR%%,${PKG_SYSCONFDIR},g' 81SUBST_SED.paths= -e 's,%%PKG_SYSCONFDIR%%,${PKG_SYSCONFDIR},g'
80SUBST_SED.paths+= -e 's,%%NGINX_LOGDIR%%,${NGINX_LOGDIR},g' 82SUBST_SED.paths+= -e 's,%%NGINX_LOGDIR%%,${NGINX_LOGDIR},g'
81SUBST_SED.paths+= -e 's,%%NGINX_PIDDIR%%,${NGINX_PIDDIR},g' 83SUBST_SED.paths+= -e 's,%%NGINX_PIDDIR%%,${NGINX_PIDDIR},g'
82SUBST_SED.paths+= -e 's,%%NGINX_USER%%,${NGINX_USER},g' 84SUBST_SED.paths+= -e 's,%%NGINX_USER%%,${NGINX_USER},g'
83SUBST_SED.paths+= -e 's,%%NGINX_GROUP%%,${NGINX_GROUP},g' 85SUBST_SED.paths+= -e 's,%%NGINX_GROUP%%,${NGINX_GROUP},g'
84 86
85MESSAGE_SUBST+= NGINX_LOGDIR=${NGINX_LOGDIR} 87MESSAGE_SUBST+= NGINX_LOGDIR=${NGINX_LOGDIR}
86MESSAGE_SUBST+= NGINX_PIDDIR=${NGINX_PIDDIR} 88MESSAGE_SUBST+= NGINX_PIDDIR=${NGINX_PIDDIR}
87MESSAGE_SUBST+= NGINX_USER=${NGINX_USER} 89MESSAGE_SUBST+= NGINX_USER=${NGINX_USER}
88MESSAGE_SUBST+= NGINX_GROUP=${NGINX_GROUP} 90MESSAGE_SUBST+= NGINX_GROUP=${NGINX_GROUP}
89 91
90.if ${OPSYS} == "Darwin" 92.if ${OPSYS} == "Darwin"
91SOEXT= bundle 93SOEXT= bundle
92.else 94.else
93SOEXT= so 95SOEXT= so
94.endif 96.endif
95PLIST_SUBST+= SOEXT=${SOEXT} 97PLIST_SUBST+= SOEXT=${SOEXT}
96 98
97post-patch: 99post-patch:
98.if !empty(PKG_OPTIONS:Mluajit) 100.if !empty(PKG_OPTIONS:Mluajit)
99 (cd ${WRKSRC}/ && patch -p1 <${PATCHDIR}/extra-patch-lua-nginx-module) 101 (cd ${WRKSRC}/ && patch -p1 <${PATCHDIR}/extra-patch-lua-nginx-module)
100.endif 102.endif
101.if !empty(PKG_OPTIONS:Mnaxsi) 103.if !empty(PKG_OPTIONS:Mnaxsi)
102 (cd ${WRKSRC}/ && patch <${PATCHDIR}/extra-patch-naxsi_runtime.c) 104 (cd ${WRKSRC}/ && patch <${PATCHDIR}/extra-patch-naxsi_runtime.c)
103.endif 105.endif
104 106
105do-install: 107do-install:
106 ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx 108 ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx
107.for file in ${EGFILES} 109.for file in ${EGFILES}
108 ${INSTALL_DATA} ${WRKSRC}/conf/${file} ${DESTDIR}${EGDIR}/conf/${file} 110 ${INSTALL_DATA} ${WRKSRC}/conf/${file} ${DESTDIR}${EGDIR}/conf/${file}
109.endfor 111.endfor
110 ${INSTALL_DATA} ${WRKSRC}/html/50x.html ${DESTDIR}${EGDIR}/html/50x.html 112 ${INSTALL_DATA} ${WRKSRC}/html/50x.html ${DESTDIR}${EGDIR}/html/50x.html
111 ${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html 113 ${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html
112 ${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 114 ${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
113.if !empty(PKG_OPTIONS:Mnaxsi) 115.if !empty(PKG_OPTIONS:Mnaxsi)
114 ${INSTALL_DATA} ${WRKDIR}/${NAXSI_DISTNAME}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf 116 ${INSTALL_DATA} ${WRKDIR}/${NAXSI_DISTNAME}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf
115.endif 117.endif
116.if !empty(PKG_OPTIONS:Mperl) 118.if !empty(PKG_OPTIONS:Mperl)
117 ${INSTALL_LIB_DIR} ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx 119 ${INSTALL_LIB_DIR} ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx
118 ${INSTALL_LIB} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.${SOEXT} \ 120 ${INSTALL_LIB} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.${SOEXT} \
119 ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx 121 ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx
120 ${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \ 122 ${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
121 ${DESTDIR}${PERL5_INSTALLVENDORARCH} 123 ${DESTDIR}${PERL5_INSTALLVENDORARCH}
122.endif 124.endif
123.if !empty(PKG_OPTIONS:Mdso) 125.if !empty(PKG_OPTIONS:Mdso)
124 ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/libexec/nginx 126 ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/libexec/nginx
125 (cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \ 127 (cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
126 -exec ${INSTALL_PROGRAM} {} ${DESTDIR}${PREFIX}/libexec/nginx \;) 128 -exec ${INSTALL_PROGRAM} {} ${DESTDIR}${PREFIX}/libexec/nginx \;)
127.endif 129.endif
128 130
129.include "../../devel/zlib/buildlink3.mk" 131.include "../../devel/zlib/buildlink3.mk"
130.include "../../mk/bsd.pkg.mk" 132.include "../../mk/bsd.pkg.mk"