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: 08-Jan-2008 20:13:24
Branch: HEAD Handle: 2008010819132300
Modified files:
openpkg-src/ctalk ctalk.patch ctalk.spec
Log:
upgrading package: ctalk 0.0.32a -> 0.0.33a
Summary:
Revision Changes Path
1.34 +21 -21 openpkg-src/ctalk/ctalk.patch
1.36 +8 -6 openpkg-src/ctalk/ctalk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ctalk/ctalk.patch
============================================================================
$ cvs diff -u -r1.33 -r1.34 ctalk.patch
--- openpkg-src/ctalk/ctalk.patch 1 Jan 2008 21:09:36 -0000 1.33
+++ openpkg-src/ctalk/ctalk.patch 8 Jan 2008 19:13:23 -0000 1.34
@@ -1,6 +1,6 @@
-Index: ctalk-0.0.32/ctpp/Makefile.in
---- ctalk-0.0.32/ctpp/Makefile.in.orig 2007-09-17 23:57:31 +0200
-+++ ctalk-0.0.32/ctpp/Makefile.in 2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.33/ctpp/Makefile.in
+--- ctalk-0.0.33/ctpp/Makefile.in.orig 2007-09-17 23:57:31 +0200
++++ ctalk-0.0.33/ctpp/Makefile.in 2007-09-18 07:49:32 +0200
@@ -121,7 +121,7 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
@@ -10,9 +10,9 @@
LIBTOOL = @LIBTOOL@
LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@
LIB_MINOR_VERSION = @LIB_MINOR_VERSION@
-Index: ctalk-0.0.32/ctpp/builtins.c
---- ctalk-0.0.32/ctpp/builtins.c.orig 2007-09-13 04:04:24 +0200
-+++ ctalk-0.0.32/ctpp/builtins.c 2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.33/ctpp/builtins.c
+--- ctalk-0.0.33/ctpp/builtins.c.orig 2007-09-13 04:04:24 +0200
++++ ctalk-0.0.33/ctpp/builtins.c 2007-09-18 07:49:32 +0200
@@ -80,11 +80,12 @@
* config file included above. See the comments in
* config/linux-gnu-x86.c
@@ -39,9 +39,9 @@
+#endif
return FALSE;
}
-Index: ctalk-0.0.32/ctpp/ccompat.c
---- ctalk-0.0.32/ctpp/ccompat.c.orig 2007-09-14 21:00:05 +0200
-+++ ctalk-0.0.32/ctpp/ccompat.c 2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.33/ctpp/ccompat.c
+--- ctalk-0.0.33/ctpp/ccompat.c.orig 2007-09-14 21:00:05 +0200
++++ ctalk-0.0.33/ctpp/ccompat.c 2007-09-18 07:49:32 +0200
@@ -53,8 +53,10 @@
char cpp_subdir[FILENAME_MAX];
@@ -62,9 +62,9 @@
/* Try to find out what the compiler target is. It may not
be the same as the autoconf $host.
-Index: ctalk-0.0.32/ctpp/i_opt.c
---- ctalk-0.0.32/ctpp/i_opt.c.orig 2007-09-13 04:04:24 +0200
-+++ ctalk-0.0.32/ctpp/i_opt.c 2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.33/ctpp/i_opt.c
+--- ctalk-0.0.33/ctpp/i_opt.c.orig 2007-09-13 04:04:24 +0200
++++ ctalk-0.0.33/ctpp/i_opt.c 2007-09-18 07:49:32 +0200
@@ -30,6 +30,8 @@
#include <stdlib.h>
#include <string.h>
@@ -74,9 +74,9 @@
#include "ctpp.h"
extern char source_file[FILENAME_MAX]; /* Declared in rtinfo.c. */
-Index: ctalk-0.0.32/lib/rtinfo.c
---- ctalk-0.0.32/lib/rtinfo.c.orig 2007-09-12 11:06:44 +0200
-+++ ctalk-0.0.32/lib/rtinfo.c 2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.33/lib/rtinfo.c
+--- ctalk-0.0.33/lib/rtinfo.c.orig 2007-09-12 11:06:44 +0200
++++ ctalk-0.0.33/lib/rtinfo.c 2007-09-18 07:49:32 +0200
@@ -32,7 +32,7 @@
#include "parser.h"
@@ -86,9 +86,9 @@
extern int daylight;
RT_INFO rtinfo;
-Index: ctalk-0.0.32/libctpp/lex.c
---- ctalk-0.0.32/libctpp/lex.c.orig 2007-09-13 04:04:26 +0200
-+++ ctalk-0.0.32/libctpp/lex.c 2007-09-18 07:49:32 +0200
+Index: ctalk-0.0.33/libctpp/lex.c
+--- ctalk-0.0.33/libctpp/lex.c.orig 2007-09-13 04:04:26 +0200
++++ ctalk-0.0.33/libctpp/lex.c 2007-09-18 07:49:32 +0200
@@ -26,6 +26,8 @@
#include <string.h>
#include <ctype.h>
@@ -98,9 +98,9 @@
#include "ctpp.h"
#include "typeof.h"
#include "prtinfo.h"
-Index: ctalk-0.0.32/src/Makefile.in
---- ctalk-0.0.32/src/Makefile.in.orig 2007-09-17 23:57:31 +0200
-+++ ctalk-0.0.32/src/Makefile.in 2007-09-18 07:54:46 +0200
+Index: ctalk-0.0.33/src/Makefile.in
+--- ctalk-0.0.33/src/Makefile.in.orig 2007-09-17 23:57:31 +0200
++++ ctalk-0.0.33/src/Makefile.in 2007-09-18 07:54:46 +0200
@@ -122,7 +122,7 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ctalk/ctalk.spec
============================================================================
$ cvs diff -u -r1.35 -r1.36 ctalk.spec
--- openpkg-src/ctalk/ctalk.spec 1 Jan 2008 21:09:36 -0000 1.35
+++ openpkg-src/ctalk/ctalk.spec 8 Jan 2008 19:13:23 -0000 1.36
@@ -22,7 +22,7 @@
##
# package versions
-%define V_ctalk 0.0.32a
+%define V_ctalk 0.0.33a
%define V_ctpp 1.0.27
# package information
@@ -36,7 +36,7 @@
Group: Language
License: GPL
Version: %{V_ctalk}
-Release: 20080101
+Release: 20080108
# list of sources
Source0: http://www.ctalklang.org/files/ctalk-%{V_ctalk}.tar.gz
@@ -73,14 +73,17 @@
%setup -q -c
%setup -q -T -D -a 1
%patch -p0
- cp ctpp-*/install-sh ctalk-*/install-sh
- chmod a+x ctalk-*/install-sh
+ for dir in ctpp-* ctalk-*; do
+ ( echo "#!/bin/sh"
+ echo "%{l_shtool} install \${1+\"[EMAIL PROTECTED]"}"
+ ) >$dir/install-sh
+ chmod a+x $dir/install-sh
+ done
%build
( cd ctalk-*
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
- INSTALL="%{l_shtool} install -c" \
./configure \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
@@ -91,7 +94,6 @@
( cd ctpp-*
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
- INSTALL="%{l_shtool} install -c" \
./configure \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]