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:   30-Oct-2005 10:01:24
  Branch: HEAD                             Handle: 2005103009012300

  Modified files:
    openpkg-src/lynx        lynx.patch lynx.spec

  Log:
    port to S-Lang 2.0

  Summary:
    Revision    Changes     Path
    1.2         +33 -3      openpkg-src/lynx/lynx.patch
    1.35        +3  -3      openpkg-src/lynx/lynx.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/lynx/lynx.patch
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 lynx.patch
  --- openpkg-src/lynx/lynx.patch       19 Jul 2004 08:45:25 -0000      1.1
  +++ openpkg-src/lynx/lynx.patch       30 Oct 2005 09:01:23 -0000      1.2
  @@ -1,6 +1,6 @@
   Index: WWW/Library/Implementation/makefile.in
   --- WWW/Library/Implementation/makefile.in.orig      2004-01-25 02:51:04 
+0100
  -+++ WWW/Library/Implementation/makefile.in   2004-07-19 10:42:02 +0200
  ++++ WWW/Library/Implementation/makefile.in   2005-10-30 08:51:21 +0100
   @@ -25,11 +25,12 @@
    INTLDIR_CPPFLAGS= @INTLDIR_CPPFLAGS@ -I$(top_srcdir)/intl
    
  @@ -15,9 +15,39 @@
                $(INTLDIR_CPPFLAGS) -I$(WWWINC)
    
    LY_CFLAGS   = @CFLAGS@
  +Index: src/LYStrings.c
  +--- src/LYStrings.c.orig     2004-02-02 21:02:28 +0100
  ++++ src/LYStrings.c  2005-10-30 08:57:31 +0100
  +@@ -849,7 +849,7 @@
  + #define define_key(string, code) \
  +     SLkm_define_keysym (string, code, Keymap_List)
  + #define expand_substring(dst, first, last, final) \
  +-    (SLexpand_escaped_string(dst, (char *)first, (char *)last), 1)
  ++    (SLexpand_escaped_string(dst, (char *)first, (char *)last, 0), 1)
  + static SLKeyMap_List_Type *Keymap_List;
  + /* This value should be larger than anything in LYStrings.h */
  + #define MOUSE_KEYSYM 0x0400
  +@@ -1237,7 +1237,7 @@
  +      * occasionally find useful).
  +      */
  +     SLang_undefine_key (parse, Keymap_List);
  +-    if (SLang_Error) return -1;
  ++    if (SLang_get_error()) return -1;
  + #endif
  +     }
  +     return 0;
  +@@ -1374,7 +1374,7 @@
  +     setup_vtXXX_keymap();
  +     define_key ("\033[M", MOUSE_KEYSYM);
  + 
  +-    if (SLang_Error)
  ++    if (SLang_get_error())
  +     SLang_exit_error ("Unable to initialize keymaps");
  + #else
  +     setup_vtXXX_keymap();
   Index: src/chrtrans/makefile.in
   --- src/chrtrans/makefile.in.orig    2004-01-08 03:03:09 +0100
  -+++ src/chrtrans/makefile.in 2004-07-19 10:41:39 +0200
  ++++ src/chrtrans/makefile.in 2005-10-30 08:51:21 +0100
   @@ -31,12 +31,13 @@
    x           = @EXEEXT@
    o           = [EMAIL PROTECTED]@
  @@ -35,7 +65,7 @@
    
   Index: src/makefile.in
   --- src/makefile.in.orig     2004-01-08 03:03:09 +0100
  -+++ src/makefile.in  2004-07-19 10:40:37 +0200
  ++++ src/makefile.in  2005-10-30 08:51:21 +0100
   @@ -41,7 +41,7 @@
    INTLLIB             = @INTLLIBS@
    INTLDIR_CPPFLAGS= @[EMAIL PROTECTED](top_srcdir)/intl
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/lynx/lynx.spec
  ============================================================================
  $ cvs diff -u -r1.34 -r1.35 lynx.spec
  --- openpkg-src/lynx/lynx.spec        11 Jun 2005 11:00:08 -0000      1.34
  +++ openpkg-src/lynx/lynx.spec        30 Oct 2005 09:01:23 -0000      1.35
  @@ -37,7 +37,7 @@
   Group:        Web
   License:      BSD
   Version:      %{V_real}
  -Release:      20050611
  +Release:      20051030
   
   #   list of sources
   Source0:      http://lynx.isc.org/release/lynx%{V_real}.tar.bz2
  @@ -48,8 +48,8 @@
   BuildRoot:    %{l_buildroot}
   BuildPreReq:  OpenPKG, openpkg >= 20040130, make
   PreReq:       OpenPKG, openpkg >= 20040130
  -BuildPreReq:  slang, zlib, openssl
  -PreReq:       slang, zlib, openssl
  +BuildPreReq:  slang >= 2.0, zlib, openssl
  +PreReq:       slang >= 2.0, zlib, openssl
   AutoReq:      no
   AutoReqProv:  no
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to