OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Steffen Weinreich
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   13-Jun-2005 14:47:13
  Branch: HEAD                             Handle: 2005061313471200

  Added files:
    openpkg-src/lftp        lftp.patch
  Modified files:
    openpkg-src/lftp        lftp.spec

  Log:
    fixed ncurses/curses preference in build process

  Summary:
    Revision    Changes     Path
    1.5         +32 -0      openpkg-src/lftp/lftp.patch
    1.81        +3  -1      openpkg-src/lftp/lftp.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/lftp/lftp.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.5 lftp.patch
  --- /dev/null 2005-06-13 14:47:01 +0200
  +++ lftp.patch        2005-06-13 14:47:12 +0200
  @@ -0,0 +1,32 @@
  +Index: src/lftp_tinfo.cc
  +--- src/lftp_tinfo.cc.orig   2002-12-18 09:52:20 +0100
  ++++ src/lftp_tinfo.cc        2005-06-13 12:05:39 +0200
  +@@ -23,20 +23,20 @@
  + #include <config.h>
  + 
  + extern "C" {
  +-#if defined(HAVE_CURSES_H)
  +-# include <curses.h>
  +-# if defined(HAVE_TERM_H)
  +-#  include <term.h>
  +-# elif defined(HAVE_NCURSES_TERM_H)
  +-#  include <ncurses/term.h>
  +-# endif
  +-#elif defined(HAVE_NCURSES_CURSES_H)
  ++#if defined(HAVE_NCURSES_CURSES_H)
  + #include <ncurses/curses.h>
  + # if defined(HAVE_NCURSES_TERM_H)
  + #  include <ncurses/term.h>
  + # elif defined(HAVE_TERM_H)
  + #  include <term.h>
  + # endif
  ++#elif defined(HAVE_CURSES_H)
  ++# include <curses.h>
  ++# if defined(HAVE_TERM_H)
  ++#  include <term.h>
  ++# elif defined(HAVE_NCURSES_TERM_H)
  ++#  include <ncurses/term.h>
  ++# endif
  + #endif
  + }
  + 
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/lftp/lftp.spec
  ============================================================================
  $ cvs diff -u -r1.80 -r1.81 lftp.spec
  --- openpkg-src/lftp/lftp.spec        12 Jun 2005 09:43:50 -0000      1.80
  +++ openpkg-src/lftp/lftp.spec        13 Jun 2005 12:47:12 -0000      1.81
  @@ -33,10 +33,11 @@
   Group:        FTP
   License:      GPL
   Version:      3.2.1
  -Release:      20050612
  +Release:      20050613
   
   #   list of sources
   Source0:      
http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.bz2
  +Patch0:       lftp.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -61,6 +62,7 @@
   
   %prep
       %setup -q
  +    %patch -p0
   
   %build
       srcdir=`pwd`
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to