mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-25 04:43:33 +00:00
Use USE_OPENSSL instead of bsd.openssl.mk.
Do not remove default DISTFILES due to port building failure when third-party module (i.e. additional DISTFILES) selected. Do not bump PORTREVISIONs. PRs: 142831, 142833
This commit is contained in:
parent
f01179356b
commit
1d924da9fe
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=247875
@ -78,8 +78,6 @@ USE_RUBY= yes
|
||||
USE_RAKE= yes
|
||||
.endif
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
NGINX_VARDIR?= /var
|
||||
NGINX_LOGDIR?= ${NGINX_VARDIR}/log
|
||||
NGINX_RUNDIR?= ${NGINX_VARDIR}/run
|
||||
@ -402,11 +400,13 @@ CONFIGURE_ARGS+=--with-mail_ssl_module
|
||||
.endif # WITH_MAIL_MODULE
|
||||
|
||||
.if defined(NGINX_OPENSSL)
|
||||
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
|
||||
USE_OPENSSL= yes
|
||||
.endif
|
||||
|
||||
PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
pre-everything::
|
||||
@${ECHO_MSG}
|
||||
.if defined(WITH_HTTP_UPSTREAM_FAIR)
|
||||
|
@ -75,8 +75,6 @@ USE_RUBY= yes
|
||||
USE_RAKE= yes
|
||||
.endif
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
NGINX_VARDIR?= /var
|
||||
NGINX_LOGDIR?= ${NGINX_VARDIR}/log
|
||||
NGINX_RUNDIR?= ${NGINX_VARDIR}/run
|
||||
@ -390,11 +388,13 @@ CONFIGURE_ARGS+=--with-mail_ssl_module
|
||||
.endif # WITH_MAIL_MODULE
|
||||
|
||||
.if defined(NGINX_OPENSSL)
|
||||
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
|
||||
USE_OPENSSL= yes
|
||||
.endif
|
||||
|
||||
PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
pre-everything::
|
||||
@${ECHO_MSG}
|
||||
.if defined(WITH_HTTP_UPSTREAM_FAIR)
|
||||
|
Loading…
Reference in New Issue
Block a user