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

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Fri Sep 23 00:26:35 CEST 2011


Revision: 15716
          http://gar.svn.sourceforge.net/gar/?rev=15716&view=rev
Author:   wahwah
Date:     2011-09-22 22:26:35 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
pkg/tree/trunk: upgrade to 1.6.0

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

Added Paths:
-----------
    csw/mgar/pkg/tree/trunk/files/0001-opt-csw-prefix.patch
    csw/mgar/pkg/tree/trunk/files/0002-comment-out-Linux-defaults.patch
    csw/mgar/pkg/tree/trunk/files/0003-Solaris-settings.patch
    csw/mgar/pkg/tree/trunk/files/0004-Using-GNU-install.patch
    csw/mgar/pkg/tree/trunk/files/0005-Allowing-CFLAGS-from-GAR.patch
    csw/mgar/pkg/tree/trunk/files/0006-Undefine-S_ISDOOR-on-Solaris.patch
    csw/mgar/pkg/tree/trunk/files/0007-dash-e-is-not-available-in-bin-sh.patch

Removed Paths:
-------------
    csw/mgar/pkg/tree/trunk/files/0002-Allowing-CFLAGS-from-GAR.patch
    csw/mgar/pkg/tree/trunk/files/solaris.patch

Modified: csw/mgar/pkg/tree/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tree/trunk/Makefile	2011-09-22 14:54:47 UTC (rev 15715)
+++ csw/mgar/pkg/tree/trunk/Makefile	2011-09-22 22:26:35 UTC (rev 15716)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME = tree
-VERSION = 1.5.3
+VERSION = 1.6.0
 CATEGORIES = utils
 DESCRIPTION = A recursive directory listing program
 define BLURB
@@ -14,8 +14,13 @@
 SPKG_SOURCEURL = http://mama.indstate.edu/users/ice/tree/
 MASTER_SITES  = ftp://mama.indstate.edu/linux/tree/
 MASTER_SITES += http://www.sfr-fresh.com/linux/misc/
-PATCHFILES += solaris.patch
-PATCHFILES += 0002-Allowing-CFLAGS-from-GAR.patch
+PATCHFILES += 0001-opt-csw-prefix.patch
+PATCHFILES += 0002-comment-out-Linux-defaults.patch
+PATCHFILES += 0003-Solaris-settings.patch
+PATCHFILES += 0004-Using-GNU-install.patch
+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
 DISTFILES  = $(NAME)-$(VERSION).tgz
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz
 CONFIGURE_SCRIPTS =

Modified: csw/mgar/pkg/tree/trunk/checksums
===================================================================
--- csw/mgar/pkg/tree/trunk/checksums	2011-09-22 14:54:47 UTC (rev 15715)
+++ csw/mgar/pkg/tree/trunk/checksums	2011-09-22 22:26:35 UTC (rev 15716)
@@ -1,3 +1 @@
-05bd12b988fe004f1e82a0528b097100  0002-Allowing-CFLAGS-from-GAR.patch
-2e286acfa044c3bf9b75f31a97fa7540  solaris.patch
-c07ce9065667a23f27aca4de8ecccb10  tree-1.5.3.tgz
+04e967a3f4108d50cde3b4b0e89e970a  tree-1.6.0.tgz

Added: csw/mgar/pkg/tree/trunk/files/0001-opt-csw-prefix.patch
===================================================================
--- csw/mgar/pkg/tree/trunk/files/0001-opt-csw-prefix.patch	                        (rev 0)
+++ csw/mgar/pkg/tree/trunk/files/0001-opt-csw-prefix.patch	2011-09-22 22:26:35 UTC (rev 15716)
@@ -0,0 +1,25 @@
+From 4ba720789cbb6218c5517f97d80192525bc25ce4 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Thu, 22 Sep 2011 23:58:11 +0200
+Subject: [PATCH 1/5] /opt/csw prefix
+
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7501eee..a7916dd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,7 +16,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+-prefix = /usr
++prefix = /opt/csw
+ 
+ CC=gcc
+ 
+-- 
+1.7.6.1
+

