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: 25-Jun-2008 08:48:31
Branch: HEAD Handle: 2008062507482800
Modified files:
openpkg-src/vile vile.patch vile.spec
Log:
upgrading package: vile 9.6o -> 9.7a
Summary:
Revision Changes Path
1.7 +57 -18 openpkg-src/vile/vile.patch
1.78 +3 -45 openpkg-src/vile/vile.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/vile/vile.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 vile.patch
--- openpkg-src/vile/vile.patch 14 Jan 2008 18:38:48 -0000 1.6
+++ openpkg-src/vile/vile.patch 25 Jun 2008 06:48:28 -0000 1.7
@@ -26,7 +26,7 @@
-
%{
/*
- * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.6 2008/01/14
18:38:48 rse Exp $
+ * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.7 2008/06/25
06:48:28 rse Exp $
Index: filters/imakeflt.l
--- filters/imakeflt.l.orig 2006-05-21 21:50:19 +0200
+++ filters/imakeflt.l 2008-01-07 18:53:31 +0100
@@ -61,7 +61,7 @@
-
%{
/*
- * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.6 2008/01/14
18:38:48 rse Exp $
+ * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.7 2008/06/25
06:48:28 rse Exp $
Index: filters/lex-filt.l
--- filters/lex-filt.l.orig 2006-05-21 21:50:19 +0200
+++ filters/lex-filt.l 2008-01-07 18:57:13 +0100
@@ -75,7 +75,7 @@
-
%{
/*
- * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.6 2008/01/14
18:38:48 rse Exp $
+ * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.7 2008/06/25
06:48:28 rse Exp $
Index: filters/mailfilt.l
--- filters/mailfilt.l.orig 2006-05-21 21:50:19 +0200
+++ filters/mailfilt.l 2008-01-07 18:57:24 +0100
@@ -130,18 +130,7 @@
-
%{
/*
- * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.6 2008/01/14
18:38:48 rse Exp $
-Index: filters/rb-filt.l
---- filters/rb-filt.l.orig 2007-11-25 21:04:46 +0100
-+++ filters/rb-filt.l 2008-01-07 19:11:08 +0100
-@@ -1,7 +1,5 @@
- %s CODE HERE SSTRING DSTRING RD SUBST
-
--%o 6000
--
- %{
-
- /*
+ * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.7 2008/06/25
06:48:28 rse Exp $
Index: filters/rpm-filt.l
--- filters/rpm-filt.l.orig 2007-05-26 16:51:13 +0200
+++ filters/rpm-filt.l 2008-01-07 19:11:29 +0100
@@ -153,7 +142,7 @@
-
%{
/*
- * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.6 2008/01/14
18:38:48 rse Exp $
+ * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.7 2008/06/25
06:48:28 rse Exp $
Index: filters/sccsfilt.l
--- filters/sccsfilt.l.orig 2007-11-26 13:00:06 +0100
+++ filters/sccsfilt.l 2008-01-07 19:11:53 +0100
@@ -177,7 +166,7 @@
-
%{
/*
- * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.6 2008/01/14
18:38:48 rse Exp $
+ * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.7 2008/06/25
06:48:28 rse Exp $
Index: filters/tcl-filt.l
--- filters/tcl-filt.l.orig 2006-05-21 21:50:48 +0200
+++ filters/tcl-filt.l 2008-01-07 19:12:29 +0100
@@ -188,7 +177,7 @@
-
%{
/*
- * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.6 2008/01/14
18:38:48 rse Exp $
+ * $Header: /v/openpkg/cvs/openpkg-src/vile/vile.patch,v 1.7 2008/06/25
06:48:28 rse Exp $
Index: filters/txt-filt.l
--- filters/txt-filt.l.orig 2007-11-26 13:08:36 +0100
+++ filters/txt-filt.l 2008-01-07 19:12:42 +0100
@@ -213,3 +202,53 @@
%{
/*
+Index: filters/sql-filt.l
+--- filters/sql-filt.l.orig 2008-06-25 08:44:31 +0200
++++ filters/sql-filt.l 2008-06-25 08:44:58 +0200
+@@ -33,21 +33,8 @@
+ static int began_state;
+ static int saved_state;
+
+-static void
+-begin_oneliner(void)
+-{
+- new_state(ONE_LINE);
+- next_line = LEAD;
+- flt_bfr_begin(String_attr);
+-}
+-
+-static void
+-finish_oneliner(void)
+-{
+- flt_bfr_finish();
+- new_state(next_line);
+- next_line = LEAD;
+-}
++static void begin_oneliner(void);
++static void finish_oneliner(void);
+
+
/******************************************************************************/
+
+@@ -221,6 +208,22 @@
+ %%
+
+ static void
++begin_oneliner(void)
++{
++ new_state(ONE_LINE);
++ next_line = 0;
++ flt_bfr_begin(String_attr);
++}
++
++static void
++finish_oneliner(void)
++{
++ flt_bfr_finish();
++ new_state(next_line);
++ next_line = 0;
++}
++
++static void
+ init_filter(int before GCC_UNUSED)
+ {
+ (void) before;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/vile/vile.spec
============================================================================
$ cvs diff -u -r1.77 -r1.78 vile.spec
--- openpkg-src/vile/vile.spec 2 Jun 2008 06:12:54 -0000 1.77
+++ openpkg-src/vile/vile.spec 25 Jun 2008 06:48:28 -0000 1.78
@@ -22,23 +22,9 @@
##
# package version
-%define V_base 9.6
+%define V_base 9.7
%define V_patch1 a
-%define V_patch2 b
-%define V_patch3 c
-%define V_patch4 d
-%define V_patch5 e
-%define V_patch6 f
-%define V_patch7 g
-%define V_patch8 h
-%define V_patch9 i
-%define V_patch10 j
-%define V_patch11 k
-%define V_patch12 l
-%define V_patch13 m
-%define V_patch14 n
-%define V_patch15 o
-%define V_patchL %{V_patch15}
+%define V_patchL %{V_patch1}
# package information
Name: vile
@@ -51,7 +37,7 @@
Group: Editor
License: GPL
Version: %{V_base}%{V_patchL}
-Release: 20080602
+Release: 20080625
# package options
%option with_x11 no
@@ -60,20 +46,6 @@
Source0: ftp://invisible-island.net/vile/vile-%{V_base}.tgz
Patch0: vile.patch
Patch1:
ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch1}.patch.gz
-Patch2:
ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch2}.patch.gz
-Patch3:
ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch3}.patch.gz
-Patch4:
ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch4}.patch.gz
-Patch5:
ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch5}.patch.gz
-Patch6:
ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch6}.patch.gz
-Patch7:
ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch7}.patch.gz
-Patch8:
ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch8}.patch.gz
-Patch9:
ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch9}.patch.gz
-Patch10:
ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch10}.patch.gz
-Patch11:
ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch11}.patch.gz
-Patch12:
ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch12}.patch.gz
-Patch13:
ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch13}.patch.gz
-Patch14:
ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch14}.patch.gz
-Patch15:
ftp://invisible-island.net/vile/patches/vile-%{V_base}%{V_patch15}.patch.gz
# build information
Prefix: %{l_prefix}
@@ -109,20 +81,6 @@
%prep
%setup -q -n vile-%{V_base}
%patch -p1 -P 1
- %patch -p1 -P 2
- %patch -p1 -P 3
- %patch -p1 -P 4
- %patch -p1 -P 5
- %patch -p1 -P 6
- %patch -p1 -P 7
- %patch -p1 -P 8
- %patch -p1 -P 9
- %patch -p1 -P 10
- %patch -p1 -P 11
- %patch -p1 -P 12
- %patch -p1 -P 13
- %patch -p1 -P 14
- %patch -p1 -P 15
%patch -p0 -P 0
chmod u+w filters/sql-filt.l*
%{l_shtool} subst \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
