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: 27-Jun-2003 11:25:00
Branch: HEAD Handle: 2003062710245801
Modified files:
openpkg-src/php php.spec
openpkg-web news.txt
Log:
add option with_openldapsasl to select SASL bindings for openldap.
Yes, that's a hack.
Summary:
Revision Changes Path
1.46 +41 -32 openpkg-src/php/php.spec
1.5036 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
============================================================================
$ cvs diff -u -r1.45 -r1.46 php.spec
--- openpkg-src/php/php.spec 3 Jun 2003 15:46:41 -0000 1.45
+++ openpkg-src/php/php.spec 27 Jun 2003 09:24:59 -0000 1.46
@@ -33,47 +33,48 @@
Group: Language
License: PHP
Version: 4.3.2
-Release: 20030603
+Release: 20030627
# package options (analog to apache.spec)
-%option with_calendar no
-%option with_mysql no
-%option with_gd no
-%option with_db no
-%option with_debug no
-%option with_pdflib no
-%option with_zlib no
-%option with_bzip2 no
-%option with_openssl no
-%option with_openldap no
-%option with_mm no
-%option with_pcre no
-%option with_ftp no
-%option with_java no
-%option with_oci7 no
-%option with_oci8 no
-%option with_freetype no
-%option with_gettext no
-%option with_imap no
-%option with_xml no
-%option with_dom no
-%option with_bc no
-%option with_transsid no
-%option with_curl no
-%option with_mhash no
-%option with_wddx no
-%option with_gdbm no
-%option with_versioning no
-%option with_pear no
+%option with_calendar no
+%option with_mysql no
+%option with_gd no
+%option with_db no
+%option with_debug no
+%option with_pdflib no
+%option with_zlib no
+%option with_bzip2 no
+%option with_openssl no
+%option with_openldap no
+%option with_openldapsasl no
+%option with_mm no
+%option with_pcre no
+%option with_ftp no
+%option with_java no
+%option with_oci7 no
+%option with_oci8 no
+%option with_freetype no
+%option with_gettext no
+%option with_imap no
+%option with_xml no
+%option with_dom no
+%option with_bc no
+%option with_transsid no
+%option with_curl no
+%option with_mhash no
+%option with_wddx no
+%option with_gdbm no
+%option with_versioning no
+%option with_pear no
# fixing implicit inter-module dependencies and correlations
%if "%{with_freetype}" == "yes"
%undefine with_gd
-%define with_gd yes
+%define with_gd yes
%endif
%if "%{with_mysql}" == "yes" || "%{with_pdflib}" == "yes" || "%{with_gd}" == "yes"
|| "%{with_dom}" == "yes"
%undefine with_zlib
-%define with_zlib yes
+%define with_zlib yes
%endif
# list of sources
@@ -107,6 +108,11 @@
%endif
%if "%{with_openldap}" == "yes"
BuildPreReq: openldap
+%if "%{with_openldapsasl}" == "yes"
+BuildPreReq: openldap::with_sasl = yes
+%else
+BuildPreReq: openldap::with_sasl = no
+%endif
%endif
%if "%{with_mm}" == "yes"
BuildPreReq: mm
@@ -172,6 +178,9 @@
%if "%{with_oci7}" == "yes" || "%{with_oci8}" == "yes"
ORACLE_HOME="`%{l_prefix}/etc/rc --query oracle_home`"
export ORACLE_HOME
+%endif
+%if "%{with_openldap}" == "yes" && "%{with_openldapsasl}" == "yes"
+ libs="$libs -lsasl2"
%endif
CC="%{l_cc}" \
CFLAGS="$cflags" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5035 -r1.5036 news.txt
--- openpkg-web/news.txt 27 Jun 2003 09:24:10 -0000 1.5035
+++ openpkg-web/news.txt 27 Jun 2003 09:24:58 -0000 1.5036
@@ -1,3 +1,4 @@
+27-Jun-2003: Upgraded package: P<php-4.3.2-20030627>
27-Jun-2003: Upgraded package: P<openldap-2.1.22-20030627>
27-Jun-2003: Upgraded package: P<apache-1.3.27-20030627>
27-Jun-2003: Upgraded package: P<kerberos-1.2.8-20030627>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
