Date: Tue, 10 Nov 2009 01:41:21 GMT From: Baptiste Grenier <gwarf@gwarf.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/140437: [PATCH] sysutils/pydf: update to 8 Message-ID: <200911100141.nAA1fLwS023643@www.freebsd.org> Resent-Message-ID: <200911100150.nAA1o0tG044447@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 140437 >Category: ports >Synopsis: [PATCH] sysutils/pydf: update to 8 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Nov 10 01:50:00 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Baptiste Grenier >Release: 7.2-RELEASE-p2 >Organization: >Environment: FreeBSD beerserk.gwarf.org 7.2-RELEASE-p2 FreeBSD 7.2-RELEASE-p2 #0: Wed Jun 24 00:57:44 UTC 2009 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: Update to version 8. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN /usr/ports/sysutils/pydf.origin/Makefile /usr/ports/sysutils/pydf/Makefile --- /usr/ports/sysutils/pydf.origin/Makefile 2009-07-19 03:38:37.000000000 +0200 +++ /usr/ports/sysutils/pydf/Makefile 2009-11-10 02:21:33.000000000 +0100 @@ -2,11 +2,11 @@ # Date created: 29 November 2007 # Whom: Baptiste Grenier <gwarf@gwarf.org> # -# $FreeBSD: ports/sysutils/pydf/Makefile,v 1.3 2009/07/19 01:38:37 wxs Exp $ +# $FreeBSD: ports/sysutils/pydf/Makefile,v 1.2 2009/01/15 08:37:28 lwhsu Exp $ # PORTNAME= pydf -PORTVERSION= 7 +PORTVERSION= 8 CATEGORIES= sysutils MASTER_SITES= http://kassiopeia.juls.savba.sk/~garabik/software/pydf/ DISTNAME= ${PORTNAME}_${PORTVERSION} diff -ruN /usr/ports/sysutils/pydf.origin/distinfo /usr/ports/sysutils/pydf/distinfo --- /usr/ports/sysutils/pydf.origin/distinfo 2009-07-19 03:38:37.000000000 +0200 +++ /usr/ports/sysutils/pydf/distinfo 2009-11-10 02:25:34.000000000 +0100 @@ -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 diff -ruN /usr/ports/sysutils/pydf.origin/files/patch-pydf /usr/ports/sysutils/pydf/files/patch-pydf --- /usr/ports/sysutils/pydf.origin/files/patch-pydf 2009-07-19 03:38:38.000000000 +0200 +++ /usr/ports/sysutils/pydf/files/patch-pydf 2009-11-10 02:21:16.000000000 +0100 @@ -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" >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911100141.nAA1fLwS023643>