Deleted: csw/mgar/pkg/tree/trunk/files/0002-Allowing-CFLAGS-from-GAR.patch
===================================================================
--- csw/mgar/pkg/tree/trunk/files/0002-Allowing-CFLAGS-from-GAR.patch	2011-09-22 14:54:47 UTC (rev 15715)
+++ csw/mgar/pkg/tree/trunk/files/0002-Allowing-CFLAGS-from-GAR.patch	2011-09-22 22:26:35 UTC (rev 15716)
@@ -1,26 +0,0 @@
-From ac6973fc238837f1618bef33603b82118a0f963d Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Mon, 5 Jul 2010 00:43:50 +0200
-Subject: [PATCH] Allowing CFLAGS from GAR.
-
----
- Makefile |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3324dd3..ac03ef9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -30,8 +30,7 @@ MANDIR=${prefix}/man/man1
- 
- # Uncomment for Solaris:
- #CC=cc
--CFLAGS=-xO0 -v
--LDFLAGS=
-+CFLAGS ?= -xO0 -v
- XOBJS=strverscmp.o
- MANDIR=${prefix}/share/man/man1
- INSTALL=ginstall
--- 
-1.7.1
-

Added: csw/mgar/pkg/tree/trunk/files/0002-comment-out-Linux-defaults.patch
===================================================================
--- csw/mgar/pkg/tree/trunk/files/0002-comment-out-Linux-defaults.patch	                        (rev 0)
+++ csw/mgar/pkg/tree/trunk/files/0002-comment-out-Linux-defaults.patch	2011-09-22 22:26:35 UTC (rev 15716)
@@ -0,0 +1,36 @@
+From e177039097217e9f6f26a7325d5c7a5ad2ccfd80 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Thu, 22 Sep 2011 23:58:52 +0200
+Subject: [PATCH 2/5] comment out Linux defaults
+
+---
+ Makefile |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a7916dd..2942176 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,7 +18,7 @@
+ 
+ prefix = /opt/csw
+ 
+-CC=gcc
++# CC=gcc
+ 
+ VERSION=1.6.0
+ TREE_DEST=tree
+@@ -31,8 +31,8 @@ OBJS=tree.o unix.o html.o xml.o hash.o color.o
+ 
+ # Linux defaults:
+ #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-CFLAGS=-O4 -Wall  -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-LDFLAGS=-s
++# CFLAGS=-O4 -Wall  -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++# LDFLAGS=-s
+ 
+ # Uncomment for FreeBSD:
+ #CFLAGS=-O2 -Wall -fomit-frame-pointer
+-- 
+1.7.6.1
+

Added: csw/mgar/pkg/tree/trunk/files/0003-Solaris-settings.patch
===================================================================
--- csw/mgar/pkg/tree/trunk/files/0003-Solaris-settings.patch	                        (rev 0)
+++ csw/mgar/pkg/tree/trunk/files/0003-Solaris-settings.patch	2011-09-22 22:26:35 UTC (rev 15716)
@@ -0,0 +1,33 @@
+From 325e376531df4acd03995a39da3644029535a92f Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Thu, 22 Sep 2011 23:59:37 +0200
+Subject: [PATCH 3/5] Solaris settings
+
+---
+ Makefile |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2942176..5444834 100644
+--- a/Makefile
++++ b/Makefile
+@@ -40,11 +40,11 @@ OBJS=tree.o unix.o html.o xml.o hash.o color.o
+ #OBJS+=strverscmp.o
+ 
+ # Uncomment for Solaris:
+-#CC=cc
+-#CFLAGS=-xO0 -v
+-#LDFLAGS=
+-#OBJS+=strverscmp.o
+-#MANDIR=${prefix}/share/man/man1
++CC=cc
++CFLAGS=-xO0 -v
++LDFLAGS=
++OBJS+=strverscmp.o
++MANDIR=${prefix}/share/man/man1
+ 
+ # Uncomment for Cygwin:
+ #CFLAGS=-O2 -Wall -fomit-frame-pointer -DCYGWIN
+-- 
+1.7.6.1
+

