git: b16b5fd495da - main - net/dante: try to unbreak the port's build on 15-CURRENT (+)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 29 Dec 2024 15:46:00 UTC
The branch main has been updated by danfe:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b16b5fd495da354af058e1be1ba3458caeb0374c
commit b16b5fd495da354af058e1be1ba3458caeb0374c
Author: Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2024-12-29 15:44:52 +0000
Commit: Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2024-12-29 15:44:52 +0000
net/dante: try to unbreak the port's build on 15-CURRENT (+)
- Due to the way this code wraps around some standard library's
functions, it cannot be compiled with -D_FORTIFY_SOURCE=2, so
disable the naive check in the configure script
- Optionize UPnP support and remove SASL dependency for now as
it does nothing alone; it could be introduced later together
with proper LDAP support
Reported by: pkg-fallout
---
net/dante/Makefile | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/net/dante/Makefile b/net/dante/Makefile
index b7b2e54ed994..7e8f625bec78 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -12,12 +12,8 @@ WWW= https://www.inet.no/dante/
LICENSE= BSD4CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libminiupnpc.so:net/miniupnpc \
- libsasl2.so:security/cyrus-sasl2
-
-USES= libtool localbase
+USES= libtool localbase ssl
GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
CONFIGURE_ARGS= --with-socks-conf=${PREFIX}/etc/socks.conf \
--with-sockd-conf=${PREFIX}/etc/sockd.conf
INSTALL_TARGET= install-strip
@@ -25,7 +21,15 @@ USE_LDCONFIG= yes
USE_RC_SUBR= sockd
-OPTIONS_DEFINE= DOCS EXAMPLES
+OPTIONS_DEFINE= DOCS EXAMPLES UPNP
+OPTIONS_DEFAULT= UPNP
+
+UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc
+UPNP_CONFIGURE_OFF= --without-upnp
+
+post-patch:
+ @${REINPLACE_CMD} -e '/FORTIFY_SOURCE gives error/,+28d' \
+ ${WRKSRC}/configure
post-install:
.for x in s d