Index: head/net/socat/Makefile
===================================================================
--- head/net/socat/Makefile	(revision 137851)
+++ head/net/socat/Makefile	(revision 137852)
@@ -1,40 +1,45 @@
 # ex:ts=8
 # Ports collection makefile for:	socat
 # Date created:			May 14, 2002
 # Whom:				ijliao
 #
 # $FreeBSD$
 #
 
 PORTNAME=	socat
-PORTVERSION=	1.4.0.3
+PORTVERSION=	1.4.2.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.dest-unreach.org/socat/download/
 
 MAINTAINER=	freebsd-ports@rikrose.net
 COMMENT=	Multipurpose relay and more
 
 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>

Property changes on: head/net/socat/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.17
\ No newline at end of property
+1.18
\ No newline at end of property
Index: head/net/socat/distinfo
===================================================================
--- head/net/socat/distinfo	(revision 137851)
+++ head/net/socat/distinfo	(revision 137852)
@@ -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

Property changes on: head/net/socat/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12
\ No newline at end of property
+1.13
\ No newline at end of property