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

  Server: cvs.openpkg.org                  Name:   Torsten Homeyer
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   01-Jun-2004 12:35:26
  Branch: HEAD                             Handle: 2004060111352500

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

  Log:
    fixed ordering of includes in ckutio.c

  Summary:
    Revision    Changes     Path
    1.1         +59 -0      openpkg-src/kermit/kermit.patch
    1.46        +3  -1      openpkg-src/kermit/kermit.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/kermit/kermit.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1 kermit.patch
  --- /dev/null 2004-06-01 12:35:26.000000000 +0200
  +++ kermit.patch      2004-06-01 12:35:26.000000000 +0200
  @@ -0,0 +1,59 @@
  +--- ckutio.c.orig    2004-06-01 12:20:41.000000000 +0200
  ++++ ckutio.c 2004-06-01 12:22:13.000000000 +0200
  +@@ -301,6 +301,28 @@
  + #include <sys/stat.h>
  + #endif /* CIE */
  + 
  ++/* Whether to include <fcntl.h> */
  ++/* we should define open() before usage (baudboy.h) */
  ++
  ++#ifndef is68k                               /* Only a few don't have this one. */
  ++#ifndef BSD41
  ++#ifndef FT21
  ++#ifndef FT18
  ++#ifndef COHERENT
  ++#include <fcntl.h>
  ++#endif /* COHERENT */
  ++#endif /* FT18 */
  ++#endif /* FT21 */
  ++#endif /* BSD41 */
  ++#endif /* not is68k */
  ++
  ++#ifdef COHERENT
  ++#ifdef _I386
  ++#include <fcntl.h>
  ++#else
  ++#include <sys/fcntl.h>
  ++#endif /* _I386 */
  ++#endif /* COHERENT */
  + /* UUCP lockfile material... */
  + 
  + #ifndef NOUUCP
  +@@ -779,27 +801,6 @@
  + #endif /* FIONREAD */
  + #endif /* XENIX */
  + 
  +-/* Whether to include <fcntl.h> */
  +-
  +-#ifndef is68k                               /* Only a few don't have this one. */
  +-#ifndef BSD41
  +-#ifndef FT21
  +-#ifndef FT18
  +-#ifndef COHERENT
  +-#include <fcntl.h>
  +-#endif /* COHERENT */
  +-#endif /* FT18 */
  +-#endif /* FT21 */
  +-#endif /* BSD41 */
  +-#endif /* not is68k */
  +-
  +-#ifdef COHERENT
  +-#ifdef _I386
  +-#include <fcntl.h>
  +-#else
  +-#include <sys/fcntl.h>
  +-#endif /* _I386 */
  +-#endif /* COHERENT */
  + 
  + #ifdef ATT7300                              /* Unix PC, internal modem dialer */
  + #include <sys/phone.h>
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/kermit/kermit.spec
  ============================================================================
  $ cvs diff -u -r1.45 -r1.46 kermit.spec
  --- openpkg-src/kermit/kermit.spec    12 Apr 2004 07:18:28 -0000      1.45
  +++ openpkg-src/kermit/kermit.spec    1 Jun 2004 10:35:25 -0000       1.46
  @@ -38,7 +38,7 @@
   Group:        Communication
   License:      GPL
   Version:      %{V_major}.%{V_minor}
  -Release:      20040412
  +Release:      20040601
   
   #   package options
   %option       with_fsl  yes
  @@ -47,6 +47,7 @@
   Source0:      ftp://kermit.columbia.edu/kermit/archives/cku%{V_minor}.tar.gz
   Source1:      rc.kermit
   Source2:      fsl.kermit
  +Patch0:       kermit.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -76,6 +77,7 @@
   
   %prep
       %setup -q -c
  +    %patch -p0
   
   %build
       %{l_shtool} subst \
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to