[91153] trunk/dports/sysutils/yum
afb at macports.org
afb at macports.org
Sat Mar 24 01:32:39 PDT 2012
Revision: 91153
https://trac.macports.org/changeset/91153
Author: afb at macports.org
Date: 2012-03-24 01:32:36 -0700 (Sat, 24 Mar 2012)
Log Message:
-----------
yum: upgrade version, add newer python variants
Modified Paths:
--------------
trunk/dports/sysutils/yum/Portfile
trunk/dports/sysutils/yum/files/patch-prefix.diff
Modified: trunk/dports/sysutils/yum/Portfile
===================================================================
--- trunk/dports/sysutils/yum/Portfile 2012-03-24 05:51:24 UTC (rev 91152)
+++ trunk/dports/sysutils/yum/Portfile 2012-03-24 08:32:36 UTC (rev 91153)
@@ -3,7 +3,7 @@
PortSystem 1.0
name yum
-version 3.2.28
+version 3.2.29
platforms darwin
categories sysutils archivers
maintainers mac.com:n3npq afb
@@ -16,19 +16,21 @@
homepage http://yum.baseurl.org/
master_sites ${homepage}download/3.2/
-checksums md5 91eff58aa4c25cd4f46b21201bbf9bea \
- sha1 2f13dbb8a78a510f9f5a5e9657592f74bafb789a \
- rmd160 954ce320cf0168f361bd5c163154a2a6281c3572
+checksums md5 8b6b106190980c606b77ebf6a81b5f70 \
+ sha1 30207763c6a6fbf2f5dc32512bd3eb208f7d39d1 \
+ rmd160 ab885fc93875925ae57ceabc8731357221d1fae3
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_build port:intltool port:py-nose
+set python.bin ${prefix}/bin/python2.4
+
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@@#${python.bin}#g' '${portpath}/${filesdir}/${patch}' | patch -p0"
}
}
@@ -39,9 +41,33 @@
use_configure no
-build.args PYTHON="${prefix}/bin/python2.4"
-destroot.args PYTHON="${prefix}/bin/python2.4" PYSYSDIR="${prefix}"
+build.args PYTHON="${python.bin}"
+destroot.args PYTHON="${python.bin}" PYSYSDIR="${prefix}"
+variant python25 description "use python 2.5 instead of python 2.4" {
+ 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
+ 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:py-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 instead of python 2.4" {
+ 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
+ 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:py-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"
+}
+
post-destroot {
xinstall -d -m 755 ${destroot}${prefix}/etc/yum/repos.d
xinstall -d -m 755 ${destroot}${prefix}/var/cache/yum/release/headers
@@ -54,6 +80,15 @@
${destroot}${prefix}/var/cache/yum/release/packages \
${destroot}${prefix}/var/log \
${destroot}${prefix}/var/run
+ # don't install the update notifier dbus daemon
+ delete ${destroot}${prefix}/etc/dbus-1/system.d/yum-updatesd.conf \
+ ${destroot}${prefix}/etc/rc.d/init.d/yum-updatesd \
+ ${destroot}${prefix}/etc/yum/yum-updatesd.conf \
+ ${destroot}${prefix}/sbin/yum-updatesd \
+ ${destroot}${prefix}/share/man/man5/yum-updatesd.conf.5 \
+ ${destroot}${prefix}/share/man/man8/yum-updatesd.8
+ delete ${destroot}${prefix}/etc/cron.daily \
+ ${destroot}${prefix}/etc/sysconfig
}
test.run yes
Modified: trunk/dports/sysutils/yum/files/patch-prefix.diff
===================================================================
--- trunk/dports/sysutils/yum/files/patch-prefix.diff 2012-03-24 05:51:24 UTC (rev 91152)
+++ trunk/dports/sysutils/yum/files/patch-prefix.diff 2012-03-24 08:32:36 UTC (rev 91153)
@@ -101,7 +101,7 @@
all:
echo "Nothing to do"
-@@ -7,25 +7,25 @@
+@@ -7,32 +7,32 @@
rm -f *.pyc *.pyo *~
install:
@@ -134,12 +134,27 @@
+ install -m 755 yum-updatesd-dbus.conf $(DESTDIR)@@PREFIX@@/etc/dbus-1/system.d/yum-updatesd.conf
- install -m 755 yum-updatesd.conf $(DESTDIR)/etc/yum/yum-updatesd.conf
-+ install -m 755 yum-updatesd.conf $(DESTDIR)@@PREFIX@@/etc/yum/yum-updatesd.conf
-
+-
- mkdir -p $(DESTDIR)/etc/bash_completion.d
- install -m 644 yum.bash $(DESTDIR)/etc/bash_completion.d
+- mkdir -p $(DESTDIR)/etc/cron.daily
+- mkdir -p $(DESTDIR)/etc/sysconfig/
+- install -D -m 755 0yum.cron $(DESTDIR)/etc/cron.daily/0yum.cron
+- install -D -m 755 yum-cron $(DESTDIR)/etc/rc.d/init.d/yum-cron
++ install -m 755 yum-updatesd.conf $(DESTDIR)@@PREFIX@@/etc/yum/yum-updatesd.conf
++
+ mkdir -p $(DESTDIR)@@PREFIX@@/etc/bash_completion.d
+ install -m 644 yum.bash $(DESTDIR)@@PREFIX@@/etc/bash_completion.d
++ mkdir -p $(DESTDIR)@@PREFIX@@/etc/cron.daily
++ mkdir -p $(DESTDIR)@@PREFIX@@/etc/sysconfig/
++ install -m 755 0yum.cron $(DESTDIR)@@PREFIX@@/etc/cron.daily/0yum.cron
++ install -m 755 yum-cron $(DESTDIR)@@PREFIX@@/etc/rc.d/init.d/yum-cron
+- install -D -m 644 yum-daily.yum $(YUMETC)/yum-daily.yum
+- install -D -m 644 yum-weekly.yum $(YUMETC)/yum-weekly.yum
+- install -D -m 644 yum-cron.sysconf $(DESTDIR)/etc/sysconfig/yum-cron
++ install -m 644 yum-daily.yum $(YUMETC)/yum-daily.yum
++ install -m 644 yum-weekly.yum $(YUMETC)/yum-weekly.yum
++ install -m 644 yum-cron.sysconf $(DESTDIR)@@PREFIX@@/etc/sysconfig/yum-cron
--- ./etc/yum.console.orig 2004-08-31 05:35:46.000000000 +0200
+++ ./etc/yum.console 2007-06-20 16:43:35.000000000 +0200
@@ -1,4 +1,4 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120324/4bef03c1/attachment.html>
More information about the macports-changes
mailing list