pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/xdu Update xdu to 3.0nb5. Changes: Add two pa...
details: https://anonhg.NetBSD.org/pkgsrc/rev/669110faf3f9
branches: trunk
changeset: 496766:669110faf3f9
user: hubertf <hubertf%pkgsrc.org@localhost>
date: Tue Jul 12 20:16:00 2005 +0000
description:
Update xdu to 3.0nb5. Changes: Add two patches by Nobuyuki Tsuchimura:
* makes xdu possible to have white spaces in directory names
* internationalization, which makes xdu possible to display any character
Addresses PR pkg/30709 by soda%NetBSD.org@localhost.
diffstat:
sysutils/xdu/Makefile | 13 ++++++++--
sysutils/xdu/distinfo | 10 ++++++-
sysutils/xdu/patches/patch-aa | 50 +++++-------------------------------------
3 files changed, 24 insertions(+), 49 deletions(-)
diffs (119 lines):
diff -r e7b6fa3507b9 -r 669110faf3f9 sysutils/xdu/Makefile
--- a/sysutils/xdu/Makefile Tue Jul 12 20:13:07 2005 +0000
+++ b/sysutils/xdu/Makefile Tue Jul 12 20:16:00 2005 +0000
@@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:26:16 agc Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/12 20:16:00 hubertf Exp $
#
DISTNAME= xdu-3.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= sysutils x11
-MASTER_SITES= http://sd.wareonearth.com/~phil/xdu/ ftp://ftp.arl.mil/pub/
+MASTER_SITES= http://sd.wareonearth.com/~phil/xdu/ \
+ ftp://ftp.arl.mil/pub/
+PATCH_SITES= http://www.nn.iij4u.or.jp/~tutimura/xdu/
EXTRACT_SUFX= .tar.Z
+PATCHFILES+= xdu-3.0.dirname.patch \
+ xdu-3.0.i18n.patch
MAINTAINER= hubertf%NetBSD.org@localhost
HOMEPAGE= http://sd.wareonearth.com/~phil/xdu/
@@ -14,4 +18,7 @@
WRKSRC= ${WRKDIR}
USE_IMAKE= yes
+PATCH_DIST_STRIP.xdu-3.0.dirname.patch = -p1
+PATCH_DIST_STRIP.xdu-3.0.i18n.patch = -p1
+
.include "../../mk/bsd.pkg.mk"
diff -r e7b6fa3507b9 -r 669110faf3f9 sysutils/xdu/distinfo
--- a/sysutils/xdu/distinfo Tue Jul 12 20:13:07 2005 +0000
+++ b/sysutils/xdu/distinfo Tue Jul 12 20:16:00 2005 +0000
@@ -1,6 +1,12 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 13:40:59 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/07/12 20:16:00 hubertf Exp $
SHA1 (xdu-3.0.tar.Z) = 196e2ba03253fd6b8a88fafe6b00e40632183d0c
RMD160 (xdu-3.0.tar.Z) = 0c95ad79aaeb6e58433add71d852cc0b2312a5f9
Size (xdu-3.0.tar.Z) = 20114 bytes
-SHA1 (patch-aa) = 05ec21899437eb15159615ce40e63e5e07073581
+SHA1 (xdu-3.0.dirname.patch) = 0db06f80cc1463f9d4d247d58632d39738c3d52f
+RMD160 (xdu-3.0.dirname.patch) = fb233756b80a3c482503be702b80b7841a7d0d7b
+Size (xdu-3.0.dirname.patch) = 1672 bytes
+SHA1 (xdu-3.0.i18n.patch) = 6f14b5458111b7c9776d15760d1876d242f0dabd
+RMD160 (xdu-3.0.i18n.patch) = a1ada2ae69331010dd7f3c0e77cb4410065a7254
+Size (xdu-3.0.i18n.patch) = 2760 bytes
+SHA1 (patch-aa) = 8296ae806d36d6e7e679c58b9694012a98176d6f
diff -r e7b6fa3507b9 -r 669110faf3f9 sysutils/xdu/patches/patch-aa
--- a/sysutils/xdu/patches/patch-aa Tue Jul 12 20:13:07 2005 +0000
+++ b/sysutils/xdu/patches/patch-aa Tue Jul 12 20:16:00 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2002/04/05 01:33:25 hubertf Exp $
+$NetBSD: patch-aa,v 1.4 2005/07/12 20:16:00 hubertf Exp $
---- xdu.c.orig Sun Jun 5 21:29:23 1994
-+++ xdu.c
+--- xdu.c.orig 2005-07-11 23:15:31.000000000 +0200
++++ xdu.c 2005-07-11 23:19:59.000000000 +0200
@@ -19,13 +19,15 @@
* limitation a license to do the foregoing actions under any patents of
* the party supplying this software to the X Consortium.
@@ -31,53 +31,15 @@
np->name = strdup(name);
np->size = size;
np->num = nnodes;
-@@ -232,7 +238,6 @@
- char *filename;
- {
- char buf[4096];
-- char name[4096];
- int size;
- FILE *fp;
-
-@@ -245,9 +250,12 @@
- }
- }
- while (fgets(buf,sizeof(buf),fp) != NULL) {
-- sscanf(buf, "%d %s\n", &size, name);
-- /*printf("%d %s\n", size, name);*/
-- parse_entry(name,size);
-+ char *p, *q = NULL;
-+ p = strtok_r(buf, " \t", &q);
-+ size = atoi(p);
-+ p = strtok_r(NULL, "\r\n", &q);
-+ /* printf("%d %s\n", size, p); */
-+ parse_entry(p,size);
- }
- fclose(fp);
- }
-@@ -290,7 +298,12 @@
- name++;
- }
- buf[indx] = 0;
-- path[arg++] = strdup(buf);
-+ path[arg] = strdup(buf);
-+ if (path[arg] == NULL) {
-+ fprintf(stderr, "Out of memory! (#3)\n");
-+ exit(1);
-+ }
-+ arg++;
- path[arg] = NULL;
-
- addtree(&top,path,size);
-@@ -622,6 +635,7 @@
+@@ -610,6 +616,7 @@
100.0*topp->size/rootp->size);
}
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(SVR4) /* == Solaris etc. */
char *
strdup(s)
char *s;
-@@ -631,10 +645,15 @@
+@@ -619,10 +626,15 @@
n = strlen(s);
cp = malloc(n+1);
Home |
Main Index |
Thread Index |
Old Index