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

[dmichelsen at users.sourceforge.net]

Revision: 10174
          http://gar.svn.sourceforge.net/gar/?rev=10174&view=rev
Author:   dmichelsen
Date:     2010-06-10 13:29:58 +0000 (Thu, 10 Jun 2010)

Log Message:
-----------
di: Fix Solaris detection

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

Added 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-06-10 13:28:43 UTC (rev 10173)
+++ csw/mgar/pkg/di/trunk/Makefile	2010-06-10 13:29:58 UTC (rev 10174)
@@ -12,6 +12,7 @@
 
 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-06-10 13:28:43 UTC (rev 10173)
+++ csw/mgar/pkg/di/trunk/checksums	2010-06-10 13:29:58 UTC (rev 10174)
@@ -1 +1,2 @@
+5573dc1446ef5972a4149d5d10bb0f93  0001-Fix-Solaris-detection.patch
 f16a3829a4666696d4e139cecfa9e225  di-4.24.tar.gz

Added: csw/mgar/pkg/di/trunk/files/0001-Fix-Solaris-detection.patch
===================================================================
--- csw/mgar/pkg/di/trunk/files/0001-Fix-Solaris-detection.patch	                        (rev 0)
+++ csw/mgar/pkg/di/trunk/files/0001-Fix-Solaris-detection.patch	2010-06-10 13:29:58 UTC (rev 10174)
@@ -0,0 +1,25 @@
+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.