[CVS] OpenPKG: openpkg-src/tree/ tree.patch tree.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Jun-2008 20:50:57
Branch: HEAD Handle: 2008060719505600
Modified files:
openpkg-src/treetree.patch tree.spec
Log:
upgrading package: tree 1.5.1.2 - 1.5.2
Summary:
RevisionChanges Path
1.5 +43 -9 openpkg-src/tree/tree.patch
1.9 +2 -6 openpkg-src/tree/tree.spec
patch -p0 '@@ .'
Index: openpkg-src/tree/tree.patch
$ cvs diff -u -r1.4 -r1.5 tree.patch
--- openpkg-src/tree/tree.patch 4 Jun 2008 20:27:24 - 1.4
+++ openpkg-src/tree/tree.patch 7 Jun 2008 18:50:56 - 1.5
@@ -1,6 +1,6 @@
Index: man/tree.1
man/tree.1.orig 2007-06-11 15:22:14 +0200
-+++ man/tree.1 2008-06-04 22:20:33 +0200
+--- man/tree.1.orig 2008-06-04 17:35:31 +0200
man/tree.1 2008-06-07 20:49:03 +0200
@@ -25,8 +25,8 @@
.br
.SH DESCRIPTION
@@ -12,19 +12,23 @@
\fItree\fP lists the files in the current directory. When directory
arguments are given, \fItree\fP lists all the files and/or directories found
in the given directories each in turn. Upon completion of listing all
-@@ -149,7 +149,7 @@
+@@ -149,11 +149,7 @@
.PP
.TP
.B -N
-Print non-printable characters as is instead of the default carrot notation.
+-.PP
+-.TP
+-.B -v
+-Sort the output by version.
+Print non-printable characters as is instead of the default caret notation.
.PP
.TP
.B -r
Index: tree.c
tree.c.orig 2008-06-04 16:15:11 +0200
-+++ tree.c 2008-06-04 22:20:33 +0200
-@@ -31,6 +31,12 @@
+--- tree.c.orig 2008-06-04 21:45:46 +0200
tree.c 2008-06-07 20:49:20 +0200
+@@ -33,6 +33,12 @@
#include limits.h
#include pwd.h
#include grp.h
@@ -37,7 +41,15 @@
#ifdef __EMX__ /* for OS/2 systems */
# define INCL_DOSFILEMGR
# define INCL_DOSNLS
-@@ -196,7 +202,8 @@
+@@ -143,7 +149,6 @@
+ /* Function prototypes: */
+ int color(u_short, char *, char, char), cmd(char *), patmatch(char *, char
*);
+ int alnumsort(struct _info **, struct _info **);
+-int versort(struct _info **a, struct _info **b);
+ int reversealnumsort(struct _info **, struct _info **);
+ int timesort(struct _info **, struct _info **);
+ int dirsfirstsort(struct _info **, struct _info **);
+@@ -200,7 +205,8 @@
q = p = dtotal = ftotal = 0;
aflag = dflag = fflag = lflag = pflag = sflag = Fflag = uflag = gflag =
FALSE;
Dflag = qflag = Nflag = Hflag = Rflag = hflag = FALSE;
@@ -45,9 +57,19 @@
+ noindent = force_color = xdev = noreport = nolinks = FALSE;
+ nocolor = TRUE;
inodeflag = devflag = FALSE;
+ flimit = 0;
dirs = xmalloc(sizeof(int) * (maxdirs=4096));
- dirs[0] = 0;
-@@ -624,7 +631,7 @@
+@@ -296,9 +302,6 @@
+ case 'r':
+ cmpfunc = reversealnumsort;
+ break;
+-case 'v':
+- cmpfunc = versort;
+- break;
+ case 'H':
+ Hflag = TRUE;
+ if (argv[n] == NULL) {
+@@ -658,7 +661,7 @@
#ifdef __USE_FILE_OFFSET64
if (inodeflag) sprintf(path, %7lld,(*dir)-inode);
#else
@@ -56,3 +78,15 @@
#endif
if (devflag) sprintf(path+strlen(path), %3d, (int)(*dir)-dev);
#ifdef __EMX__
+@@ -917,11 +920,6 @@
+ return strcmp((*a)-name,(*b)-name);
+ }
+
+-int versort(struct _info **a, struct _info **b)
+-{
+- return strverscmp((*a)-name,(*b)-name);
+-}
+-
+ int reversealnumsort(struct _info **a, struct _info **b)
+ {
+ return strcmp((*b)-name,(*a)-name);
@@ .
patch -p0 '@@ .'
Index: openpkg-src/tree/tree.spec
$ cvs diff -u -r1.8 -r1.9 tree.spec
--- openpkg-src/tree/tree.spec4 Jun 2008 20:27:24 - 1.8
+++ openpkg-src/tree/tree.spec7 Jun 2008 18:50:56 - 1.9
@@ -21,10 +21,6 @@
## SUCH DAMAGE.
##
-# package version
-%define V_tree 1.5.1
-%define V_pl2
-
# package information
Name: tree
Summary: Filesystem Tree Listing
@@ -35,8 +31,8 @@
Class:EVAL
Group:ShellUtils
License: GPL
-Version: %{V_tree}.%{V_pl}
-Release: 20080604
+Version: 1.5.2
+Release: 20080607
# list of sources
Source0: ftp://mama.indstate.edu/linux/tree/tree-%{version}.tgz
@@ .
__
OpenPKG
[CVS] OpenPKG: openpkg-src/tree/ tree.patch tree.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Jun-2008 22:27:25
Branch: HEAD Handle: 2008060421272400
Modified files:
openpkg-src/treetree.patch tree.spec
Log:
upgrading package: tree 1.5.1.1 - 1.5.1.2
Summary:
RevisionChanges Path
1.4 +7 -26 openpkg-src/tree/tree.patch
1.8 +2 -2 openpkg-src/tree/tree.spec
patch -p0 '@@ .'
Index: openpkg-src/tree/tree.patch
$ cvs diff -u -r1.3 -r1.4 tree.patch
--- openpkg-src/tree/tree.patch 10 Jan 2007 18:44:25 - 1.3
+++ openpkg-src/tree/tree.patch 4 Jun 2008 20:27:24 - 1.4
@@ -1,6 +1,6 @@
Index: man/tree.1
man/tree.1.orig 2007-01-09 21:53:30 +0100
-+++ man/tree.1 2007-01-10 19:42:01 +0100
+--- man/tree.1.orig 2007-06-11 15:22:14 +0200
man/tree.1 2008-06-04 22:20:33 +0200
@@ -25,8 +25,8 @@
.br
.SH DESCRIPTION
@@ -22,19 +22,9 @@
.TP
.B -r
Index: tree.c
tree.c.orig 2007-01-09 22:07:16 +0100
-+++ tree.c 2007-01-10 19:42:47 +0100
-@@ -17,7 +17,9 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-+#if defined(__linux__)
- #include features.h
-+#endif
- #include stdlib.h
- #include stdio.h
- #include time.h
-@@ -32,6 +34,12 @@
+--- tree.c.orig 2008-06-04 16:15:11 +0200
tree.c 2008-06-04 22:20:33 +0200
+@@ -31,6 +31,12 @@
#include limits.h
#include pwd.h
#include grp.h
@@ -47,16 +37,7 @@
#ifdef __EMX__ /* for OS/2 systems */
# define INCL_DOSFILEMGR
# define INCL_DOSNLS
-@@ -181,7 +189,7 @@
-
- #ifdef CYGWIN
- extern int MB_CUR_MAX;
--#else
-+#elif defined(__linux__)
- extern size_t MB_CUR_MAX;
- #endif
-
-@@ -194,7 +202,8 @@
+@@ -196,7 +202,8 @@
q = p = dtotal = ftotal = 0;
aflag = dflag = fflag = lflag = pflag = sflag = Fflag = uflag = gflag =
FALSE;
Dflag = qflag = Nflag = Hflag = Rflag = hflag = FALSE;
@@ -66,7 +47,7 @@
inodeflag = devflag = FALSE;
dirs = xmalloc(sizeof(int) * (maxdirs=4096));
dirs[0] = 0;
-@@ -624,7 +633,7 @@
+@@ -624,7 +631,7 @@
#ifdef __USE_FILE_OFFSET64
if (inodeflag) sprintf(path, %7lld,(*dir)-inode);
#else
@@ .
patch -p0 '@@ .'
Index: openpkg-src/tree/tree.spec
$ cvs diff -u -r1.7 -r1.8 tree.spec
--- openpkg-src/tree/tree.spec26 Apr 2008 14:52:15 - 1.7
+++ openpkg-src/tree/tree.spec4 Jun 2008 20:27:24 - 1.8
@@ -23,7 +23,7 @@
# package version
%define V_tree 1.5.1
-%define V_pl1
+%define V_pl2
# package information
Name: tree
@@ -36,7 +36,7 @@
Group:ShellUtils
License: GPL
Version: %{V_tree}.%{V_pl}
-Release: 20080426
+Release: 20080604
# list of sources
Source0: ftp://mama.indstate.edu/linux/tree/tree-%{version}.tgz
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/tree/ tree.patch tree.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Jan-2007 19:44:26
Branch: HEAD Handle: 2007011018442500
Modified files:
openpkg-src/treetree.patch tree.spec
Log:
upgrading package: tree 1.5.0 - 1.5.1
Summary:
RevisionChanges Path
1.3 +35 -33 openpkg-src/tree/tree.patch
1.4 +3 -3 openpkg-src/tree/tree.spec
patch -p0 '@@ .'
Index: openpkg-src/tree/tree.patch
$ cvs diff -u -r1.2 -r1.3 tree.patch
--- openpkg-src/tree/tree.patch 27 Oct 2006 18:21:32 - 1.2
+++ openpkg-src/tree/tree.patch 10 Jan 2007 18:44:25 - 1.3
@@ -1,6 +1,6 @@
-Index: tree.1
tree.1.orig 2004-08-15 01:29:06 +0200
-+++ tree.1 2006-10-27 20:20:38 +0200
+Index: man/tree.1
+--- man/tree.1.orig 2007-01-09 21:53:30 +0100
man/tree.1 2007-01-10 19:42:01 +0100
@@ -25,8 +25,8 @@
.br
.SH DESCRIPTION
@@ -12,12 +12,7 @@
\fItree\fP lists the files in the current directory. When directory
arguments are given, \fItree\fP lists all the files and/or directories found
in the given directories each in turn. Upon completion of listing all
-@@ -139,11 +139,11 @@
- .TP
- .B -q
- Print non-printable characters in filenames as question marks instead of
the default
--carrot notation.
-+caret notation.
+@@ -149,7 +149,7 @@
.PP
.TP
.B -N
@@ -27,24 +22,24 @@
.TP
.B -r
Index: tree.c
tree.c.orig 2004-08-16 03:07:21 +0200
-+++ tree.c 2006-10-27 20:20:38 +0200
-@@ -19,9 +19,6 @@
-
- #ifdef LINUX_BIGFILE
- # define _LARGEFILE64_SOURCE
--#else
--# define stat64 stat
--# define lstat64 lstat
- #endif
+--- tree.c.orig 2007-01-09 22:07:16 +0100
tree.c 2007-01-10 19:42:47 +0100
+@@ -17,7 +17,9 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
++#if defined(__linux__)
+ #include features.h
++#endif
#include stdlib.h
-@@ -38,6 +35,12 @@
+ #include stdio.h
+ #include time.h
+@@ -32,6 +34,12 @@
#include limits.h
#include pwd.h
#include grp.h
+
-+#if !defined(LINUX_BIGFILE)
++#if !defined(LINUX_BIGFILE) defined(__linux__)
+# define stat64 stat
+# define lstat64 lstat
+#endif
@@ -52,24 +47,31 @@
#ifdef __EMX__ /* for OS/2 systems */
# define INCL_DOSFILEMGR
# define INCL_DOSNLS
-@@ -189,7 +192,9 @@
- FILE *outfile;
- int *dirs, maxdirs;
+@@ -181,7 +189,7 @@
-+#ifdef __linux__
+ #ifdef CYGWIN
+ extern int MB_CUR_MAX;
+-#else
++#elif defined(__linux__)
extern size_t MB_CUR_MAX;
-+#endif
+ #endif
- int main(int argc, char **argv)
- {
-@@ -200,8 +205,9 @@
+@@ -194,7 +202,8 @@
q = p = dtotal = ftotal = 0;
aflag = dflag = fflag = lflag = pflag = sflag = Fflag = uflag = gflag =
FALSE;
- Dflag = qflag = Nflag = Hflag = Rflag = FALSE;
+ Dflag = qflag = Nflag = Hflag = Rflag = hflag = FALSE;
- noindent = force_color = nocolor = xdev = noreport = nolinks = FALSE;
+ noindent = force_color = xdev = noreport = nolinks = FALSE;
- inodeflag = devflag = FALSE;
+ nocolor = TRUE;
+ inodeflag = devflag = FALSE;
dirs = xmalloc(sizeof(int) * (maxdirs=4096));
- Level = -1;
-
+ dirs[0] = 0;
+@@ -624,7 +633,7 @@
+ #ifdef __USE_FILE_OFFSET64
+ if (inodeflag) sprintf(path, %7lld,(*dir)-inode);
+ #else
+-if (inodeflag) sprintf(path, %7ld,(*dir)-inode);
++if (inodeflag) sprintf(path, %7ld, (long int)((*dir)-inode));
+ #endif
+ if (devflag) sprintf(path+strlen(path), %3d, (int)(*dir)-dev);
+ #ifdef __EMX__
@@ .
patch -p0 '@@ .'
Index: openpkg-src/tree/tree.spec
$ cvs diff -u -r1.3 -r1.4 tree.spec
--- openpkg-src/tree/tree.spec1 Jan 2007 17:42:27 - 1.3
+++ openpkg-src/tree/tree.spec10 Jan 2007 18:44:25 - 1.4
@@ -32,8 +32,8 @@
Class:EVAL
Group:ShellUtils
License: GPL
-Version: 1.5.0
-Release: 20061027
+Version: 1.5.1
+Release: 20070110
# list of sources
Source0: ftp://mama.indstate.edu/linux/tree/tree-%{version}.tgz
@@ -79,7 +79,7 @@
%{l_shtool} install -c -s -m 755 \
tree $RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_shtool} install -c -m 644 \
-tree.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+man/tree.1
[CVS] OpenPKG: openpkg-src/tree/ tree.patch tree.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Oct-2006 20:18:59
Branch: HEAD Handle: 2006102719185800
Added files:
openpkg-src/treetree.patch tree.spec
Log:
new package: tree 1.5.0 (Filesystem Tree Listing)
Summary:
RevisionChanges Path
1.1 +36 -0 openpkg-src/tree/tree.patch
1.1 +89 -0 openpkg-src/tree/tree.spec
patch -p0 '@@ .'
Index: openpkg-src/tree/tree.patch
$ cvs diff -u -r0 -r1.1 tree.patch
--- /dev/null 2006-10-27 20:18:53 +0200
+++ tree.patch2006-10-27 20:18:58 +0200
@@ -0,0 +1,36 @@
+Index: tree.c
+--- tree.c.orig 2004-08-16 03:07:21 +0200
tree.c 2006-10-27 20:16:19 +0200
+@@ -19,9 +19,6 @@
+
+ #ifdef LINUX_BIGFILE
+ # define _LARGEFILE64_SOURCE
+-#else
+-# define stat64 stat
+-# define lstat64 lstat
+ #endif
+
+ #include stdlib.h
+@@ -38,6 +35,12 @@
+ #include limits.h
+ #include pwd.h
+ #include grp.h
++
++#if !defined(LINUX_BIGFILE)
++# define stat64 stat
++# define lstat64 lstat
++#endif
++
+ #ifdef __EMX__ /* for OS/2 systems */
+ # define INCL_DOSFILEMGR
+ # define INCL_DOSNLS
+@@ -189,7 +192,9 @@
+ FILE *outfile;
+ int *dirs, maxdirs;
+
++#ifdef __linux__
+ extern size_t MB_CUR_MAX;
++#endif
+
+ int main(int argc, char **argv)
+ {
@@ .
patch -p0 '@@ .'
Index: openpkg-src/tree/tree.spec
$ cvs diff -u -r0 -r1.1 tree.spec
--- /dev/null 2006-10-27 20:18:53 +0200
+++ tree.spec 2006-10-27 20:18:59 +0200
@@ -0,0 +1,89 @@
+##
+## tree.spec -- OpenPKG RPM Package Specification
+## Copyright (c) 2000-2006 OpenPKG Foundation e.V. http://openpkg.net/
+## Copyright (c) 2000-2006 Ralf S. Engelschall http://engelschall.com/
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+##
+
+# package information
+Name: tree
+Summary: Filesystem Tree Listing
+URL: http://mama.indstate.edu/users/ice/tree/
+Vendor: Steve Baker
+Packager: OpenPKG Foundation e.V.
+Distribution: OpenPKG Community
+Class:EVAL
+Group:ShellUtils
+License: GPL
+Version: 1.5.0
+Release: 20061027
+
+# list of sources
+Source0: ftp://mama.indstate.edu/linux/tree/tree-%{version}.tgz
+Patch0: tree.patch
+
+# build information
+Prefix: %{l_prefix}
+BuildRoot:%{l_buildroot}
+BuildPreReq: OpenPKG, openpkg = 20040130
+PreReq: OpenPKG, openpkg = 20040130
+AutoReq: no
+AutoReqProv: no
+
+%description
+tree(1) is a handy little utility to display a tree view of the
+filesystem directories.
+
+%track
+prog tree = {
+version = %{version}
+url = ftp://mama.indstate.edu/linux/tree/
+regex = tree-(__VER__)\.tgz
+}
+
+%prep
+%setup -q
+%patch -p0
+
+%build
+export CC=%{l_cc}
+export CFLAGS=%{l_cflags -O}
+export LDFLAGS=
+case %{l_platform -t} in
+*-linux* ) CFLAGS=$CFLAGS -DLINUX_BIGFILE ;;
+esac
+%{l_make} %{l_mflags} CC=$CC CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{l_shtool} mkdir -f -p -m 755 \
+$RPM_BUILD_ROOT%{l_prefix}/bin \
+$RPM_BUILD_ROOT%{l_prefix}/man/man1
+%{l_shtool} install -c -s -m 755 \
+tree $RPM_BUILD_ROOT%{l_prefix}/bin/
+
