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: 26-May-2005 20:21:09
Branch: HEAD Handle: 2005052619210900
Modified files:
openpkg-src/cvsps cvsps.patch cvsps.spec
Log:
upgrading package: cvsps 2.0rc1 -> 2.1
Summary:
Revision Changes Path
1.12 +56 -51 openpkg-src/cvsps/cvsps.patch
1.28 +2 -2 openpkg-src/cvsps/cvsps.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvsps/cvsps.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 cvsps.patch
--- openpkg-src/cvsps/cvsps.patch 4 Jul 2003 13:27:46 -0000 1.11
+++ openpkg-src/cvsps/cvsps.patch 26 May 2005 18:21:09 -0000 1.12
@@ -1,8 +1,9 @@
---- Makefile.orig Fri Apr 11 16:06:01 2003
-+++ Makefile Mon Jun 30 09:43:43 2003
+Index: Makefile
+--- Makefile.orig 2005-05-26 05:39:40 +0200
++++ Makefile 2005-05-26 20:19:29 +0200
@@ -1,9 +1,10 @@
MAJOR=2
- MINOR=0rc1
+ MINOR=1
-CC?=gcc
-CFLAGS?=-g -O2 -Wall
-CFLAGS+=-I. -DVERSION=\"$(MAJOR).$(MINOR)\"
@@ -15,7 +16,7 @@
OBJS=\
cbtcommon/debug.o\
cbtcommon/hash.o\
-@@ -19,8 +20,11 @@
+@@ -20,8 +21,11 @@
all: cvsps
@@ -28,51 +29,9 @@
install:
[ -d $(prefix)/bin ] || mkdir -p $(prefix)/bin
---- util.h.orig Fri Apr 11 16:06:01 2003
-+++ util.h Fri Jul 4 15:23:50 2003
-@@ -19,5 +19,6 @@
- void timing_stop(const char *);
- int my_system(const char *);
- int escape_filename(char *, int, const char *);
-+char *my_strsep(char **, const char *);
-
- #endif /* UTIL_H */
---- util.c.orig Fri Apr 11 16:06:01 2003
-+++ util.c Fri Jul 4 15:23:31 2003
-@@ -241,3 +241,31 @@
-
- return (*src == 0) ? 0 : -1;
- }
-+
-+char *my_strsep(char **stringp, const char *delim)
-+{
-+ char *s;
-+ const char *spanp;
-+ int c, sc;
-+ char *tok;
-+
-+ if ((s = *stringp) == NULL)
-+ return NULL;
-+ for (tok = s;;) {
-+ c = *s++;
-+ spanp = delim;
-+ do {
-+ if ((sc = *spanp++) == c) {
-+ if (c == 0)
-+ s = NULL;
-+ else
-+ s[-1] = 0;
-+ *stringp = s;
-+ return tok;
-+ }
-+ } while (sc != 0);
-+ }
-+ /* NOTREACHED */
-+ return NULL;
-+}
-+
---- cache.c.orig Fri Apr 11 16:06:01 2003
-+++ cache.c Fri Jul 4 15:24:33 2003
+Index: cache.c
+--- cache.c.orig 2005-05-26 05:39:40 +0200
++++ cache.c 2005-05-26 20:18:47 +0200
@@ -361,7 +361,7 @@
strcpy(buff, p_buff);
@@ -82,8 +41,9 @@
{
char * c = strchr(s, ':');
---- cvs_direct.c.orig Fri Apr 11 16:06:02 2003
-+++ cvs_direct.c Fri Jul 4 15:25:08 2003
+Index: cvs_direct.c
+--- cvs_direct.c.orig 2005-05-26 05:39:40 +0200
++++ cvs_direct.c 2005-05-26 20:18:47 +0200
@@ -92,12 +92,12 @@
strcpy(root, p_root);
@@ -152,3 +112,48 @@
if (!tok2)
{
debug(DEBUG_APPERROR, "diff_opts parse_error: argument %s requires
two arguments", tok);
+Index: util.c
+--- util.c.orig 2005-05-26 05:39:40 +0200
++++ util.c 2005-05-26 20:18:47 +0200
+@@ -289,3 +289,31 @@
+
+ return (*src == 0) ? 0 : -1;
+ }
++
++char *my_strsep(char **stringp, const char *delim)
++{
++ char *s;
++ const char *spanp;
++ int c, sc;
++ char *tok;
++
++ if ((s = *stringp) == NULL)
++ return NULL;
++ for (tok = s;;) {
++ c = *s++;
++ spanp = delim;
++ do {
++ if ((sc = *spanp++) == c) {
++ if (c == 0)
++ s = NULL;
++ else
++ s[-1] = 0;
++ *stringp = s;
++ return tok;
++ }
++ } while (sc != 0);
++ }
++ /* NOTREACHED */
++ return NULL;
++}
++
+Index: util.h
+--- util.h.orig 2005-05-26 05:39:40 +0200
++++ util.h 2005-05-26 20:18:47 +0200
+@@ -23,5 +23,6 @@
+ void timing_stop(const char *);
+ int my_system(const char *);
+ int escape_filename(char *, int, const char *);
++char *my_strsep(char **, const char *);
+
+ #endif /* UTIL_H */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvsps/cvsps.spec
============================================================================
$ cvs diff -u -r1.27 -r1.28 cvsps.spec
--- openpkg-src/cvsps/cvsps.spec 24 Mar 2005 11:18:37 -0000 1.27
+++ openpkg-src/cvsps/cvsps.spec 26 May 2005 18:21:09 -0000 1.28
@@ -32,8 +32,8 @@
Class: EVAL
Group: SCM
License: GPL
-Version: 2.0rc1
-Release: 20040207
+Version: 2.1
+Release: 20050526
# list of sources
Source0: http://www.cobite.com/cvsps/cvsps-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
