OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 27-Nov-2009 13:45:27
Branch: HEAD Handle: 2009112712452600
Modified files:
openpkg-src/yaml yaml.patch yaml.spec
Log:
modifying package: yaml-0 20091004 -> 20091127
Summary:
Revision Changes Path
1.4 +47 -59 openpkg-src/yaml/yaml.patch
1.86 +5 -5 openpkg-src/yaml/yaml.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/yaml/yaml.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 yaml.patch
--- openpkg-src/yaml/yaml.patch 1 Sep 2007 08:50:24 -0000 1.3
+++ openpkg-src/yaml/yaml.patch 27 Nov 2009 12:45:26 -0000 1.4
@@ -1,19 +1,19 @@
-Index: syck-20070218/ext/php/phpext.c
---- syck-20070218/ext/php/phpext.c.orig 2003-09-24 16:36:09 +0200
-+++ syck-20070218/ext/php/phpext.c 2006-11-26 18:01:20 +0100
-@@ -177,6 +177,8 @@
- unsigned int i;
-
- MAKE_STD_ZVAL(o);
-+ TSRMLS_FETCH();
+Index: YAML-AppConfig-0.16/Makefile.PL
+--- YAML-AppConfig-0.16/Makefile.PL.orig 2006-07-02 23:21:51 +0200
++++ YAML-AppConfig-0.16/Makefile.PL 2009-11-27 13:24:07 +0100
+@@ -21,6 +21,7 @@
+ eval "require $info->[0]; 0;";
+ push @yamls, @$info unless $@;
+ }
+- die "YAML >= 0.38 or YAML::Syck >= 0 required.\n" unless @yamls;
++ # die "YAML >= 0.38 or YAML::Syck >= 0 required.\n" unless @yamls;
+ return @yamls;
+ }
+
- switch (n->kind)
- {
- case syck_str_kind:
-Index: syck-20070218/lib/bytecode.c
---- syck-20070218/lib/bytecode.c.orig 2005-04-13 08:27:54 +0200
-+++ syck-20070218/lib/bytecode.c 2006-11-26 18:01:20 +0100
-@@ -8,6 +8,10 @@
+Index: syck-0.70/lib/bytecode.c
+--- syck-0.70/lib/bytecode.c.orig 2009-09-30 19:29:34 +0200
++++ syck-0.70/lib/bytecode.c 2009-11-27 13:24:07 +0100
+@@ -7,6 +7,10 @@
*
* Copyright (C) 2003 why the lucky stiff
*/
@@ -22,11 +22,11 @@
+#include <string.h>
+
#include "syck.h"
- #include "gram.h"
-Index: syck-20070218/lib/handler.c
---- syck-20070218/lib/handler.c.orig 2005-01-08 22:44:00 +0100
-+++ syck-20070218/lib/handler.c 2006-11-26 18:01:20 +0100
+ #if GRAM_FILES_HAVE_TAB_SUFFIX
+Index: syck-0.70/lib/handler.c
+--- syck-0.70/lib/handler.c.orig 2009-09-30 19:29:34 +0200
++++ syck-0.70/lib/handler.c 2009-11-27 13:24:07 +0100
@@ -7,6 +7,9 @@
* Copyright (C) 2003 why the lucky stiff
*/
@@ -37,10 +37,10 @@
#include "syck.h"
SYMID
-Index: syck-20070218/lib/implicit.c
---- syck-20070218/lib/implicit.c.orig 2005-04-06 19:18:59 +0200
-+++ syck-20070218/lib/implicit.c 2006-11-26 18:01:20 +0100
-@@ -9,6 +9,7 @@
+Index: syck-0.70/lib/implicit.c
+--- syck-0.70/lib/implicit.c.orig 2009-09-30 19:29:34 +0200
++++ syck-0.70/lib/implicit.c 2009-11-27 13:24:07 +0100
+@@ -8,6 +8,7 @@
* Copyright (C) 2003 why the lucky stiff
*/
@@ -48,9 +48,9 @@
#include "syck.h"
#define YYCTYPE char
-Index: syck-20070218/lib/node.c
---- syck-20070218/lib/node.c.orig 2005-04-13 08:27:54 +0200
-+++ syck-20070218/lib/node.c 2006-11-26 18:01:20 +0100
+Index: syck-0.70/lib/node.c
+--- syck-0.70/lib/node.c.orig 2009-09-30 19:29:34 +0200
++++ syck-0.70/lib/node.c 2009-11-27 13:24:07 +0100
@@ -7,6 +7,9 @@
* Copyright (C) 2003 why the lucky stiff
*/
@@ -61,9 +61,9 @@
#include "syck.h"
/*
-Index: syck-20070218/lib/syck.c
---- syck-20070218/lib/syck.c.orig 2005-01-01 03:06:25 +0100
-+++ syck-20070218/lib/syck.c 2006-11-26 18:01:20 +0100
+Index: syck-0.70/lib/syck.c
+--- syck-0.70/lib/syck.c.orig 2009-09-30 19:29:34 +0200
++++ syck-0.70/lib/syck.c 2009-11-27 13:24:07 +0100
@@ -7,6 +7,7 @@
* Copyright (C) 2003 why the lucky stiff
*/
@@ -88,51 +88,39 @@
if ( str->ptr > str->end )
{
str->ptr = str->end;
-Index: syck-20070218/lib/syck.h
---- syck-20070218/lib/syck.h.orig 2005-04-13 08:27:54 +0200
-+++ syck-20070218/lib/syck.h 2006-11-26 18:01:20 +0100
-@@ -17,6 +17,8 @@
- #define YAML_DOMAIN "yaml.org,2002"
+Index: syck-0.70/lib/syck.h
+--- syck-0.70/lib/syck.h.orig 2009-09-30 19:29:34 +0200
++++ syck-0.70/lib/syck.h 2009-11-27 13:24:07 +0100
+@@ -36,6 +36,8 @@
+ #include <stddef.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <ctype.h>
#ifdef HAVE_ST_H
#include <st.h>
-Index: syck-20070218/lib/token.c
---- syck-20070218/lib/token.c.orig 2005-04-13 08:27:54 +0200
-+++ syck-20070218/lib/token.c 2006-11-26 18:01:20 +0100
-@@ -8,6 +8,8 @@
+Index: syck-0.70/lib/token.c
+--- syck-0.70/lib/token.c.orig 2009-09-30 19:29:34 +0200
++++ syck-0.70/lib/token.c 2009-11-27 13:24:07 +0100
+@@ -7,6 +7,8 @@
*
* Copyright (C) 2003 why the lucky stiff
*/
+#include <stdlib.h>
+#include <string.h>
#include "syck.h"
- #include "gram.h"
-Index: syck-20070218/lib/yaml2byte.c
---- syck-20070218/lib/yaml2byte.c.orig 2004-08-02 19:32:35 +0200
-+++ syck-20070218/lib/yaml2byte.c 2006-11-26 18:02:03 +0100
-@@ -9,6 +9,8 @@
- * WARNING WARNING WARNING --- THIS IS *NOT JUST* PLAYING
- * ANYMORE! -- WHY HAS EMBRACED THIS AS THE REAL THING!
+ #if GRAM_FILES_HAVE_TAB_SUFFIX
+Index: syck-0.70/lib/yaml2byte.c
+--- syck-0.70/lib/yaml2byte.c.orig 2009-09-30 19:29:34 +0200
++++ syck-0.70/lib/yaml2byte.c 2009-11-27 13:24:31 +0100
+@@ -11,6 +11,8 @@
*/
+ #include "syck.h"
+ #include <assert.h>
+#include <stdlib.h>
+#include <string.h>
- #include <syck.h>
- #include <assert.h>
#define YAMLBYTE_UTF8
-Index: YAML-AppConfig-0.16/Makefile.PL
---- YAML-AppConfig-0.16/Makefile.PL.orig 2007-09-01 10:46:07 +0200
-+++ YAML-AppConfig-0.16/Makefile.PL 2007-09-01 10:46:47 +0200
-@@ -21,6 +21,7 @@
- eval "require $info->[0]; 0;";
- push @yamls, @$info unless $@;
- }
-- die "YAML >= 0.38 or YAML::Syck >= 0 required.\n" unless @yamls;
-+ # die "YAML >= 0.38 or YAML::Syck >= 0 required.\n" unless @yamls;
- return @yamls;
- }
-+
+ #include "yamlbyte.h"
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/yaml/yaml.spec
============================================================================
$ cvs diff -u -r1.85 -r1.86 yaml.spec
--- openpkg-src/yaml/yaml.spec 4 Oct 2009 17:07:40 -0000 1.85
+++ openpkg-src/yaml/yaml.spec 27 Nov 2009 12:45:26 -0000 1.86
@@ -22,7 +22,7 @@
##
# package version
-%define V_libsyck 20070218
+%define V_libsyck 0.70
%define V_libyaml 0.1.3
%define V_perl_yaml 0.70
%define V_perl_yaml_syck 1.07
@@ -48,7 +48,7 @@
Group: Language
License: BSD/Artistic
Version: 0
-Release: 20091004
+Release: 20091127
# package options
%option with_perl no
@@ -57,7 +57,7 @@
%option with_java no
# list of sources
-Source0: ftp://ftp.openpkg.org/sources/CPY/yaml/syck-%{V_libsyck}.tar.gz
+Source0:
http://cloud.github.com/downloads/indeyets/syck/syck-%{V_libsyck}.tar.gz
Source1: http://pyyaml.org/download/libyaml/yaml-%{V_libyaml}.tar.gz
Source2:
http://www.cpan.org/modules/by-module/YAML/YAML-%{V_perl_yaml}.tar.gz
Source3:
http://www.cpan.org/modules/by-module/YAML/YAML-Syck-%{V_perl_yaml_syck}.tar.gz
@@ -108,7 +108,7 @@
%track
prog yaml:libsyck = {
version = %{V_libsyck}
- url = ftp://ftp.openpkg.org/sources/CPY/yaml/
+ url = http://github.com/indeyets/syck/downloads
regex = syck-(__VER__)\.tar\.gz
}
prog yaml:libyaml = {
@@ -213,7 +213,7 @@
./configure \
--prefix=%{l_prefix} \
--disable-shared
- %{l_make} %{l_mflags -O}
+ %{l_make} %{l_mflags}
) || exit $?
# build PHP API
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
