--- Portfile.orig	2013-10-22 10:09:30.000000000 -0700
+++ Portfile	2013-10-22 09:44:33.000000000 -0700
@@ -5,6 +5,7 @@
 
 name                git-core
 version             1.8.4
+revision            2
 description         A fast version control system
 long_description    Git is a fast, scalable, distributed open source version \
                     control system focusing on speed and efficiency.
@@ -25,12 +26,9 @@
                     rmd160  faa19ee86ae56f23bfde6ea446f32b60494ba6d8 \
                     sha256  854552e693b22a7ff1c25d2d710d87c8f7dad14888c946c10be60893fdee091f \
 
-depends_run         port:rsync \
-                    port:p5.12-error \
-                    port:p5.12-term-readkey
+depends_run         port:rsync
 
-depends_lib         port:perl5.12 \
-                    port:curl \
+depends_lib         port:curl \
                     port:zlib \
                     port:openssl \
                     port:expat \
@@ -39,6 +37,27 @@
 patchfiles          patch-Makefile.diff git-subtree.1.diff
 patch.pre_args      -p1
 
+if {[variant_isset perl5_14]} {
+    set perlver 5.14
+} elseif {[variant_isset perl5_16]} {
+    set perlver 5.16
+} else {
+    set perlver 5.12
+    default_variants +perl5_12
+}
+
+variant perl5_12 conflicts perl5_14 perl5_16 description {use perl 5.12} {}
+variant perl5_14 conflicts perl5_12 perl5_16 description {use perl 5.14} {}
+variant perl5_16 conflicts perl5_12 perl5_14 description {use perl 5.16} {}
+
+depends_run-append  port:p${perlver}-error \
+                    port:p${perlver}-term-readkey
+
+depends_lib-append  port:perl${perlver}
+
+configure.perl      ${prefix}/bin/perl${perlver}
+
+
 extract.only        git-${version}${extract.suffix} \
                     git-manpages-${version}${extract.suffix}
 
@@ -56,7 +75,7 @@
                     CURLDIR=${prefix} \
                     OPENSSLDIR=${prefix} \
                     ICONVDIR=${prefix} \
-                    PERL_PATH="${prefix}/bin/perl5.12" \
+                    PERL_PATH="${prefix}/bin/perl${perlver}" \
                     NO_FINK=1 \
                     NO_DARWIN_PORTS=1 \
                     NO_R_TO_GCC_LINKER=1 \
@@ -181,8 +200,8 @@
 
 variant svn description {Bi-directional subversion repository support} {
     depends_run-append  port:subversion \
-                        port:p5.12-libwww-perl \
-                        port:p5.12-svn-simple
+                        port:p${perlver}-libwww-perl \
+                        port:p${perlver}-svn-simple
     patchfiles-append   patch-perl-Git-SVN-Fetcher.pm.diff \
                         patch-perl-Git.pm.diff