Changeset 28336


Ignore:
Timestamp:
Aug 28, 2007, 3:24:06 PM (13 years ago)
Author:
afb@…
Message:

version upgrade (patch hell), added livecheck

Location:
trunk/dports/sysutils/yum
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/sysutils/yum/Portfile

    r27583 r28336  
    44
    55name            yum
    6 version         3.2.2
     6version         3.2.3
    77platforms       darwin
    88categories      sysutils archivers
     
    1717homepage        http://linux.duke.edu/projects/yum/
    1818master_sites    ${homepage}download/3.2/
    19 checksums       md5 c6a9e8cc846fe9d080d61bd1b2146cfc
     19checksums       md5 89cf296107d580655aaf83fb7206edfc
    2020
    2121patchfiles      patch-prefix.diff patch-translate.py
     
    5353                ${destroot}${prefix}/var/run
    5454}
     55
     56livecheck.check regex
     57# get the last modified tarball
     58livecheck.url   ${master_sites}?C=M\;O=D
     59livecheck.regex ${name}-(\[0-9\\.\]+)${extract.suffix}
  • trunk/dports/sysutils/yum/files/patch-prefix.diff

    r26872 r28336  
    1616     import yummain
    1717     yummain.main(sys.argv[1:])
     18--- bin/yum-updatesd.py.orig    2007-07-25 17:05:44.000000000 +0200
     19+++ bin/yum-updatesd.py 2007-08-28 17:16:06.000000000 +0200
     20@@ -1,4 +1,4 @@
     21-#!/usr/bin/python
     22+#!@@PYTHON@@
     23 import sys, os
     24 import optparse
     25 
     26@@ -16,7 +16,7 @@
     27     os.dup2(fd, 2)
     28     os.close(fd)
     29 
     30-sys.path.insert(0, '/usr/share/yum-cli')
     31+sys.path.insert(0, '@@PREFIX@@/share/yum-cli')
     32 try:
     33     import yumupd
     34     yumupd.main(options)
    1835--- ./callback.py.orig  2007-02-03 20:49:32.000000000 +0100
    1936+++ ./callback.py       2007-06-19 18:17:13.000000000 +0200
     
    2542 # the Free Software Foundation; either version 2 of the License, or
    2643    yumupd.main(options)
    27 --- cli.py.orig 2007-06-05 21:53:46.000000000 +0200
    28 +++ cli.py      2007-06-29 12:57:52.000000000 +0200
    29 @@ -1,4 +1,4 @@
    30 -#!/usr/bin/python -t
    31 +#!@@PYTHON@@ -t
    32  # This program is free software; you can redistribute it and/or modify
    33  # it under the terms of the GNU General Public License as published by
    34  # the Free Software Foundation; either version 2 of the License, or
    35 @@ -1171,10 +1171,10 @@
     44--- cli.py.orig 2007-08-15 17:48:03.000000000 +0200
     45+++ cli.py      2007-08-28 17:08:57.000000000 +0200
     46@@ -1,4 +1,4 @@
     47-#!/usr/bin/python -t
     48+#!@@PYTHON@@ -t
     49 # This program is free software; you can redistribute it and/or modify
     50 # it under the terms of the GNU General Public License as published by
     51 # the Free Software Foundation; either version 2 of the License, or
     52@@ -1207,10 +1207,10 @@
    3653         if opts.installroot:
    3754             if os.access(opts.installroot+'/'+opts.conffile, os.R_OK):
     
    4865         else:
    4966             root = '/'
    50 @@ -1195,7 +1195,7 @@
     67@@ -1231,7 +1231,7 @@
    5168                 help="be tolerant of errors")
    5269         self.add_option("-C", dest="cacheonly", action="store_true",
     
    126143--- ./i18n.py.orig      2004-01-28 08:31:02.000000000 +0100
    127144+++ ./i18n.py   2007-06-20 16:27:22.000000000 +0200
     145@@ -1,4 +1,4 @@
     146-#!/usr/bin/env python
     147+#!/@@PYTHON@@
     148 """i18n abstraction
     149 
     150 License: GPL
    128151@@ -17,7 +17,7 @@
    129152         t = gettext.translation('yum')
     
    135158         _ = gettext.gettext
    136159 
    137 --- ./Makefile.orig     2007-02-16 03:01:51.000000000 +0100
    138 +++ ./Makefile  2007-06-20 16:25:49.000000000 +0200
    139 @@ -17,18 +17,18 @@
     160--- Makefile.orig       2007-08-22 06:10:48.000000000 +0200
     161+++ Makefile    2007-08-28 16:58:56.000000000 +0200
     162@@ -17,19 +17,19 @@
    140163        for d in $(SUBDIRS); do make PYTHON=$(PYTHON) -C $$d; [ $$? = 0 ] || exit 1 ; done
    141164 
     
    160183 
    161184-       mkdir -p $(DESTDIR)/var/cache/yum
     185-       mkdir -p $(DESTDIR)/var/lib/yum
    162186+       mkdir -p $(DESTDIR)@@PREFIX@@/var/cache/yum
     187+       mkdir -p $(DESTDIR)@@PREFIX@@/var/lib/yum       
    163188 
    164189        for d in $(SUBDIRS); do make PYTHON=$(PYTHON) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
     
    341366 # it under the terms of the GNU General Public License as published by
    342367 # the Free Software Foundation; either version 2 of the License, or
    343 --- ./yum/config.py.orig        2007-04-26 16:12:30.000000000 +0200
    344 +++ ./yum/config.py     2007-06-20 16:39:03.000000000 +0200
     368--- yum/config.py.orig  2007-08-17 07:46:51.000000000 +0200
     369+++ yum/config.py       2007-08-28 17:01:05.000000000 +0200
    345370@@ -1,4 +1,4 @@
    346371-#!/usr/bin/python -t
     
    351376@@ -461,8 +461,8 @@
    352377     installroot = Option('/')
    353  
     378     config_file_path = Option('/etc/yum/yum.conf')
    354379     plugins = BoolOption(False)
    355380-    pluginpath = ListOption(['/usr/share/yum-plugins', '/usr/lib/yum-plugins'])
     
    360385 class YumConf(StartupConf):
    361386     '''
    362 @@ -473,10 +473,10 @@
     387@@ -473,11 +473,11 @@
    363388     retries = IntOption(10)
    364389     recent = IntOption(7)
    365390 
    366391-    cachedir = Option('/var/cache/yum')
     392-    persistdir = Option('/var/lib/yum')
    367393+    cachedir = Option('@@PREFIX@@/var/cache/yum')
     394+    persistdir = Option('@@PREFIX@@/var/lib/yum')
    368395     keepcache = BoolOption(True)
    369396-    logfile = Option('/var/log/yum.log')
     
    385412 #transaction set states
    386413 TS_UPDATE = 10
    387 --- ./yum/depsolve.py.orig      2007-04-25 20:55:36.000000000 +0200
    388 +++ ./yum/depsolve.py   2007-06-20 16:47:02.000000000 +0200
    389 @@ -1,4 +1,4 @@
    390 -#!/usr/bin/python -t
    391 +#!@@PYTHON@@ -t
    392  # This program is free software; you can redistribute it and/or modify
    393  # it under the terms of the GNU General Public License as published by
    394  # the Free Software Foundation; either version 2 of the License, or
    395 @@ -119,7 +119,7 @@
     414--- yum/depsolve.py.orig    2007-08-21 19:30:05.000000000 +0200
     415+++ yum/depsolve.py 2007-08-28 17:03:37.000000000 +0200
     416@@ -1,4 +1,4 @@
     417-#!/usr/bin/python -t
     418+#!@@PYTHON@@ -t
     419 # This program is free software; you can redistribute it and/or modify
     420 # it under the terms of the GNU General Public License as published by
     421 # the Free Software Foundation; either version 2 of the License, or
     422@@ -130,7 +130,7 @@
    396423         # filelists.xml for all repos to make the searchProvides more complete.
    397424         if name[0] == '/':
     
    457484 # it under the terms of the GNU General Public License as published by
    458485 # the Free Software Foundation; either version 2 of the License, or
     486--- ./yum/rpmsack.py.orig       2007-04-27 15:16:12.000000000 +0200
     487+++ ./yum/rpmsack.py    2007-06-19 18:17:13.000000000 +0200
     488@@ -1,4 +1,4 @@
     489-#!/usr/bin/python -tt
     490+#!@@PYTHON@@ -tt
     491 # This program is free software; you can redistribute it and/or modify
     492 # it under the terms of the GNU General Public License as published by
     493 # the Free Software Foundation; either version 2 of the License, or
     494--- yum/rpmtrans.py.orig        2007-08-15 19:27:19.000000000 +0200
     495+++ yum/rpmtrans.py     2007-08-28 17:12:01.000000000 +0200
     496@@ -1,4 +1,4 @@
     497-#!/usr/bin/python -t
     498+#!@@PYTHON@@ -t
     499 # This program is free software; you can redistribute it and/or modify
     500 # it under the terms of the GNU General Public License as published by
     501 # the Free Software Foundation; either version 2 of the License, or
    459502--- ./yum/repos.py.orig 2007-04-25 20:55:36.000000000 +0200
    460503+++ ./yum/repos.py      2007-06-19 18:17:13.000000000 +0200
     
    465508 # it under the terms of the GNU General Public License as published by
    466509 # the Free Software Foundation; either version 2 of the License, or
    467 --- ./yum/rpmsack.py.orig       2007-04-27 15:16:12.000000000 +0200
    468 +++ ./yum/rpmsack.py    2007-06-19 18:17:13.000000000 +0200
    469 @@ -1,4 +1,4 @@
    470 -#!/usr/bin/python -tt
    471 +#!@@PYTHON@@ -tt
    472  # This program is free software; you can redistribute it and/or modify
    473  # it under the terms of the GNU General Public License as published by
    474  # the Free Software Foundation; either version 2 of the License, or
    475 --- ./yum/sqlitecache.py.orig   2007-04-04 01:03:50.000000000 +0200
    476 +++ ./yum/sqlitecache.py        2007-06-19 18:17:13.000000000 +0200
    477 @@ -1,4 +1,4 @@
    478 -#!/usr/bin/python -tt
    479 +#!@@PYTHON@@ -tt
    480  
    481  # This program is free software; you can redistribute it and/or modify
    482  # it under the terms of the GNU General Public License as published by
    483510--- ./yum/sqlitesack.py.orig    2007-04-25 20:55:36.000000000 +0200
    484511+++ ./yum/sqlitesack.py 2007-06-19 18:17:13.000000000 +0200
     
    497524 # utility functions to handle differences in pysqlite versions
    498525 # These are from Wichert Akkerman <wichert@deephackmode.org>'s python-dhm
    499 --- ./yum/storagefactory.py.orig        2006-12-02 05:20:03.000000000 +0100
    500 +++ ./yum/storagefactory.py     2007-06-19 18:17:13.000000000 +0200
    501 @@ -1,4 +1,4 @@
    502 -#!/usr/bin/python -tt
    503 +#!@@PYTHON@@ -tt
    504  # This program is free software; you can redistribute it and/or modify
    505  # it under the terms of the GNU General Public License as published by
    506  # the Free Software Foundation; either version 2 of the License, or
    507526--- ./yum/update_md.py.orig     2007-05-15 14:18:08.000000000 +0200
    508527+++ ./yum/update_md.py  2007-06-19 18:17:13.000000000 +0200
Note: See TracChangeset for help on using the changeset viewer.