[53814] trunk/dports/net

toby at macports.org toby at macports.org
Tue Jul 14 11:21:57 PDT 2009


Revision: 53814
          http://trac.macports.org/changeset/53814
Author:   toby at macports.org
Date:     2009-07-14 11:21:55 -0700 (Tue, 14 Jul 2009)
Log Message:
-----------
#20297 (ldns, ldns-tools, drill upstream update)

Modified Paths:
--------------
    trunk/dports/net/drill/Portfile
    trunk/dports/net/ldns/Portfile
    trunk/dports/net/ldns-tools/Portfile

Added Paths:
-----------
    trunk/dports/net/drill/files/
    trunk/dports/net/drill/files/patch-..-acx_nlnetlabs.m4.diff
    trunk/dports/net/drill/files/patch-configure.ac.diff

Modified: trunk/dports/net/drill/Portfile
===================================================================
--- trunk/dports/net/drill/Portfile	2009-07-14 14:53:18 UTC (rev 53813)
+++ trunk/dports/net/drill/Portfile	2009-07-14 18:21:55 UTC (rev 53814)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name                drill
-version             1.5.1
+version             1.6.0
 categories          net devel
 platforms           darwin
 maintainers         durchmesser.ch:marius.rieder
@@ -15,9 +15,17 @@
 homepage            http://www.nlnetlabs.nl/projects/drill/
 master_sites        http://www.nlnetlabs.nl/downloads/ldns/
 distfiles           ldns-${version}${extract.suffix}
-checksums           sha1 070210a417633b7358bb3466da40e6f1872f36c2
-depends_lib         port:openssl port:ldns
+patchfiles          patch-configure.ac.diff \
+                    patch-..-acx_nlnetlabs.m4.diff
+checksums           sha1 e5fdbc5cd66f6afc4f816e9acd334bddc488e830
+depends_lib         port:ldns
 worksrcdir          ldns-${version}/drill
 use_autoconf        yes
 autoconf.cmd        autoreconf
-configure.args      --with-ldns=${prefix} --with-ssl=${prefix}
+configure.args      --with-ldns=${prefix} --without-ssl
+
+variant ssl {
+    configure.args-delete --without-ssl
+    configure.args-append --with-ssl=${prefix}
+    depends_lib-append	port:openssl
+}

