git: 230467c8b242 - main - lang/erlang: update to version 21.3.8.22; unbreak ODBC and PDF.

[Jimmy Olgeni]

The branch main has been updated by olgeni:

URL: https://cgit.FreeBSD.org/ports/commit/?id=230467c8b24252dc03744acd911eb0e5ca99ce73

commit 230467c8b24252dc03744acd911eb0e5ca99ce73
Author:     Jimmy Olgeni <olgeni at FreeBSD.org>
AuthorDate: 2021-04-08 10:36:51 +0000
Commit:     Jimmy Olgeni <olgeni at FreeBSD.org>
CommitDate: 2021-04-10 19:25:39 +0000

    lang/erlang: update to version 21.3.8.22; unbreak ODBC and PDF.
    
    - Update WX requirement to 3.1.
    
    PR:             254767 (ODBC part)
    PR:             243880 (WX part)
---
 lang/erlang/Makefile | 12 +++++++-----
 lang/erlang/distinfo |  6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 1a3acb117a41..434b8ba33b56 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	erlang
 DISTVERSIONPREFIX=	OTP-
-DISTVERSION=	21.3.8.21
+DISTVERSION=	21.3.8.22
 PORTREVISION=	0
 PORTEPOCH=	4
 CATEGORIES=	lang parallel java
@@ -99,6 +99,8 @@ MANPAGES_RUN_DEPENDS=		${LOCALBASE}/etc/man.d/erlang.conf:lang/erlang-man
 NATIVE_CONFIGURE_ENABLE=	native-libs
 ODBC_CONFIGURE_WITH=		odbc
 ODBC_LIB_DEPENDS=		libodbc.so:databases/unixODBC
+ODBC_CFLAGS=			-I/usr/local/include
+ODBC_LDFLAGS=			-L/usr/local/lib
 OPENSSL_CONFIGURE_WITH=		ssl=${OPENSSLBASE}
 OPENSSL_USES=			ssl
 SCTP_CONFIGURE_ENABLE=		sctp
@@ -106,8 +108,8 @@ THREADS_CONFIGURE_ENABLE=	threads
 WX_CONFIGURE_WITH=		wx-config=${WX_CONFIG}
 WX_USES=			gl
 WX_VARS=			USE_GL="gl glu" \
-				USE_WX=2.8+ \
-				WX_COMPS="wx contrib"
+				USE_WX=3.1+ \
+				WX_COMPS="wx"
 
 .include <bsd.port.pre.mk>
 
@@ -220,8 +222,8 @@ post-stage:
 	${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
 	@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* ${DATADIR_REL}/* -type f -o -type l \
 		| ${SORT} >> ${TMPPLIST}
-	if [ -d ${STAGEDIR}/${DOCSDIR} ]; then \
-		@cd ${STAGEDIR}${PREFIX}; ${FIND} ${DOCSDIR_REL}/* -name \*.pdf \
+	@if [ -d ${STAGEDIR}/${DOCSDIR} ]; then \
+		cd ${STAGEDIR}${PREFIX}; ${FIND} ${DOCSDIR_REL}/* -name \*.pdf \
 			| ${SORT} >> ${TMPPLIST}; \
 	fi
 
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index fd8070f16a52..e56238cf25a2 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1613753643
-SHA256 (erlang/erlang-otp-OTP-21.3.8.21_GH0.tar.gz) = 47a0edb246c267f905564245ca3019e8491db5537dfa5441dc5031a4d091ea15
-SIZE (erlang/erlang-otp-OTP-21.3.8.21_GH0.tar.gz) = 54098328
+TIMESTAMP = 1617876643
+SHA256 (erlang/erlang-otp-OTP-21.3.8.22_GH0.tar.gz) = 51783572539d59db168dbe0d39bff1966a3f868be0842e49144523bb9474a021
+SIZE (erlang/erlang-otp-OTP-21.3.8.22_GH0.tar.gz) = 54103132
 SHA256 (erlang/erlang-corba-4.5.2_GH0.tar.gz) = 36f397e6aef97eebda629badb0570cb4ddc979a6d1557bc487a9e13671facf8f
 SIZE (erlang/erlang-corba-4.5.2_GH0.tar.gz) = 1422685