git: b389996182d7 - main - net/socat: Update to 1.7.4.2

From: Emanuel Haupt <ehaupt_at_FreeBSD.org>
Date: Fri, 05 Nov 2021 14:19:48 UTC
The branch main has been updated by ehaupt:

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

commit b389996182d7e055cb94b76e1249a7cd661063e0
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2021-11-05 14:13:58 +0000
Commit:     Emanuel Haupt <ehaupt@FreeBSD.org>
CommitDate: 2021-11-05 14:15:07 +0000

    net/socat: Update to 1.7.4.2
    
    PR:             259657
---
 net/socat/Makefile | 24 ++++++++++--------------
 net/socat/distinfo |  6 +++---
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/net/socat/Makefile b/net/socat/Makefile
index 3cf3fc19d465..55725b3bb9e8 100644
--- a/net/socat/Makefile
+++ b/net/socat/Makefile
@@ -1,8 +1,7 @@
 # Created by: ijliao
 
 PORTNAME=	socat
-PORTVERSION=	1.7.4.1
-PORTREVISION=	1
+DISTVERSION=	1.7.4.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.dest-unreach.org/socat/download/ \
 		LOCAL/ehaupt
@@ -14,32 +13,29 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler cpe ssl tar:bzip2
+CPE_VENDOR=	dest-unreach
 USE_RC_SUBR=	socat
 
 GNU_CONFIGURE=	yes
 
-CPE_VENDOR=	dest-unreach
-
 PORTSCOUT=	skipv:2.0.0-b2
 
-PLIST_FILES=	bin/filan bin/procan bin/socat man/man1/socat.1.gz \
-		"@sample etc/socat-instances.conf.sample"
-PORTDOCS=	EXAMPLES README SECURITY FAQ
+PLIST_FILES=	bin/filan \
+		bin/procan \
+		bin/socat \
+		"@sample etc/socat-instances.conf.sample" \
+		man/man1/socat.1.gz
+PORTDOCS=	EXAMPLES FAQ README SECURITY
 
 OPTIONS_DEFINE=	DOCS READLINE
 
-READLINE_CONFIGURE_ENABLE=	readline
 READLINE_USES=			readline
+READLINE_CONFIGURE_ENABLE=	readline
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT} != base
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-.endif
-
-.if ${COMPILER_TYPE} == "clang"
-CFLAGS+=	-Wno-unused-comparison
+USES+=		localbase
 .endif
 
 do-install:
diff --git a/net/socat/distinfo b/net/socat/distinfo
index 1c25df50bc96..09c79a5b6f92 100644
--- a/net/socat/distinfo
+++ b/net/socat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610295740
-SHA256 (socat-1.7.4.1.tar.bz2) = 3faca25614e89123dff5045680549ecef519d02e331aaf3c4f5a8f6837c675e9
-SIZE (socat-1.7.4.1.tar.bz2) = 510101
+TIMESTAMP = 1636108899
+SHA256 (socat-1.7.4.2.tar.bz2) = 6690a9f9990457b505097a272bbf2cbf4cc35576176f76646e3524b0e91c1763
+SIZE (socat-1.7.4.2.tar.bz2) = 514542