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

[wahwah at users.sourceforge.net]

Revision: 8295
          http://gar.svn.sourceforge.net/gar/?rev=8295&view=rev
Author:   wahwah
Date:     2010-02-02 08:11:38 +0000 (Tue, 02 Feb 2010)

Log Message:
-----------
tree: Version bump to 1.5.3, Makefile edits

Modified Paths:
--------------
    csw/mgar/pkg/tree/trunk/Makefile
    csw/mgar/pkg/tree/trunk/checksums
    csw/mgar/pkg/tree/trunk/files/solaris.patch

Modified: csw/mgar/pkg/tree/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tree/trunk/Makefile	2010-02-02 08:05:14 UTC (rev 8294)
+++ csw/mgar/pkg/tree/trunk/Makefile	2010-02-02 08:11:38 UTC (rev 8295)
@@ -3,7 +3,7 @@
 # $Id$
 
 GARNAME = tree
-GARVERSION = 1.5.2.2
+GARVERSION = 1.5.3
 CATEGORIES = utils
 DESCRIPTION = A recursive directory listing program
 define BLURB

Modified: csw/mgar/pkg/tree/trunk/checksums
===================================================================
--- csw/mgar/pkg/tree/trunk/checksums	2010-02-02 08:05:14 UTC (rev 8294)
+++ csw/mgar/pkg/tree/trunk/checksums	2010-02-02 08:11:38 UTC (rev 8295)
@@ -1,2 +1,2 @@
-e714975edbf63afd3037b3c75b0c5319  download/solaris.patch
-a7731a898e2c0d7e422a57a84ffbb06c  download/tree-1.5.2.2.tgz
+2e286acfa044c3bf9b75f31a97fa7540  solaris.patch
+c07ce9065667a23f27aca4de8ecccb10  tree-1.5.3.tgz

Modified: csw/mgar/pkg/tree/trunk/files/solaris.patch
===================================================================
--- csw/mgar/pkg/tree/trunk/files/solaris.patch	2010-02-02 08:05:14 UTC (rev 8294)
+++ csw/mgar/pkg/tree/trunk/files/solaris.patch	2010-02-02 08:11:38 UTC (rev 8295)
@@ -1,7 +1,5 @@
-diff --git a/Makefile b/Makefile
-index 54260a7..e622acd 100644
---- a/Makefile
-+++ b/Makefile
+--- 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.
@@ -12,30 +10,25 @@
 -CC=gcc
 +# CC=gcc
  
- VERSION=1.5.2.2
+ VERSION=1.5.3
  TREE_DEST=tree
-@@ -20,8 +20,9 @@ MANDIR=${prefix}/man/man1
+@@ -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=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--LDFLAGS=-s
-+#CFLAGS=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+#LDFLAGS=-s
-+#INSTALL=$(INSTALL)
+-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
  
- # Uncomment for FreeBSD:
- #CFLAGS=-O2 -Wall -fomit-frame-pointer
-@@ -29,11 +30,12 @@ LDFLAGS=-s
- #XOBJS=strverscmp.o
+@@ -30,10 +30,11 @@
  
  # Uncomment for Solaris:
--#CC=cc
+ #CC=cc
 -#CFLAGS=-xO0 -v
 -#LDFLAGS=
 -#XOBJS=strverscmp.o
 -#MANDIR=${prefix}/share/man/man1
-+CC=cc
 +CFLAGS=-xO0 -v
 +LDFLAGS=
 +XOBJS=strverscmp.o
@@ -44,7 +37,7 @@
  
  # Uncomment for Cygwin:
  #CFLAGS=-O2 -Wall -fomit-frame-pointer -DCYGWIN
-@@ -83,12 +85,12 @@ clean:
+@@ -83,12 +84,12 @@
  	rm -f *~
  
  install: tree
@@ -52,12 +45,13 @@
 -	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) $(MANDIR)/$(MAN)
++ 	fi
 +	$(INSTALL) man/$(MAN) $(DESTDIR)$(MANDIR)/$(MAN)
  
  distclean:


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