Index: head/net/echoping/Makefile
===================================================================
--- head/net/echoping/Makefile	(revision 402385)
+++ head/net/echoping/Makefile	(revision 402386)
@@ -1,53 +1,43 @@
 # Created by: peter
 # $FreeBSD$
 
 PORTNAME=	echoping
 PORTVERSION=	6.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net ipv6
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ping-like program that uses TCP and/or HTTP
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
 		libidn.so:${PORTSDIR}/dns/libidn
 
 USES=		cpe libtool
 CPE_VENDOR=	echoping_project
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-http --enable-icp --enable-smtp --with-ssl \
 		--enable-ttcp --enable-tos --with-libidn=${LOCALBASE} \
 		--enable-plugin="${PING_PLUGINS}"
+INSTALL_TARGET=	install-strip
 
 PING_PLUGINS=	dns random whois
 
 OPTIONS_DEFINE=	LDAP PGSQL
-OPTIONS_DEFAULT=	LDAP
+OPTIONS_DEFAULT=LDAP
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+LDAP_USE=	OPENLDAP=yes
+LDAP_VARS=	PING_PLUGINS+=ldap
 
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	yes
-PING_PLUGINS+=	ldap
-PLIST_SUB=	WITH_LDAP=""
-.else
-PLIST_SUB=	WITH_LDAP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USES+=		pgsql
-PING_PLUGINS+=	postgresql
-PLIST_SUB+=	WITH_PGSQL=""
-.else
-PLIST_SUB+=	WITH_PGSQL="@comment "
-.endif
+PGSQL_USES=	pgsql
+PGSQL_VARS=	PING_PLUGINS+=postgresql
 
 post-patch:
 	@${REINPLACE_CMD} '/^echoping_LDADD =/s/$$/ -lm/' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
Index: head/net/echoping/pkg-plist
===================================================================
--- head/net/echoping/pkg-plist	(revision 402385)
+++ head/net/echoping/pkg-plist	(revision 402386)
@@ -1,29 +1,29 @@
 bin/echoping
 include/echoping/compilation.h
 include/echoping/echoping.h
 lib/echoping/dns.a
 lib/echoping/dns.so
 lib/echoping/dns.so.0
 lib/echoping/dns.so.0.0.0
-%%WITH_LDAP%%lib/echoping/ldap.a
-%%WITH_LDAP%%lib/echoping/ldap.so
-%%WITH_LDAP%%lib/echoping/ldap.so.0
-%%WITH_LDAP%%lib/echoping/ldap.so.0.0.0
-%%WITH_PGSQL%%lib/echoping/postgresql.a
-%%WITH_PGSQL%%lib/echoping/postgresql.so
-%%WITH_PGSQL%%lib/echoping/postgresql.so.0
-%%WITH_PGSQL%%lib/echoping/postgresql.so.0.0.0
+%%LDAP%%lib/echoping/ldap.a
+%%LDAP%%lib/echoping/ldap.so
+%%LDAP%%lib/echoping/ldap.so.0
+%%LDAP%%lib/echoping/ldap.so.0.0.0
+%%PGSQL%%lib/echoping/postgresql.a
+%%PGSQL%%lib/echoping/postgresql.so
+%%PGSQL%%lib/echoping/postgresql.so.0
+%%PGSQL%%lib/echoping/postgresql.so.0.0.0
 lib/echoping/random.a
 lib/echoping/random.so
 lib/echoping/random.so.0
 lib/echoping/random.so.0.0.0
 lib/echoping/whois.a
 lib/echoping/whois.so
 lib/echoping/whois.so.0
 lib/echoping/whois.so.0.0.0
 man/man1/echoping.1.gz
 man/man1/echoping_dns.1.gz
-%%WITH_LDAP%%man/man1/echoping_ldap.1.gz
-%%WITH_PGSQL%%man/man1/echoping_postgresql.1.gz
+%%LDAP%%man/man1/echoping_ldap.1.gz
+%%PGSQL%%man/man1/echoping_postgresql.1.gz
 man/man1/echoping_random.1.gz
 man/man1/echoping_whois.1.gz