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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  r...@openpkg.org
  Module: openpkg-src                      Date:   18-May-2009 22:47:34
  Branch: HEAD                             Handle: 2009051821473400

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

  Log:
    upgrading package: curl 7.19.4 -> 7.19.5

  Summary:
    Revision    Changes     Path
    1.22        +25 -19     openpkg-src/curl/curl.patch
    1.114       +2  -5      openpkg-src/curl/curl.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/curl/curl.patch
  ============================================================================
  $ cvs diff -u -r1.21 -r1.22 curl.patch
  --- openpkg-src/curl/curl.patch       10 Apr 2009 08:36:54 -0000      1.21
  +++ openpkg-src/curl/curl.patch       18 May 2009 20:47:34 -0000      1.22
  @@ -1,8 +1,23 @@
   Index: configure
  ---- configure.orig   2009-02-13 15:25:53 +0100
  -+++ configure        2009-04-10 10:32:44 +0200
  -@@ -21303,7 +21303,7 @@
  -   echo $ECHO_N "(cached) $ECHO_C" >&6
  +--- configure.orig   2009-05-16 23:09:34 +0200
  ++++ configure        2009-05-18 22:44:29 +0200
  +@@ -4724,13 +4724,7 @@
  + if $ac_preproc_ok; then
  +   :
  + else
  +-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  +-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity 
check
  +-See \`config.log' for more details." >&5
  +-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
  +-See \`config.log' for more details." >&2;}
  +-   { (exit 1); exit 1; }; }; }
  ++  :
  + fi
  + 
  + ac_ext=c
  +@@ -21518,7 +21512,7 @@
  +   $as_echo_n "(cached) " >&6
    else
      ac_check_lib_save_LIBS=$LIBS
   -LIBS="-l"$LDAPLIBNAME"  $LIBS"
  @@ -10,8 +25,8 @@
    cat >conftest.$ac_ext <<_ACEOF
    /* confdefs.h.  */
    _ACEOF
  -@@ -21361,7 +21361,7 @@
  - #define `echo "HAVE_LIB"$LDAPLIBNAME"" | $as_tr_cpp` 1
  +@@ -21583,7 +21577,7 @@
  + #define `$as_echo "HAVE_LIB"$LDAPLIBNAME"" | $as_tr_cpp` 1
    _ACEOF
    
   -  LIBS="-l"$LDAPLIBNAME" $LIBS"
  @@ -19,8 +34,8 @@
    
    else
    
  -@@ -21545,7 +21545,7 @@
  -   echo $ECHO_N "(cached) $ECHO_C" >&6
  +@@ -21771,7 +21765,7 @@
  +   $as_echo_n "(cached) " >&6
    else
      ac_check_lib_save_LIBS=$LIBS
   -LIBS="-l"$LBERLIBNAME"  $LIBS"
  @@ -28,8 +43,8 @@
    cat >conftest.$ac_ext <<_ACEOF
    /* confdefs.h.  */
    _ACEOF
  -@@ -21603,7 +21603,7 @@
  - #define `echo "HAVE_LIB"$LBERLIBNAME"" | $as_tr_cpp` 1
  +@@ -21836,7 +21830,7 @@
  + #define `$as_echo "HAVE_LIB"$LBERLIBNAME"" | $as_tr_cpp` 1
    _ACEOF
    
   -  LIBS="-l"$LBERLIBNAME" $LIBS"
  @@ -37,12 +52,3 @@
    
    else
    
  -@@ -23435,7 +23435,7 @@
  -         PKGTEST="no"
  -     PREFIX_OPENSSL=$OPT_SSL
  -     LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
  --    if  "$PREFIX_OPENSSL" != "/usr"  ; then
  -+    if test "$PREFIX_OPENSSL" != "/usr"; then
  -       LDFLAGS="$LDFLAGS -L$LIB_OPENSSL"
  -       CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include"
  -     fi
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/curl/curl.spec
  ============================================================================
  $ cvs diff -u -r1.113 -r1.114 curl.spec
  --- openpkg-src/curl/curl.spec        18 Apr 2009 13:09:32 -0000      1.113
  +++ openpkg-src/curl/curl.spec        18 May 2009 20:47:34 -0000      1.114
  @@ -31,8 +31,8 @@
   Class:        BASE
   Group:        Web
   License:      MIT-style
  -Version:      7.19.4
  -Release:      20090410
  +Version:      7.19.5
  +Release:      20090518
   
   #   package options
   %option       with_ssl       yes
  @@ -108,9 +108,6 @@
       %patch -p0
   
   %build
  -    %{l_shtool} subst \
  -        -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
  -        configure
       ( echo 'ac_cv_header_openssl_engine_h=no'
         echo 'lt_cv_prog_compiler_c_o_F77=no'
         echo 'lt_cv_sys_max_cmd_len=100'
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to