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

File gnutls-1.4.1_to_1.6.1.diff, 2.8 KB (added by boeyms@…, 18 years ago)
  • devel/gnutls/Portfile

    diff -Naur dports/devel/gnutls/Portfile dports-devel/devel/gnutls/Portfile
    old new  
    22
    33PortSystem 1.0
    44name            gnutls
    5 version         1.4.1
     5version         1.6.1
    66categories      devel
    77maintainers     mij@macports.org
    88description     GNU Transport Layer Security Library
     
    1616
    1717master_sites    gnupg
    1818
    19 checksums       sha1 25d183fef21abbcaab0afe6b5809893aa70b577d
     19checksums       sha1 e9517a6ad324245a5ebf8d86a16fc1486cd0b6ee
    2020
    2121use_bzip2       yes
    2222
    23 depends_lib     port:libgcrypt port:libtasn1 port:opencdk
     23depends_lib     port:libgcrypt port:libtasn1 port:opencdk port:lzo
     24
     25patchfiles      patch-includes_gnutls_gnutlsxx.h patch-lib_gnutlsxx.cpp
    2426
    2527configure.env   LDFLAGS="-L${prefix}/lib" CPPFLAGS="-I${prefix}/include -D_asn1_find_node=asn1_find_node"
    2628configure.args  --mandir=${prefix}/share/man --infodir=${prefix}/share/info \
  • devel/gnutls/files/patch-includes_gnutls_gnutlsxx.h

    diff -Naur dports/devel/gnutls/files/patch-includes_gnutls_gnutlsxx.h dports-devel/devel/gnutls/files/patch-includes_gnutls_gnutlsxx.h
    old new  
     1--- includes/gnutls/gnutlsxx.h  2006-08-07 22:40:23.000000000 +1000
     2+++ includes/gnutls/gnutlsxx.h  2007-01-25 20:40:43.000000000 +1100
     3@@ -233,7 +233,17 @@
     4 {
     5     public:
     6         credentials(gnutls_credentials_type_t t);
     7-        credentials( credentials& c);
     8+#if defined(__APPLE__) || defined(__MACOS__)
     9+       /* FIXME: This #if is due to a compile bug in Mac OS X.  Give
     10+          it some time and then remove this cruft.  See also
     11+          lib/gnutlsxx.cpp. */
     12+       credentials( credentials& c) {
     13+         type = c.type;
     14+         set_ptr( c.ptr());
     15+       }
     16+#else
     17+       credentials( credentials& c);
     18+#endif
     19         virtual ~credentials() { }
     20         gnutls_credentials_type_t get_type() const;
     21     protected:
  • devel/gnutls/files/patch-lib_gnutlsxx.cpp

    diff -Naur dports/devel/gnutls/files/patch-lib_gnutlsxx.cpp dports-devel/devel/gnutls/files/patch-lib_gnutlsxx.cpp
    old new  
     1--- lib/gnutlsxx.cpp    2006-06-02 05:49:01.000000000 +1000
     2+++ lib/gnutlsxx.cpp    2007-01-25 20:40:26.000000000 +1100
     3@@ -822,11 +822,16 @@
     4 {
     5 }
     6 
     7+#if !(defined(__APPLE__) || defined(__MACOS__))
     8+/* FIXME: This #if is due to a compile bug in Mac OS X.  Give it some
     9+   time and then remove this cruft.  See also
     10+   includes/gnutls/gnutlsxx.h. */
     11 credentials::credentials( credentials& c)
     12 {
     13     this->type = c.type;
     14     this->set_ptr( c.ptr());
     15 }
     16+#endif
     17 
     18 gnutls_credentials_type_t credentials::get_type() const
     19 {