kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Stop bringing in OpenSSL from ports, it builds fine with the base one on

Browse source 
9, and WITH_OPENSSL_PORT does not belong in a port's Makefile anyway.

Not bumping PORTREVISION because:
- if you are building with poudriere, it will detect that a dependency
  has changed and rebuild it.
- if you are building from ports, you will have OpenSSL from ports
  installed, and it will choose to use it.

Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2016-04-06 13:53:09 +00:00
parent ee730e2ec2
commit 4668b601fb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=412619
3 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dns/bind9-devel/Makefile
View file

@ -195,15 +195,9 @@ PLIST_SUB+= NOBASE="" BASE="@comment "
SUB_LIST+= NOBASE="" BASE="@comment "
USE_RC_SUBR+= named
SUB_FILES+= named.conf
.if ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1}
WITH_OPENSSL_PORT=yes
.endif
.else
PLIST_SUB+= NOBASE="@comment " BASE=""
SUB_LIST+= NOBASE="@comment " BASE=""
.if ${PORT_OPTIONS:MSSL}
WITH_OPENSSL_PORT= yes
.endif
.endif
PKGDEINSTALL= ${PKGINSTALL}
@ -211,6 +205,14 @@ PKGDEINSTALL= ${PKGINSTALL}
PORTDOCS= *
.include <bsd.port.pre.mk>
.if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && defined(WITH_OPENSSL_BASE)
BROKEN= OpenSSL from the base system does not support GOST, add \
WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \
that needs SSL.
.endif
post-extract:
echo "SRCID=${HASH}" > ${WRKSRC}/srcid
@ -260,4 +262,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
${STAGEDIR}${ETCDIR}/rndc.conf.sample
.include <bsd.port.mk>
.include <bsd.port.post.mk>

16
dns/bind910/Makefile
View file

@ -219,15 +219,9 @@ SUB_LIST+= NOBASE="" BASE="@comment "
USE_RC_SUBR+= named
SUB_FILES+= named.conf
.endif # !defined(BIND_TOOLS_SLAVE)
.if ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1}
WITH_OPENSSL_PORT=yes
.endif
.else
PLIST_SUB+= NOBASE="@comment " BASE=""
SUB_LIST+= NOBASE="@comment " BASE=""
.if ${PORT_OPTIONS:MSSL}
WITH_OPENSSL_PORT= yes
.endif
.endif
PKGDEINSTALL= ${PKGINSTALL}
@ -235,6 +229,14 @@ PKGDEINSTALL= ${PKGINSTALL}
PORTDOCS= *
.include <bsd.port.pre.mk>
.if ( ${PORT_OPTIONS:MGOST} || ${PORT_OPTIONS:MGOST_ASN1} ) && defined(WITH_OPENSSL_BASE)
BROKEN= OpenSSL from the base system does not support GOST, add \
WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \
that needs SSL.
.endif
post-patch:
@${REINPLACE_CMD} -e 's|readline/readline.h|editline/readline.h|; \
s|readline/history.h|histedit.h|' \
@ -293,4 +295,4 @@ post-install:
.endif # BIND_TOOLS_SLAVE
.include <bsd.port.mk>
.include <bsd.port.post.mk>

16
dns/bind99/Makefile
View file

@ -179,21 +179,23 @@ PLIST_SUB+= NOBASE="" BASE="@comment "
SUB_LIST+= NOBASE="" BASE="@comment "
USE_RC_SUBR+= named
SUB_FILES+= named.conf
.if ${PORT_OPTIONS:MGOST}
WITH_OPENSSL_PORT=yes
.endif
.else
PLIST_SUB+= NOBASE="@comment " BASE=""
SUB_LIST+= NOBASE="@comment " BASE=""
.if ${PORT_OPTIONS:MSSL}
WITH_OPENSSL_PORT= yes
.endif
.endif
PKGDEINSTALL= ${PKGINSTALL}
PORTDOCS= *
.include <bsd.port.pre.mk>
.if ( ${PORT_OPTIONS:MGOST} ) && defined(WITH_OPENSSL_BASE)
BROKEN= OpenSSL from the base system does not support GOST, add \
WITH_OPENSSL_PORT=yes to your /etc/make.conf and rebuild everything \
that needs SSL.
.endif
post-patch:
@${REINPLACE_CMD} -e 's|readline/readline.h|editline/readline.h|; \
s|readline/history.h|histedit.h|' \
@ -241,4 +243,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
${STAGEDIR}${ETCDIR}/rndc.conf.sample
.include <bsd.port.mk>
.include <bsd.port.post.mk>