[25248] trunk/dports/devel/gnutls

[source_changes at macosforge.org]

Revision: 25248
          http://trac.macosforge.org/projects/macports/changeset/25248
Author:   sfiera at macports.org
Date:     2007-05-16 06:59:33 -0700 (Wed, 16 May 2007)

Log Message:
-----------
Oops, gnutls 0.7-series isn't stable. Rolling back parts of r25224 (still updating to 0.6.2)

Modified Paths:
--------------
    trunk/dports/devel/gnutls/Portfile

Added Paths:
-----------
    trunk/dports/devel/gnutls/files/
    trunk/dports/devel/gnutls/files/patch-includes_gnutls_gnutlsxx.h
    trunk/dports/devel/gnutls/files/patch-lib_gnutlsxx.cpp

Modified: trunk/dports/devel/gnutls/Portfile
===================================================================
--- trunk/dports/devel/gnutls/Portfile	2007-05-16 13:59:25 UTC (rev 25247)
+++ trunk/dports/devel/gnutls/Portfile	2007-05-16 13:59:33 UTC (rev 25248)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name		gnutls
-version		1.7.9
+version		1.6.2
 categories	devel security
 maintainers	sfiera at macports.org
 description	GNU Transport Layer Security Library
@@ -15,16 +15,16 @@
 	SSL 3.0 protocols. The library does not include any patented algorithms \
 	and is available under the GNU Lesser GPL license.
 
-master_sites \
-	http://www.gnu.org/software/gnutls/releases/ \
-	http://josefsson.org/gnutls/releases/
+master_sites	gnupg:alpha/${name}
 
-checksums	sha1 fb54ad79207cf859b823d9fdf51e1d31d22a7d93
+checksums	sha1 d9b0cc20d10d4f0d4f2427a111b0481ae3cbb7da
 
 use_bzip2	yes
 
 depends_lib	port:libgcrypt port:libtasn1 port:opencdk port:lzo
 
+patchfiles      patch-includes_gnutls_gnutlsxx.h patch-lib_gnutlsxx.cpp
+
 configure.env	CPPFLAGS="-D_asn1_find_node=asn1_find_node"
 configure.args	--mandir=${prefix}/share/man --infodir=${prefix}/share/info \
 			--with-libtasn1-prefix=${prefix} --with-libreadline-prefix=${prefix}

Added: trunk/dports/devel/gnutls/files/patch-includes_gnutls_gnutlsxx.h
===================================================================
--- trunk/dports/devel/gnutls/files/patch-includes_gnutls_gnutlsxx.h	                        (rev 0)
+++ trunk/dports/devel/gnutls/files/patch-includes_gnutls_gnutlsxx.h	2007-05-16 13:59:33 UTC (rev 25248)
@@ -0,0 +1,21 @@
+--- includes/gnutls/gnutlsxx.h	2006-08-07 22:40:23.000000000 +1000
++++ includes/gnutls/gnutlsxx.h	2007-01-25 20:40:43.000000000 +1100
+@@ -233,7 +233,17 @@
+ {
+     public:
+         credentials(gnutls_credentials_type_t t);
+-        credentials( credentials& c);
++#if defined(__APPLE__) || defined(__MACOS__)
++	/* FIXME: This #if is due to a compile bug in Mac OS X.  Give
++	   it some time and then remove this cruft.  See also
++	   lib/gnutlsxx.cpp. */
++	credentials( credentials& c) {
++	  type = c.type;
++	  set_ptr( c.ptr());
++	}
++#else
++	credentials( credentials& c);
++#endif
+         virtual ~credentials() { }
+         gnutls_credentials_type_t get_type() const;
+     protected:

Added: trunk/dports/devel/gnutls/files/patch-lib_gnutlsxx.cpp
===================================================================
--- trunk/dports/devel/gnutls/files/patch-lib_gnutlsxx.cpp	                        (rev 0)
+++ trunk/dports/devel/gnutls/files/patch-lib_gnutlsxx.cpp	2007-05-16 13:59:33 UTC (rev 25248)
@@ -0,0 +1,19 @@
+--- lib/gnutlsxx.cpp	2006-06-02 05:49:01.000000000 +1000
++++ lib/gnutlsxx.cpp	2007-01-25 20:40:26.000000000 +1100
+@@ -822,11 +822,16 @@
+ { 
+ }
+ 
++#if !(defined(__APPLE__) || defined(__MACOS__))
++/* FIXME: This #if is due to a compile bug in Mac OS X.  Give it some
++   time and then remove this cruft.  See also
++   includes/gnutls/gnutlsxx.h. */
+ credentials::credentials( credentials& c)
+ {
+     this->type = c.type;
+     this->set_ptr( c.ptr());
+ }
++#endif
+ 
+ gnutls_credentials_type_t credentials::get_type() const
+ { 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070516/14800396/attachment.html