- Update to 1.4.2.0 [1]

- OPTIONSify
- Fix the packing list when NOPORTDOCS is defined
- Polish the Makefile

PR:		ports/82387 [1]
Submitted by:	maintainer [1]

2 files changed, 18 insertions, 13 deletions

diff --git a/net/socat/Makefile b/net/socat/Makefile
index b6a7236dcb1f..afd1138ed25a 100644
--- a/net/socat/Makefile
+++ b/net/socat/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	socat
-PORTVERSION=	1.4.0.3
+PORTVERSION=	1.4.2.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.dest-unreach.org/socat/download/
 
@@ -18,23 +18,28 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R:R}
 USE_BZIP2=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-MAKE_ARGS=	CCOPT="${CFLAGS}"
-
-.if defined(WITHOUT_SSL)
-CONFIGURE_ARGS+=	--disable-openssl
-.else
-USE_OPENSSL=	yes
-.endif
 
 MAN1=		socat.1
+.if !defined(NOPORTDOCS)
 PORTDOCS=	EXAMPLES README SECURITY FAQ
+.endif
 PLIST_FILES=	bin/filan bin/procan bin/socat
 
+OPTIONS=	SSL "OpenSSL support" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SSL)
+# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+.else
+CONFIGURE_ARGS+=	--disable-openssl
+.endif
+
 .if !defined(NOPORTDOCS)
 post-install:
-	@${MKDIR} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/socat/distinfo b/net/socat/distinfo
index 0c9a2dfd14de..2bcc10d6394b 100644
--- a/net/socat/distinfo
+++ b/net/socat/distinfo
@@ -1,2 +1,2 @@
-MD5 (socat-1.4.0.3.tar.bz2) = 104f87f25305990bf46708f55e525973
-SIZE (socat-1.4.0.3.tar.bz2) = 255824
+MD5 (socat-1.4.2.0.tar.bz2) = 2ad4aab8eff97ad16e0d2d1be6d3f05b
+SIZE (socat-1.4.2.0.tar.bz2) = 266022