--- /opt/local/var/macports/sources/svn.macports.org/trunk/dports/devel/libical/Portfile	2015-01-12 12:43:08.473052723 +0100
+++ /opt/local/site-ports/devel/libical/Portfile	2015-10-09 09:37:31.221160361 +0200
@@ -1,10 +1,11 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id: Portfile 124942 2014-09-01 00:07:36Z khindenburg@macports.org $
+# $Id: Portfile 119360 2014-04-23 16:52:49Z devans@macports.org $
 
 PortSystem          1.0
+PortGroup           cmake 1.0
+cmake.out_of_source yes
 
 name                libical
-version             1.0
 categories          devel
 license             {LGPL-2.1 MPL-1}
 maintainers         nomaintainer
@@ -14,11 +15,42 @@
 homepage            http://sourceforge.net/projects/freeassociation/
 master_sites        sourceforge:freeassociation
 
-checksums           rmd160  1c78b07c37c80e8fe068fb3164bbf8614f02e67f \
+subport libical-devel {
+    description-append \
+                    . Follows the development version.
+    long_description \
+                    ${description}
+}
+
+if {${subport} eq "${name}"} {
+    version         1.0
+    revision        1
+    checksums       rmd160  1c78b07c37c80e8fe068fb3164bbf8614f02e67f \
                     sha256  7c39b3448e4927a2de2775d853f52b3aaeb42400970a3db0b01a78987e6ec0b7
+    patchfiles-append \
+                    fix_timezone_crash.patch \
+                    make_recursive_mutex.patch
+} else {
+    # v1.0.1-351-g25bc500
+    maintainers     gmail.com:rjvbertin openmaintainer
+    if {[file exists ${filespath}/libical-git/.git]} {
+        fetch.type  git
+        git.url     ${filespath}/libical-git
+        git.branch  25bc500e15bafcef7324ec9b6472982b56dcdc6d
+    } else {
+        PortGroup   github 1.0
+        git.url     http://github.com/libical/libical
+        github.setup \
+                    libical libical 25bc500e15bafcef7324ec9b6472982b56dcdc6d
+    }
+    version         1.0.1.351
+    distname        ${name}-git
+}
+
+# use_autoreconf      yes
+# autoreconf.args     -fvi
 
-use_autoreconf      yes
-autoreconf.args     -fvi
+patch.pre_args      -p1
 
 livecheck.url       http://sourceforge.net/projects/freeassociation/files/
 livecheck.regex     "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
