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: 18-Sep-2007 08:16:27
Branch: HEAD Handle: 2007091807162600
Modified files:
openpkg-src/ctalk ctalk.patch ctalk.spec
Log:
upgrading package: ctalk 0.09a -> 0.0.11a
Summary:
Revision Changes Path
1.3 +91 -103 openpkg-src/ctalk/ctalk.patch
1.3 +4 -4 openpkg-src/ctalk/ctalk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ctalk/ctalk.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 ctalk.patch
--- openpkg-src/ctalk/ctalk.patch 12 Sep 2007 17:17:47 -0000 1.2
+++ openpkg-src/ctalk/ctalk.patch 18 Sep 2007 06:16:26 -0000 1.3
@@ -1,70 +1,70 @@
-Index: ctalk-0.09a/classes/ctalklib
---- ctalk-0.09a/classes/ctalklib.orig 2007-08-16 23:48:35 +0200
-+++ ctalk-0.09a/classes/ctalklib 2007-09-09 11:02:54 +0200
-@@ -521,6 +521,7 @@
- /*
- * Prototypes of C library functions.
- */
-+#if 0
- extern int atoi (const char *);
- extern double atof (const char *);
- extern long long atoll (const char *);
-@@ -532,6 +533,7 @@
- extern void _error (char *, ...);
- extern void _warning (char *, ...);
- extern int strcmp (const char *, const char *);
-+#endif
-
- /*
- * Prototypes of ctalk library functions.
-Index: ctalk-0.09a/ctpp/Makefile.in
---- ctalk-0.09a/ctpp/Makefile.in.orig 2007-08-17 00:54:36 +0200
-+++ ctalk-0.09a/ctpp/Makefile.in 2007-09-09 11:02:54 +0200
-@@ -95,7 +95,7 @@
-
- CFLAGS = -g3 -Wall
- CPPFLAGS = -I$(top_builddir)/include
--LIBS = $(top_builddir)/libctpp/.libs/libctpp.so
+Index: ctalk-0.0.11/ctpp/Makefile.in
+--- ctalk-0.0.11/ctpp/Makefile.in.orig 2007-09-17 23:57:31 +0200
++++ ctalk-0.0.11/ctpp/Makefile.in 2007-09-18 07:49:32 +0200
+@@ -121,7 +121,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = $(top_builddir)/libctpp/.libs/libctpp$(LIBEXT)
+LIBS = $(top_builddir)/libctpp/libctpp.la
- DEFS = -DPKGNAME=\"$(PACKAGE)\" -DCLASSLIBDIR=\"$(pkgincludedir)\"
-DVERSION=\"$(VERSION)\" -DHOST_OS=$(HOST_OS) -DHOST_CPU=$(HOST_CPU)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES =
-Index: ctalk-0.09a/ctpp/builtins.c
---- ctalk-0.09a/ctpp/builtins.c.orig 2007-08-17 00:42:00 +0200
-+++ ctalk-0.09a/ctpp/builtins.c 2007-09-09 11:02:54 +0200
-@@ -37,11 +37,6 @@
- * definition to the preprocessor's name space.
- */
-
--#if (HOST_OS==linux-gnu) && ((HOST_CPU==i386) || (HOST_CPU==i486) || \
-- (HOST_CPU==i586) || (HOST_CPU==i686))
--#include "config/linux-gnu-x86.h"
--#endif
+ LIBTOOL = @LIBTOOL@
+ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@
+ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@
+Index: ctalk-0.0.11/ctpp/builtins.c
+--- ctalk-0.0.11/ctpp/builtins.c.orig 2007-09-13 04:04:24 +0200
++++ ctalk-0.0.11/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
+ */
++#if defined(__linux__) && defined(__i386__)
+ for (i = 0; builtins[i]; i+=2) {
+ sprintf (s, "#define %s %s\n", builtins[i], builtins[i+1]);
+ tokenize_define (s);
+ }
-
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -62,17 +57,6 @@
- int i;
- char s[MAXLABEL];
++#endif
-- /*
-- * Host-dependent symbol/definition pairs from the
-- * config file included above. See the comments in
-- * config/linux-gnu-x86.c
-- */
-- for (i = 0; builtins[i]; i+=2) {
-- sprintf (s, "#define %s %s\n", builtins[i], builtins[i+1]);
-- tokenize_define (s);
-- }
--
--
if (gcc_macros_opt) gcc_builtins ();
- return 0;
-Index: ctalk-0.09a/ctpp/i_opt.c
---- ctalk-0.09a/ctpp/i_opt.c.orig 2007-08-17 00:42:00 +0200
-+++ ctalk-0.09a/ctpp/i_opt.c 2007-09-09 11:02:54 +0200
+@@ -93,9 +94,11 @@
+
+ int is_builtin_symbol (char *name) {
+ int i;
++#if defined(__linux__) && defined(__i386__)
+ for (i = 0; builtins[i]; i+=2) {
+ if (!strcmp (name, builtins[i]))
+ return TRUE;
+ }
++#endif
+ return FALSE;
+ }
+Index: ctalk-0.0.11/ctpp/ccompat.c
+--- ctalk-0.0.11/ctpp/ccompat.c.orig 2007-09-14 21:00:05 +0200
++++ ctalk-0.0.11/ctpp/ccompat.c 2007-09-18 07:49:32 +0200
+@@ -53,8 +53,10 @@
+
+ char cpp_subdir[FILENAME_MAX];
+
++#if defined(__linux__) && defined(__i386__)
+ extern char *host_os; /* Defined in builtins.c.
*/
+ extern char *host_cpu;
++#endif
+
+ #if defined(__DJGPP__) || defined(__CYGWIN__)
+ #define GCC_BIN "gcc.exe"
+@@ -338,7 +340,7 @@
+
+ strcpy (gcc_target, "djgpp");
+
+-#else
++#elif defined(__linux__) && defined(__i386__)
+
+ /* Try to find out what the compiler target is. It may not
+ be the same as the autoconf $host.
+Index: ctalk-0.0.11/ctpp/i_opt.c
+--- ctalk-0.0.11/ctpp/i_opt.c.orig 2007-09-13 04:04:24 +0200
++++ ctalk-0.0.11/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.09a/lib/rtinfo.c
---- ctalk-0.09a/lib/rtinfo.c.orig 2006-11-25 05:06:56 +0100
-+++ ctalk-0.09a/lib/rtinfo.c 2007-09-09 11:02:54 +0200
+Index: ctalk-0.0.11/lib/rtinfo.c
+--- ctalk-0.0.11/lib/rtinfo.c.orig 2007-09-12 11:06:44 +0200
++++ ctalk-0.0.11/lib/rtinfo.c 2007-09-18 07:49:32 +0200
@@ -32,7 +32,7 @@
#include "parser.h"
@@ -86,45 +86,33 @@
extern int daylight;
RT_INFO rtinfo;
-Index: ctalk-0.09a/libctpp/lex.c
---- ctalk-0.09a/libctpp/lex.c.orig 2007-08-17 00:42:02 +0200
-+++ ctalk-0.09a/libctpp/lex.c 2007-09-09 11:02:54 +0200
+Index: ctalk-0.0.11/libctpp/lex.c
+--- ctalk-0.0.11/libctpp/lex.c.orig 2007-09-13 04:04:26 +0200
++++ ctalk-0.0.11/libctpp/lex.c 2007-09-18 07:49:32 +0200
@@ -26,6 +26,8 @@
- #include <string.h>
- #include <ctype.h>
- #include <errno.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include "ctpp.h"
- #include "typeof.h"
- #include "prtinfo.h"
-Index: ctalk-0.09a/libctpp/rtinfo.c
---- ctalk-0.09a/libctpp/rtinfo.c.orig 2007-08-17 00:42:02 +0200
-+++ ctalk-0.09a/libctpp/rtinfo.c 2007-09-09 11:02:54 +0200
-@@ -29,7 +29,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <errno.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include "ctpp.h"
+ #include "typeof.h"
#include "prtinfo.h"
-
- extern char *tzname[2];
--long int timezone;
-+long int ctalk_timezone;
- extern int daylight;
-
- RT_INFO rtinfo;
-Index: ctalk-0.09a/src/Makefile.in
---- ctalk-0.09a/src/Makefile.in.orig 2007-08-17 00:54:37 +0200
-+++ ctalk-0.09a/src/Makefile.in 2007-09-09 11:02:54 +0200
-@@ -92,7 +92,7 @@
-
- CFLAGS = -g3 -Wall
- CPPFLAGS = -I$(top_builddir)/include
+Index: ctalk-0.0.11/src/Makefile.in
+--- ctalk-0.0.11/src/Makefile.in.orig 2007-09-17 23:57:31 +0200
++++ ctalk-0.0.11/src/Makefile.in 2007-09-18 07:54:46 +0200
+@@ -122,7 +122,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
-LIBS = $(top_builddir)/lib/.libs/libctalk.so
+LIBS = $(top_builddir)/lib/libctalk.la
- DEFS = -DPKGNAME=\"$(PACKAGE)\" -DCLASSLIBDIR=\"$(pkgincludedir)\"
-DVERSION=\"$(VERSION)\"
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES =
+ LIBTOOL = @LIBTOOL@
+ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@
+ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@
Index: ctpp-1.0.16/ctpp/Makefile.in
---- ctpp-1.0.16/ctpp/Makefile.in.orig 2007-09-08 11:30:35 +0200
-+++ ctpp-1.0.16/ctpp/Makefile.in 2007-09-09 11:04:03 +0200
+--- ctpp-1.0.16/ctpp/Makefile.in.orig 2007-09-12 14:36:28 +0200
++++ ctpp-1.0.16/ctpp/Makefile.in 2007-09-18 07:49:32 +0200
@@ -121,7 +121,7 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
@@ -136,7 +124,7 @@
LIB_MINOR_VERSION = @LIB_MINOR_VERSION@
Index: ctpp-1.0.16/ctpp/builtins.c
--- ctpp-1.0.16/ctpp/builtins.c.orig 2007-09-04 06:14:05 +0200
-+++ ctpp-1.0.16/ctpp/builtins.c 2007-09-09 11:02:54 +0200
++++ ctpp-1.0.16/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
@@ -165,7 +153,7 @@
}
Index: ctpp-1.0.16/ctpp/ccompat.c
--- ctpp-1.0.16/ctpp/ccompat.c.orig 2007-09-04 06:14:05 +0200
-+++ ctpp-1.0.16/ctpp/ccompat.c 2007-09-09 11:02:54 +0200
++++ ctpp-1.0.16/ctpp/ccompat.c 2007-09-18 07:49:32 +0200
@@ -53,8 +53,10 @@
char cpp_subdir[FILENAME_MAX];
@@ -188,7 +176,7 @@
be the same as the autoconf $host.
Index: ctpp-1.0.16/ctpp/i_opt.c
--- ctpp-1.0.16/ctpp/i_opt.c.orig 2007-08-27 03:18:27 +0200
-+++ ctpp-1.0.16/ctpp/i_opt.c 2007-09-09 11:02:54 +0200
++++ ctpp-1.0.16/ctpp/i_opt.c 2007-09-18 07:49:32 +0200
@@ -30,6 +30,8 @@
#include <stdlib.h>
#include <string.h>
@@ -200,7 +188,7 @@
extern char source_file[FILENAME_MAX]; /* Declared in rtinfo.c. */
Index: ctpp-1.0.16/libctpp/lex.c
--- ctpp-1.0.16/libctpp/lex.c.orig 2007-08-27 03:04:06 +0200
-+++ ctpp-1.0.16/libctpp/lex.c 2007-09-09 11:02:54 +0200
++++ ctpp-1.0.16/libctpp/lex.c 2007-09-18 07:49:32 +0200
@@ -26,6 +26,8 @@
#include <string.h>
#include <ctype.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ctalk/ctalk.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 ctalk.spec
--- openpkg-src/ctalk/ctalk.spec 12 Sep 2007 17:17:47 -0000 1.2
+++ openpkg-src/ctalk/ctalk.spec 18 Sep 2007 06:16:26 -0000 1.3
@@ -23,7 +23,7 @@
##
# package versions
-%define V_ctalk 0.09a
+%define V_ctalk 0.0.11a
%define V_ctpp 1.0.16
# package information
@@ -37,7 +37,7 @@
Group: Language
License: GPL
Version: %{V_ctalk}
-Release: 20070912
+Release: 20070918
# list of sources
Source0:
http://switch.dl.sourceforge.net/ctalk-lang/ctalk-%{V_ctalk}.tar.gz
@@ -76,7 +76,7 @@
%patch -p0
%build
- ( cd ctalk-%{V_ctalk}
+ ( cd ctalk-*
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
./configure \
@@ -99,7 +99,7 @@
%install
rm -rf $RPM_BUILD_ROOT
- ( cd ctalk-%{V_ctalk}
+ ( cd ctalk-*
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
) || exit $?
( cd ctpp-%{V_ctpp}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
