[131816] trunk/dports/textproc/intltool/Portfile

[mojca at macports.org]

Revision: 131816
          https://trac.macports.org/changeset/131816
Author:   mojca at macports.org
Date:     2015-01-19 02:20:59 -0800 (Mon, 19 Jan 2015)
Log Message:
-----------
intltool: use PortGroup to create Perl variants (#46570)

Modified Paths:
--------------
    trunk/dports/textproc/intltool/Portfile

Modified: trunk/dports/textproc/intltool/Portfile
===================================================================
--- trunk/dports/textproc/intltool/Portfile	2015-01-19 10:13:52 UTC (rev 131815)
+++ trunk/dports/textproc/intltool/Portfile	2015-01-19 10:20:59 UTC (rev 131816)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           perl5 1.0
 
 name                intltool
 version             0.50.2
@@ -29,33 +30,23 @@
 checksums           rmd160  52b1c6aae5f5f0069d09cef8d709ab267c460319 \
                     sha256  67f25c5c6fb71d095793a7f895b245e65e829e8bde68c6c8b4c912144ff34406
 
+perl5.require_variant   yes
+perl5.conflict_variants yes
+perl5.branches          5.16 5.18 5.20
+perl5.create_variants   ${perl5.branches}
+
 depends_build       port:gnome-common
-depends_lib         port:expat
 
+depends_lib-append  port:expat \
+                    port:p${perl5.major}-getopt-long \
+                    port:p${perl5.major}-pathtools \
+                    port:p${perl5.major}-scalar-list-utils \
+                    port:p${perl5.major}-xml-parser
+
 patchfiles          patch-remove-intltool-perl-hack.diff
 
-# TODO: This perlver cruft should be done in the perl5 PortGroup
-if {[variant_isset perl5_18]} {
-    set perlver 5.18
-} elseif {[variant_isset perl5_20]} {
-    set perlver 5.20
-} else {
-    set perlver 5.16
-    default_variants +perl5_16
-}
+configure.perl      ${prefix}/bin/perl${perl5.major}
 
-variant perl5_16 conflicts perl5_18 perl5_20 description {use perl 5.16} {}
-variant perl5_18 conflicts perl5_16 perl5_20 description {use perl 5.18} {}
-variant perl5_20 conflicts perl5_16 perl5_18 description {use perl 5.20} {}
-
-depends_lib-append  port:perl${perlver} \
-                    port:p${perlver}-xml-parser \
-                    port:p${perlver}-getopt-long \
-                    port:p${perlver}-pathtools \
-                    port:p${perlver}-scalar-list-utils
-
-configure.perl      ${prefix}/bin/perl${perlver}
-
 test.run            yes
 test.target         check
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150119/e4641925/attachment-0001.html>