[64433] trunk/dports/sysutils/duplicity/Portfile

[Ryan Schmidt]

On Mar 5, 2010, at 14:08, singingwolfboy at macports.org wrote:

> Revision: 64433
>          http://trac.macports.org/changeset/64433
> Author:   singingwolfboy at macports.org
> Date:     2010-03-05 12:08:32 -0800 (Fri, 05 Mar 2010)
> Log Message:
> -----------
> fixed problematic duplicity port, at the expense of python25 support

In the future, please make whitespace changes in a separate commit from functional changes. This makes it much easier to review your changes.

The problem you're fixing here: did the problem prevent the port from building? If so, that's fine, but if not, then the revision should be increased so those who already had the port installed are invited to upgrade.



> Modified Paths:
> --------------
>    trunk/dports/sysutils/duplicity/Portfile
> 
> Modified: trunk/dports/sysutils/duplicity/Portfile
> ===================================================================
> --- trunk/dports/sysutils/duplicity/Portfile	2010-03-05 19:54:07 UTC (rev 64432)
> +++ trunk/dports/sysutils/duplicity/Portfile	2010-03-05 20:08:32 UTC (rev 64433)
> @@ -1,13 +1,15 @@
> # -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
> # $Id$
> 
> -PortSystem    1.0
> +PortSystem          1.0
> +PortGroup           python26 1.0
> 
> -name          duplicity
> -version       0.6.06
> -categories    sysutils
> -platforms     darwin
> -maintainers   singingwolfboy openmaintainer
> +name                duplicity
> +categories          sysutils
> +version             0.6.06
> +set stable_series   [join [lrange [split ${version} .] 0 1] .]-series
> +platforms           darwin
> +maintainers         singingwolfboy openmaintainer
> 
> description   Encrypted bandwidth-efficient backup.
> long_description  Duplicity backs directories by producing encrypted \
> @@ -18,55 +20,28 @@
>       encrypt and/or sign these archives, they will be safe from spying \
>       and/or modification by the server.
> 
> -set stable_series 0.6-series
> -homepage      http://duplicity.nongnu.org/
> -master_sites  https://launchpad.net/duplicity/${stable_series}/${version}/+download
> +distname            duplicity-${version}
> +homepage            http://duplicity.nongnu.org/
> +master_sites        https://launchpad.net/duplicity/${stable_series}/${version}/+download
> 
> checksums           md5     abbbbcde4af24efffbc218583d581453 \
>                     sha1    45bc382f5d1b05960d3b45492b3e2c44a0ea7688 \
>                     rmd160  7867fba4fc5a250a0030034dd89fef74df3dfbbd
> 
> -depends_lib-append  port:librsync \
> -                    port:gnupg
> -
> -depends_run-append  port:ncftp
> -
> -build.args     --librsync-dir=${prefix}
> -
> -universal_variant no
> -
> -if {![variant_isset python25] && ![variant_isset python26]} {
> -    default_variants    +python26
> -}                   
> -                    
> -variant python25 description {Uses Python 2.5} conflicts python26 {
> -    PortGroup           python25 1.0
> -    depends_run-append  port:py25-gnupg \
> -                        port:py25-boto
> -    # setting the PortGroup clears a lot of other settings, which means
> -    # we need to remind MacPorts about them.
> -    categories          sysutils
> -    depends_lib-append  port:librsync \
> -                        port:gnupg
> +build.args          --librsync-dir=${prefix}
> +universal_variant   no
> +python.link_binaries yes
> +post-destroot {
> +    ln -s ${name}-${python.branch} ${destroot}${prefix}/bin/${name}
> }
> 
> -variant python26 description {Uses Python 2.6} conflicts python25 {
> -    PortGroup           python26 1.0
> -    depends_run-append  port:py26-gnupg \
> -                        port:py26-boto
> -    # setting the PortGroup clears a lot of other settings, which means
> -    # we need to remind MacPorts about them.
> -    categories          sysutils
> -    depends_lib-append  port:librsync \
> -                        port:gnupg
> -    # this is apparently required due to the way Python 2.6 installs as
> -    # a framework
> -    post-destroot {
> -        PortGroup       python26 1.0
> -        ln -s ${python.prefix}/bin/duplicity ${destroot}${prefix}/bin/
> -    }
> -}
> +depends_run-append  port:py26-gnupg \
> +                    port:py26-boto \
> +                    port:ncftp
> 
> +depends_lib-append  port:librsync \
> +                    port:gnupg
> +
> livecheck.type    regex
> livecheck.url     https://launchpad.net/duplicity/+download
> livecheck.regex   {duplicity-(\d+(?:\.\d+)*).tar.gz}