mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
- Update to 8
PR: 140437 Submitted by: Baptiste Grenier <gwarf@gwarf.org> (maintainer)
This commit is contained in:
parent
88d11c39ca
commit
a41c9013b7
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=244181
3 changed files with 39 additions and 24 deletions
|
@ -6,7 +6,7 @@
|
|||
#
|
||||
|
||||
PORTNAME= pydf
|
||||
PORTVERSION= 7
|
||||
PORTVERSION= 8
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= http://kassiopeia.juls.savba.sk/~garabik/software/pydf/
|
||||
DISTNAME= ${PORTNAME}_${PORTVERSION}
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
MD5 (pydf_7.tar.gz) = 54c631b1bf8d00111d49567b2e83d718
|
||||
SHA256 (pydf_7.tar.gz) = ce09e48bf6d03d4128c3dfbbe4cdd093ac533006440cc6aa239592e0af223c23
|
||||
SIZE (pydf_7.tar.gz) = 12487
|
||||
MD5 (pydf_8.tar.gz) = f1434d6d8c5291eda206c2d506e7792d
|
||||
SHA256 (pydf_8.tar.gz) = 47202ae24d00464684ab75babb8ec85d7bd79d09c5bb48441d240ed5688a8ad5
|
||||
SIZE (pydf_8.tar.gz) = 12532
|
||||
|
|
|
@ -1,26 +1,41 @@
|
|||
--- pydf.orig 2009-04-10 13:00:07.000000000 +0000
|
||||
+++ pydf 2009-07-15 12:54:08.000000000 +0000
|
||||
--- pydf.orig 2009-11-10 00:38:15.000000000 +0100
|
||||
+++ pydf 2009-11-10 02:13:13.000000000 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/python
|
||||
+#! %%PYTHON_CMD%%
|
||||
|
||||
import sys, os, string, types, commands, struct
|
||||
from optparse import OptionParser
|
||||
@@ -169,8 +169,8 @@
|
||||
@@ -169,7 +169,7 @@
|
||||
#end of default definitions
|
||||
|
||||
|
||||
# read configuration file
|
||||
-for i in ["/etc/pydfrc", os.environ['HOME']+"/.pydfrc"]:
|
||||
- if os.path.isfile(i):
|
||||
+for i in ["%%PREFIX%%/etc/pydfrc", os.environ['HOME']+"/.pydfrc"]:
|
||||
+ if os.path.isfile(i):
|
||||
execfile(i)
|
||||
|
||||
|
||||
@@ -344,9 +344,9 @@
|
||||
except OSError, IOError:
|
||||
-for conffile in ["/etc/pydfrc", os.environ['HOME']+"/.pydfrc"]:
|
||||
+for conffile in ["%%PREFIX%/etc/pydfrc", os.environ['HOME']+"/.pydfrc"]:
|
||||
if os.path.isfile(conffile):
|
||||
execfile(conffile)
|
||||
|
||||
@@ -294,11 +294,12 @@
|
||||
continue
|
||||
device, on = line.split(' on ', 1)
|
||||
device = device.split()[0]
|
||||
- onparts = on.split()
|
||||
+ onparts = on.rstrip(")").split(" (")
|
||||
on = onparts[0]
|
||||
- # option format: (a,b,..)
|
||||
- opts = onparts[-1][1:-1].split(",")
|
||||
- r[on] = (device, '', opts)
|
||||
+ # option format: (fstype, a, b, ..)
|
||||
+ typ, opts = onparts[1].split(", ", 1)
|
||||
+ opts = opts.split(", ")
|
||||
+ r[on] = (device, typ, opts)
|
||||
|
||||
if r:
|
||||
return r
|
||||
@@ -335,9 +336,9 @@
|
||||
except (OSError, IOError):
|
||||
status = 10*[0]
|
||||
|
||||
|
||||
- fs_blocksize = status[F_BSIZE]
|
||||
+ fs_blocksize = status[F_FRSIZE]
|
||||
if fs_blocksize == 0:
|
||||
|
@ -29,7 +44,7 @@
|
|||
free = status[F_BFREE]
|
||||
size = status[F_BLOCKS]
|
||||
avail = status[F_BAVAIL]
|
||||
@@ -375,7 +375,7 @@
|
||||
@@ -366,7 +367,7 @@
|
||||
used_f = myformat(used, sizeformat, fs_blocksize)
|
||||
avail_f = myformat(avail, sizeformat, fs_blocksize)
|
||||
try:
|
||||
|
@ -38,12 +53,12 @@
|
|||
perc_f = str(perc)
|
||||
except ZeroDivisionError:
|
||||
perc = 0
|
||||
@@ -444,7 +444,7 @@
|
||||
@@ -435,7 +436,7 @@
|
||||
"test if fs (as type) is a special one"
|
||||
"in addition, a filesystem is special if it has number of blocks equal to 0"
|
||||
fs = fs.lower()
|
||||
- return fs in [ "tmpfs", "devpts", "proc", "sysfs", "usbfs" ]
|
||||
+ return fs in [ "tmpfs", "devpts", "proc", "sysfs", "usbfs", "procfs", "devfs" ]
|
||||
|
||||
|
||||
|
||||
+ return fs in [ "tmpfs", "devpts", "proc", "sysfs", "usbfs", "procfs", "devfs", "linprocfs" ]
|
||||
|
||||
def get_table(mps):
|
||||
"table is a list of rows"
|
||||
|
|
Loading…
Add table
Reference in a new issue