Ticket #35474: patch-add-certsync

Index: devel/mercurial/Portfile
===================================================================
--- devel/mercurial/Portfile    (revision 106056)
+++ devel/mercurial/Portfile    (working copy)
@@ -6,6 +6,7 @@
 PortGroup           bitbucket 1.0
 
 bitbucket.setup     mirror mercurial 2.5.2
+revision            1
 categories          devel python
 license             GPL-2+
 maintainers         deric sean
@@ -28,7 +29,7 @@
 platforms           darwin
 checksums           rmd160  e818da7123ae4b12b3ae612d0a40bff413a47388 \
                     sha256  82c587a447fd93e804844a703df4c39d28781af183095ed9ef50a5c12867b6c4
-depends_run         port:curl-ca-bundle
+depends_run         port:certsync
 
 patchfiles          patch-setup.py.diff
 
Index: devel/osc/Portfile
===================================================================
--- devel/osc/Portfile  (revision 106056)
+++ devel/osc/Portfile  (working copy)
@@ -5,6 +5,7 @@
 
 name                osc
 version             0.130.1
+revision            1
 
 categories          devel python
 platforms           darwin
@@ -20,7 +21,7 @@
 
 python.default_version 25
 
-depends_lib-append  port:curl-ca-bundle \
+depends_lib-append  port:certsync \
                     port:py25-elementtree \
                     port:py25-urlgrabber \
                     port:py25-m2crypto
Index: gnome/glib-networking/Portfile
===================================================================
--- gnome/glib-networking/Portfile      (revision 106056)
+++ gnome/glib-networking/Portfile      (working copy)
@@ -5,7 +5,7 @@
 
 name            glib-networking
 version         2.36.0
-revision        1
+revision        2
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     Network-related giomodules for glib
 long_description ${description}
@@ -24,7 +24,7 @@
                 port:gnutls \
                 port:libproxy
 
-depends_run     port:curl-ca-bundle
+depends_run     port:certsync
 
 use_xz         yes
 
Index: net/curl/Portfile
===================================================================
--- net/curl/Portfile   (revision 106056)
+++ net/curl/Portfile   (working copy)
@@ -178,12 +178,12 @@
 }
 
 subport curl-ca-bundle {
-    revision                    0
+    revision                    1
     categories                  net
     license                     {MPL-2 LGPL-2.1+}
     supported_archs             noarch
     installs_libs               no
-    conflicts                   certsync
+    replaced_by                 certsync
 
     description                 CA certificate bundle for curl
 
@@ -191,58 +191,8 @@
                                 (CA certs) which curl (when linked with OpenSSL) uses to \
                                 verify the authenticity of secure web and FTP servers.
 
-    depends_build               path:bin/perl:perl5
-
-    set certdata_file           certdata.txt
-    set certdata_version        1.87
-    set certdata_date           2012-12-29
-    set certdata_distfile       certdata-${certdata_version}.txt
-    set certdata_path           security/nss/lib/ckfw/builtins/${certdata_file}
-
-    # Set this to the UTC date when an update to certdata.txt is committed.
-    set commit_date_utc         2013-01-11
-
-    # Avoid most of the checksum errors that inevitably occur whenever upstream
-    # updates certdata.txt by only using the upstream site on the day the latest
-    # update is committed. After that time, use only our mirrors, which should
-    # have copied the file by then. The success of this strategy relies on
-    # upstream not updating the file again on that day.
-    set days_since_commit [expr {[expr {[clock seconds] - [clock format [clock scan ${commit_date_utc} -gmt yes] -format %s]}] / 86400}]
-    if {${days_since_commit} > 0} {
-        master_sites-append http://distfiles.macports.org/curl/:certdata
-    } else {
-        master_sites-append http://mxr.mozilla.org/mozilla/source/${certdata_path}?raw=1&dummy=:certdata
-    }
-
-    extract.only                ${distfiles}
-    extract.post_args-append    ${worksrcdir}/Makefile ${worksrcdir}/lib/mk-ca-bundle.pl
-
-    distfiles-append            ${certdata_distfile}:certdata
-
-    checksums-append            ${certdata_distfile} \
-                                rmd160  bc21321abe4cf27418880c4ce8e6ebd329df82a1 \
-                                sha256  5b28c27582f302c4bf34ddb114266e143d6d685a688357651be9c9db000d822d
-
-    post-extract {
-        xinstall ${distpath}/${certdata_distfile} ${worksrcpath}/${certdata_file}
-    }
-
-    patchfiles                  patch-no-autodownload.diff
-
-    use_configure               no
-
-    build.target                ca-bundle
-
-    destroot {
-        set ca_bundle_dir ${prefix}/share/curl
-        set openssl_dir ${prefix}/etc/openssl
-        xinstall -d ${destroot}${ca_bundle_dir} ${destroot}${openssl_dir}
-        xinstall -m 644 ${worksrcpath}/lib/ca-bundle.crt ${destroot}${ca_bundle_dir}/curl-ca-bundle.crt
-        ln -s ${ca_bundle_dir}/curl-ca-bundle.crt ${destroot}${openssl_dir}/cert.pem
-    }
-
-    livecheck.type              regex
-    livecheck.url               http://bonsai.mozilla.org/cvsquery.cgi?file=mozilla/${certdata_path}&date=explicit&mindate=${certdata_date}
-    livecheck.version           ${certdata_version}
-    livecheck.regex             '${certdata_file}','(\[0-9.\]+)'
+   pre-configure {
+      ui_error "${name} has been renamed to ${replaced_by}. Please install ${replaced_by} instead."
+      return -code error "obsolete port"
+   }
 }
Index: net/vantages/Portfile
===================================================================
--- net/vantages/Portfile       (revision 106056)
+++ net/vantages/Portfile       (working copy)
@@ -4,7 +4,7 @@
 
 name                    vantages
 version                 0.8.8b
-revision                1
+revision                2
 categories              net
 platforms               darwin
 maintainers             nomaintainer
@@ -36,7 +36,7 @@
 # /usr/bin/ranlib: library member: libshttpd.a(compat_unix.c) is not an object file (not allowed in a library with multiple architectures)
 universal_variant       no
 
-depends_lib             port:curl-ca-bundle \
+depends_lib             port:certsync \
                         port:expat \
                         port:gnupg \
                         port:gpgme \
Index: security/certsync/Portfile
===================================================================
--- security/certsync/Portfile  (revision 106056)
+++ security/certsync/Portfile  (working copy)
@@ -3,8 +3,8 @@
 PortSystem 1.0
 name                   certsync
 version                        1.0.2
+revision               1
 categories             security
-conflicts              curl-ca-bundle
 maintainers            landonf openmaintainer
 description            Export x509 CAs from the Mac OS X Keychain.
 long_description       The package implements exporting of x509 CAs from \
@@ -45,6 +45,15 @@
        ln -s ${prefix}/etc/openssl/cert.pem ${destroot}${prefix}/share/curl/curl-ca-bundle.crt
 }
 
+pre-activate {
+    # Ensure that curl-ca-bundle is deactivated, as we replace a number of files it has
+    # installed.
+    # http://trac.macports.org/wiki/PortfileRecipes#deactivatehack
+    if {![catch {set installed [lindex [registry_active curl-ca-bundle] 0]}]} {
+        registry_deactivate_composite kerberos5 "" [list ports_nodepcheck 1]
+    }
+}
+
 post-activate {
        system "${prefix}/bin/update-ca-certificates"
 }