[65809] trunk/dports/net/echoping

[ryandesign at macports.org]

Revision: 65809
          http://trac.macports.org/changeset/65809
Author:   ryandesign at macports.org
Date:     2010-04-01 01:43:14 -0700 (Thu, 01 Apr 2010)
Log Message:
-----------
echoping:

 * update to 6.0.2
 * remove idn variant and always enable internationalized domain support
 * make ssl the default variant unless you've already chosen the gnutls variant
 * make gnutls and ssl variants conflict with one another
 * add descriptions to variants
 * fix build with latest gnutls which doesn't have libgnutls-config; use pkg-config instead
 * convert to port:-style dependencies
 * add needed dependencies on popt, openldap and pkgconfig

Modified Paths:
--------------
    trunk/dports/net/echoping/Portfile

Added Paths:
-----------
    trunk/dports/net/echoping/files/
    trunk/dports/net/echoping/files/patch-configure.diff
    trunk/dports/net/echoping/files/patch-plugins-dns-dns.c.diff

Modified: trunk/dports/net/echoping/Portfile
===================================================================
--- trunk/dports/net/echoping/Portfile	2010-04-01 08:18:47 UTC (rev 65808)
+++ trunk/dports/net/echoping/Portfile	2010-04-01 08:43:14 UTC (rev 65809)
@@ -2,7 +2,7 @@
 PortSystem		1.0
 
 name			echoping
-version			5.2.0
+version			6.0.2
 categories		net
 maintainers		nomaintainer
 description		small program to test approximate network performance
@@ -11,32 +11,44 @@
 					"echo" (or other protocol, like HTTP) packets.
 homepage		http://echoping.sourceforge.net/
 master_sites	sourceforge
-checksums		md5 aef46a1d09a1083e99eb5e18e9184af2
+
+checksums		md5     991478532b56ab3b6f46ea9fa332626f \
+				sha1    8b414d1dbc5a0f21a7f2cccb0138aec13117a1a4 \
+				rmd160  73ee80f4b666fde3a0e02589388e485c487005fc
+
 platforms		darwin
 
+depends_build	port:pkgconfig
+
+depends_lib		port:libidn \
+				port:openldap \
+				port:popt
+
+patchfiles		patch-configure.diff \
+				patch-plugins-dns-dns.c.diff
+
 configure.args	--enable-http \
 				--enable-icp \
 				--enable-smtp \
-				--enable-ttcp \
+				--disable-tcp-info \
 				--enable-tos \
 				--disable-priority \
-				--without-libidn \
+				--with-libidn \
 				--without-gnutls \
-				--without-ssl \
-				--mandir=${prefix}/share/man
+				--without-ssl
 
-variant idn {
-	depends_lib-append		lib:libidn.11:libidn
-	configure.args-append	--with-libidn
-}
-
-variant gnutls {
-	depends_lib-append		lib:libgnutls.11:gnutls
+variant gnutls conflicts ssl description {Add SSL/TLS crypt support with GNU TLS} {
+	depends_lib-append		port:gnutls
+	configure.args-delete	--without-gnutls
 	configure.args-append	--with-gnutls
 }
 
-variant ssl {
-	depends_lib-append		lib:libssl.0.9:openssl
+variant ssl conflicts gnutls description {Add SSL crypt support with OpenSSL} {
+	depends_lib-append		port:openssl
+	configure.args-delete	--without-ssl
 	configure.args-append	--with-ssl
 }
 
+if {![variant_isset gnutls]} {
+	default_variants +ssl
+}

Added: trunk/dports/net/echoping/files/patch-configure.diff
===================================================================
--- trunk/dports/net/echoping/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/net/echoping/files/patch-configure.diff	2010-04-01 08:43:14 UTC (rev 65809)
@@ -0,0 +1,22 @@
+--- configure.orig	2007-04-09 14:53:04.000000000 -0500
++++ configure	2010-04-01 03:29:39.000000000 -0500
+@@ -20144,8 +20144,8 @@
+ _ACEOF
+ 
+    GNUTLS=1
+-   CPPFLAGS="${CPPFLAGS} `libgnutls-config --cflags`"
+-   LDFLAGS="${LDFLAGS} `libgnutls-config --libs`"
++   CPPFLAGS="${CPPFLAGS} `pkg-config gnutls --cflags`"
++   LDFLAGS="${LDFLAGS} `pkg-config gnutls --libs`"
+    if test "$withval" != "yes"; then
+ 	GNUTLSROOT=$withval
+ 	LDFLAGS="${LDFLAGS} -L$GNUTLSROOT/lib"
+@@ -22926,7 +22926,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_gnutls_gnutls_global_init" >&5
+ echo "${ECHO_T}$ac_cv_lib_gnutls_gnutls_global_init" >&6; }
+ if test $ac_cv_lib_gnutls_gnutls_global_init = yes; then
+-  LIBS="${LIBS} `libgnutls-config --libs`"
++  LIBS="${LIBS} `pkg-config gnutls --libs`"
+ else
+   { { echo "$as_me:$LINENO: error: Get the GNU TLS library (http://www.gnutls.org/)" >&5
+ echo "$as_me: error: Get the GNU TLS library (http://www.gnutls.org/)" >&2;}

Added: trunk/dports/net/echoping/files/patch-plugins-dns-dns.c.diff
===================================================================
--- trunk/dports/net/echoping/files/patch-plugins-dns-dns.c.diff	                        (rev 0)
+++ trunk/dports/net/echoping/files/patch-plugins-dns-dns.c.diff	2010-04-01 08:43:14 UTC (rev 65809)
@@ -0,0 +1,10 @@
+--- plugins/dns/dns.c.orig	2007-04-05 07:40:48.000000000 -0500
++++ plugins/dns/dns.c	2010-04-01 02:44:51.000000000 -0500
+@@ -9,6 +9,7 @@
+ #endif
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
++#include <arpa/nameser_compat.h>
+ #include <resolv.h>
+ 
+ struct addrinfo name_server;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100401/407b1a7d/attachment.html>