ports/136788: [PATCH] sysutils/pydf: update to 7

[Baptiste Grenier]

The following reply was made to PR ports/136788; it has been noted by GNATS.

From: Baptiste Grenier <gwarf at gwarf.org>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/136788: [PATCH] sysutils/pydf: update to 7
Date: Thu, 16 Jul 2009 23:42:25 +0200

 --JcvBIhDvR6w3jUPA
 Content-Type: multipart/mixed; boundary="lkTb+7nhmha7W+c3"
 Content-Disposition: inline
 
 
 --lkTb+7nhmha7W+c3
 Content-Type: text/plain; charset=iso-8859-1
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Hello,
 
 Le 15/07/09 =E0 15:12, Edwin Groothuis t=E9l=E9scripta :
 > Maintainer of sysutils/pydf,
 >=20
 > Please note that PR ports/136788 has just been submitted.
 >=20
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >=20
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports/136788
 
 Thanks for the submission, this patch is OK, it seems that there is just
 a little indentation error in the pydf file patch.
 
 Please find attached an updated patch.
 
 Cheers,
 Baptiste
 
 --=20
 \,,/_[-_-]_\,,/
 http://asocial.ws/gwarf
 
 --lkTb+7nhmha7W+c3
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="patch-2.diff"
 Content-Transfer-Encoding: quoted-printable
 
 diff -ruN /usr/ports/sysutils/pydf.origin/Makefile /usr/ports/sysutils/pydf=
 /Makefile
 --- /usr/ports/sysutils/pydf.origin/Makefile	2009-01-15 09:37:28.000000000 =
 +0100
 +++ /usr/ports/sysutils/pydf/Makefile	2009-07-16 23:36:08.000000000 +0200
 @@ -6,7 +6,7 @@
  #
 =20
  PORTNAME=3D	pydf
 -PORTVERSION=3D	6
 +PORTVERSION=3D	7
  CATEGORIES=3D	sysutils
  MASTER_SITES=3D	http://kassiopeia.juls.savba.sk/~garabik/software/pydf/
  DISTNAME=3D	${PORTNAME}_${PORTVERSION}
 diff -ruN /usr/ports/sysutils/pydf.origin/distinfo /usr/ports/sysutils/pydf=
 /distinfo
 --- /usr/ports/sysutils/pydf.origin/distinfo	2009-01-15 09:37:28.000000000 =
 +0100
 +++ /usr/ports/sysutils/pydf/distinfo	2009-07-16 23:36:08.000000000 +0200
 @@ -1,3 +1,3 @@
 -MD5 (pydf_6.tar.gz) =3D b71572cc111a8f68edc876351b0f7733
 -SHA256 (pydf_6.tar.gz) =3D 4202b4cbbd631b40f6e2fbd73bf0a6397899e6acf148e84=
 864731a92cfa5cb80
 -SIZE (pydf_6.tar.gz) =3D 12140
 +MD5 (pydf_7.tar.gz) =3D 54c631b1bf8d00111d49567b2e83d718
 +SHA256 (pydf_7.tar.gz) =3D ce09e48bf6d03d4128c3dfbbe4cdd093ac533006440cc6a=
 a239592e0af223c23
 +SIZE (pydf_7.tar.gz) =3D 12487
 diff -ruN /usr/ports/sysutils/pydf.origin/files/patch-pydf /usr/ports/sysut=
 ils/pydf/files/patch-pydf
 --- /usr/ports/sysutils/pydf.origin/files/patch-pydf	2007-12-14 17:54:24.00=
 0000000 +0100
 +++ /usr/ports/sysutils/pydf/files/patch-pydf	2009-07-16 23:36:08.000000000=
  +0200
 @@ -1,21 +1,23 @@
 ---- pydf.original	Tue Dec  4 23:02:26 2007
 -+++ pydf	Tue Dec  4 23:02:14 2007
 +--- pydf.orig  2009-04-10 13:00:07.000000000 +0000
 ++++ pydf       2009-07-15 12:54:08.000000000 +0000
  @@ -1,4 +1,4 @@
  -#! /usr/bin/python
  +#! %%PYTHON_CMD%%
 =20
   import sys, os, string, types, commands, struct
   from optparse import OptionParser
 -@@ -166,7 +166,7 @@
 +@@ -169,8 +169,8 @@
   #end of default definitions
 =20
   # 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):
 ++      if os.path.isfile(i):
           execfile(i)
 =20
 -@@ -336,9 +336,9 @@
 +
 +@@ -344,9 +344,9 @@
           except OSError, IOError:
               status =3D 10*[0]
 =20
 @@ -25,18 +27,18 @@
  -            fs_blocksize =3D status[F_FRSIZE]
  +            fs_blocksize =3D status[F_BSIZE]
           free =3D status[F_BFREE]
 -         used =3D long(status[F_BLOCKS]-free)
           size =3D status[F_BLOCKS]
 -@@ -351,7 +351,7 @@
 -         avail_f =3D myformat(avail, sizeformat, fs_blocksize)
 -
 -         try:
 --            perc =3D round(100.*used/size, 1)
 -+            perc =3D round(100.*used/(avail+used), 1)
 -         except ZeroDivisionError:
 -             perc =3D 0
 -         perc_f =3D str(perc)
 -@@ -419,7 +419,7 @@
 +         avail =3D status[F_BAVAIL]
 +@@ -375,7 +375,7 @@
 +             used_f =3D myformat(used, sizeformat, fs_blocksize)
 +             avail_f =3D myformat(avail, sizeformat, fs_blocksize)
 +             try:
 +-                perc =3D round(100.*used/size, 1)
 ++                perc =3D round(100.*used/(avail+used), 1)
 +                 perc_f =3D str(perc)
 +             except ZeroDivisionError:
 +                 perc =3D 0
 +@@ -444,7 +444,7 @@
       "test if fs (as type) is a special one"
       "in addition, a filesystem is special if it has number of blocks equa=
 l to 0"
       fs =3D fs.lower()
 
 --lkTb+7nhmha7W+c3--
 
 --JcvBIhDvR6w3jUPA
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.12 (FreeBSD)
 
 iEYEARECAAYFAkpfnsAACgkQe8xalydi66E0twCgnoaB8cXZ3UwjkohwZ1NHj4Tv
 MpQAn0o8u9DViTCPtnGlQpQjTDe2bO9y
 =y4GE
 -----END PGP SIGNATURE-----
 
 --JcvBIhDvR6w3jUPA--