Added: csw/mgar/pkg/tree/trunk/files/0004-Using-GNU-install.patch
===================================================================
--- csw/mgar/pkg/tree/trunk/files/0004-Using-GNU-install.patch	                        (rev 0)
+++ csw/mgar/pkg/tree/trunk/files/0004-Using-GNU-install.patch	2011-09-22 22:26:35 UTC (rev 15716)
@@ -0,0 +1,43 @@
+From e50871ba9d5ecf90bce31e334b5346a68ea393a0 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Fri, 23 Sep 2011 00:00:47 +0200
+Subject: [PATCH 4/5] Using GNU install
+
+---
+ Makefile |   11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 5444834..bf1bc70 100644
+--- a/Makefile
++++ b/Makefile
+@@ -46,6 +46,9 @@ LDFLAGS=
+ OBJS+=strverscmp.o
+ MANDIR=${prefix}/share/man/man1
+ 
++# Using the GNU install on Solaris
++INSTALL=ginstall
++
+ # Uncomment for Cygwin:
+ #CFLAGS=-O2 -Wall -fomit-frame-pointer -DCYGWIN
+ #LDFLAGS=-s
+@@ -94,12 +97,12 @@ clean:
+ 	rm -f *~
+ 
+ install: tree
+-	install -d $(BINDIR)
+-	install -d $(MANDIR)
++	$(INSTALL) -d $(DESTDIR)$(BINDIR)
++	$(INSTALL) -d $(DESTDIR)$(MANDIR)
+ 	if [ -e $(TREE_DEST) ]; then \
+-		install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
++		$(INSTALL) -s $(TREE_DEST) $(DESTDIR)$(BINDIR)/$(TREE_DEST); \
+ 	fi
+-	install doc/$(MAN) $(MANDIR)/$(MAN)
++	$(INSTALL) doc/$(MAN) $(DESTDIR)$(MANDIR)/$(MAN)
+ 
+ distclean:
+ 	if [ -f tree.o ]; then rm *.o; fi
+-- 
+1.7.6.1
+

Added: csw/mgar/pkg/tree/trunk/files/0005-Allowing-CFLAGS-from-GAR.patch
===================================================================
--- csw/mgar/pkg/tree/trunk/files/0005-Allowing-CFLAGS-from-GAR.patch	                        (rev 0)
+++ csw/mgar/pkg/tree/trunk/files/0005-Allowing-CFLAGS-from-GAR.patch	2011-09-22 22:26:35 UTC (rev 15716)
@@ -0,0 +1,24 @@
+From 384304832c1c4db1a4606d9935f3575c4f98ae8e Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Fri, 23 Sep 2011 00:02:05 +0200
+Subject: [PATCH 5/5] Allowing CFLAGS from GAR
+
+---
+ Makefile |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index bf1bc70..8cc8886 100644
+--- a/Makefile
++++ b/Makefile
+@@ -41,7 +41,6 @@ OBJS=tree.o unix.o html.o xml.o hash.o color.o
+ 
+ # Uncomment for Solaris:
+ CC=cc
+-CFLAGS=-xO0 -v
+ LDFLAGS=
+ OBJS+=strverscmp.o
+ MANDIR=${prefix}/share/man/man1
+-- 
+1.7.6.1
+

Added: csw/mgar/pkg/tree/trunk/files/0006-Undefine-S_ISDOOR-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/tree/trunk/files/0006-Undefine-S_ISDOOR-on-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/tree/trunk/files/0006-Undefine-S_ISDOOR-on-Solaris.patch	2011-09-22 22:26:35 UTC (rev 15716)
@@ -0,0 +1,27 @@
+From 24b1cab40c7ffc94bec6e2ff81b5af06cb4a38fa Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Fri, 23 Sep 2011 00:16:12 +0200
+Subject: [PATCH] Undefine S_ISDOOR on Solaris
+
+---
+ tree.h |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/tree.h b/tree.h
+index 21e01ad..20f9072 100644
+--- a/tree.h
++++ b/tree.h
+@@ -59,6 +59,10 @@
+ #define mbstowcs(w,m,x) mbsrtowcs(w,(const char**)(& #m),x,NULL)
+ #endif
+ 
++#if defined(__sun) || defined(__sun__)
++# undef S_ISDOOR
++#endif
++
+ /* Should probably use strdup(), but we like our xmalloc() */
+ #define scopy(x)	strcpy(xmalloc(strlen(x)+1),(x))
+ #define MINIT		30	/* number of dir entries to initially allocate */
+-- 
+1.7.6.1
+

