irc/anope: fix build error with SASL option enabled

Also did some Makefile cleanup and reordering to make linters happy PR: 275399 Reported by: Siva Mahadevan <me@svmhdvn.name> Approved by: Rafael Grether <devnull@apt322.org> (maintainer)
freebsd · Nov 30, 2023 · 43293f0 · 43293f0
1 parent c7716dd
commit 43293f0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/irc/anope/Makefile b/irc/anope/Makefile
@@ -12,18 +12,19 @@ LICENSE_FILE=	${WRKSRC}/docs/COPYING
 USES=		cmake localbase:ldflags shebangfix
 USE_GITHUB=	yes
 USE_RC_SUBR=	anope
+SHEBANG_FILES=	${WRKSRC}/src/tools/*.sh
 
 CMAKE_ARGS=	-DINSTDIR:STRING="${PREFIX}/anope"
-SHEBANG_FILES=	${WRKSRC}/src/tools/*.sh
 CFLAGS_amd64=	-fPIC
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	GNUTLS LDAP MYSQL NLS OPENSSL PCRE POSIX REDIS SASL SQLITE STATS TRE
+OPTIONS_DEFINE=		GNUTLS LDAP MYSQL NLS OPENSSL PCRE POSIX REDIS SASL \
+			SQLITE STATS TRE
 OPTIONS_DEFAULT=	MYSQL OPENSSL POSIX
-OPTIONS_SUB=	yes
-POSIX_DESC=	POSIX Regex Module
-STATS_DESC=	Channel Statistics Module
-TRE_DESC=	Tre Regex Module
+OPTIONS_SUB=		yes
+POSIX_DESC=		POSIX Regex Module
+STATS_DESC=		Channel Statistics Module
+TRE_DESC=		Tre Regex Module
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
@@ -35,10 +36,10 @@ NLS_USES=	gettext
 
 OPENSSL_USES=	ssl
 
-REDIS_RUN_DEPENDS=	redis>=0:databases/redis
-
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 
+REDIS_RUN_DEPENDS=	redis>=0:databases/redis
+
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 SQLITE_USES=	sqlite
@@ -67,18 +68,14 @@ post-patch-MYSQL-on:
 post-patch-OPENSSL-on:
 	${LN} -s ${WRKSRC}/modules/extra/m_ssl_openssl.cpp ${WRKSRC}/modules/
 
-post-patch-SQLITE-on:
-	${LN} -s ${WRKSRC}/modules/extra/m_sqlite.cpp ${WRKSRC}/modules/
-
 post-patch-PCRE-on:
 	${LN} -s ${WRKSRC}/modules/extra/m_regex_pcre.cpp ${WRKSRC}/modules/
 
 post-patch-POSIX-on:
 	${LN} -s ${WRKSRC}/modules/extra/m_regex_posix.cpp ${WRKSRC}/modules/
 
-post-patch-SASL-on:
-	${LN} -s ${WRKSRC}/modules/extra/m_sasl_dh-aes.cpp ${WRKSRC}/modules/
-	${LN} -s ${WRKSRC}/modules/extra/m_sasl_dh-blowfish.cpp ${WRKSRC}/modules/
+post-patch-SQLITE-on:
+	${LN} -s ${WRKSRC}/modules/extra/m_sqlite.cpp ${WRKSRC}/modules/
 
 post-patch-STATS-on:
 	${LN} -s ${WRKSRC}/modules/extra/stats ${WRKSRC}/modules/

diff --git a/irc/anope/files/patch-CMakeLists.txt b/irc/anope/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig	2023-06-02 15:14:06.209032000 +0000
-+++ CMakeLists.txt	2023-06-02 15:15:18.248991000 +0000
+--- CMakeLists.txt.orig	2023-06-02 15:14:06 UTC
++++ CMakeLists.txt
 @@ -486,16 +486,16 @@
  get_filename_component(SERVICES_BINARY ${SERVICES_BINARY} NAME)
 

diff --git a/irc/anope/pkg-plist b/irc/anope/pkg-plist
@@ -126,8 +126,6 @@ anope/lib/modules/m_redis.so
 %%TRE%%anope/lib/modules/m_regex_tre.so
 anope/lib/modules/m_rewrite.so
 anope/lib/modules/m_sasl.so
-%%SASL%%anope/lib/modules/m_sasl_dh-aes.so
-%%SASL%%anope/lib/modules/m_sasl_dh-blowfish.so
 %%GNUTLS%%anope/lib/modules/m_ssl_gnutls.so
 %%OPENSSL%%anope/lib/modules/m_ssl_openssl.so
 %%MYSQL%%anope/lib/modules/m_sql_authentication.so