Update to 6.0.1

* Use the new plugin functionality available and build the dns, random and whois
  plugins by default.
* The postgresql and ldap plugins can be optionally built by setting
  PKG_OPTIONS.echoping.

6.0.1 (2007-04-04)
* Bug fixes only

6.0.0 (2007-03-26)
* Plugins: several plugins (whois, postgresql, dns) are now
  shipped with echoping and you can write your own. All new
  protocols will now be supported via plugins. Consequences:
* you now need an Unix with a working dlopen(3)
* echoping now requires the popt parsing library
* popt: echoping now depends on popt. One main change: options
  parsing is lightly different so some scripts *may* break. A
  typical example is that "old-school" Unix aggreation of arguments
  ("echoping -v4 localhost") is no longer accepted (use "echoping -v
  -4 localhost").
* Many bug fixes, see the list at Sourceforge

7 files changed, 84 insertions, 9 deletions

diff --git a/net/echoping/Makefile b/net/echoping/Makefile
index c919e793334..f9f5391fe80 100644
--- a/net/echoping/Makefile
+++ b/net/echoping/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:18 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2007/04/09 14:44:29 adrianp Exp $
 #
 
-DISTNAME=	echoping-5.2.0
-PKGREVISION=	4
+DISTNAME=	echoping-6.0.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.internatif.org/pub/unix/echoping/
 
@@ -10,11 +9,24 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://echoping.sourceforge.net/
 COMMENT=	Test performance of a remote TCP service
 
+.include "../../mk/bsd.prefs.mk"
+
 GNU_CONFIGURE=		YES
+PLIST_SRC=		${WRKDIR}/.PLIST_SRC
+PLUGINS=		dns random whois
+USE_LIBTOOL=		YES
+
+.include "options.mk"
+
 CONFIGURE_ARGS+=	--enable-icp
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q}
 CONFIGURE_ARGS+=	--with-libidn=${BUILDLINK_PREFIX.libidn}
+CONFIGURE_ARGS+=	--enable-plugin="${PLUGINS}"
+
+post-build:
+	${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
 
-.include "../../devel/libidn/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/echoping/PLIST b/net/echoping/PLIST
index b626a3675eb..745c5dab8f0 100644
--- a/net/echoping/PLIST
+++ b/net/echoping/PLIST
@@ -1,3 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:18 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/09 14:44:29 adrianp Exp $
 bin/echoping
+include/echoping/compilation.h
+include/echoping/echoping.h
+lib/echoping/dns.la
+lib/echoping/random.la
+lib/echoping/whois.la
 man/man1/echoping.1
+man/man1/echoping_dns.1
+man/man1/echoping_random.1
+man/man1/echoping_whois.1
+@dirrm include/echoping
+@unexec ${RMDIR} %D/lib/echoping 2>/dev/null || ${TRUE}
diff --git a/net/echoping/PLIST.ldap b/net/echoping/PLIST.ldap
new file mode 100644
index 00000000000..5d69428e382
--- /dev/null
+++ b/net/echoping/PLIST.ldap
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.ldap,v 1.1 2007/04/09 14:44:30 adrianp Exp $
+lib/echoping/ldap.la
+man/man1/echoping_ldap.1
+@unexec ${RMDIR} %D/lib/echoping 2>/dev/null || ${TRUE}
diff --git a/net/echoping/PLIST.pgsql b/net/echoping/PLIST.pgsql
new file mode 100644
index 00000000000..229781cb8c7
--- /dev/null
+++ b/net/echoping/PLIST.pgsql
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.pgsql,v 1.1 2007/04/09 14:44:30 adrianp Exp $
+lib/echoping/postgresql.la
+man/man1/echoping_postgresql.1
+@unexec ${RMDIR} %D/lib/echoping 2>/dev/null || ${TRUE}
diff --git a/net/echoping/distinfo b/net/echoping/distinfo
index 452d72e32fa..2eccca41698 100644
--- a/net/echoping/distinfo
+++ b/net/echoping/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:13:45 agc Exp $
+$NetBSD: distinfo,v 1.6 2007/04/09 14:44:30 adrianp Exp $
 
-SHA1 (echoping-5.2.0.tar.gz) = 21b0a92aa1760aca4c2249f0199d94f5c46e0360
-RMD160 (echoping-5.2.0.tar.gz) = dcf65162034ec295a7b7d993d166d8ef70a1be79
-Size (echoping-5.2.0.tar.gz) = 120911 bytes
+SHA1 (echoping-6.0.1.tar.gz) = 142ccb8d02a6df20ae46a30cd0d34596484f9afb
+RMD160 (echoping-6.0.1.tar.gz) = 28413bb966d0fdee3db4a249543061dc7beeab4c
+Size (echoping-6.0.1.tar.gz) = 1814035 bytes
+SHA1 (patch-aa) = 13f24d486adb1f6f4bacab16847d19ec19174887
diff --git a/net/echoping/options.mk b/net/echoping/options.mk
new file mode 100644
index 00000000000..03594a5cb94
--- /dev/null
+++ b/net/echoping/options.mk
@@ -0,0 +1,25 @@
+# $NetBSD: options.mk,v 1.1 2007/04/09 14:44:30 adrianp Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.echoping
+
+PKG_SUPPORTED_OPTIONS=	ldap pgsql
+
+.include "../../mk/bsd.options.mk"
+
+###
+### OpenLDAP plugin
+###
+.if !empty(PKG_OPTIONS:Mldap)
+.  include "../../databases/openldap-client/buildlink3.mk"
+PLUGINS+=	ldap
+PLIST_SRC+=	${PKGDIR}/PLIST.ldap
+.endif
+
+###
+### PostgreSQL plugin
+###
+.if !empty(PKG_OPTIONS:Mpgsql)
+.  include "../../mk/pgsql.buildlink3.mk"
+PLUGINS+=	postgresql
+PLIST_SRC+=	${PKGDIR}/PLIST.pgsql
+.endif
diff --git a/net/echoping/patches/patch-aa b/net/echoping/patches/patch-aa
new file mode 100644
index 00000000000..5a1dc008c22
--- /dev/null
+++ b/net/echoping/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.3 2007/04/09 14:44:30 adrianp Exp $
+
+--- plugins/configure.orig	2007-04-04 22:20:35.000000000 +0100
++++ plugins/configure
+@@ -19150,12 +19150,12 @@ fi
+ 
+ # Check whether --enable-plugin was given.
+ if test "${enable_plugin+set}" = set; then
+-  enableval=$enable_plugin; if test "$enableval" == "no"; then
++  enableval=$enable_plugin; if test "$enableval" = "no"; then
+    { { echo "$as_me:$LINENO: error: You cannot disable plugin support" >&5
+ echo "$as_me: error: You cannot disable plugin support" >&2;}
+    { (exit 1); exit 1; }; }
+ else
+-   if test "$enableval" == "yes"; then
++   if test "$enableval" = "yes"; then
+       { { echo "$as_me:$LINENO: error: You must indicate a list of plugins with this option" >&5
+ echo "$as_me: error: You must indicate a list of plugins with this option" >&2;}
+    { (exit 1); exit 1; }; }