Added: trunk/dports/net/drill/files/patch-..-acx_nlnetlabs.m4.diff
===================================================================
--- trunk/dports/net/drill/files/patch-..-acx_nlnetlabs.m4.diff	                        (rev 0)
+++ trunk/dports/net/drill/files/patch-..-acx_nlnetlabs.m4.diff	2009-07-14 18:21:55 UTC (rev 53814)
@@ -0,0 +1,212 @@
+Index: ../acx_nlnetlabs.m4
+===================================================================
+--- ../acx_nlnetlabs.m4	(revision 2980)
++++ ../acx_nlnetlabs.m4	(revision 2984)
+@@ -2,9 +2,12 @@
+ # Copyright 2009, Wouter Wijngaards, NLnet Labs.   
+ # BSD licensed.
+ #
+-# Version 2
++# Version 3 - 2009-07-13
++#
++# Changelog
++# 2009-07-13
++# - added ACX_WITH_SSL_OPTIONAL
+ # 2009-07-03
+-# Changelog
+ # - fixup LDFLAGS for empty ssl dir.
+ #
+ # Automates some of the checking constructs.  Aims at portability for POSIX.
+@@ -30,6 +33,8 @@
+ # ACX_TYPE_IN_PORT_T		- in_port_t type.
+ # ACX_ARG_RPATH			- add --disable-rpath option.
+ # ACX_WITH_SSL			- add --with-ssl option, link -lcrypto.
++# ACX_WITH_SSL_OPTIONAL		- add --with-ssl option, link -lcrypto,
++				  where --without-ssl is also accepted
+ # ACX_LIB_SSL			- setup to link -lssl.
+ # ACX_SYS_LARGEFILE		- improved sys_largefile, fseeko, >2G files.
+ # ACX_CHECK_GETADDRINFO_WITH_INCLUDES - find getaddrinfo, portably.
+@@ -555,22 +560,11 @@
+ 	fi
+ ])
+ 
+-dnl Check for SSL. 
+-dnl Adds --with-ssl option, searches for openssl and defines HAVE_SSL if found
+-dnl Setup of CPPFLAGS, CFLAGS.  Adds -lcrypto to LIBS. 
+-dnl Checks main header files of SSL.
+-dnl
+-AC_DEFUN([ACX_WITH_SSL],
+-[
+-AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl=pathname],
+-                                    [enable SSL (will check /usr/local/ssl
+-                            /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/sfw /usr)]),[
+-        ],[
+-            withval="yes"
+-        ])
+-    if test x_$withval = x_no; then
+-	AC_MSG_ERROR([Need SSL library to do digital signature cryptography])
+-    fi
++dnl Common code for both ACX_WITH_SSL and ACX_WITH_SSL_OPTIONAL
++dnl Takes one argument; the withval checked in those 2 functions
++dnl sets up the environment for the given openssl path
++AC_DEFUN([ACX_SSL_CHECKS], [
++    withval=$1
+     if test x_$withval != x_no; then
+         AC_MSG_CHECKING(for SSL)
+         if test x_$withval = x_ -o x_$withval = x_yes; then
+@@ -581,10 +575,10 @@
+             if test -f "$dir/include/openssl/ssl.h"; then
+                 found_ssl="yes"
+                 AC_DEFINE_UNQUOTED([HAVE_SSL], [], [Define if you have the SSL libraries installed.])
+-		dnl assume /usr/include is already in the include-path.
+-		if test "$ssldir" != "/usr"; then
+-			CPPFLAGS="$CPPFLAGS -I$ssldir/include"
+-		fi
++                dnl assume /usr/include is already in the include-path.
++                if test "$ssldir" != "/usr"; then
++                        CPPFLAGS="$CPPFLAGS -I$ssldir/include"
++                fi
+                 break;
+             fi
+         done
+@@ -593,61 +587,96 @@
+         else
+             AC_MSG_RESULT(found in $ssldir)
+             HAVE_SSL=yes
+-	    dnl assume /usr is already in the lib and dynlib paths.
+-	    if test "$ssldir" != "/usr" -a "$ssldir" != ""; then
++            dnl assume /usr is already in the lib and dynlib paths.
++            if test "$ssldir" != "/usr" -a "$ssldir" != ""; then
+                 LDFLAGS="$LDFLAGS -L$ssldir/lib"
+-		ACX_RUNTIME_PATH_ADD([$ssldir/lib])
+-	    fi
+-	
+-	    AC_MSG_CHECKING([for HMAC_CTX_init in -lcrypto])
+-	    LIBS="$LIBS -lcrypto"
+-	    AC_TRY_LINK(, [
+-		int HMAC_CTX_init(void);
+-		(void)HMAC_CTX_init();
+-	      ], [
+-		AC_MSG_RESULT(yes)
+-		AC_DEFINE([HAVE_HMAC_CTX_INIT], 1, 
+-			[If you have HMAC_CTX_init])
+-	      ], [
+-		AC_MSG_RESULT(no)
+-	    	# check if -lwsock32 or -lgdi32 are needed.	
+-		BAKLIBS="$LIBS"
+-		LIBS="$LIBS -lgdi32"
+-		AC_MSG_CHECKING([if -lcrypto needs -lgdi32])
+-		AC_TRY_LINK([], [
+-		    int HMAC_CTX_init(void);
+-		    (void)HMAC_CTX_init();
+-		  ],[
+-		    AC_DEFINE([HAVE_HMAC_CTX_INIT], 1, 
+-			[If you have HMAC_CTX_init])
+-		    AC_MSG_RESULT(yes) 
+-		  ],[
+-		    AC_MSG_RESULT(no)
+-		    LIBS="$BAKLIBS"
+-		    LIBS="$LIBS -ldl"
+-		    AC_MSG_CHECKING([if -lcrypto needs -ldl])
+-		    AC_TRY_LINK([], [
+-			int HMAC_CTX_init(void);
+-			(void)HMAC_CTX_init();
+-		      ],[
+-			AC_DEFINE([HAVE_HMAC_CTX_INIT], 1, 
+-			    [If you have HMAC_CTX_init])
+-			AC_MSG_RESULT(yes) 
+-		      ],[
+-			AC_MSG_RESULT(no)
++                ACX_RUNTIME_PATH_ADD([$ssldir/lib])
++            fi
++        
++            AC_MSG_CHECKING([for HMAC_CTX_init in -lcrypto])
++            LIBS="$LIBS -lcrypto"
++            AC_TRY_LINK(, [
++                int HMAC_CTX_init(void);
++                (void)HMAC_CTX_init();
++              ], [
++                AC_MSG_RESULT(yes)
++                AC_DEFINE([HAVE_HMAC_CTX_INIT], 1, 
++                          [If you have HMAC_CTX_init])
++              ], [
++                AC_MSG_RESULT(no)
++                # check if -lwsock32 or -lgdi32 are needed.	
++                BAKLIBS="$LIBS"
++                LIBS="$LIBS -lgdi32"
++                AC_MSG_CHECKING([if -lcrypto needs -lgdi32])
++                AC_TRY_LINK([], [
++                    int HMAC_CTX_init(void);
++                    (void)HMAC_CTX_init();
++                  ],[
++                    AC_DEFINE([HAVE_HMAC_CTX_INIT], 1, 
++                        [If you have HMAC_CTX_init])
++                    AC_MSG_RESULT(yes) 
++                  ],[
++                    AC_MSG_RESULT(no)
++                    LIBS="$BAKLIBS"
++                    LIBS="$LIBS -ldl"
++                    AC_MSG_CHECKING([if -lcrypto needs -ldl])
++                    AC_TRY_LINK([], [
++                        int HMAC_CTX_init(void);
++                        (void)HMAC_CTX_init();
++                      ],[
++                        AC_DEFINE([HAVE_HMAC_CTX_INIT], 1, 
++                            [If you have HMAC_CTX_init])
++                        AC_MSG_RESULT(yes) 
++                      ],[
++                        AC_MSG_RESULT(no)
+                     AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required])
+-		    ])
+-		])
++                    ])
++                ])
+             ])
+         fi
+         AC_SUBST(HAVE_SSL)
+-	AC_SUBST(RUNTIME_PATH)
++        AC_SUBST(RUNTIME_PATH)
+     fi
+ AC_CHECK_HEADERS([openssl/ssl.h],,, [AC_INCLUDES_DEFAULT])
+ AC_CHECK_HEADERS([openssl/err.h],,, [AC_INCLUDES_DEFAULT])
+ AC_CHECK_HEADERS([openssl/rand.h],,, [AC_INCLUDES_DEFAULT])
++])dnl End of ACX_SSL_CHECKS
++
++dnl Check for SSL, where SSL is mandatory
++dnl Adds --with-ssl option, searches for openssl and defines HAVE_SSL if found
++dnl Setup of CPPFLAGS, CFLAGS.  Adds -lcrypto to LIBS. 
++dnl Checks main header files of SSL.
++dnl
++AC_DEFUN([ACX_WITH_SSL],
++[
++AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl=pathname],
++                                    [enable SSL (will check /usr/local/ssl
++                            /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/sfw /usr)]),[
++        ],[
++            withval="yes"
++        ])
++    if test x_$withval = x_no; then
++	AC_MSG_ERROR([Need SSL library to do digital signature cryptography])
++    fi
++    ACX_SSL_CHECKS($withval)
+ ])dnl End of ACX_WITH_SSL
+ 
++dnl Check for SSL, where ssl is optional (--without-ssl is allowed)
++dnl Adds --with-ssl option, searches for openssl and defines HAVE_SSL if found
++dnl Setup of CPPFLAGS, CFLAGS.  Adds -lcrypto to LIBS. 
++dnl Checks main header files of SSL.
++dnl
++AC_DEFUN([ACX_WITH_SSL_OPTIONAL],
++[
++AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl=pathname],
++                                [enable SSL (will check /usr/local/ssl
++                                /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /opt/local /usr/sfw /usr)]),[
++        ],[
++            withval="yes"
++        ])
++    ACX_SSL_CHECKS($withval)
++])dnl End of ACX_WITH_SSL_OPTIONAL
++
+ dnl Setup to use -lssl
+ dnl To use -lcrypto, use the ACX_WITH_SSL setup (before this one).
+ AC_DEFUN([ACX_LIB_SSL],

Added: trunk/dports/net/drill/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/net/drill/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/net/drill/files/patch-configure.ac.diff	2009-07-14 18:21:55 UTC (rev 53814)
@@ -0,0 +1,85 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 2980)
++++ configure.ac	(revision 2984)
+@@ -4,6 +4,7 @@
+ AC_PREREQ(2.56)
+ AC_INIT(ldns, 1.6.0, libdns at nlnetlabs.nl,libdns)
+ AC_CONFIG_SRCDIR([drill.c])
++sinclude(../acx_nlnetlabs.m4)
+ 
+ OURCPPFLAGS=''
+ CPPFLAGS=${CPPFLAGS:-${OURCPPFLAGS}}
+@@ -194,71 +195,7 @@
+ AC_CHECK_LIB(socket, socket)
+ AC_CHECK_LIB(nsl, inet_pton)
+ 
+-# Checks for libraries.
+-# Check for SSL, original taken from
+-# http://www.gnu.org/software/ac-archive/htmldoc/check_ssl.html and
+-# modified for NSD and 
+-# copied again for use in ldns
+-AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl=pathname],
+-                                    [enable SSL (will check /usr/local/ssl
+-                            /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr/sfw /usr)]),[
+-        ],[
+-            withval="yes"
+-    if test x_$withval != x_no; then
+-        AC_MSG_CHECKING(for SSL)
+-        if test x_$withval = x_ -o x_$withval = x_yes; then
+-            withval="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr/sfw /usr"
+-        fi
+-        for dir in $withval; do
+-            ssldir="$dir"
+-            if test -f "$dir/include/openssl/ssl.h"; then
+-                found_ssl="yes";
+-                AC_DEFINE_UNQUOTED([HAVE_SSL], [], [Define if you have the SSL libraries installed.])
+-                CPPFLAGS="$CPPFLAGS -I$ssldir/include";
+-                break;
+-            fi
+-        done
+-        if test x_$found_ssl != x_yes; then
+-            AC_MSG_ERROR(Cannot find the SSL libraries in $withval)
+-        else
+-            AC_MSG_RESULT(found in $ssldir)
+-            HAVE_SSL=yes
+-            LDFLAGS="$LDFLAGS -L$ssldir/lib";
+-            if test "x$enable_rpath" = xyes; then
+-	        RUNTIME_PATH="$RUNTIME_PATH -R$ssldir/lib"
+-            fi
+-            AC_MSG_CHECKING([for HMAC_CTX_init in -lcrypto])
+-            LIBS="$LIBS -lcrypto"
+-            AC_TRY_LINK(, [
+-                int HMAC_CTX_init(void);
+-                (void)HMAC_CTX_init();
+-              ], [
+-                AC_MSG_RESULT(yes)
+-                AC_DEFINE([HAVE_HMAC_CTX_INIT], 1,
+-                        [If you have HMAC_CTX_init])
+-              ], [
+-                AC_MSG_RESULT(no)
+-                # check if -lwsock32 or -lgdi32 are needed.     
+-                LIBS="$LIBS -lgdi32 -lws2_32"
+-                AC_MSG_CHECKING([if -lcrypto needs -lgdi32])
+-                AC_TRY_LINK([], [
+-                    int HMAC_CTX_init(void);
+-                    (void)HMAC_CTX_init();
+-                  ],[
+-                    AC_DEFINE([HAVE_HMAC_CTX_INIT], 1,
+-                        [If you have HMAC_CTX_init])
+-                    AC_MSG_RESULT(yes)
+-                  ],[
+-                    AC_MSG_RESULT(no)
+-                    AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or
+- higher is required])
+-                ])
+-            ])
+-        fi
+-        AC_SUBST(HAVE_SSL)
+-	AC_SUBST(RUNTIME_PATH)
+-    fi
+-])
++ACX_WITH_SSL_OPTIONAL
+ 
+ LIBS_STC="$LIBS"
+ AC_SUBST(LIBS_STC)

