OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Feb-2007 08:30:11
Branch: HEAD Handle: 2007020607301100
Modified files:
openpkg-src/apache apache.spec
Log:
trying to get the mess sorted a little bit by putting options in
alphabetical order (at least for description and dependency stuff)
Summary:
Revision Changes Path
1.376 +117 -116 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.375 -r1.376 apache.spec
--- openpkg-src/apache/apache.spec 6 Feb 2007 07:16:18 -0000 1.375
+++ openpkg-src/apache/apache.spec 6 Feb 2007 07:30:11 -0000 1.376
@@ -83,34 +83,32 @@
%option with_suphp_ugid_check yes
# package options (additionally used Apache modules; can be enabled
without thinking)
-%option with_mod_ssl no
-%option with_mod_define no
-%option with_mod_perl no
-%option with_mod_php no
%option with_mod_dav no
+%option with_mod_define no
%option with_mod_layout no
%option with_mod_macro no
+%option with_mod_perl no
+%option with_mod_php no
+%option with_mod_ssl no
# package options (additionally used Apache modules; you have to know what
you do)
+%option with_mod_access_referer no
+%option with_mod_auth_kerb no
%option with_mod_auth_ldap no
-%option with_mod_auth_radius no
%option with_mod_auth_mysql no
%option with_mod_auth_pam no
-%option with_mod_auth_kerb no
-%option with_mod_gzip no
+%option with_mod_auth_radius no
+%option with_mod_evasive no
%option with_mod_fastcgi no
-%option with_mod_throttle no
-%option with_mod_access_referer no
+%option with_mod_gzip no
%option with_mod_owa no
-%option with_mod_roaming no
%option with_mod_relocate no
+%option with_mod_roaming no
%option with_mod_security no
-%option with_mod_evasive no
+%option with_mod_throttle no
# package options (optional PHP5 specific settings; requires
"with_mod_php")
# please note the lack of an PEAR option since PEAR is provided by the
'php' package
-%option with_mod_php_suhosin no
-%option with_mod_php_hardened no
%option with_mod_php_bc no
%option with_mod_php_bdb no
%option with_mod_php_bzip2 no
@@ -125,6 +123,7 @@
%option with_mod_php_gd no
%option with_mod_php_gdbm no
%option with_mod_php_gettext no
+%option with_mod_php_hardened no
%option with_mod_php_iconv no
%option with_mod_php_imap no
%option with_mod_php_mbregex no
@@ -144,6 +143,7 @@
%option with_mod_php_snmp no
%option with_mod_php_sqlite no
%option with_mod_php_ssl no
+%option with_mod_php_suhosin no
%option with_mod_php_t1lib no
%option with_mod_php_versioning no
%option with_mod_php_wddx no
@@ -243,169 +243,170 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823
PreReq: OpenPKG, openpkg >= 20060823
+%if "%{with_gdbm_ndbm}" == "yes"
+BuildPreReq: gdbm, gdbm::with_ndbm = yes
+PreReq: gdbm, gdbm::with_ndbm = yes
+%endif
+%if "%{with_mod_auth_kerb}" == "yes"
+BuildPreReq: kerberos
+PreReq: kerberos
+%endif
+%if "%{with_mod_auth_ldap}" == "yes"
+BuildPreReq: openldap, openssl
+PreReq: openldap, openssl
+%endif
+%if "%{with_mod_auth_mysql}" == "yes"
+BuildPreReq: mysql
+PreReq: mysql
+%endif
+%if "%{with_mod_auth_pam}" == "yes"
+BuildPreReq: PAM
+PreReq: PAM
+%endif
%if "%{with_mod_dav}" == "yes"
BuildPreReq: expat
PreReq: expat
%endif
-%if "%{with_mod_ssl}" == "yes"
-BuildPreReq: openssl, mm
-PreReq: openssl, mm
+%if "%{with_mod_owa}" == "yes"
+BuildPreReq: oracle
+PreReq: oracle
%endif
%if "%{with_mod_perl}" == "yes"
BuildPreReq: perl
PreReq: perl
%endif
-%if "%{with_mod_owa}" == "yes"
-BuildPreReq: oracle
-PreReq: oracle
-%endif
%if "%{with_mod_php}" == "yes"
BuildPreReq: gcc, sed, flex, bison
-%if "%{with_mod_php_suhosin}" == "yes"
-BuildPreReq: autoconf
-%endif
-%if "%{with_mod_php_mssql}" == "yes"
-BuildPreReq: freetds, libiconv
-PreReq: freetds, libiconv
-%endif
-%if "%{with_mod_php_sqlite}" == "yes"
-BuildPreReq: sqlite
-PreReq: sqlite
-%endif
-%if "%{with_mod_php_mysql}" == "yes"
-BuildPreReq: mysql
-PreReq: mysql
-%endif
-%if "%{with_mod_php_pgsql}" == "yes"
-BuildPreReq: postgresql, openssl
-PreReq: postgresql, openssl
-%endif
-%if "%{with_mod_php_gd}" == "yes"
-BuildPreReq: gd >= 2.0.20, jpeg, png
-PreReq: gd >= 2.0.20, jpeg, png
-%endif
%if "%{with_mod_php_bdb}" == "yes"
BuildPreReq: db
PreReq: db
%endif
-%if "%{with_mod_php_zlib}" == "yes"
-BuildPreReq: zlib
-PreReq: zlib
-%endif
%if "%{with_mod_php_bzip2}" == "yes"
BuildPreReq: bzip2
PreReq: bzip2
%endif
-%if "%{with_mod_php_ssl}" == "yes"
-BuildPreReq: openssl
-PreReq: openssl
-%endif
-%if "%{with_mod_php_openldap}" == "yes"
-BuildPreReq: openldap, openssl
-PreReq: openldap, openssl
-%if "%{with_mod_php_openldapsasl}" == "yes"
-BuildPreReq: openldap::with_sasl = yes
-PreReq: openldap::with_sasl = yes
-%else
-BuildPreReq: openldap::with_sasl = no
-PreReq: openldap::with_sasl = no
-%endif
+%if "%{with_mod_php_crack}" == "yes"
+BuildPreReq: cracklib
+PreReq: cracklib
%endif
-%if "%{with_mod_php_mm}" == "yes"
-BuildPreReq: mm
-PreReq: mm
+%if "%{with_mod_php_curl}" == "yes"
+BuildPreReq: curl
+PreReq: curl
%endif
-%if "%{with_mod_php_pcre}" == "yes"
-BuildPreReq: pcre
-PreReq: pcre
+%if "%{with_mod_php_dom}" == "yes"
+BuildPreReq: libxml, libxslt
+PreReq: libxml, libxslt
%endif
%if "%{with_mod_php_freetype}" == "yes"
BuildPreReq: freetype
PreReq: freetype
%endif
-%if "%{with_mod_php_t1lib}" == "yes"
-BuildPreReq: t1lib
-PreReq: t1lib
+%if "%{with_mod_php_gd}" == "yes"
+BuildPreReq: gd >= 2.0.20, jpeg, png
+PreReq: gd >= 2.0.20, jpeg, png
+%endif
+%if "%{with_mod_php_gdbm}" == "yes"
+BuildPreReq: gdbm
+PreReq: gdbm
%endif
%if "%{with_mod_php_gettext}" == "yes"
BuildPreReq: gettext, libiconv
PreReq: gettext, libiconv
%endif
+%if "%{with_mod_php_iconv}" == "yes"
+BuildPreReq: libiconv
+PreReq: libiconv
+%endif
%if "%{with_mod_php_imap}" == "yes"
BuildPreReq: imap, openssl
PreReq: imap, openssl
%endif
-%if "%{with_mod_php_xml}" == "yes"
-BuildPreReq: libxml
-PreReq: libxml
-%endif
-%if "%{with_mod_php_xsl}" == "yes"
-BuildPreReq: libxml, libxslt
-PreReq: libxml, libxslt
-%endif
-%if "%{with_mod_php_dom}" == "yes"
-BuildPreReq: libxml, libxslt
-PreReq: libxml, libxslt
-%endif
-%if "%{with_mod_php_curl}" == "yes"
-BuildPreReq: curl
-PreReq: curl
+%if "%{with_mod_php_mcrypt}" == "yes"
+BuildPreReq: libmcrypt
+PreReq: libmcrypt
%endif
%if "%{with_mod_php_mhash}" == "yes"
BuildPreReq: mhash
PreReq: mhash
%endif
-%if "%{with_mod_php_mcrypt}" == "yes"
-BuildPreReq: libmcrypt
-PreReq: libmcrypt
+%if "%{with_mod_php_mm}" == "yes"
+BuildPreReq: mm
+PreReq: mm
%endif
-%if "%{with_mod_php_gdbm}" == "yes"
-BuildPreReq: gdbm
-PreReq: gdbm
+%if "%{with_mod_php_mssql}" == "yes"
+BuildPreReq: freetds, libiconv
+PreReq: freetds, libiconv
+%endif
+%if "%{with_mod_php_mysql}" == "yes"
+BuildPreReq: mysql
+PreReq: mysql
%endif
%if "%{with_mod_php_oci8}" == "yes"
BuildPreReq: oracle
-%endif
-%if "%{with_mod_php_snmp}" == "yes"
-BuildPreReq: snmp
-PreReq: snmp
+PreReq: oracle
%endif
%if "%{with_mod_php_odbc}" == "yes"
BuildPreReq: unixodbc
PreReq: unixodbc
%endif
-%if "%{with_mod_php_iconv}" == "yes"
-BuildPreReq: libiconv
-PreReq: libiconv
+%if "%{with_mod_php_openldap}" == "yes"
+BuildPreReq: openldap, openssl
+PreReq: openldap, openssl
+%if "%{with_mod_php_openldapsasl}" == "yes"
+BuildPreReq: openldap::with_sasl = yes
+PreReq: openldap::with_sasl = yes
+%else
+BuildPreReq: openldap::with_sasl = no
+PreReq: openldap::with_sasl = no
+%endif
+%endif
+%if "%{with_mod_php_pcre}" == "yes"
+BuildPreReq: pcre
+PreReq: pcre
+%endif
+%if "%{with_mod_php_pgsql}" == "yes"
+BuildPreReq: postgresql, openssl
+PreReq: postgresql, openssl
%endif
%if "%{with_mod_php_sendmail}" == "yes"
BuildPreReq: MTA
PreReq: MTA
%endif
-%if "%{with_mod_php_crack}" == "yes"
-BuildPreReq: cracklib
-PreReq: cracklib
+%if "%{with_mod_php_snmp}" == "yes"
+BuildPreReq: snmp
+PreReq: snmp
%endif
+%if "%{with_mod_php_sqlite}" == "yes"
+BuildPreReq: sqlite
+PreReq: sqlite
%endif
-%if "%{with_mod_auth_ldap}" == "yes"
-BuildPreReq: openldap, openssl
-PreReq: openldap, openssl
+%if "%{with_mod_php_ssl}" == "yes"
+BuildPreReq: openssl
+PreReq: openssl
%endif
-%if "%{with_mod_auth_mysql}" == "yes"
-BuildPreReq: mysql
-PreReq: mysql
+%if "%{with_mod_php_suhosin}" == "yes"
+BuildPreReq: autoconf
%endif
-%if "%{with_mod_auth_pam}" == "yes"
-BuildPreReq: PAM
-PreReq: PAM
+%if "%{with_mod_php_t1lib}" == "yes"
+BuildPreReq: t1lib
+PreReq: t1lib
%endif
-%if "%{with_mod_auth_kerb}" == "yes"
-BuildPreReq: kerberos
-PreReq: kerberos
+%if "%{with_mod_php_xml}" == "yes"
+BuildPreReq: libxml
+PreReq: libxml
%endif
-%if "%{with_gdbm_ndbm}" == "yes"
-BuildPreReq: gdbm, gdbm::with_ndbm = yes
-PreReq: gdbm, gdbm::with_ndbm = yes
+%if "%{with_mod_php_xsl}" == "yes"
+BuildPreReq: libxml, libxslt
+PreReq: libxml, libxslt
+%endif
+%if "%{with_mod_php_zlib}" == "yes"
+BuildPreReq: zlib
+PreReq: zlib
+%endif
+%endif
+%if "%{with_mod_ssl}" == "yes"
+BuildPreReq: openssl, mm
+PreReq: openssl, mm
%endif
%if "%{with_suphp}" == "yes"
BuildPreReq: php, gcc, gcc::with_cxx = yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
