Merge branch 'next'

1 files changed, 15 insertions, 30 deletions

diff --git a/dist/Portfile b/dist/Portfile
index fc82b3d3..3388c936 100644
--- a/dist/Portfile
+++ b/dist/Portfile
@@ -4,26 +4,24 @@
 PortSystem          1.0
 
 name                ledger-devel
-version             3.0-20100611
+version             3.0.0-20100615
 homepage            http://www.newartisans.com/software/ledger.html
-categories          finance accounting reporting
+categories          finance
 
 description         A command-line, double-entry accounting tool.
 long_description    Ledger is a powerful, double-entry accounting system that \
                     is accessed from the UNIX command-line.
 
-maintainers         johnw@newartisans.com
+maintainers         newartisans.com:johnw
 
 platforms           darwin
 
 use_bzip2           yes
-master_sites        http://ftp.newartisans.com/pub/ledger/:source
-distname            ${name}-${version}
-distfiles           ${distname}${extract.suffix}:source
-checksums           ${distname}${extract.suffix} \
-                        md5     0ab9a855719df536a85f7ea5238b8a6e \
-                        sha1    e2ee9e2951fd37bac50c91046f097c11294a6e8e \
-                        rmd160  72cdfe76add63425b1ade1d03479e837e9f2dafe
+master_sites        http://ftp.newartisans.com/pub/ledger/
+distname            ledger-${version}
+checksums           md5     980e819c4cb68b8777849a44316e0edc \
+                    sha1    ff1b281ce6ddfeb5814ce59bd4d69b97ddb21f7e \
+                    rmd160  a40e64bf21c9c132619b0921dee0e12299e3938a
 
 depends_build       port:automake \
                     port:autoconf \
@@ -35,23 +33,15 @@ depends_lib         port:gettext \
                     port:boost \
                     port:libedit
 
-# gmp and mpfr are not universal
-universal_variant   no
-
 configure.args      --with-extra-includes=${prefix}/include \
                     --with-extra-libs=${prefix}/lib
 
 build.args          DYLD_LIBRARY_PATH=${worksrcpath}/ledger/.libs
 
-platform darwin 9 {}
-platform darwin 10 {}
-
 destroot.args       DESTDIR=${destroot}${prefix} \
                     DYLD_LIBRARY_PATH=${worksrcpath}/ledger/.libs \
                     docprefix=${destroot}/share/doc
 
-post-destroot {}
-
 variant debug description {Enable debug mode} {
     configure.args-append   --enable-debug=yes
 }
@@ -60,12 +50,10 @@ variant icu description {Enable full Unicode support} {
     if {[variant_isset python25]} {
         depends_lib-delete      port:boost+python25
         depends_lib-append      port:boost+icu+python25
-    }
-    else if {[variant_isset python26]} {
+    } elsif {[variant_isset python26]} {
         depends_lib-delete      port:boost+python26
         depends_lib-append      port:boost+icu+python26
-    }
-    else {
+    } else {
         depends_lib-delete      port:boost
         depends_lib-append      port:boost+icu
     }
@@ -76,8 +64,7 @@ variant python25 description {build python 2.5 support} conflicts python26 {
     if {[variant_isset icu]} {
         depends_lib-delete      port:boost+icu
         depends_lib-append      port:boost+icu+python25
-    }
-    else {
+    } else {
         depends_lib-delete      port:boost
         depends_lib-append      port:boost+python25
     }
@@ -89,15 +76,13 @@ variant python26 description {build python 2.6 support} conflicts python25 {
     if {[variant_isset icu]} {
         depends_lib-delete      port:boost+icu
         depends_lib-append      port:boost+icu+python26
-    }
-    else {
+    } else {
         depends_lib-delete      port:boost
         depends_lib-append      port:boost+python26
     }
     depends_lib-append          port:python26
 }
 
-#livecheck.check     regex
-#livecheck.url       ${homepage}
-#livecheck.regex     "Latest Stable Ledger \\(Version (\\d+.\\d+.\\d+)\\)"
-
+livecheck.check     regex
+livecheck.url       [lindex ${master_sites} 0]
+livecheck.regex     ${name}-(\[0-9.-\]+)\\.tar