[76852] trunk/dports/gis/qgis/Portfile

[vince at macports.org]

Revision: 76852
          http://trac.macports.org/changeset/76852
Author:   vince at macports.org
Date:     2011-03-10 13:19:12 -0800 (Thu, 10 Mar 2011)
Log Message:
-----------
Add several tweaks to make the Portfile more compliant to accepted MacPorts
rules according to suggestions from the [76805] thread on the list.

Modified Paths:
--------------
    trunk/dports/gis/qgis/Portfile

Modified: trunk/dports/gis/qgis/Portfile
===================================================================
--- trunk/dports/gis/qgis/Portfile	2011-03-10 21:14:06 UTC (rev 76851)
+++ trunk/dports/gis/qgis/Portfile	2011-03-10 21:19:12 UTC (rev 76852)
@@ -49,8 +49,8 @@
 pre-extract {
 	# At least one python package must be specified
 	if {[lsearch [split ${portvariants} "+"] "python*"] == -1} {
-		ui_error		"Qgis requires python. Please select a variant."
-		exit 0
+		ui_error		"Qgis requires python."
+		return 			-code error " Please select a python variant."
 	}	
 }
 
@@ -62,7 +62,7 @@
 
 # Python related stuff
 
-variant python25 {	
+variant python25 conflicts universal description use Python 2.5 {	
 	depends_lib-append	port:py25-pyqt4
 	
 	configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.5"
@@ -72,7 +72,7 @@
 				"-DSIP_BINARY_PATH=${Py_own_FRM}/Versions/2.5/bin/sip"
 }
 
-variant python26 {
+variant python26 description use Python 2.6 {
 	depends_lib-append	port:py26-pyqt4
 	
 	configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.6"
@@ -83,7 +83,7 @@
 
 }
 
-variant python27 {
+variant python27 description use Python 2.7 {
 	depends_lib-append	port:py27-pyqt4
 	
 	configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.7"
@@ -94,7 +94,7 @@
 
 }
 
-variant python30 {
+variant python30 description use Python 3.0 {
 	depends_lib-append	port:py30-pyqt4
 	
 	configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python3.0"
@@ -105,7 +105,7 @@
 
 }
 
-variant python31 {
+variant python31 description use Python 3.1 {
 	depends_lib-append	port:py31-pyqt4
 	
 	configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python3.1"
@@ -186,11 +186,6 @@
 						[lsearch $variantlist "python*"]] 0 5]
 	set Pyverpath	[join [split ${Pyversion} ""] .]
 
-	if {[variant_isset universal] && ${Pyversion} < 26} {
-		ui_error		"Universal build requires Python > 2.5"
-		exit 0
-	}
-
 	# Set up a fake framework in ${worksrcpath}/Python.framework
 	set Py_sys_FRM	"${frameworks_dir}/Python.framework/Versions/${Pyverpath}"
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110310/f9cc1713/attachment.html>