OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Nov-2004 09:57:50
Branch: HEAD Handle: 2004110108574900
Added files:
openpkg-src/vile vile.patch
Modified files:
openpkg-src/vile vile.spec
Log:
upgrading package: vile 9.4i -> 9.4j
Summary:
Revision Changes Path
1.1 +142 -0 openpkg-src/vile/vile.patch
1.16 +21 -15 openpkg-src/vile/vile.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/vile/vile.patch
============================================================================
$ cvs diff -u -r0 -r1.1 vile.patch
--- /dev/null 2004-11-01 09:57:49 +0100
+++ vile.patch 2004-11-01 09:57:49 +0100
@@ -0,0 +1,142 @@
+Index: tcap.h
+--- tcap.h.orig 2002-12-22 18:19:16 +0100
++++ tcap.h 2004-11-01 09:31:24 +0100
+@@ -19,11 +19,13 @@
+ #define MK other_MK /* workaround for bug in NetBSD 1.5 curses */
+
+ /* _XOPEN_SOURCE_EXTENDED is needed for the wide-character X/Open functions */
++#if 0
+ #ifdef NCURSES
+ # ifndef _XOPEN_SOURCE_EXTENDED
+ # define _XOPEN_SOURCE_EXTENDED 1
+ # endif
+ #endif
++#endif
+
+ #ifdef NEED_CURSES_H
+ # ifdef HAVE_NCURSESW_NCURSES_H
+Index: filters/dcl-filt.l
+--- filters/dcl-filt.l.orig 2004-11-01 09:42:08 +0100
++++ filters/dcl-filt.l 2004-11-01 09:42:47 +0100
+@@ -37,59 +37,9 @@
+
+ static char *look_for = 0;
+
+-static void
+-handle_ident(char *text, int length)
+-{
+- char *attr = ci_keyword_attr(text);
+- char *temp = lowercase_of(text);
+- flt_puts(text, length, attr);
+- if (!strcmp(temp, "deck")) {
+- /* FIXME: "DECK" can also have an option /dollars whose value would
+- * be the actual string to search for.
+- */
+- look_for = "eod";
+- }
+-}
+-
+-static void
+-handle_newline(void)
+-{
+- flt_putc('\n');
+- if (look_for != 0) {
+- BEGIN(LITERAL);
+- }
+-}
+-
+-static void
+-handle_literal(char *text, int length)
+-{
+- int dollars = 0;
+-
+- if (*text == '$') {
+- flt_puts(text, 1, Comment_attr);
+- ++text;
+- --length;
+- dollars = 1;
+- }
+- while (length > 0 && isspace(CharOf(*text))) {
+- flt_putc(*text);
+- ++text;
+- --length;
+- }
+- if (length > 0) {
+- char *attr = String_attr;
+-
+- if (dollars) {
+- char *temp = lowercase_of(text);
+- if (!strcmp(temp, look_for)) {
+- look_for = 0;
+- attr = ci_keyword_attr(temp);
+- BEGIN(NORMAL);
+- }
+- }
+- flt_puts(text, length, attr);
+- }
+-}
++static void handle_ident(char *text, int length);
++static void handle_newline(void);
++static void handle_literal(char *text, int length);
+
+ %}
+
+@@ -160,3 +110,58 @@
+ while (yylex() > 0) {
+ }
+ }
++
++static void
++handle_ident(char *text, int length)
++{
++ char *attr = ci_keyword_attr(text);
++ char *temp = lowercase_of(text);
++ flt_puts(text, length, attr);
++ if (!strcmp(temp, "deck")) {
++ /* FIXME: "DECK" can also have an option /dollars whose value would
++ * be the actual string to search for.
++ */
++ look_for = "eod";
++ }
++}
++
++static void
++handle_newline(void)
++{
++ flt_putc('\n');
++ if (look_for != 0) {
++ BEGIN(LITERAL);
++ }
++}
++
++static void
++handle_literal(char *text, int length)
++{
++ int dollars = 0;
++
++ if (*text == '$') {
++ flt_puts(text, 1, Comment_attr);
++ ++text;
++ --length;
++ dollars = 1;
++ }
++ while (length > 0 && isspace(CharOf(*text))) {
++ flt_putc(*text);
++ ++text;
++ --length;
++ }
++ if (length > 0) {
++ char *attr = String_attr;
++
++ if (dollars) {
++ char *temp = lowercase_of(text);
++ if (!strcmp(temp, look_for)) {
++ look_for = 0;
++ attr = ci_keyword_attr(temp);
++ BEGIN(NORMAL);
++ }
++ }
++ flt_puts(text, length, attr);
++ }
++}
++
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/vile/vile.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 vile.spec
--- openpkg-src/vile/vile.spec 20 Sep 2004 16:17:48 -0000 1.15
+++ openpkg-src/vile/vile.spec 1 Nov 2004 08:57:49 -0000 1.16
@@ -24,17 +24,18 @@
##
# package version
-%define V_base 9.4
-%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_patchL %{V_patch9}
+%define V_base 9.4
+%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_patchL %{V_patch10}
# package information
Name: vile
@@ -47,13 +48,14 @@
Group: Editor
License: BeerWare
Version: %{V_base}%{V_patchL}
-Release: 20040920
+Release: 20041101
# package options
%option with_x11 no
# list of sources
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
@@ -63,6 +65,7 @@
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
# build information
Prefix: %{l_prefix}
@@ -95,7 +98,8 @@
%prep
%setup -q -n vile-%{V_base}
- %patch -p1 -P 1 2 3 4 5 6 7 8 9
+ %patch -p1 -P 1 2 3 4 5 6 7 8 9 10
+ %patch -p0 -P 0
%build
%if "%{with_x11}" == "yes"
@@ -113,10 +117,12 @@
%if "%{with_x11}" == "yes"
--with-x \
--x-includes=`%{l_rc} --query x11_incdir` \
- --x-libraries=`%{l_rc} --query x11_libdir`
+ --x-libraries=`%{l_rc} --query x11_libdir` \
%else
- --without-x
+ --without-x \
%endif
+ --without-iconv \
+ --without-locale
%{l_make} %{l_mflags -O}
%install
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