Added: csw/mgar/pkg/tree/trunk/files/0007-dash-e-is-not-available-in-bin-sh.patch
===================================================================
--- csw/mgar/pkg/tree/trunk/files/0007-dash-e-is-not-available-in-bin-sh.patch	                        (rev 0)
+++ csw/mgar/pkg/tree/trunk/files/0007-dash-e-is-not-available-in-bin-sh.patch	2011-09-22 22:26:35 UTC (rev 15716)
@@ -0,0 +1,25 @@
+From f2594284817d767991ba54daf2c1ebade28b67e1 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Fri, 23 Sep 2011 00:22:30 +0200
+Subject: [PATCH] dash e is not available in /bin/sh
+
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8cc8886..8b36db5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -98,7 +98,7 @@ clean:
+ install: tree
+ 	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -d $(DESTDIR)$(MANDIR)
+-	if [ -e $(TREE_DEST) ]; then \
++	if [ -r $(TREE_DEST) ]; then \
+ 		$(INSTALL) -s $(TREE_DEST) $(DESTDIR)$(BINDIR)/$(TREE_DEST); \
+ 	fi
+ 	$(INSTALL) doc/$(MAN) $(DESTDIR)$(MANDIR)/$(MAN)
+-- 
+1.7.6.1
+

Deleted: csw/mgar/pkg/tree/trunk/files/solaris.patch
===================================================================
--- csw/mgar/pkg/tree/trunk/files/solaris.patch	2011-09-22 14:54:47 UTC (rev 15715)
+++ csw/mgar/pkg/tree/trunk/files/solaris.patch	2011-09-22 22:26:35 UTC (rev 15716)
@@ -1,58 +0,0 @@
---- tree-1.5.3/Makefile.orig	2010-02-02 09:04:08.804909345 +0100
-+++ tree-1.5.3/Makefile	2010-02-02 09:04:12.780237318 +0100
-@@ -6,9 +6,9 @@
- # warranties, including, without limitation, the implied warranties
- # of merchant-ability and fitness for a particular purpose.
- 
--prefix = /usr
-+prefix = /opt/csw
- 
--CC=gcc
-+# CC=gcc
- 
- VERSION=1.5.3
- TREE_DEST=tree
-@@ -19,7 +19,7 @@
- # Uncomment options below for your particular OS:
- 
- # Linux defaults:
--CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+# CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- #CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- #LDFLAGS=-s
- 
-@@ -30,10 +30,11 @@
- 
- # Uncomment for Solaris:
- #CC=cc
--#CFLAGS=-xO0 -v
--#LDFLAGS=
--#XOBJS=strverscmp.o
--#MANDIR=${prefix}/share/man/man1
-+CFLAGS=-xO0 -v
-+LDFLAGS=
-+XOBJS=strverscmp.o
-+MANDIR=${prefix}/share/man/man1
-+INSTALL=ginstall
- 
- # Uncomment for Cygwin:
- #CFLAGS=-O2 -Wall -fomit-frame-pointer -DCYGWIN
-@@ -83,12 +84,12 @@
- 	rm -f *~
- 
- install: tree
--	install -d $(BINDIR)
--	install -d $(MANDIR)
--	if [ -e $(TREE_DEST) ]; then \
--		install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
--	fi
--	install man/$(MAN) $(MANDIR)/$(MAN)
-+	$(INSTALL) -d $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -d $(DESTDIR)$(MANDIR)
-+	if [ -r $(TREE_DEST) ]; then \
-+		$(INSTALL) -s $(TREE_DEST) $(DESTDIR)$(BINDIR)/$(TREE_DEST); \
-+ 	fi
-+	$(INSTALL) man/$(MAN) $(DESTDIR)$(MANDIR)/$(MAN)
- 
- distclean:
- 	if [ -f tree.o ]; then rm *.o; fi

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



More information about the devel mailing list