[91179] trunk/dports/sysutils/yum/Portfile

[afb at macports.org]

Revision: 91179
          https://trac.macports.org/changeset/91179
Author:   afb at macports.org
Date:     2012-03-25 01:01:20 -0700 (Sun, 25 Mar 2012)
Log Message:
-----------
yum: apply changes from ryandesign

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

Modified: trunk/dports/sysutils/yum/Portfile
===================================================================
--- trunk/dports/sysutils/yum/Portfile	2012-03-25 07:57:31 UTC (rev 91178)
+++ trunk/dports/sysutils/yum/Portfile	2012-03-25 08:01:20 UTC (rev 91179)
@@ -8,6 +8,8 @@
 platforms	darwin
 categories	sysutils archivers
 maintainers	mac.com:n3npq afb
+supported_archs	noarch
+
 description	Automatic updater and package installer/remover for RPM
 long_description	Yum is an automatic updater and package installer/remover for \
 			rpm systems. It automatically computes dependencies and figures \
@@ -23,10 +25,10 @@
 
 patchfiles	patch-prefix.diff patch-sqlutils.py patch-packages.py
 
-depends_lib	lib:librpm:rpm port:python24 port:py-celementtree port:py-urlgrabber port:py-libxml2 port:py-yum-metadata-parser port:py-iniparse port:py-pygpgme
-depends_build	port:intltool port:py24-nose
+depends_lib	port:rpm
+depends_build	port:intltool
 
-set python.bin	${prefix}/bin/python2.4
+set python.bin  ""
 
 patch {
 		foreach patch $patchfiles {
@@ -42,36 +44,38 @@
 
 use_configure	no
 
-build.args	PYTHON="${python.bin}"
-destroot.args	PYTHON="${python.bin}" PYSYSDIR="${prefix}"
+destroot.args	PYSYSDIR="${prefix}"
 
-variant python24 description "use python 2.4" {}
-default_variants +python24
+pre-build {
+	build.args-append	PYTHON="${python.bin}"
+}
 
-variant python25 description "use python 2.5" {
-	depends_lib-delete	port:python24 port:py-celementtree port:py-urlgrabber port:py-libxml2 port:py-yum-metadata-parser port:py-iniparse port:py-pygpgme
+pre-destroot {
+	destroot.args-append	PYTHON="${python.bin}"
+}
+
+variant python24 conflicts python25 python27 description "use python 2.4" {
+	depends_lib-append	port:python24 port:py-celementtree port:py-urlgrabber port:py-libxml2 port:py-yum-metadata-parser port:py-iniparse port:py-pygpgme
+	depends_build-append	port:py24-nose
+	set python.bin		${prefix}/bin/python2.4
+}
+
+variant python25 conflicts python24 python26 description "use python 2.5" {
 	depends_lib-append	port:python25 port:py25-celementtree port:py25-urlgrabber port:py25-libxml2 port:py25-yum-metadata-parser port:py25-iniparse port:py25-pygpgme
-	depends_build-delete	port:py24-nose
 	depends_build-append	port:py25-nose
 	set python.bin		${prefix}/bin/python2.5
-	build.args-delete	PYTHON="${prefix}/bin/python2.4"
-	build.args-append	PYTHON="${prefix}/bin/python2.5"
-	destroot.args-delete	PYTHON="${prefix}/bin/python2.4"
-	destroot.args-append	PYTHON="${prefix}/bin/python2.5"
 }
 
-variant python26 description "use python 2.6" {
-	depends_lib-delete	port:python24 port:py-celementtree port:py-urlgrabber port:py-libxml2 port:py-yum-metadata-parser port:py-iniparse port:py-pygpgme
+variant python26 conflicts python24 python25 description "use python 2.6" {
 	depends_lib-append	port:python26 port:py26-celementtree port:py26-urlgrabber port:py26-libxml2 port:py26-yum-metadata-parser port:py26-iniparse port:py26-pygpgme
-	depends_build-delete	port:py24-nose
 	depends_build-append	port:py26-nose
 	set python.bin		${prefix}/bin/python2.6
-	build.args-delete	PYTHON="${prefix}/bin/python2.4"
-	build.args-append	PYTHON="${prefix}/bin/python2.6"
-	destroot.args-delete	PYTHON="${prefix}/bin/python2.4"
-	destroot.args-append	PYTHON="${prefix}/bin/python2.6"
 }
 
+if {![variant_isset python24] && ![variant_isset python25] && ![variant_isset python26]} {
+	default_variants +python24
+}
+
 post-destroot	{
 		xinstall -d -m 755 ${destroot}${prefix}/etc/yum/repos.d
 		xinstall -d -m 755 ${destroot}${prefix}/var/cache/yum/release/headers
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120325/303e3e2d/attachment.html>