Modified: trunk/dports/net/ldns/Portfile
===================================================================
--- trunk/dports/net/ldns/Portfile	2009-07-14 14:53:18 UTC (rev 53813)
+++ trunk/dports/net/ldns/Portfile	2009-07-14 18:21:55 UTC (rev 53814)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name                ldns
-version             1.5.1
+version             1.6.0
 categories          net devel
 platforms           darwin
 maintainers         durchmesser.ch:marius.rieder
@@ -14,15 +14,20 @@
 
 homepage            http://www.nlnetlabs.nl/projects/ldns/
 master_sites        http://www.nlnetlabs.nl/downloads/ldns/
-checksums           sha1 070210a417633b7358bb3466da40e6f1872f36c2
+checksums           sha1 e5fdbc5cd66f6afc4f816e9acd334bddc488e830
 
-depends_lib         port:openssl
 depends_build       bin:glibtool:libtool
 
-configure.args      --mandir=${prefix}/share/man --with-ssl=${prefix}
+configure.args      --mandir=${prefix}/share/man --without-ssl
 configure.cppflags  -I${worksrcpath}/include
 build.type          gnu
 
+variant ssl {
+    configure.args-delete --without-ssl
+    configure.args-append --with-ssl=${prefix}
+    depends_lib-append	port:openssl
+}
+
 platform darwin 8 {
     configure.env MACOSX_DEPLOYMENT_TARGET=10.4
     build.env MACOSX_DEPLOYMENT_TARGET=10.4

Modified: trunk/dports/net/ldns-tools/Portfile
===================================================================
--- trunk/dports/net/ldns-tools/Portfile	2009-07-14 14:53:18 UTC (rev 53813)
+++ trunk/dports/net/ldns-tools/Portfile	2009-07-14 18:21:55 UTC (rev 53814)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name                ldns-tools
-version             1.5.1
+version             1.6.0
 categories          net devel
 platforms           darwin
 maintainers         durchmesser.ch:marius.rieder
@@ -14,9 +14,15 @@
 homepage            http://www.nlnetlabs.nl/projects/ldns/
 master_sites        http://www.nlnetlabs.nl/downloads/ldns/
 distfiles           ldns-${version}${extract.suffix}
-checksums           sha1 070210a417633b7358bb3466da40e6f1872f36c2
-depends_lib         port:openssl port:ldns
+checksums           sha1 e5fdbc5cd66f6afc4f816e9acd334bddc488e830
+depends_lib         port:ldns
 worksrcdir          ldns-${version}/examples
 use_autoconf        yes
 autoconf.cmd        autoreconf
-configure.args      --with-ldns=${prefix} --with-ssl=${prefix}
+configure.args      --with-ldns=${prefix} --without-ssl
+
+variant ssl {
+    configure.args-delete --without-ssl
+    configure.args-append --with-ssl=${prefix}
+    depends_lib-append	port:openssl
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090714/274fde45/attachment.html>


More information about the macports-changes mailing list