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: 27-Nov-2003 14:23:11
Branch: HEAD Handle: 2003112713230902
Modified files:
openpkg-src/php3 php3.spec
openpkg-web news.txt
Log:
include Christoph's changes/additions
Summary:
Revision Changes Path
1.2 +19 -4 openpkg-src/php3/php3.spec
1.7561 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/php3/php3.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 php3.spec
--- openpkg-src/php3/php3.spec 27 Nov 2003 13:07:02 -0000 1.1
+++ openpkg-src/php3/php3.spec 27 Nov 2003 13:23:11 -0000 1.2
@@ -42,6 +42,7 @@
%option with_db no
%option with_zlib no
%option with_openssl no
+%option with_ftp no
# fixing implicit inter-module dependencies and correlations
%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes"
@@ -55,12 +56,15 @@
# list of sources
Source0: http://www.php.net/distributions/php-%{version}.tar.gz
+Patch0: http://static.php.net/www.php.net/distributions/mime.c.diff-3.0.gz
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20030708, gcc, sed, flex, bison
PreReq: OpenPKG, openpkg >= 20030708, MTA
+BuildPreReq: gdbm
+PreReq: gdbm
%if "%{with_mysql}" == "yes"
BuildPreReq: mysql
PreReq: mysql
@@ -103,12 +107,15 @@
%prep
%setup -q -n php-%{version}
+ cd functions
+ %patch -p0
%build
# configure package
- cflags="%{l_cflags -O} %{l_cppflags}"
+ cflags="%{l_cflags -O}"
+ cppflags="%{l_cppflags}"
ldflags="%{l_ldflags}"
- libs=""
+ libs="-lgdbm"
%if "%{with_gd}" == "yes"
libs="$libs -lpng -lz"
%endif
@@ -118,6 +125,7 @@
CC="%{l_cc}" \
CFLAGS="$cflags" \
+ CPPFLAGS="$cppflags" \
LDFLAGS="$ldflags" \
LIBS="$libs" \
PROG_SENDMAIL="%{l_prefix}/sbin/sendmail" \
@@ -150,12 +158,19 @@
%if "%{with_openssl}" == "yes"
--with-openssl=%{l_prefix} \
%endif
+%if "%{with_ftp}" == "yes"
+ --enable-ftp \
+%else
+ --disable-ftp \
+%endif
+ --without-apache \
--enable-force-cgi-redirect \
--enable-discard-path \
- --enable-track-vars
+ --enable-track-vars \
+ --enable-memory-limit
# build package
- %{l_make} %{l_mflags}
+ %{l_make} %{l_mflags -O}
%install
# install package
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7560 -r1.7561 news.txt
--- openpkg-web/news.txt 27 Nov 2003 13:07:01 -0000 1.7560
+++ openpkg-web/news.txt 27 Nov 2003 13:23:09 -0000 1.7561
@@ -1,3 +1,4 @@
+27-Nov-2003: Upgraded package: P<php3-3.0.18-20031127>
27-Nov-2003: New package: P<php3-3.0.18-20031127>
27-Nov-2003: Upgraded package: P<php-4.3.4-20031127>
27-Nov-2003: Upgraded package: P<apache-1.3.29-20031127>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
