[csw-devel] SF.net SVN: gar:[10445] csw/mgar/pkg/di/trunk

[dmichelsen at users.sourceforge.net]

Revision: 10445
          http://gar.svn.sourceforge.net/gar/?rev=10445&view=rev
Author:   dmichelsen
Date:     2010-07-05 21:31:37 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
di: Update to 4.25

Modified Paths:
--------------
    csw/mgar/pkg/di/trunk/Makefile
    csw/mgar/pkg/di/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/di/trunk/files/0001-Fix-Solaris-detection.patch

Modified: csw/mgar/pkg/di/trunk/Makefile
===================================================================
--- csw/mgar/pkg/di/trunk/Makefile	2010-07-05 21:15:56 UTC (rev 10444)
+++ csw/mgar/pkg/di/trunk/Makefile	2010-07-05 21:31:37 UTC (rev 10445)
@@ -1,5 +1,5 @@
 GARNAME = di
-GARVERSION = 4.24
+GARVERSION = 4.25
 CATEGORIES = utils
 
 DESCRIPTION = Disk information utility
@@ -12,7 +12,6 @@
 
 MASTER_SITES = http://www.gentoo.com/di/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-PATCHFILES = 0001-Fix-Solaris-detection.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/di/trunk/checksums
===================================================================
--- csw/mgar/pkg/di/trunk/checksums	2010-07-05 21:15:56 UTC (rev 10444)
+++ csw/mgar/pkg/di/trunk/checksums	2010-07-05 21:31:37 UTC (rev 10445)
@@ -1,2 +1 @@
-5573dc1446ef5972a4149d5d10bb0f93  0001-Fix-Solaris-detection.patch
-f16a3829a4666696d4e139cecfa9e225  di-4.24.tar.gz
+765ef603afe1d95f52f7a5f64e85eced  di-4.25.tar.gz

Deleted: csw/mgar/pkg/di/trunk/files/0001-Fix-Solaris-detection.patch
===================================================================
--- csw/mgar/pkg/di/trunk/files/0001-Fix-Solaris-detection.patch	2010-07-05 21:15:56 UTC (rev 10444)
+++ csw/mgar/pkg/di/trunk/files/0001-Fix-Solaris-detection.patch	2010-07-05 21:31:37 UTC (rev 10445)
@@ -1,25 +0,0 @@
-From 08eae7402b5bbc3dd9e3c3d1227f22c140014c00 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 10 Jun 2010 15:23:45 +0200
-Subject: [PATCH] Fix Solaris detection
-
----
- di.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/di.c b/di.c
-index d5adef2..32c3502 100644
---- a/di.c
-+++ b/di.c
-@@ -431,7 +431,7 @@ main (argc, argv)
-         /* change default display format here */
-     diopts->dispBlockSize = DI_VAL_1024 * DI_VAL_1024;
-     diopts->flags = 0;
--#if ! SunOS /* Solaris loopback devices should be excluded */
-+#if ! __SunOS /* Solaris loopback devices should be excluded */
-     diopts->flags |= DI_F_INCLUDE_LOOPBACK;
- #endif
-     strcpy (diopts->sortType, "m"); /* default - sort by mount point */
--- 
-1.7.1
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.