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

  Server: cvs.openpkg.org                  Name:   Michael van Elst
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   25-Jul-2003 08:55:51
  Branch: HEAD                             Handle: 2003072507554902

  Modified files:
    openpkg-src/php         php.spec
    openpkg-web             news.txt

  Log:
    fix with_db, align LIBS configuration with mod_php

  Summary:
    Revision    Changes     Path
    1.57        +18 -5      openpkg-src/php/php.spec
    1.5797      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/php/php.spec
  ============================================================================
  $ cvs diff -u -r1.56 -r1.57 php.spec
  --- openpkg-src/php/php.spec  15 Jul 2003 10:43:10 -0000      1.56
  +++ openpkg-src/php/php.spec  25 Jul 2003 06:55:51 -0000      1.57
  @@ -33,7 +33,7 @@
   Group:        Language
   License:      PHP
   Version:      4.3.2
  -Release:      20030715
  +Release:      20030725
   
   #   package options (analog to apache.spec)
   %option       with_calendar      no
  @@ -207,13 +207,26 @@
       ldflags="$ldflags %{l_ldflags}"
       libs="$libs -lndbm -lgdbm"
   %endif
  -%if "%{with_oci7}" == "yes" || "%{with_oci8}" == "yes"
  -    ORACLE_HOME="`%{l_prefix}/etc/rc --query oracle_home`"
  -    export ORACLE_HOME
  +%if "%{with_gd}" == "yes"
  +    libs="$libs -lpng -lz"
  +%endif
  +%if "%{with_gettext}" == "yes"
  +    libs="$libs -liconv"
   %endif
   %if  "%{with_openldap}" == "yes" && "%{with_openldapsasl}" == "yes"
       libs="$libs -lsasl2"
   %endif
  +%if "%{with_imap}" == "yes"
  +    libs="$libs -lssl -lcrypto"
  +%endif
  +%if "%{with_db}" == "yes"
  +    libs="$libs -ldb"
  +%endif
  +%if "%{with_oci7}" == "yes" || "%{with_oci8}" == "yes"
  +    ORACLE_HOME="`%{l_prefix}/etc/rc --query oracle_home`"
  +    export ORACLE_HOME
  +%endif
  +
       CC="%{l_cc}" \
       CFLAGS="$cflags" \
       LDFLAGS="$ldflags" \
  @@ -245,7 +258,7 @@
           --with-freetype-dir=%{l_prefix} \
   %endif
   %if "%{with_db}" == "yes"
  -        --with-db3=%{l_prefix} \
  +        --with-db4=%{l_prefix} \
   %endif
   %if "%{with_debug}" == "yes"
           --with-debug=yes \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5796 -r1.5797 news.txt
  --- openpkg-web/news.txt      25 Jul 2003 06:22:42 -0000      1.5796
  +++ openpkg-web/news.txt      25 Jul 2003 06:55:49 -0000      1.5797
  @@ -1,3 +1,4 @@
  +25-Jul-2003: Upgraded package: P<php-4.3.2-20030725>
   25-Jul-2003: Upgraded package: P<smtpfeed-1.18-20030725>
   25-Jul-2003: Upgraded package: P<rt-3.0.4-20030725>
   24-Jul-2003: Upgraded package: P<aide-0.9-20030724>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to