OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 11-Dec-2006 08:53:24 Branch: HEAD Handle: 2006121107532300 Modified files: openpkg-src/lighttpd lighttpd.spec Log: add optional bzip2 support, add missing zlib dependency, add optional LUA support for mod_cml, etc Summary: Revision Changes Path 1.31 +24 -5 openpkg-src/lighttpd/lighttpd.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/lighttpd/lighttpd.spec ============================================================================ $ cvs diff -u -r1.30 -r1.31 lighttpd.spec --- openpkg-src/lighttpd/lighttpd.spec 16 Oct 2006 11:15:32 -0000 1.30 +++ openpkg-src/lighttpd/lighttpd.spec 11 Dec 2006 07:53:23 -0000 1.31 @@ -33,14 +33,16 @@ Group: Web License: MIT-style Version: 1.4.13 -Release: 20061016 +Release: 20061211 # package options %option with_fsl yes +%option with_pcre yes +%option with_bzip2 no %option with_ipv6 no %option with_mysql no -%option with_pcre yes %option with_ssl no +%option with_lua no # list of sources Source0: http://www.lighttpd.net/download/lighttpd-%{version}.tar.gz @@ -53,6 +55,12 @@ BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc PreReq: OpenPKG, openpkg >= 20060823 +BuildPreReq: zlib +PreReq: zlib +%if "%{with_bzip2}" == "yes" +BuildPreReq: bzip2 +PreReq: bzip2 +%endif %if "%{with_fsl}" == "yes" BuildPreReq: fsl >= 1.5.0 PreReq: fsl >= 1.5.0 @@ -69,6 +77,10 @@ BuildPreReq: openssl PreReq: openssl %endif +%if "%{with_lua}" == "yes" +BuildPreReq: lua +PreReq: lua +%endif AutoReq: no AutoReqProv: no @@ -97,9 +109,6 @@ %build # configure program - case "%{l_platform -t}" in - *-sunos* | *-freebsd* ) %{l_shtool} subst -e 's;-D_XOPEN_SOURCE=600;;' configure ;; - esac CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ CXXFLAGS="%{l_cxxflags -O}" \ @@ -125,6 +134,16 @@ %else --without-pcre \ %endif +%if "%{with_bzip2}" == "yes" + --with-bzip2 \ +%else + --without-bzip2 \ +%endif +%if "%{with_lua}" == "yes" + --with-lua \ +%else + --without-lua \ +%endif %if "%{with_ssl}" == "yes" --with-openssl=%{l_prefix} %else @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org