Ignore:
Timestamp:
Jan 25, 2004, 3:28:02 AM (16 years ago)
Author:
fkr
Message:

Bug:
Submitted by:
Reviewed by:
Approved by: ranger@ (maintainer)
Obtained from:
Port: yum
Version: 1.0.3

  • move patches to use @@PREFIX@@
  • bump to version 1.0.3
Location:
trunk/dports/sysutils/yum
Files:
13 edited

Legend:

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

    r4423 r4993  
    1 # $Id: Portfile,v 1.5 2004/01/02 21:05:58 fkr Exp $
     1# $Id: Portfile,v 1.6 2004/01/25 03:28:01 fkr Exp $
    22
    33PortSystem 1.0
    44name            yum
    5 version         1.0.1
     5version         1.0.3
    66platforms       darwin
    7 revision        2
    87categories      sysutils archivers
    98maintainers     ranger@befunk.com
     
    1514                        update each one using rpm.
    1615homepage        http://linux.duke.edu/projects/yum/
    17 
    18 master_sites    http://linux.duke.edu/projects/yum/download/1.0/
    19 checksums       md5 a4c831ef1cf8bc32eadc396919dc06fd
     16master_sites    ${homepage}download/1.0/
     17checksums       md5 0188c0edfa3f2d552a39898297a67af7
    2018
    2119patchfiles      patch-archwork-py.diff          patch-bin-yum-arch.diff \
    2220                patch-bin-yum.diff              patch-clientstuff-py.diff \
    2321                patch-config-py.diff            patch-docs-yum-8.diff \
     22                patch-etc-yum-conf.diff         patch-etc-yum-cron.diff \
    2423                patch-docs-yum-conf-5.diff      patch-etc-makefile-in.diff \
    25                 patch-etc-yum-conf.diff         patch-etc-yum-cron.diff \
    2624                patch-etc-yum-init.diff         patch-etc-yum-logrotate.diff \
    2725                patch-iutil-py.diff             patch-makefile-in.diff \
    2826                patch-translate-py.diff         patch-up2datetheft-py.diff \
    29                 patch-yummain-py.diff
     27                patch-yummain-py.diff 
    3028
    3129depends_lib     lib:librpm-4.0.4:rpm
     
    3432                foreach patch $patchfiles {
    3533                        system "cd '${workpath}/${distname}' && \
    36                         sed -e 's#/opt/local#${prefix}#g' '${portpath}/${filesdir}/${patch}' | patch -p0"
     34                        sed -e 's#@@PREFIX@@#${prefix}#g' '${portpath}/${filesdir}/${patch}' | patch -p0"
    3735                }
    3836}
  • trunk/dports/sysutils/yum/files/patch-bin-yum-arch.diff

    r2730 r4993  
    1 diff -uNr ../yum-1.0.1/bin/yum-arch ./bin/yum-arch
    2 --- ../yum-1.0.1/bin/yum-arch   Mon May 19 22:55:00 2003
    3 +++ ./bin/yum-arch      Sat May 31 18:32:23 2003
     1--- bin/yum-arch.orig   Sat Jan 24 21:04:00 2004
     2+++ bin/yum-arch        Sat Jan 24 20:52:11 2004
    43@@ -18,7 +18,8 @@
    54 
     
    76 
    87-sys.path.insert(1,'/usr/share/yum')
    9 +sys.path.insert(1,'/opt/local/share/yum')
    10 +sys.path.insert(1,'/opt/local/lib/python2.2/site-packages')
     8+sys.path.insert(1,'@@PREFIX@@/share/yum')
     9+sys.path.insert(1,'@@PREFIX@@/lib/python2.2/site-packages')
    1110 import pullheaders
    1211 pullheaders.main()
  • trunk/dports/sysutils/yum/files/patch-bin-yum.diff

    r2730 r4993  
    1 diff -uNr ../yum-1.0.1/bin/yum ./bin/yum
    2 --- ../yum-1.0.1/bin/yum        Mon May 19 22:55:00 2003
    3 +++ ./bin/yum   Sat May 31 18:32:23 2003
     1--- bin/yum.orig        Sat Jan 24 21:05:00 2004
     2+++ bin/yum     Sat Jan 24 20:52:48 2004
    43@@ -18,12 +18,13 @@
    54 
     
    76 import os
    87-sys.path.insert(1,'/usr/share/yum')
    9 +sys.path.insert(1,'/opt/local/share/yum')
    10 +sys.path.insert(1,'/opt/local/lib/python2.2/site-packages')
     8+sys.path.insert(1,'@@PREFIX@@/share/yum')
     9+sys.path.insert(1,'@@PREFIX@@/lib/python2.2/site-packages')
    1110 import yummain
    1211 import yumlock
     
    1413 uid = os.geteuid()
    1514-lockfile = '/var/run/yum.pid'
    16 +lockfile = '/opt/local/var/run/yum.pid'
     15+lockfile = '@@PREFIX@@/var/run/yum.pid'
    1716 mypid = str(os.getpid())
    1817 
  • trunk/dports/sysutils/yum/files/patch-clientstuff-py.diff

    r2739 r4993  
    1 --- ../yum-1.0.1/clientStuff.py Mon May 19 22:54:59 2003
    2 +++ clientStuff.py      Mon Jun  2 16:17:10 2003
    3 @@ -152,15 +152,17 @@
     1--- clientStuff.py.orig Sat Jan 24 21:06:03 2004
     2+++ clientStuff.py      Sat Jan 24 20:53:11 2004
     3@@ -155,15 +155,17 @@
    44     return 0
    55 
     
    77-    dbpath = "/var/lib/rpm/"
    88-    rpm.addMacro("_dbpath", dbpath)
    9 +    for dbpath in ["/opt/local/var/lib/rpm/", "/var/lib/rpm/"]:
     9+    for dbpath in ["@@PREFIX@@/var/lib/rpm/", "/var/lib/rpm/"]:
    1010+        if os.path.exists(dbpath + "Packages"):
    1111+            rpm.addMacro("_dbpath", dbpath)
  • trunk/dports/sysutils/yum/files/patch-config-py.diff

    r2730 r4993  
    1 diff -uNr ../yum-1.0.1/config.py ./config.py
    2 --- ../yum-1.0.1/config.py      Mon May 19 22:54:59 2003
    3 +++ ./config.py Sat May 31 18:32:23 2003
     1--- config.py.orig      Sat Jan 24 21:09:24 2004
     2+++ config.py   Sat Jan 24 20:55:25 2004
    43@@ -42,7 +42,7 @@
    54 
     
    76 class yumconf:
    87-    def __init__(self, configfile = '/etc/yum.conf'):
    9 +    def __init__(self, configfile = '/opt/local/etc/yum.conf'):
     8+    def __init__(self, configfile = '@@PREFIX@@/etc/yum.conf'):
    109         self.cfg = yumConfigParser()
    1110         (s,b,p,q,f,o) = urlparse.urlparse(configfile)
     
    1615         #defaults
    1716-        self.cachedir = '/var/cache/yum'
    18 +        self.cachedir = '/opt/local/var/cache/yum'
     17+        self.cachedir = '@@PREFIX@@/var/cache/yum'
    1918         self.debuglevel = 2
    2019-        self.logfile = '/var/log/yum.log'
    21 +        self.logfile = '/opt/local/var/log/yum.log'
     20+        self.logfile = '@@PREFIX@@/var/log/yum.log'
    2221         self.pkgpolicy = 'newest'
    2322         self.gpghome = '/root/.gnupg'
  • trunk/dports/sysutils/yum/files/patch-docs-yum-8.diff

    r2730 r4993  
    1 diff -uNr ../yum-1.0.1/docs/yum.8 ./docs/yum.8
    2 --- ../yum-1.0.1/docs/yum.8     Mon May 19 22:55:00 2003
    3 +++ ./docs/yum.8        Sat May 31 18:32:23 2003
    4 @@ -159,8 +159,8 @@
     1--- docs/yum.8.orig     Sat Jan 24 21:09:36 2004
     2+++ docs/yum.8  Sat Jan 24 20:56:05 2004
     3@@ -161,8 +161,8 @@
    54 .PP
    65 .SH "FILES"
     
    87-/etc/yum.conf
    98-/var/cache/yum/
    10 +/opt/local/etc/yum.conf
    11 +/opt/local/var/cache/yum/
     9+@@PREFIX@@/etc/yum.conf
     10+@@PREFIX@@/var/cache/yum/
    1211 .fi
    1312 
  • trunk/dports/sysutils/yum/files/patch-docs-yum-conf-5.diff

    r2730 r4993  
    1 diff -uNr ../yum-1.0.1/docs/yum.conf.5 ./docs/yum.conf.5
    2 --- ../yum-1.0.1/docs/yum.conf.5        Mon May 19 22:55:00 2003
    3 +++ ./docs/yum.conf.5   Sat May 31 18:32:23 2003
     1--- docs/yum.conf.5.orig        Sat Jan 24 21:10:13 2004
     2+++ docs/yum.conf.5     Sat Jan 24 20:56:56 2004
    43@@ -8,7 +8,7 @@
    54 \fByum.conf\fR. This configuration file is searched for
     
    1110 .SH "PARAMETERS"
    1211 .LP
    13 @@ -128,7 +128,7 @@
     12@@ -133,7 +133,7 @@
    1413 
    1514 .SH "FILES"
    1615 .LP
    1716-/etc/yum.conf
    18 +/opt/local/etc/yum.conf
     17+@@PREFIX@@/etc/yum.conf
    1918 .SH "SEE ALSO"
    2019 .LP
  • trunk/dports/sysutils/yum/files/patch-etc-makefile-in.diff

    r2730 r4993  
    1 diff -uNr ../yum-1.0.1/etc/Makefile.in ./etc/Makefile.in
    2 --- ../yum-1.0.1/etc/Makefile.in        Mon May 19 22:55:00 2003
    3 +++ ./etc/Makefile.in   Sat May 31 18:32:23 2003
     1--- etc/Makefile.in.orig        Sat Jan 24 21:13:29 2004
     2+++ etc/Makefile.in     Sat Jan 24 20:58:59 2004
    43@@ -36,14 +36,14 @@
    54 
     
    1110-       $(INSTALL_SCRIPT) $(srcdir)/yum.init $(DESTDIR)/etc/init.d/yum
    1211-       $(INSTALL_DATA) $(srcdir)/yum.logrotate $(DESTDIR)/etc/logrotate.d/yum
    13 +       mkdir -p $(DESTDIR)/opt/local/etc/{cron.daily,init.d,logrotate.d}
    14 +       $(INSTALL_DATA) $(srcdir)/yum.conf $(DESTDIR)/opt/local/etc/yum.conf
    15 +       $(INSTALL_SCRIPT) $(srcdir)/yum.cron $(DESTDIR)/opt/local/etc/cron.daily/yum.cron
    16 +       $(INSTALL_SCRIPT) $(srcdir)/yum.init $(DESTDIR)/opt/local/etc/init.d/yum
    17 +       $(INSTALL_DATA) $(srcdir)/yum.logrotate $(DESTDIR)/opt/local/etc/logrotate.d/yum
     12+       mkdir -p $(DESTDIR)@@PREFIX@@/etc/{cron.daily,init.d,logrotate.d}
     13+       $(INSTALL_DATA) $(srcdir)/yum.conf $(DESTDIR)@@PREFIX@@/etc/yum.conf
     14+       $(INSTALL_SCRIPT) $(srcdir)/yum.cron $(DESTDIR)@@PREFIX@@/etc/cron.daily/yum.cron
     15+       $(INSTALL_SCRIPT) $(srcdir)/yum.init $(DESTDIR)@@PREFIX@@/etc/init.d/yum
     16+       $(INSTALL_DATA) $(srcdir)/yum.logrotate $(DESTDIR)@@PREFIX@@/etc/logrotate.d/yum
    1817 
    1918 uninstall:
    2019-       $(RM) /etc/yum.conf
    21 +       $(RM) /opt/local/etc/yum.conf
     20+       $(RM) @@PREFIX/etc/yum.conf
    2221 
    2322 
  • trunk/dports/sysutils/yum/files/patch-etc-yum-cron.diff

    r2730 r4993  
    1 diff -uNr ../yum-1.0.1/etc/yum.cron ./etc/yum.cron
    2 --- ../yum-1.0.1/etc/yum.cron   Mon May 19 22:55:00 2003
    3 +++ ./etc/yum.cron      Sat May 31 18:32:23 2003
     1--- etc/yum.cron.orig   Sat Jan 24 21:23:23 2004
     2+++ etc/yum.cron        Sat Jan 24 21:23:52 2004
    43@@ -1,6 +1,6 @@
    54 #!/bin/sh
     
    87-       /usr/bin/yum -R 10 -e 0 -d 0 -y update yum
    98-       /usr/bin/yum -R 120 -e 0 -d 0 -y update
    10 +if [ -f /opt/local/var/lock/subsys/yum ]; then
    11 +       /opt/local/bin/yum -R 10 -e 0 -d 0 -y update yum
    12 +       /opt/local/bin/yum -R 120 -e 0 -d 0 -y update
     9+if [ -f @@PREFIX@@/var/lock/subsys/yum ]; then
     10+       @@PREFIX@@/usr/bin/yum -R 10 -e 0 -d 0 -y update yum
     11+       @@PREFIX@@/usr/bin/yum -R 120 -e 0 -d 0 -y update
    1312 fi
  • trunk/dports/sysutils/yum/files/patch-etc-yum-init.diff

    r2730 r4993  
    1 diff -uNr ../yum-1.0.1/etc/yum.init ./etc/yum.init
    2 --- ../yum-1.0.1/etc/yum.init   Mon May 19 22:55:00 2003
    3 +++ ./etc/yum.init      Sat May 31 18:32:23 2003
     1--- etc/yum.init.orig   Sat Jan 24 21:14:10 2004
     2+++ etc/yum.init        Sat Jan 24 20:59:35 2004
    43@@ -14,13 +14,13 @@
    54 
     
    76        echo -n "Enabling yum: "
    87-       (/bin/touch /var/lock/subsys/yum && success) || failure
    9 +       (/bin/touch /opt/local/var/lock/subsys/yum && success) || failure
     8+       (/bin/touch @@PREFIX@@/var/lock/subsys/yum && success) || failure
    109        echo
    1110 }
     
    1413        echo -n "Disabling yum: "
    1514-       (/bin/rm -f /var/lock/subsys/yum && success) || failure
    16 +       (/bin/rm -f /opt/local/var/lock/subsys/yum && success) || failure
     15+       (/bin/rm -f @@PREFIX@@/var/lock/subsys/yum && success) || failure
    1716        echo
    1817 }
     
    2322   condrestart)
    2423-        if [ -f /var/lock/subsys/yum ]; then
    25 +        if [ -f /opt/local/var/lock/subsys/yum ]; then
     24+        if [ -f @@PREFIX@@/var/lock/subsys/yum ]; then
    2625            stop
    2726            start
     
    3029   status)
    3130-       if [ -f /var/lock/subsys/yum ]; then
    32 +       if [ -f /opt/local/var/lock/subsys/yum ]; then
     31+       if [ -f @@PREFIX@@/var/lock/subsys/yum ]; then
    3332                echo "nightly yum update is enabled"
    3433        else
  • trunk/dports/sysutils/yum/files/patch-etc-yum-logrotate.diff

    r2730 r4993  
    1 diff -uNr ../yum-1.0.1/etc/yum.logrotate ./etc/yum.logrotate
    2 --- ../yum-1.0.1/etc/yum.logrotate      Mon May 19 22:55:00 2003
    3 +++ ./etc/yum.logrotate Sat May 31 18:32:23 2003
     1--- etc/yum.logrotate.orig      Sat Jan 24 21:15:40 2004
     2+++ etc/yum.logrotate   Sat Jan 24 20:59:50 2004
    43@@ -1,4 +1,4 @@
    54-/var/log/yum.log {
    6 +/opt/local/var/log/yum.log {
     5+@@PREFIX@@/var/log/yum.log {
    76     missingok
    87     create 0600 root root
  • trunk/dports/sysutils/yum/files/patch-makefile-in.diff

    r2730 r4993  
    1 diff -uNr ../yum-1.0.1/Makefile.in ./Makefile.in
    2 --- ../yum-1.0.1/Makefile.in    Mon May 19 22:54:59 2003
    3 +++ ./Makefile.in       Sat May 31 18:32:23 2003
    4 @@ -182,7 +182,7 @@
     1--- Makefile.in.orig    Sat Jan 24 21:16:19 2004
     2+++ Makefile.in Sat Jan 24 21:00:07 2004
     3@@ -185,7 +185,7 @@
    54        done
    65 
    76 installdirs:
    87-       $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)/etc $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(mandir)/man8 $(DESTDIR)$(mandir)/man5 $(DESTDIR)/var/cache/@PACKAGE@/
    9 +       $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)/etc $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(mandir)/man8 $(DESTDIR)$(mandir)/man5 $(DESTDIR)/opt/local/var/cache/@PACKAGE@/
     8+       $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)/etc $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(mandir)/man8 $(DESTDIR)$(mandir)/man5 $(DESTDIR)@@PREFIX@@/var/cache/@PACKAGE@/
    109 
    1110 archive: dist
  • trunk/dports/sysutils/yum/files/patch-up2datetheft-py.diff

    r2739 r4993  
    1 --- ../yum-1.0.1/up2datetheft.py        Mon May 19 22:54:59 2003
    2 +++ up2datetheft.py     Mon Jun  2 16:17:43 2003
     1--- up2datetheft.py.orig        Sat Jan 24 21:17:02 2004
     2+++ up2datetheft.py     Sat Jan 24 21:00:50 2004
    33@@ -21,16 +21,17 @@
    44 
     
    77-    dbpath = "/var/lib/rpm/"
    88-    rpm.addMacro("_dbpath", dbpath)
    9 +    for dbpath in ["/opt/local/var/lib/rpm/", "/var/lib/rpm/"]:
     9+    for dbpath in ["@@PREFIX@@/var/lib/rpm/", "/var/lib/rpm/"]:
    1010+        if os.path.exists(dbpath + "Packages"):
    1111+            rpm.addMacro("_dbpath", dbpath)
Note: See TracChangeset for help on using the changeset viewer.