[csw-devel] SF.net SVN: gar:[20323] csw/mgar/pkg/tree/trunk

[wahwah at users.sourceforge.net]

Revision: 20323
          http://gar.svn.sourceforge.net/gar/?rev=20323&view=rev
Author:   wahwah
Date:     2013-02-21 09:14:23 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
tree/trunk: fix a compilation breakage

Modified Paths:
--------------
    csw/mgar/pkg/tree/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/tree/trunk/files/0008-Check-for-both-S_ISPORT-and-S_ISDOOR.patch

Modified: csw/mgar/pkg/tree/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tree/trunk/Makefile	2013-02-21 08:41:20 UTC (rev 20322)
+++ csw/mgar/pkg/tree/trunk/Makefile	2013-02-21 09:14:23 UTC (rev 20323)
@@ -9,7 +9,7 @@
 define BLURB
   Tree is a recursive directory listing program that produces a depth indented
   listing of files, which is colorized ala dircolors if the LS_COLORS
-  environment variable is set and output is to tty. 
+  environment variable is set and output is to tty.
 endef
 SPKG_SOURCEURL = http://mama.indstate.edu/users/ice/tree/
 MASTER_SITES  = ftp://mama.indstate.edu/linux/tree/
@@ -21,8 +21,8 @@
 PATCHFILES += 0005-Allowing-CFLAGS-from-GAR.patch
 PATCHFILES += 0006-Undefine-S_ISDOOR-on-Solaris.patch
 PATCHFILES += 0007-dash-e-is-not-available-in-bin-sh.patch
+PATCHFILES += 0008-Check-for-both-S_ISPORT-and-S_ISDOOR.patch
 DISTFILES  = $(NAME)-$(VERSION).tgz
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz
 CONFIGURE_SCRIPTS =
 SKIPTEST = 1
 LICENSE = LICENSE

Added: csw/mgar/pkg/tree/trunk/files/0008-Check-for-both-S_ISPORT-and-S_ISDOOR.patch
===================================================================
--- csw/mgar/pkg/tree/trunk/files/0008-Check-for-both-S_ISPORT-and-S_ISDOOR.patch	                        (rev 0)
+++ csw/mgar/pkg/tree/trunk/files/0008-Check-for-both-S_ISPORT-and-S_ISDOOR.patch	2013-02-21 09:14:23 UTC (rev 20323)
@@ -0,0 +1,25 @@
+From be733b4581fa3a3203781f6aa61a6854d35b6575 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Thu, 21 Feb 2013 10:13:15 +0100
+Subject: [PATCH] Check for both S_ISPORT and S_ISDOOR
+
+---
+ tree.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tree.c b/tree.c
+index 19cf368..86d1c82 100644
+--- a/tree.c
++++ b/tree.c
+@@ -45,7 +45,7 @@ int mb_cur_max;
+ #ifdef __EMX__
+ const u_short ifmt[]={ FILE_ARCHIVED, FILE_DIRECTORY, FILE_SYSTEM, FILE_HIDDEN, FILE_READONLY, 0};
+ #else
+-  #ifdef S_ISPORT
++  #if defined(S_ISPORT) && defined(S_ISDOOR)
+   const u_int ifmt[] = {S_IFREG, S_IFDIR, S_IFLNK, S_IFCHR, S_IFBLK, S_IFSOCK, S_IFIFO, S_ISDOOR, S_ISPORT, 0};
+   const char fmt[] = "-dlcbspDP?";
+   const char *ftype[] = {"file", "directory", "link", "char", "block", "socket", "fifo", "door", "port", "unknown", NULL};
+-- 
+1.8.1
+

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