use a more common form of openssl handling
PR: 161011 Submitted by: crees
This commit is contained in:
parent
c858b6ec88
commit
60d6564a47
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=282913
3 changed files with 11 additions and 9 deletions
|
@ -62,6 +62,8 @@ OPTIONS= BUFFEREVENTS "use libevent's buffered IO" off \
|
|||
THREADS "multi-threading support" on \
|
||||
TRANSPARENT "transparent proxy support" on
|
||||
|
||||
USE_OPENSSL= yes
|
||||
|
||||
USE_RC_SUBR= tor
|
||||
SUB_FILES= pkg-message
|
||||
|
||||
|
@ -73,7 +75,7 @@ CONFLICTS= tor-[0-9]*
|
|||
MANCOMPRESSED= no
|
||||
MAN1= tor.1 tor-resolve.1 torify.1 tor-gencert.1
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
.if defined(WITH_GMAKE)
|
||||
USE_GMAKE= yes
|
||||
|
@ -92,7 +94,6 @@ CONFIGURE_ARGS+= --enable-gcc-hardening
|
|||
(${OSVERSION} >= 900000 && ${OSVERSION} < 900027) )
|
||||
WITH_OPENSSL_PORT= yes
|
||||
.endif
|
||||
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
|
||||
|
||||
.if defined(WITH_BUFFEREVENTS)
|
||||
CONFIGURE_ARGS+= --enable-bufferevents
|
||||
|
@ -181,4 +182,4 @@ check regression-test test: build
|
|||
@( cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \
|
||||
${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check )
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -60,6 +60,8 @@ OPTIONS= BUFFREELISTS "freelists for buffer RAM" on \
|
|||
THREADS "multi-threading support" on \
|
||||
TRANSPARENT "transparent proxy support" on
|
||||
|
||||
USE_OPENSSL= yes
|
||||
|
||||
USE_RC_SUBR= tor
|
||||
SUB_FILES= pkg-message
|
||||
|
||||
|
@ -71,7 +73,7 @@ CONFLICTS= tor-devel-[0-9]*
|
|||
MANCOMPRESSED= no
|
||||
MAN1= tor.1 tor-resolve.1 torify.1 tor-gencert.1
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
.if defined(WITH_GMAKE)
|
||||
USE_GMAKE= yes
|
||||
|
@ -90,7 +92,6 @@ CONFIGURE_ARGS+= --enable-gcc-hardening
|
|||
(${OSVERSION} >= 900000 && ${OSVERSION} < 900011) )
|
||||
WITH_OPENSSL_PORT= yes
|
||||
.endif
|
||||
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
|
||||
|
||||
.if defined(WITH_BUFFREELISTS)
|
||||
CONFIGURE_ARGS+= --enable-buf-freelists
|
||||
|
@ -152,4 +153,4 @@ check regression-test test: build
|
|||
@( cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \
|
||||
${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check )
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -38,7 +38,7 @@ OPTIONS= COOKIES "Enable cookies" On \
|
|||
SSL "Enable (experimental) https support" On \
|
||||
THREADED_DNS "Enable re-entrant resolver library" On
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
.ifdef(WITH_COOKIES)
|
||||
CONFIGURE_ARGS+= --enable-cookies
|
||||
|
@ -60,7 +60,7 @@ CONFIGURE_ARGS+= --disable-ipv6
|
|||
|
||||
.ifdef(WITH_SSL)
|
||||
CONFIGURE_ARGS+= --enable-ssl
|
||||
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
|
||||
USE_OPENSSL= yes
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-ssl
|
||||
.endif
|
||||
|
@ -94,4 +94,4 @@ post-install:
|
|||
${INSTALL_MAN} ${WRKSRC}/doc/* ${DOCSDIR}
|
||||
.endif
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
.include <bsd.port.mk>
|
||||
|
|
Loading…
Reference in a new issue