diff -ruN /usr/ports/net/echoping/Makefile ./Makefile
--- /usr/ports/net/echoping/Makefile	2014-03-09 14:43:19.595441000 +0000
+++ ./Makefile	2014-05-07 12:59:11.000000000 +0000
@@ -2,17 +2,17 @@
 # $FreeBSD: head/net/echoping/Makefile 347634 2014-03-09 14:43:19Z miwi $
 
 PORTNAME=	echoping
-PORTVERSION=	6.0.0
-PORTREVISION=	4
+PORTVERSION=	6.0.2
 CATEGORIES=	net ipv6
-MASTER_SITES=	ftp://ftp.internatif.org/pub/unix/echoping/
+MASTER_SITES=	SF
 
 MAINTAINER=	sumikawa@FreeBSD.org
 COMMENT=	A ping-like program that uses TCP and/or HTTP
 
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
-		idn.17:${PORTSDIR}/dns/libidn
+LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
+		libidn.so:${PORTSDIR}/dns/libidn
 
+USES=	libtool
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-http --enable-icp --enable-smtp --with-ssl \
@@ -28,7 +28,6 @@
 
 .if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
-MAN1+=		echoping_ldap.1
 PING_PLUGINS+=	ldap
 PLIST_SUB=	WITH_LDAP=""
 .else
@@ -37,7 +36,6 @@
 
 .if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
-MAN1+=		echoping_postgresql.1
 PING_PLUGINS+=	postgresql
 PLIST_SUB+=	WITH_PGSQL=""
 .else
@@ -50,7 +48,4 @@
 BROKEN=		Does not link on ia64 or powerpc
 .endif
 
-post-patch:
-	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} -e 's|echo aout|echo elf|'
-
 .include <bsd.port.post.mk>
diff -ruN /usr/ports/net/echoping/distinfo ./distinfo
--- /usr/ports/net/echoping/distinfo	2014-01-22 15:30:13.980828000 +0000
+++ ./distinfo	2014-05-07 12:02:19.000000000 +0000
@@ -1,2 +1,2 @@
-SHA256 (echoping-6.0.0.tar.gz) = ec1e827a15a5a150a80f2d3abfab2e28628797a98527e82535c9a3f67e9fbfb4
-SIZE (echoping-6.0.0.tar.gz) = 1811321
+SHA256 (echoping-6.0.2.tar.gz) = 1dfa4c45bf461b2379ff91773ed7136176e2abac9e85c26bc9654942b5155eac
+SIZE (echoping-6.0.2.tar.gz) = 1660983
diff -ruN /usr/ports/net/echoping/pkg-descr ./pkg-descr
--- /usr/ports/net/echoping/pkg-descr	2014-01-22 15:44:51.352299000 +0000
+++ ./pkg-descr	2014-05-07 11:56:47.000000000 +0000
@@ -8,4 +8,4 @@
 
 It's useful for checking that http servers are running and not wedged.
 
-WWW:	http://echoping.sourceforge.net/
+WWW: http://echoping.sourceforge.net/
diff -ruN /usr/ports/net/echoping/pkg-plist ./pkg-plist
--- /usr/ports/net/echoping/pkg-plist	2014-03-09 14:43:19.595441000 +0000
+++ ./pkg-plist	2014-05-07 12:51:59.000000000 +0000
@@ -1,4 +1,6 @@
 bin/echoping
+include/echoping/compilation.h
+include/echoping/echoping.h
 lib/echoping/dns.a
 lib/echoping/dns.la
 lib/echoping/dns.so
@@ -21,7 +23,9 @@
 lib/echoping/whois.so.0
 man/man1/echoping.1.gz
 man/man1/echoping_dns.1.gz
-man/man1/echoping_ldap.1.gz
+%%WITH_LDAP%%man/man1/echoping_ldap.1.gz
+%%WITH_PGSQL%%man/man1/echoping_postgresql.1.gz
 man/man1/echoping_random.1.gz
 man/man1/echoping_whois.1.gz
+@dirrm include/echoping
 @dirrm lib/echoping