Ticket #11671: gnutls-1.4.1_to_1.6.1.diff

devel/gnutls/Portfile

@@ -2 +2 @@
 
 PortSystem 1.0
 name            gnutls
-version         1.4.1
+version         1.6.1
 categories      devel
 maintainers     mij@macports.org
 description     GNU Transport Layer Security Library
@@ -16 +16 @@
 
 master_sites    gnupg
 
-checksums       sha1 25d183fef21abbcaab0afe6b5809893aa70b577d
+checksums       sha1 e9517a6ad324245a5ebf8d86a16fc1486cd0b6ee
 
 use_bzip2       yes
 
-depends_lib     port:libgcrypt port:libtasn1 port:opencdk
+depends_lib     port:libgcrypt port:libtasn1 port:opencdk port:lzo
+
+patchfiles      patch-includes_gnutls_gnutlsxx.h patch-lib_gnutlsxx.cpp
 
 configure.env   LDFLAGS="-L${prefix}/lib" CPPFLAGS="-I${prefix}/include -D_asn1_find_node=asn1_find_node"
 configure.args  --mandir=${prefix}/share/man --infodir=${prefix}/share/info \

devel/gnutls/files/patch-includes_gnutls_gnutlsxx.h

@@ +1 @@
+--- 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:

devel/gnutls/files/patch-lib_gnutlsxx.cpp

@@ +1 @@
+--- 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
+ {