[91795] trunk/dports/sysutils/rpm/Portfile

[afb at macports.org]

Revision: 91795
          https://trac.macports.org/changeset/91795
Author:   afb at macports.org
Date:     2012-04-10 11:41:37 -0700 (Tue, 10 Apr 2012)
Log Message:
-----------
rpm: default to python2.5, remove +python25 variant

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

Modified: trunk/dports/sysutils/rpm/Portfile
===================================================================
--- trunk/dports/sysutils/rpm/Portfile	2012-04-10 18:26:33 UTC (rev 91794)
+++ trunk/dports/sysutils/rpm/Portfile	2012-04-10 18:41:37 UTC (rev 91795)
@@ -4,7 +4,7 @@
 
 name			rpm
 version			4.4.9
-revision                13
+revision                14
 platforms		darwin freebsd linux
 license			GPL-2 LGPL-2
 categories		sysutils archivers
@@ -20,7 +20,7 @@
 master_sites		${homepage}/files/${name}/${name}-4.4
 checksums		md5 210b768006e7d88dd8a3bcd498ea27f6
 
-depends_build		port:python24 port:perl5.8
+depends_build		port:python25 port:perl5.8
 
 depends_lib		port:readline port:gettext \
 			port:popt port:sqlite3 port:beecrypt \
@@ -37,10 +37,10 @@
 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 \
-			--with-python=2.4 --with-perl=5.8 --without-apidocs \
+			--with-python=2.5 --with-perl=5.8 --without-apidocs \
 			--sysconfdir=${prefix}/etc
 
-configure.env		__PYTHON=${prefix}/bin/python2.4 __PERL=${prefix}/bin/perl5.8
+configure.env		__PYTHON=${prefix}/bin/python2.5 __PERL=${prefix}/bin/perl5.8
 
 			# needed because it checks for sqlite3_open in sqlite lib...
 configure.env-append	ac_cv_lib_sqlite_sqlite3_open=yes
@@ -93,7 +93,7 @@
 			      --with-glob --enable-broken-chown \
 			      --disable-rpath
 
-	configure.cppflags-append -I${prefix}/Library/Frameworks/Python.framework/Versions/2.4/include/python2.4
+	configure.cppflags-append -I${prefix}/Library/Frameworks/Python.framework/Versions/2.5/include/python2.5
 
 	post-destroot {
 		# Mac OS X specific changes
@@ -127,15 +127,6 @@
 	configure.args-append --with-apidocs
 }
 
-variant python25 description { use python 2.5 instead of python 2.4 } {
-	depends_build-delete	port:python24
-	depends_build-append	port:python25
-	configure.args-delete	--with-python=2.4
-	configure.args-append	--with-python=2.5
-	configure.env-delete	__PYTHON=${prefix}/bin/python2.4
-	configure.env-append	__PYTHON=${prefix}/bin/python2.5
-}
-
 livecheck.type	regex
 # get the last modified tarball
 livecheck.url	${master_sites}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120410/b71e6e3f/attachment-0001.html>