Ticket #46570: git-perl-variants.diff

Portfile

@@ -2 +2 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           perl5 1.0
 
 name                git
 version             2.2.2
@@ -25 +26 @@
                     rmd160  fa2b2923a052c39bea1be91e47ed05d984199740 \
                     sha256  c9340fad1f521f3782abca4839d66bfee237f3e931856413561cf1b55fc9d550 \
 
+perl5.require_variant   yes
+perl5.conflict_variants yes
+perl5.branches          5.16 5.18 5.20
+perl5.create_variants   ${perl5.branches}
+
 depends_run         port:rsync
 
 depends_lib         port:curl \
-                    port:zlib \
+                    port:expat \
+                    port:libiconv \
                     port:openssl \
-                    port:expat \
-                    port:libiconv
+                    port:perl${perl5.major} \
+                    port:zlib
 
-if {[variant_isset perl5_12]} {
-    set perl_version 5.12
-} elseif {[variant_isset perl5_14]} {
-    set perl_version 5.14
-} else {
-    set perl_version 5.16
-    default_variants +perl5_16
-}
+depends_run-append  port:p${perl5.major}-authen-sasl \
+                    port:p${perl5.major}-error \
+                    port:p${perl5.major}-net-smtp-ssl \
+                    port:p${perl5.major}-term-readkey
 
-
-depends_run-append  port:p${perl_version}-authen-sasl \
-                    port:p${perl_version}-error \
-                    port:p${perl_version}-net-smtp-ssl \
-                    port:p${perl_version}-term-readkey
-
-depends_lib-append  port:perl${perl_version}
-
 patchfiles          patch-Makefile.diff git-subtree.1.diff
 patch.pre_args      -p1
 
@@ -70 +65 @@
                     CURLDIR=${prefix} \
                     OPENSSLDIR=${prefix} \
                     ICONVDIR=${prefix} \
-                    PERL_PATH="${prefix}/bin/perl${perl_version}" \
+                    PERL_PATH="${prefix}/bin/perl${perl5.major}" \
                     NO_FINK=1 \
                     NO_DARWIN_PORTS=1 \
                     NO_R_TO_GCC_LINKER=1 \
@@ -147 +142 @@
     depends_lib-append      port:python27
 }
 
-variant perl5_16 conflicts perl5_14 perl5_12 description {use perl 5.16} {}
-variant perl5_14 conflicts perl5_16 perl5_12 description {use perl 5.14} {}
-variant perl5_12 conflicts perl5_16 perl5_14 description {use perl 5.12} {}
-
 variant pcre {
     build.args-append       LIBPCREDIR=${prefix} USE_LIBPCRE=1
     depends_lib-append      port:pcre
@@ -206 +197 @@
 
 variant svn description {Bi-directional subversion repository support} {
     depends_run-append  port:subversion \
-                        port:p${perl_version}-libwww-perl \
-                        port:p${perl_version}-svn-simple
+                        port:p${perl5.major}-libwww-perl \
+                        port:p${perl5.major}-svn-simple
 }
 
 variant bash_completion {