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: 23-Mar-2009 08:28:26
Branch: HEAD Handle: 2009032307282500
Modified files:
openpkg-src/ragel ragel.patch ragel.spec
Log:
upgrading package: ragel 6.3 -> 6.4
Summary:
Revision Changes Path
1.16 +11 -47 openpkg-src/ragel/ragel.patch
1.78 +6 -5 openpkg-src/ragel/ragel.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ragel/ragel.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 ragel.patch
--- openpkg-src/ragel/ragel.patch 8 Apr 2007 08:01:25 -0000 1.15
+++ openpkg-src/ragel/ragel.patch 23 Mar 2009 07:28:25 -0000 1.16
@@ -1,8 +1,8 @@
Index: doc/Makefile.in
---- doc/Makefile.in.orig 2007-04-04 03:12:44 +0200
-+++ doc/Makefile.in 2007-04-08 09:55:53 +0200
-@@ -36,7 +36,7 @@
- MANPAGES = ragel.1 rlgen-cd.1 rlgen-java.1 rlgen-ruby.1 rlgen-dot.1
+--- doc/Makefile.in.orig 2009-03-22 17:01:01 +0100
++++ doc/Makefile.in 2009-03-22 23:13:53 +0100
+@@ -37,7 +37,7 @@
+ MANPAGES = ragel.1
# Rules.
-all: ragel-guide.pdf $(MANPAGES)
@@ -10,48 +10,12 @@
ragel-guide.pdf: $(PDFFIGS) $(INPUT)
-@@ -69,8 +69,3 @@
- install -m 644 rlgen-cd.1 $(mandir)/man1/rlgen-cd.1
- install -m 644 rlgen-java.1 $(mandir)/man1/rlgen-java.1
- install -m 644 rlgen-ruby.1 $(mandir)/man1/rlgen-ruby.1
-- install -d $(docdir)
-- install -m 644 ragel-guide.pdf $(docdir)/ragel-guide.pdf
+@@ -70,8 +70,3 @@
+ install -m 644 ragel.1 $(DESTDIR)$(mandir)/man1/ragel.1
+
+ install: all man-install
+- install -d $(DESTDIR)$(docdir)
+- install -m 644 ragel-guide.pdf $(DESTDIR)$(docdir)/ragel-guide.pdf
- gzip -c ../ChangeLog > ChangeLog.gz
-- install -m 644 ChangeLog.gz $(docdir)/ChangeLog.gz
+- install -m 644 ChangeLog.gz $(DESTDIR)$(docdir)/ChangeLog.gz
- rm ChangeLog.gz
-Index: redfsm/gendata.cpp
---- redfsm/gendata.cpp.orig 2007-03-27 05:45:11 +0200
-+++ redfsm/gendata.cpp 2007-04-08 09:55:53 +0200
-@@ -20,6 +20,7 @@
- */
-
- #include "gendata.h"
-+#include <climits>
- #include <iostream>
-
- using std::cerr;
-Index: rlgen-cd/fsmcodegen.cpp
---- rlgen-cd/fsmcodegen.cpp.orig 2007-03-27 05:45:11 +0200
-+++ rlgen-cd/fsmcodegen.cpp 2007-04-08 09:55:53 +0200
-@@ -25,6 +25,7 @@
- #include "fsmcodegen.h"
- #include "redfsm.h"
- #include "gendata.h"
-+#include <climits>
- #include <sstream>
- #include <string>
- #include <assert.h>
-Index: rlgen-cd/fsmcodegen.h
---- rlgen-cd/fsmcodegen.h.orig 2007-03-14 20:58:14 +0100
-+++ rlgen-cd/fsmcodegen.h 2007-04-08 09:55:53 +0200
-@@ -30,6 +30,10 @@
- #include "common.h"
- #include "gendata.h"
-
-+#ifdef CS
-+#undef CS
-+#endif
-+
- using std::string;
- using std::ostream;
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ragel/ragel.spec
============================================================================
$ cvs diff -u -r1.77 -r1.78 ragel.spec
--- openpkg-src/ragel/ragel.spec 3 Oct 2008 06:56:44 -0000 1.77
+++ openpkg-src/ragel/ragel.spec 23 Mar 2009 07:28:25 -0000 1.78
@@ -31,8 +31,8 @@
Class: PLUS
Group: CompilerCompiler
License: GPL
-Version: 6.3
-Release: 20081003
+Version: 6.4
+Release: 20090323
# list of sources
Source0: http://www.complang.org/ragel/ragel-%{version}.tar.gz
@@ -76,7 +76,8 @@
CFLAGS="%{l_cflags -O}" \
CXXFLAGS="%{l_cxxflags -O}" \
./configure \
- --prefix=%{l_prefix}
+ --prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man
%{l_make} %{l_mflags}
( cd doc
%{l_make} %{l_mflags}
@@ -87,9 +88,9 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/man/man1
- %{l_make} %{l_mflags} install prefix=$RPM_BUILD_ROOT%{l_prefix}
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
( cd doc
- %{l_make} %{l_mflags} install prefix=$RPM_BUILD_ROOT%{l_prefix}
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
) || exit $?
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
