[36076] trunk/dports/sysutils/yum
afb at macports.org
afb at macports.org
Wed Apr 16 11:38:33 PDT 2008
Revision: 36076
http://trac.macosforge.org/projects/macports/changeset/36076
Author: afb at macports.org
Date: 2008-04-16 11:38:32 -0700 (Wed, 16 Apr 2008)
Log Message:
-----------
port upgrade: yum 3.2.14
Modified Paths:
--------------
trunk/dports/sysutils/yum/Portfile
trunk/dports/sysutils/yum/files/patch-prefix.diff
Removed Paths:
-------------
trunk/dports/sysutils/yum/files/patch-translate.py
Modified: trunk/dports/sysutils/yum/Portfile
===================================================================
--- trunk/dports/sysutils/yum/Portfile 2008-04-16 18:24:49 UTC (rev 36075)
+++ trunk/dports/sysutils/yum/Portfile 2008-04-16 18:38:32 UTC (rev 36076)
@@ -3,7 +3,7 @@
PortSystem 1.0
name yum
-version 3.2.8
+version 3.2.14
platforms darwin
categories sysutils archivers
maintainers n3npq at mac.com afb at macports.org
@@ -16,13 +16,13 @@
homepage http://linux.duke.edu/projects/yum/
master_sites ${homepage}download/3.2/
-checksums md5 25362cf7c9baeb557975be8ca2534555 \
- sha1 e98fbb4f9823e619ce1d7132e311cb6f9b148e07 \
- rmd160 a209ad2680abc0962d112063b6152359797bcafa
+checksums md5 3ef5002fffe7919889c4187791e86a7d \
+ sha1 c2bfad6f323d1853d9656dcee230961a560a4c48 \
+ rmd160 254a9a375aa1df8de6155e7bf650fb2e1b77698a
-patchfiles patch-prefix.diff patch-translate.py patch-sqlutils.py
+patchfiles patch-prefix.diff patch-sqlutils.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
+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
patch {
foreach patch $patchfiles {
Modified: trunk/dports/sysutils/yum/files/patch-prefix.diff
===================================================================
--- trunk/dports/sysutils/yum/files/patch-prefix.diff 2008-04-16 18:24:49 UTC (rev 36075)
+++ trunk/dports/sysutils/yum/files/patch-prefix.diff 2008-04-16 18:38:32 UTC (rev 36076)
@@ -64,15 +64,15 @@
root=opts.installroot
else:
root = '/'
-@@ -1231,7 +1231,7 @@
- help="be tolerant of errors")
+@@ -1103,7 +1103,7 @@
+ help=_("be tolerant of errors"))
self.add_option("-C", dest="cacheonly", action="store_true",
- help="run entirely from cache, don't update cache")
+ help=_("run entirely from cache, don't update cache"))
- self.add_option("-c", dest="conffile", default='/etc/yum/yum.conf',
+ self.add_option("-c", dest="conffile", default='@@PREFIX@@/etc/yum/yum.conf',
- help="config file location", metavar=' [config file]')
+ help=_("config file location"), metavar=' [config file]')
self.add_option("-R", dest="sleeptime", type='int', default=None,
- help="maximum command wait time", metavar=' [minutes]')
+ help=_("maximum command wait time"), metavar=' [minutes]')
--- ./docs/Makefile.orig 2006-11-14 07:15:47.000000000 +0100
+++ ./docs/Makefile 2007-06-20 16:26:25.000000000 +0200
@@ -6,9 +6,9 @@
@@ -140,23 +140,14 @@
missingok
notifempty
size 30k
---- ./i18n.py.orig 2004-01-28 08:31:02.000000000 +0100
-+++ ./i18n.py 2007-06-20 16:27:22.000000000 +0200
+--- ./yum/i18n.py.orig 2008-04-16 09:05:25.000000000 +0200
++++ ./yum/i18n.py 2007-06-20 16:27:22.000000000 +0200
@@ -1,4 +1,4 @@
--#!/usr/bin/env python
+-#!/usr/bin/python -tt
+#!/@@PYTHON@@
- """i18n abstraction
-
- License: GPL
-@@ -17,7 +17,7 @@
- t = gettext.translation('yum')
- _ = t.gettext
- else:
-- gettext.bindtextdomain('yum', '/usr/share/locale')
-+ gettext.bindtextdomain('yum', '@@PREFIX@@/share/locale')
- gettext.textdomain('yum')
- _ = gettext.gettext
-
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
--- Makefile.orig 2007-08-22 06:10:48.000000000 +0200
+++ Makefile 2007-08-28 16:58:56.000000000 +0200
@@ -17,19 +17,19 @@
@@ -188,6 +179,17 @@
for d in $(SUBDIRS); do make PYTHON=$(PYTHON) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
+--- po/Makefile.orig 2008-01-28 20:04:54.000000000 +0100
++++ po/Makefile 2008-04-16 09:13:47.000000000 +0200
+@@ -1,7 +1,7 @@
+ INSTALL= /usr/bin/install -c
+ INSTALL_PROGRAM= ${INSTALL}
+ INSTALL_DATA= ${INSTALL} -m 644
+-INSTALLNLSDIR=$(DESTDIR)/usr/share/locale
++INSTALLNLSDIR=$(DESTDIR)@@PREFIX@@/share/locale
+ top_srcdir = "."
+
+
--- yum-updatesd.py.orig 2007-05-15 14:18:07.000000000 +0200
+++ yum-updatesd.py 2007-06-29 12:34:07.000000000 +0200
@@ -1,4 +1,4 @@
@@ -243,14 +245,6 @@
# Originally written by Barry Warsaw <bwarsaw at python.org>
#
# minimally patched to make it even more xgettext compatible
---- ./progress_meter.py.orig 2006-12-05 09:33:35.000000000 +0100
-+++ ./progress_meter.py 2007-06-19 18:17:13.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -t
-+#!@@PYTHON@@ -t
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; either version 2 of the License, or
--- ./rpmUtils/__init__.py.orig 2006-08-19 21:05:15.000000000 +0200
+++ ./rpmUtils/__init__.py 2007-06-19 18:17:13.000000000 +0200
@@ -1,4 +1,4 @@
@@ -320,17 +314,6 @@
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
---- ./translate.py.orig 2003-10-09 00:48:48.000000000 +0200
-+++ ./translate.py 2007-06-20 16:24:00.000000000 +0200
-@@ -5,7 +5,7 @@
-
- import os, string
-
--prefix = '/usr'
-+prefix = '@@PREFIX@@'
- localedir = prefix + '/share/locale'
- _cat = None
- _cats = {}
--- ./yum/__init__.py.orig 2007-05-16 22:57:12.000000000 +0200
+++ ./yum/__init__.py 2007-06-19 18:17:13.000000000 +0200
@@ -1,4 +1,4 @@
@@ -419,15 +402,19 @@
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
-@@ -130,7 +130,7 @@
- # filelists.xml for all repos to make the searchProvides more complete.
- if name[0] == '/':
- matched = 0
-- globs = ['.*bin\/.*', '^\/etc\/.*', '^\/usr\/lib\/sendmail$']
-+ globs = ['.*bin\/.*', '^\@@PREFIX@@\/etc\/.*', '^\@@PREFIX@@\/lib\/sendmail$']
- for glob in globs:
- globc = re.compile(glob)
- if globc.match(name):
+--- ./yum/misc.py.orig 2008-03-26 22:23:42.000000000 +0100
++++ ./yum/misc.py 2008-04-16 09:00:09.000000000 +0200
+@@ -40,8 +40,8 @@
+ global _re_compiled_pri_fnames_match
+ if _re_compiled_pri_fnames_match is None:
+ one = re.compile('.*bin\/.*')
+- two = re.compile('^\/etc\/.*')
+- three = re.compile('^\/usr\/lib\/sendmail$')
++ two = re.compile('^\@@PREFIX@@\/etc\/.*')
++ three = re.compile('^\@@PREFIX@@\/lib\/sendmail$')
+ _re_compiled_pri_fnames_match = (one, two, three)
+ for rec in _re_compiled_pri_fnames_match:
+ if rec.match(filename):
--- ./yum/Errors.py.orig 2007-02-03 22:51:00.000000000 +0100
+++ ./yum/Errors.py 2007-06-19 18:17:13.000000000 +0200
@@ -1,4 +1,4 @@
Deleted: trunk/dports/sysutils/yum/files/patch-translate.py
===================================================================
--- trunk/dports/sysutils/yum/files/patch-translate.py 2008-04-16 18:24:49 UTC (rev 36075)
+++ trunk/dports/sysutils/yum/files/patch-translate.py 2008-04-16 18:38:32 UTC (rev 36076)
@@ -1,14 +0,0 @@
---- translate.py.orig 2003-10-09 00:48:48.000000000 +0200
-+++ translate.py 2007-06-20 16:24:00.000000000 +0200
-@@ -246,6 +246,11 @@
- if (len (arch) == 4 and arch[0] == 'i' and arch[2:4] == "86"):
- arch = "i386"
-
-+ if arch == "Power Macintosh":
-+ arch = "ppc"
-+ if arch == "powerpc":
-+ arch = "ppc"
-+
- if arch == "sparc64":
- arch = "sparc"
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080416/04c72f14/attachment.html
More information about the macports-changes
mailing list