[143200] trunk/dports/science/xraylib

[devans at macports.org]

Revision: 143200
          https://trac.macports.org/changeset/143200
Author:   devans at macports.org
Date:     2015-12-07 08:01:33 -0800 (Mon, 07 Dec 2015)
Log Message:
-----------
xraylib: update perl variants using perl5 portgroup (#46570, maintainer approval).

Modified Paths:
--------------
    trunk/dports/science/xraylib/Portfile
    trunk/dports/science/xraylib/files/yosemite-libtool.patch

Modified: trunk/dports/science/xraylib/Portfile
===================================================================
--- trunk/dports/science/xraylib/Portfile	2015-12-07 14:49:35 UTC (rev 143199)
+++ trunk/dports/science/xraylib/Portfile	2015-12-07 16:01:33 UTC (rev 143200)
@@ -3,6 +3,7 @@
 
 PortSystem          1.0
 PortGroup           github 1.0
+PortGroup           perl5 1.0
 
 name                xraylib
 version             3.1.0
@@ -43,49 +44,16 @@
 use_parallel_build  no
 configure.ccache    no
 
+perl5.conflict_variants yes
+perl5.branches 5.16 5.18 5.20 5.22
+perl5.create_variants ${perl5.branches}
 
-variant perl5_10 description {Perl 5.10 bindings} conflicts perl5_12 perl5_14 perl5_16 perl5_18 perl5_20 { 
-    configure.args-append --enable-perl --enable-perl-integration PERL=${prefix}/bin/perl5.10
+if {[variant_isset perl5_16] || [variant_isset perl5_18] || [variant_isset perl5_20] || [variant_isset perl5_22]} {
+    configure.args-append --enable-perl --enable-perl-integration PERL=${prefix}/bin/perl${perl5.major}
     configure.args-delete --disable-perl
     depends_build-append port:swig-perl
-    depends_lib-append port:perl5.10
 }
 
-variant perl5_12 description {Perl 5.12 bindings} conflicts perl5_10 perl5_14 perl5_16 perl5_18 perl5_20 { 
-    configure.args-append --enable-perl --enable-perl-integration PERL=${prefix}/bin/perl5.12
-    configure.args-delete --disable-perl
-    depends_build-append port:swig-perl
-    depends_lib-append port:perl5.12
-}
-
-variant perl5_14 description {Perl 5.14 bindings} conflicts perl5_10 perl5_12 perl5_16 perl5_18 perl5_20 { 
-    configure.args-append --enable-perl --enable-perl-integration PERL=${prefix}/bin/perl5.14
-    configure.args-delete --disable-perl
-    depends_build-append port:swig-perl
-    depends_lib-append port:perl5.14
-}
-
-variant perl5_16 description {Perl 5.16 bindings} conflicts perl5_10 perl5_12 perl5_14 perl5_18 perl5_20 { 
-    configure.args-append --enable-perl --enable-perl-integration PERL=${prefix}/bin/perl5.16
-    configure.args-delete --disable-perl
-    depends_build-append port:swig-perl
-    depends_lib-append port:perl5.16
-}
-
-variant perl5_18 description {Perl 5.18 bindings} conflicts perl5_10 perl5_12 perl5_14 perl5_16 perl5_20 { 
-    configure.args-append --enable-perl --enable-perl-integration PERL=${prefix}/bin/perl5.18
-    configure.args-delete --disable-perl
-    depends_build-append port:swig-perl
-    depends_lib-append port:perl5.18
-}
-
-variant perl5_20 description {Perl 5.20 bindings} conflicts perl5_10 perl5_12 perl5_14 perl5_16 perl5_18 { 
-    configure.args-append --enable-perl --enable-perl-integration PERL=${prefix}/bin/perl5.20
-    configure.args-delete --disable-perl
-    depends_build-append port:swig-perl
-    depends_lib-append port:perl5.20
-}
-
 variant python26 description {Python 2.6 bindings} conflicts python27 python33 python34 {
     configure.args-append --enable-python --enable-python-integration --enable-python-numpy PYTHON=${prefix}/bin/python2.6
     configure.args-delete --disable-python --disable-python-numpy

Modified: trunk/dports/science/xraylib/files/yosemite-libtool.patch
===================================================================
--- trunk/dports/science/xraylib/files/yosemite-libtool.patch	2015-12-07 14:49:35 UTC (rev 143199)
+++ trunk/dports/science/xraylib/files/yosemite-libtool.patch	2015-12-07 16:01:33 UTC (rev 143200)
@@ -4,7 +4,7 @@
 ===================================================================
 --- configure.orig
 +++ configure
-@@ -10879,7 +10879,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
+@@ -8276,7 +8276,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
        case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
  	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
  	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/618cc188/attachment.html>