[124022] trunk/dports/sysutils
afb at macports.org
afb at macports.org
Sun Aug 17 06:40:09 PDT 2014
Revision: 124022
https://trac.macports.org/changeset/124022
Author: afb at macports.org
Date: 2014-08-17 06:40:09 -0700 (Sun, 17 Aug 2014)
Log Message:
-----------
upgrade to python27 and perl5.16
Modified Paths:
--------------
trunk/dports/sysutils/createrepo/Portfile
trunk/dports/sysutils/rpm/Portfile
trunk/dports/sysutils/rpm45/Portfile
trunk/dports/sysutils/rpm52/Portfile
trunk/dports/sysutils/rpm53/Portfile
trunk/dports/sysutils/smart/Portfile
trunk/dports/sysutils/yum/Portfile
trunk/dports/sysutils/yum-createrepo/Portfile
trunk/dports/sysutils/yum-utils/Portfile
Modified: trunk/dports/sysutils/createrepo/Portfile
===================================================================
--- trunk/dports/sysutils/createrepo/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/createrepo/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
@@ -5,7 +5,7 @@
name createrepo
conflicts yum-createrepo
version 0.4.11
-revision 2
+revision 3
categories sysutils
platforms darwin
maintainers afb
@@ -23,21 +23,21 @@
patch-dumpMetadata.py patch-genpkgmetadata.py \
patch-readMetadata.py patch-modifyrepo.py
-depends_run port:python25 port:rpm port:py25-libxml2 port:py25-yum-metadata-parser
+depends_run port:python27 port:rpm port:py27-libxml2 port:py27-yum-metadata-parser
# this should be depends_test:
-depends_build port:py25-checker
+depends_build port:py27-checker
post-patch {
reinplace "s|__PREFIX__|${prefix}|g" \
${worksrcpath}/bin/createrepo ${worksrcpath}/bin/modifyrepo
- reinplace "s|__PYTHON__|${prefix}/bin/python2.5|g" \
+ reinplace "s|__PYTHON__|${prefix}/bin/python2.7|g" \
${worksrcpath}/dumpMetadata.py ${worksrcpath}/genpkgmetadata.py \
${worksrcpath}/readMetadata.py ${worksrcpath}/modifyrepo.py
}
use_configure no
-build.args prefix=${prefix} PYTHON="${prefix}/bin/python2.5"
+build.args prefix=${prefix} PYTHON="${prefix}/bin/python2.7"
destroot.args prefix=${prefix} INSTALL="/usr/bin/install -p" INSTALL_MODULES="/usr/bin/install -m 755"
Modified: trunk/dports/sysutils/rpm/Portfile
===================================================================
--- trunk/dports/sysutils/rpm/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/rpm/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
@@ -4,7 +4,7 @@
name rpm
version 4.4.9
-revision 16
+revision 17
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:python25 port:perl5.8
+depends_build port:python27 port:perl5.16
depends_lib port:gettext \
port:popt port:sqlite3 port:beecrypt \
@@ -37,12 +37,12 @@
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.5 --with-perl=5.8 --without-apidocs \
+ --with-python=2.7 --with-perl=5.16 --without-apidocs \
--sysconfdir=${prefix}/etc
configure.libs-append -liconv
-configure.env __PYTHON=${prefix}/bin/python2.5 __PERL=${prefix}/bin/perl5.8
+configure.env __PYTHON=${prefix}/bin/python2.7 __PERL=${prefix}/bin/perl5.16
# needed because it checks for sqlite3_open in sqlite lib...
configure.env-append ac_cv_lib_sqlite_sqlite3_open=yes
@@ -96,7 +96,7 @@
--with-glob --enable-broken-chown \
--disable-rpath
- configure.cppflags-append -I${frameworks_dir}/Python.framework/Versions/2.5/include/python2.5
+ configure.cppflags-append -I${frameworks_dir}/Python.framework/Versions/2.7/include/python2.7
post-destroot {
# Mac OS X specific changes
Modified: trunk/dports/sysutils/rpm45/Portfile
===================================================================
--- trunk/dports/sysutils/rpm45/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/rpm45/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
@@ -4,7 +4,7 @@
name rpm45
version 4.5
-revision 1
+revision 2
platforms darwin freebsd linux
categories sysutils archivers
license {LGPL-2.1 GPL-2}
@@ -30,7 +30,7 @@
#worksrcdir rpm
depends_build port:expat port:neon \
- port:python25 port:perl5.8 \
+ port:python27 port:perl5.16 \
port:readline port:beecrypt \
port:libiconv port:gettext
@@ -53,10 +53,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.5 --with-perl --without-apidocs \
+ --with-python=2.7 --with-perl --without-apidocs \
--sysconfdir=${prefix}/etc/rpm
-configure.env __PYTHON=${prefix}/bin/python2.5 __PERL=${prefix}/bin/perl5.8
+configure.env __PYTHON=${prefix}/bin/python2.7 __PERL=${prefix}/bin/perl5.16
# needed because it checks for sqlite3_open in sqlite lib...
configure.env-append ac_cv_lib_sqlite_sqlite3_open=yes
@@ -111,8 +111,8 @@
--with-glob --enable-broken-chown \
--disable-rpath
- configure.cppflags-append -I${prefix}/include/python2.5
- configure.cppflags-append -I${prefix}/Library/Frameworks/Python.framework/Versions/2.5/include/python2.5
+ configure.cppflags-append -I${prefix}/include/python2.7
+ configure.cppflags-append -I${prefix}/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7
post-destroot {
# Mac OS X specific changes
Modified: trunk/dports/sysutils/rpm52/Portfile
===================================================================
--- trunk/dports/sysutils/rpm52/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/rpm52/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
@@ -4,7 +4,7 @@
name rpm52
version 5.2.1
-revision 6
+revision 7
platforms darwin freebsd linux
license LGPL-2.1
categories sysutils archivers
@@ -25,7 +25,7 @@
worksrcdir rpm-${version}
depends_build port:expat port:neon \
- port:python25 port:perl5.8 \
+ port:python27 port:perl5.16 \
port:readline port:beecrypt \
port:libiconv port:gettext
@@ -45,11 +45,11 @@
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.5 --with-perl --with-sqlite --with-dbapi=sqlite \
+ --with-python=2.7 --with-perl --with-sqlite --with-dbapi=sqlite \
--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.5 __PERL=${prefix}/bin/perl5.8 \
- PERL=${prefix}/bin/perl5.8
+configure.env __PYTHON=${prefix}/bin/python2.7 __PERL=${prefix}/bin/perl5.16 \
+ PERL=${prefix}/bin/perl5.16
configure.args-append --with-js=internal --with-lua=internal --with-db=internal
@@ -106,42 +106,6 @@
configure.args-append --with-apidocs
}
-variant python26 description { use python 2.6 instead of python 2.5 } {
- depends_build-delete port:python25
- depends_build-append port:python26
- configure.args-delete --with-python=2.5
- configure.args-append --with-python=2.6
- configure.env-delete __PYTHON=${prefix}/bin/python2.5
- configure.env-append __PYTHON=${prefix}/bin/python2.6
-}
-
-variant python27 description { use python 2.7 instead of python 2.5 } {
- depends_build-delete port:python25
- depends_build-append port:python27
- configure.args-delete --with-python=2.5
- configure.args-append --with-python=2.7
- configure.env-delete __PYTHON=${prefix}/bin/python2.5
- configure.env-append __PYTHON=${prefix}/bin/python2.7
-}
-
-variant perl5_10 description { use perl 5.10 instead of perl 5.8 } {
- depends_build-delete port:perl5.8
- depends_build-append port:perl5.10
- configure.env-delete PERL=${prefix}/bin/perl5.8
- configure.env-append PERL=${prefix}/bin/perl5.10
- configure.env-delete __PERL=${prefix}/bin/perl5.8
- configure.env-append __PERL=${prefix}/bin/perl5.10
-}
-
-variant perl5_12 description { use perl 5.12 instead of perl 5.8 } {
- depends_build-delete port:perl5.8
- depends_build-append port:perl5.12
- configure.env-delete PERL=${prefix}/bin/perl5.8
- configure.env-append PERL=${prefix}/bin/perl5.12
- configure.env-delete __PERL=${prefix}/bin/perl5.8
- configure.env-append __PERL=${prefix}/bin/perl5.12
-}
-
livecheck.type regex
# get the last modified tarball
livecheck.url ${master_sites}
Modified: trunk/dports/sysutils/rpm53/Portfile
===================================================================
--- trunk/dports/sysutils/rpm53/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/rpm53/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
@@ -4,7 +4,7 @@
name rpm53
version 5.3.11
-revision 1
+revision 2
set date 20110602
set branch [join [lrange [split ${version} .] 0 1] .]
platforms darwin freebsd linux
@@ -28,7 +28,7 @@
worksrcdir rpm-${version}
depends_build port:expat port:neon \
- port:python25 port:perl5.8 \
+ port:python27 port:perl5.16 \
port:readline port:beecrypt \
port:libiconv port:gettext
@@ -53,12 +53,12 @@
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.5 --with-perl --with-sqlite --with-db=external \
+ --with-python=2.7 --with-perl --with-sqlite --with-db=external \
--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.5 __PERL=${prefix}/bin/perl5.8 \
- PERL=${prefix}/bin/perl5.8
+configure.env __PYTHON=${prefix}/bin/python2.7 __PERL=${prefix}/bin/perl5.16 \
+ PERL=${prefix}/bin/perl5.16
configure.args-append --disable-openmp --with-lua=internal --with-syck=internal
@@ -126,42 +126,6 @@
configure.args-append --with-apidocs
}
-variant python26 description { use python 2.6 instead of python 2.5 } {
- depends_build-delete port:python25
- depends_build-append port:python26
- configure.args-delete --with-python=2.5
- configure.args-append --with-python=2.6
- configure.env-delete __PYTHON=${prefix}/bin/python2.5
- configure.env-append __PYTHON=${prefix}/bin/python2.6
-}
-
-variant python27 description { use python 2.7 instead of python 2.5 } {
- depends_build-delete port:python25
- depends_build-append port:python27
- configure.args-delete --with-python=2.5
- configure.args-append --with-python=2.7
- configure.env-delete __PYTHON=${prefix}/bin/python2.5
- configure.env-append __PYTHON=${prefix}/bin/python2.7
-}
-
-variant perl5_10 description { use perl 5.10 instead of perl 5.8 } {
- depends_build-delete port:perl5.8
- depends_build-append port:perl5.10
- configure.env-delete PERL=${prefix}/bin/perl5.8
- configure.env-append PERL=${prefix}/bin/perl5.10
- configure.env-delete __PERL=${prefix}/bin/perl5.8
- configure.env-append __PERL=${prefix}/bin/perl5.10
-}
-
-variant perl5_12 description { use perl 5.12 instead of perl 5.8 } {
- depends_build-delete port:perl5.8
- depends_build-append port:perl5.12
- configure.env-delete PERL=${prefix}/bin/perl5.8
- configure.env-append PERL=${prefix}/bin/perl5.12
- configure.env-delete __PERL=${prefix}/bin/perl5.8
- configure.env-append __PERL=${prefix}/bin/perl5.12
-}
-
livecheck.type regex
# get the last modified tarball
livecheck.url ${master_sites}
Modified: trunk/dports/sysutils/smart/Portfile
===================================================================
--- trunk/dports/sysutils/smart/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/smart/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
@@ -4,6 +4,7 @@
name smart
version 1.4.1
+revision 1
platforms darwin freebsd
license GPL-2+
categories sysutils archivers
@@ -26,10 +27,10 @@
use_bzip2 yes
patchfiles patch-prefix.diff
-depends_lib path:lib/python2.5/site-packages/rpm/__init__.py:rpm port:python25
+depends_lib path:lib/python2.7/site-packages/rpm/__init__.py:rpm port:python27
### by default, it will run --shell interface.
### to run it with --gui, you will need:
-#depends_run port:py25-gtk
+#depends_run port:py27-pygtk
patch {
foreach patch $patchfiles {
@@ -40,9 +41,9 @@
use_configure no
-build.args-append PYTHON="${prefix}/bin/python2.5"
-destroot.args-append PYTHON="${prefix}/bin/python2.5"
-test.args-append PYTHON="${prefix}/bin/python2.5"
+build.args-append PYTHON="${prefix}/bin/python2.7"
+destroot.args-append PYTHON="${prefix}/bin/python2.7"
+test.args-append PYTHON="${prefix}/bin/python2.7"
post-destroot {
destroot.keepdirs ${destroot}${prefix}/etc/smart/channels \
Modified: trunk/dports/sysutils/yum/Portfile
===================================================================
--- trunk/dports/sysutils/yum/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/yum/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
@@ -5,6 +5,7 @@
name yum
version 3.2.29
set branch [join [lrange [split ${version} .] 0 1] .]
+revision 1
platforms darwin
categories sysutils archivers
maintainers mac.com:n3npq afb
@@ -25,8 +26,8 @@
patchfiles patch-prefix.diff patch-sqlutils.py patch-packages.py
-depends_lib lib:librpm:rpm
-depends_build port:intltool
+depends_lib path:lib/python2.7/site-packages/rpm/__init__.py:rpm port:python27 port:py27-urlgrabber port:py27-libxml2 port:py27-yum-metadata-parser port:py27-iniparse port:py27-pygpgme
+depends_build port:intltool port:py27-nose
set python.bin ""
@@ -54,22 +55,6 @@
destroot.args-append PYTHON="${python.bin}"
}
-variant python25 conflicts 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-append port:py25-nose
- set python.bin ${prefix}/bin/python2.5
-}
-
-variant python26 conflicts 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-append port:py26-nose
- set python.bin ${prefix}/bin/python2.6
-}
-
-if {![variant_isset python25] && ![variant_isset python26]} {
- default_variants +python25
-}
-
post-destroot {
xinstall -d -m 755 ${destroot}${prefix}/etc/yum/repos.d
xinstall -d -m 755 ${destroot}${prefix}/var/cache/yum/release/headers
Modified: trunk/dports/sysutils/yum-createrepo/Portfile
===================================================================
--- trunk/dports/sysutils/yum-createrepo/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/yum-createrepo/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
@@ -5,7 +5,7 @@
name yum-createrepo
conflicts createrepo
version 0.9.8
-revision 1
+revision 2
categories sysutils
platforms darwin
maintainers afb
@@ -22,11 +22,11 @@
rmd160 aa6021d6cc3e01f8b7dde108a966210dd7480509
patchfiles patch-prefix.diff patch-sqlite.diff
-depends_run port:python25 port:yum
+depends_run port:python27 port:yum
# this should be depends_test:
-depends_build port:py25-checker
+depends_build port:py27-checker
-set python.bin ${prefix}/bin/python2.5
+set python.bin ${prefix}/bin/python2.7
patch {
foreach patch $patchfiles {
@@ -40,18 +40,6 @@
build.args prefix=${prefix} PYTHON="${python.bin}"
destroot.args prefix=${prefix} PYTHON="${python.bin}" INSTALL="/usr/bin/install -p" INSTALL_MODULES="/usr/bin/install -m 755"
-variant python26 description "use python 2.6 instead of python 2.5" {
- depends_run-delete port:python25
- depends_run-append port:python26
- depends_build-delete port:py25-checker
- depends_build-append port:py26-checker
- set python.bin ${prefix}/bin/python2.6
- build.args-delete PYTHON="${prefix}/bin/python2.5"
- build.args-append PYTHON="${prefix}/bin/python2.6"
- destroot.args-delete PYTHON="${prefix}/bin/python2.5"
- destroot.args-append PYTHON="${prefix}/bin/python2.6"
-}
-
test.run yes
test.target check
Modified: trunk/dports/sysutils/yum-utils/Portfile
===================================================================
--- trunk/dports/sysutils/yum-utils/Portfile 2014-08-17 13:26:09 UTC (rev 124021)
+++ trunk/dports/sysutils/yum-utils/Portfile 2014-08-17 13:40:09 UTC (rev 124022)
@@ -4,6 +4,7 @@
name yum-utils
version 1.1.17
+revision 1
platforms darwin
categories sysutils
maintainers afb
@@ -20,12 +21,12 @@
patchfiles patch-prefix.diff
-depends_lib port:python24 port:yum
+depends_lib port:python27 port:yum
patch {
foreach patch $patchfiles {
system "cd '${workpath}/${distname}' && \
- sed -e 's#@@PREFIX@@#${prefix}#g' -e 's#@@PYTHON@@#${prefix}/bin/python2.4#g' '${portpath}/${filesdir}/${patch}' | patch -p0"
+ sed -e 's#@@PREFIX@@#${prefix}#g' -e 's#@@PYTHON@@#${prefix}/bin/python2.7#g' '${portpath}/${filesdir}/${patch}' | patch -p0"
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140817/11ada49e/attachment-0001.html>
More information about the macports-changes
mailing list