[152142] trunk/dports/sysutils/rpm54/Portfile

[devans at macports.org]

Revision: 152142
          https://trac.macports.org/changeset/152142
Author:   devans at macports.org
Date:     2016-08-29 20:21:19 -0700 (Mon, 29 Aug 2016)
Log Message:
-----------
rpm54: add variants +perl5_22 +perl5_24, default +perl5_24 to match dependency ossp-uuid, increment revision (#52111. maintainer timeout).

Modified Paths:
--------------
    trunk/dports/sysutils/rpm54/Portfile

Modified: trunk/dports/sysutils/rpm54/Portfile
===================================================================
--- trunk/dports/sysutils/rpm54/Portfile	2016-08-30 03:16:35 UTC (rev 152141)
+++ trunk/dports/sysutils/rpm54/Portfile	2016-08-30 03:21:19 UTC (rev 152142)
@@ -1,10 +1,11 @@
 # $Id$
 
-PortSystem 1.0
+PortSystem 		1.0
+PortGroup 		perl5 1.0
 
 name			rpm54
 version                 5.4.15
-revision                1
+revision                2
 set date		20140824
 set branch		[join [lrange [split ${version} .] 0 1] .]
 platforms		darwin freebsd linux
@@ -31,8 +32,7 @@
 			port:expat port:neon \
 			port:python27 port:popt port:sqlite3 port:xar-devel \
 			port:xz port:pcre port:ossp-uuid \
-			port:db60 \
-			port:perl5.22
+			port:db60
 
 depends_run		path:lib/libssl.dylib:openssl \
 			bin:gzip:gzip \
@@ -45,6 +45,14 @@
 
 build.type		gnu
 
+# use perl5 port group to create variants to match dependency ossp-uuid
+# set default variant to perl5_24 (#52081)
+
+perl5.conflict_variants yes
+perl5.branches		5.22 5.24
+perl5.default_branch	5.24
+perl5.create_variants 	${perl5.branches}
+
 configure.args		--disable-nls --without-javaglue --without-included-gettext \
 			--with-libintl-prefix=${prefix} --with-libiconv-prefix=${prefix} \
 			--mandir=${prefix}/share/man --infodir=${prefix}/share/info \
@@ -52,8 +60,8 @@
 			--with-neon=external --with-beecrypt=external --with-popt=external \
 			--with-xar=external --with-xz=external --with-pcre=external --with-uuid=external \
 			--without-apidocs --sysconfdir=${prefix}/etc --with-path-cfg=${prefix}/etc/rpm
-configure.env		__PYTHON=${prefix}/bin/python2.7 __PERL=${prefix}/bin/perl5.22 \
-			PERL=${prefix}/bin/perl5.22
+configure.env		__PYTHON=${prefix}/bin/python2.7 __PERL=${perl5.bin} \
+			PERL=${perl5.bin}
 
 
 configure.args-append	--disable-openmp --with-lua=internal --with-syck=internal
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160829/87f29672/attachment.html>