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 openpkg-web          Date:   31-Jul-2003 10:11:37
  Branch: OPENPKG_1_STABLE HEAD            Handle: 2003073109113501

  Added files:              (Branch: OPENPKG_1_STABLE)
    openpkg-src/ex          ex.patch
  Modified files:
    openpkg-web             news.txt
  Modified files:           (Branch: OPENPKG_1_STABLE)
    openpkg-src/ex          ex.spec

  Log:
    MFC: fix building: va_list cannot be compared against NULL

  Summary:
    Revision    Changes     Path
    1.1.2.1     +20 -0      openpkg-src/ex/ex.patch
    1.13.2.3    +3  -1      openpkg-src/ex/ex.spec
    1.5924      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/ex/ex.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1.2.1 ex.patch
  --- /dev/null 2003-07-31 10:11:37.000000000 +0200
  +++ ex.patch  2003-07-31 10:11:37.000000000 +0200
  @@ -0,0 +1,20 @@
  +--- ts.c.orig        Thu Jan 30 12:04:20 2003
  ++++ ts.c     Thu Jul 31 10:09:09 2003
  +@@ -126,7 +126,7 @@
  +     int n;
  +     int bytes;
  + 
  +-    if (format == NULL || ap == NULL)
  ++    if (format == NULL)
  +         return -1;
  +     bytes = 0;
  +     while (*format != '\0') {
  +@@ -200,7 +200,7 @@
  +     int n;
  +     va_list ap2;
  + 
  +-    if (format == NULL || ap == NULL)
  ++    if (format == NULL)
  +         return NULL;
  +     ap2 = ap;
  +     if ((n = ts_suite_mvxprintf(NULL, 0, format, ap)) == -1)
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ex/ex.spec
  ============================================================================
  $ cvs diff -u -r1.13.2.2 -r1.13.2.3 ex.spec
  --- openpkg-src/ex/ex.spec    24 Jul 2003 20:49:30 -0000      1.13.2.2
  +++ openpkg-src/ex/ex.spec    31 Jul 2003 08:11:36 -0000      1.13.2.3
  @@ -33,10 +33,11 @@
   Group:        System
   License:      MIT/X11-style
   Version:      1.0.2
  -Release:      1.20030724
  +Release:      1.20030731
   
   #   list of sources
   Source0:      ftp://ftp.ossp.org/pkg/lib/ex/ex-%{version}.tar.gz
  +Patch0:       ex.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -61,6 +62,7 @@
   
   %prep
       %setup -q
  +    %patch -p0
   
   %build
       CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5923 -r1.5924 news.txt
  --- openpkg-web/news.txt      31 Jul 2003 08:10:48 -0000      1.5923
  +++ openpkg-web/news.txt      31 Jul 2003 08:11:35 -0000      1.5924
  @@ -1,3 +1,4 @@
  +31-Jul-2003: Upgraded package: P<ex-1.0.2-1.20030731>
   31-Jul-2003: Upgraded package: P<ex-1.0.2-20030731>
   31-Jul-2003: Upgraded package: P<emacs-21.3-1.20030731>
   31-Jul-2003: Upgraded package: P<emacs-21.3-20030731>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to