diff --git a/net/ncftp/Makefile b/net/ncftp/Makefile
index 5f49556a551..e0a79e90121 100644
--- a/net/ncftp/Makefile
+++ b/net/ncftp/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2002/06/25 20:27:22 naddy Exp $
+# $OpenBSD: Makefile,v 1.20 2002/08/27 19:55:09 nino Exp $
 
 COMMENT=		"ftp replacement with advanced user interface"
 
 PKGNAME=		${DISTNAME:S/-src//}
-DISTNAME=		ncftp-3.1.3-src
+DISTNAME=		ncftp-3.1.4-src
 CATEGORIES=		net
-NEED_VERSION=		1.500
 HOMEPAGE=		http://www.ncftp.com/ncftp/
 
 MAINTAINER=		Eric Jackson <shinobi@monkey.org>
@@ -19,7 +18,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		ftp://ftp.ncftp.com/ncftp/
 MASTER_SITES0=		ftp://ftp.kame.net/pub/kame/misc/
 
-PATCHFILES=		ncftp-313-v6-20020617.diff.gz:0
+PATCHFILES=		ncftp-314-v6-20020709.diff.gz:0
 PATCH_DIST_STRIP=	-p1
 
 CONFIGURE_STYLE=	gnu dest
diff --git a/net/ncftp/distinfo b/net/ncftp/distinfo
index d234757d579..c2ae4394ab8 100644
--- a/net/ncftp/distinfo
+++ b/net/ncftp/distinfo
@@ -1,6 +1,6 @@
-MD5 (ncftp-3.1.3-src.tar.gz) = b2d9077116efe59e9f4dd9f95df5cbff
-MD5 (ncftp-313-v6-20020617.diff.gz) = 7796747bd42e44f2fd39e91e70872790
-RMD160 (ncftp-3.1.3-src.tar.gz) = 4e81561ab77f7557dd74ac5d74eeeb4a2abfe0ec
-RMD160 (ncftp-313-v6-20020617.diff.gz) = 9a94bda7b3f3f03ebdd60da2ccaacdcbcc67f542
-SHA1 (ncftp-3.1.3-src.tar.gz) = 56490611c3bd3a41dea8225daf0a9eb27b5e25fc
-SHA1 (ncftp-313-v6-20020617.diff.gz) = 1e11e5a8f106b828b381c61d1f32cae198c3d1e0
+MD5 (ncftp-3.1.4-src.tar.gz) = 2f3887a67793462e9444ec2ff8621a63
+MD5 (ncftp-314-v6-20020709.diff.gz) = 6b1fa736b9b60bff919be4a2a3419cde
+RMD160 (ncftp-3.1.4-src.tar.gz) = 238c69d9f7b91149b0aafd82b2b1877c0eb53450
+RMD160 (ncftp-314-v6-20020709.diff.gz) = f8cc29e0a6cec47e66a3112720dc7234cb9574ae
+SHA1 (ncftp-3.1.4-src.tar.gz) = 6f164e2bd23ac3b72cddba31df2e8d5a09d4f701
+SHA1 (ncftp-314-v6-20020709.diff.gz) = 80cc364e7e063200e5b61dd1171a3ba1d8209619
diff --git a/net/ncftp/patches/patch-libncftp_ftp_c b/net/ncftp/patches/patch-libncftp_ftp_c
deleted file mode 100644
index 0eda6869aa2..00000000000
--- a/net/ncftp/patches/patch-libncftp_ftp_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libncftp_ftp_c,v 1.1 2002/06/25 19:47:12 naddy Exp $
---- libncftp/ftp.c.orig	Mon Jun 24 21:12:15 2002
-+++ libncftp/ftp.c	Mon Jun 24 21:12:25 2002
-@@ -694,7 +694,7 @@ Passive(const FTPCIPtr cip, struct socka
- 		if (isdigit((int) *cp))
- 			break;
- 	}
--	if (sscanf(cp, "%d|", &port) != 1) {
-+	if (sscanf(cp, "%hd|", &port) != 1) {
- 		Error(cip, kDontPerror, "Cannot parse EPSV response: %s\n", rp->msg.first->line);
- 		goto next;
- 	}
diff --git a/net/ncftp/patches/patch-sio_SConnect_c b/net/ncftp/patches/patch-sio_SConnect_c
deleted file mode 100644
index 5e72b9f466c..00000000000
--- a/net/ncftp/patches/patch-sio_SConnect_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-sio_SConnect_c,v 1.1 2002/06/25 19:47:12 naddy Exp $
---- sio/SConnect.c.orig	Tue Jun 25 20:03:36 2002
-+++ sio/SConnect.c	Tue Jun 25 20:04:05 2002
-@@ -95,7 +95,7 @@ _SConnect(const int sfd, const struct so
- #		pragma message save
- #		pragma message disable intconcastsgn
- #	endif
--	if (ioctlsocket(sfd, (int) FIONBIO, &opt) != 0) {
-+	if (ioctlsocket(sfd, FIONBIO, &opt) != 0) {
- 		SETERRNO
- 		return (-1);
- 	}
-@@ -242,7 +242,7 @@ connected:
- #		pragma message disable intconcastsgn
- #	endif
- 	opt = 0;
--	if (ioctlsocket(sfd, (int) FIONBIO, &opt) != 0) {
-+	if (ioctlsocket(sfd, FIONBIO, &opt) != 0) {
- 		SETERRNO
- 		shutdown(sfd, 2);
- 		return (-1);