3 files changed, 28 insertions, 34 deletions

diff --git a/ftp/ftplib/Makefile b/ftp/ftplib/Makefile
index 02458c03a341..97222f305739 100644
--- a/ftp/ftplib/Makefile
+++ b/ftp/ftplib/Makefile
@@ -1,43 +1,39 @@
-# ex:ts=8
-# Ports collection makefile for:	ftplib
-# Date created:			Feb 11, 2004
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	ftplib
-PORTVERSION=	3.1.1
+PORTVERSION=	4.0
 CATEGORIES=	ftp
-MASTER_SITES=	http://www.nbpfaus.net/~pfau/ftplib/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-src
-
-PATCH_SITES=	http://www.nbpfaus.net/~pfau/ftplib/
-PATCHFILES=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}.patch
-PATCH_DIST_STRIP=	-p3
+MASTER_SITES=	http://nbpfaus.net/~pfau/ftplib/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A set of routines that implement the FTP protocol
+COMMENT=	Set of routines that implement the FTP protocol
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/linux
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	yes
-MAKE_ARGS+=	DEBUG="${CFLAGS}" LDFLAGS="${LDFLAGS} -L."
 USE_LDCONFIG=	yes
 
-PLIST_FILES=	lib/libftp.so lib/libftp.so.3 lib/libftp.a \
-		include/ftplib.h bin/qftp bin/ftpdir bin/ftpget \
-		bin/ftplist bin/ftprm bin/ftpsend
+PLIST_FILES=	bin/ftpdir bin/ftpget bin/ftplist bin/ftprm bin/ftpsend \
+		bin/qftp include/ftplib.h \
+		lib/libftp.a lib/libftp.so lib/libftp.so.4
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/^SOVERSION/s|=.*|= $$(SONAME)| ; \
+		 s|CFLAGS =|CFLAGS +=| ; \
+		 s|LDFLAGS =|LDFLAGS +=| ; \
+		 s|$$(SOVERSION)|$$(SONAME)| ; \
+		 s|-lc -o|-o| ; \
+		 /libftp.so/s|ln -sf|${TRUE}|' ${WRKSRC}/Makefile
 
 do-install:
-	@(cd ${WRKSRC} ; \
-		${INSTALL_PROGRAM} qftp ${PREFIX}/bin ; \
-		${INSTALL_DATA} libftp.so.3 ${PREFIX}/lib ; \
-		${INSTALL_DATA} libftp.a ${PREFIX}/lib ; \
-		${LN} -fs ${PREFIX}/lib/libftp.so.3 ${PREFIX}/lib/libftp.so ; \
-		${INSTALL_DATA} ftplib.h ${PREFIX}/include ; \
-		for i in ftpdir ftpget ftplist ftprm ftpsend; do \
-  		  ${LN} -s qftp ${PREFIX}/bin/$$i ; done \
-	)
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} qftp ${PREFIX}/bin)
+.for i in ftpdir ftpget ftplist ftprm ftpsend
+	(cd ${PREFIX}/bin && ${LN} -sf qftp ${i})
+.endfor
+	(cd ${WRKSRC} && ${INSTALL_DATA} ftplib.h ${PREFIX}/include)
+	(cd ${WRKSRC} && ${INSTALL_DATA} libftp.a libftp.so.4 ${PREFIX}/lib)
+	(cd ${PREFIX}/lib && ${LN} -sf libftp.so.4 libftp.so)
 
 .include <bsd.port.mk>
diff --git a/ftp/ftplib/distinfo b/ftp/ftplib/distinfo
index f82ccc3e29b4..34f285e5e601 100644
--- a/ftp/ftplib/distinfo
+++ b/ftp/ftplib/distinfo
@@ -1,4 +1,2 @@
-SHA256 (ftplib-3.1-src.tar.gz) = be524e1086cfe9d86afa832e1413dde79a4e88ee8ea5325a87ffaaf6620a0a2b
-SIZE (ftplib-3.1-src.tar.gz) = 90243
-SHA256 (ftplib-3.1-1.patch) = 374c278c5aecfc957600ae0cadc4ed0ca49a132920e84adf2b76215531c3c273
-SIZE (ftplib-3.1-1.patch) = 6741
+SHA256 (ftplib-4.0.tar.gz) = a9fabf1fdb2d6cc3713fd5413724ecc266f438a53a24595619080db9e51426a1
+SIZE (ftplib-4.0.tar.gz) = 66680
diff --git a/ftp/ftplib/pkg-descr b/ftp/ftplib/pkg-descr
index 1d9af55b4279..789973183305 100644
--- a/ftp/ftplib/pkg-descr
+++ b/ftp/ftplib/pkg-descr
@@ -1,5 +1,5 @@
 ftplib is a set of routines that implement the FTP protocol. They allow
-applications to create and access remote files through function calls instead
-of needing to fork and exec an interactive ftp client program.
+applications to create and access remote files through function calls
+instead of needing to fork and exec an interactive ftp client program.
 
 WWW: http://nbpfaus.net/~pfau/ftplib/