[Lunar-commits] r25000 - moonbase/trunk/compilers/php
Auke Kok
sofar at lunar-linux.org
Sat Jun 23 18:37:11 CEST 2007
Author: sofar
Date: 2007-06-23 18:37:11 +0200 (Sat, 23 Jun 2007)
New Revision: 25000
Modified:
moonbase/trunk/compilers/php/CONFIGURE
moonbase/trunk/compilers/php/CONFLICTS
moonbase/trunk/compilers/php/DEPENDS
Log:
Cleanup for DEPENDS and BUILD. Added correct gd-detection.
From: stelzy at gmail.com
Modified: moonbase/trunk/compilers/php/CONFIGURE
===================================================================
--- moonbase/trunk/compilers/php/CONFIGURE 2007-06-23 16:36:47 UTC (rev 24999)
+++ moonbase/trunk/compilers/php/CONFIGURE 2007-06-23 16:37:11 UTC (rev 25000)
@@ -1,44 +1,18 @@
mquery IMAP "Install imap support?" y
mquery REGGLOBALS "Enable global variable support (potential security risk)?" n
+mquery FTP "Install ftp support?" y "--enable-ftp" ""
+mquery EXIF "Install EXIF support?" y "--enable-exif" ""
+mquery TRANSSID "Enable transparent session id?" y "--enable-trans-sid" ""
+mquery SOCKETS "Enable sockets support (experimental)?" y "--enable-sockets" ""
+mquery NCURSES "Enable ncurses support (experimental)?" y "--with-ncurses" ""
+mquery BCMATH "Enable BC math support?" y "--enable-bcmath" ""
-if ! grep -q CONFIGURED $MODULE_CONFIG; then
-
- if query "Install ftp support?" y; then
- OPTS="$OPTS --enable-ftp"
+if module_installed lighttpd; then
+ mquery FASTCGI "Build FastCGI version (required by lighttpd)?" y
+fi
+if query "Enable multibyte string support?" n; then
+ OPTS="$OPTS --enable-mbstring"
+ if query "Disable multibyte regular expression functions?" n; then
+ OPTS="$OPTS --disable-mbregex"
fi
-
- if query "Install EXIF support?" y; then
- OPTS="$OPTS --enable-exif"
- fi
-
- if query "Enable transparent session id?" y; then
- OPTS="$OPTS --enable-trans-sid"
- fi
-
- if query "Enable sockets support (experimental)?" y; then
- OPTS="$OPTS --enable-sockets"
- fi
-
- if query "Enable ncurses support (experimental)?" y; then
- OPTS="$OPTS --with-ncurses"
- fi
-
- if module_installed lighttpd; then
- mquery FASTCGI "Build FastCGI version (required by lighttpd)?" y
- fi
-
- if query "Enable multibyte string support?" n; then
- OPTS="$OPTS --enable-mbstring"
- if query "Disable multibyte regular expression functions?" n; then
- OPTS="$OPTS --disable-mbregex"
- fi
- fi
-
- if query "Enable BC math support?" y; then
- OPTS="$OPTS --enable-bcmath"
- fi
-
- echo 'CONFIGURED="y"' >> $MODULE_CONFIG
- echo 'OPTS='\"$OPTS\" >> $MODULE_CONFIG
-
fi
Modified: moonbase/trunk/compilers/php/CONFLICTS
===================================================================
--- moonbase/trunk/compilers/php/CONFLICTS 2007-06-23 16:36:47 UTC (rev 24999)
+++ moonbase/trunk/compilers/php/CONFLICTS 2007-06-23 16:37:11 UTC (rev 25000)
@@ -1,3 +1,2 @@
-conflicts php5 &&
+conflicts php5
conflicts php5-suhosin
-
Modified: moonbase/trunk/compilers/php/DEPENDS
===================================================================
--- moonbase/trunk/compilers/php/DEPENDS 2007-06-23 16:36:47 UTC (rev 24999)
+++ moonbase/trunk/compilers/php/DEPENDS 2007-06-23 16:37:11 UTC (rev 25000)
@@ -1,121 +1,123 @@
-depends readline &&
+depends readline
-optional_depends "aspell" \
- "--with-pspell" \
- "" \
- "for spelling functions" &&
-
-optional_depends "bzip2" \
- "--with-bz2" \
- "" \
- "for compression support" &&
+optional_depends "aspell" \
+ "--with-pspell" \
+ "" \
+ "for spelling functions"
-optional_depends "mhash" \
- "--with-mhash" \
- "" \
- "for hash functions support" &&
+optional_depends "bzip2" \
+ "--with-bz2" \
+ "" \
+ "for compression support"
-optional_depends "mcrypt" \
- "--with-mcrypt" \
- "" \
- "for crypto library" &&
+optional_depends "mhash" \
+ "--with-mhash" \
+ "" \
+ "for hash functions support"
-optional_depends "gmp" \
- "--with-gmp" \
- "" \
- "GNU math lib support" &&
+optional_depends "mcrypt" \
+ "--with-mcrypt" \
+ "" \
+ "for crypto library"
-optional_depends "openssl" \
- "--with-openssl" \
- "" \
- "for OpenSSL support" &&
+optional_depends "gmp" \
+ "--with-gmp" \
+ "" \
+ "GNU math lib support"
-optional_depends "gettext" \
- "--with-gettext" \
- "" \
- "for GNU gettext support" &&
-
-optional_depends "db" \
- "--with-db4" \
- "" \
- "for Berkeley DB4 support" &&
+optional_depends "openssl" \
+ "--with-openssl" \
+ "" \
+ "for OpenSSL support"
-optional_depends "gdbm" \
- "--with-gdbm" \
- "" \
- "for GNU dbm support" &&
+optional_depends "gettext" \
+ "--with-gettext" \
+ "" \
+ "for GNU gettext support"
-optional_depends "postgresql" \
- "--with-pgsql=/usr" \
- "" \
- "for Postgresql support" &&
-
-optional_depends "mysql" \
- "--with-mysql=/usr" \
- "" \
- "for native MySQL support" &&
+optional_depends "db" \
+ "--with-db4" \
+ "" \
+ "for Berkeley DB4 support"
-optional_depends "freetds" \
- "--with-sybase=/usr" \
- "" \
- "for SyBase support" &&
+optional_depends "gdbm" \
+ "--with-gdbm" \
+ "" \
+ "for GNU dbm support"
-optional_depends "freetype2" \
- "--with-freetype-dir=/usr" \
- "" \
- "for freetype2 support" &&
+optional_depends "postgresql" \
+ "--with-pgsql=/usr" \
+ "" \
+ "for PostgreSQL support"
-optional_depends "pdflib" \
- "--with-pdflib" \
- "" \
- "for pdflib support" &&
+optional_depends "mysql" \
+ "--with-mysql=/usr" \
+ "" \
+ "for native MySQL support"
-optional_depends "gd" \
- "--with-gd \
- --enable-gd-native-ttf \
- --with-jpeg-dir=/usr \
- --with-png-dir=/usr \
- --with-zlib" \
- "" \
- "for on the fly graphics" &&
+optional_depends "freetds" \
+ "--with-sybase=/usr" \
+ "" \
+ "for SyBase support"
-optional_depends "curl" \
- "--with-curl" \
- "" \
- "for curl support" &&
+optional_depends "freetype2" \
+ "--with-freetype-dir=/usr" \
+ "" \
+ "for freetype2 support"
-optional_depends "ming" \
- "--with-ming" \
- "--without-ming" \
- "for dynamic FLASH generation" &&
+optional_depends "pdflib" \
+ "--with-pdflib" \
+ "" \
+ "for pdflib support"
-optional_depends "Sablot" \
- "--enable-xslt --with-xslt-sablot=/usr" \
- "" \
- "for xslt support" &&
+optional_depends "gd" \
+ "--with-gd=/usr \
+ --enable-gd-native-ttf \
+ --with-jpeg-dir=/usr \
+ --with-png-dir=/usr \
+ --with-zlib" \
+ "" \
+ "for on the fly graphics"
-optional_depends "expat" \
- "--with-expat-dir=/usr" \
- "" \
- "for expat xml support" &&
+optional_depends "curl" \
+ "--with-curl" \
+ "" \
+ "for cURL support"
-optional_depends "libxml2" \
- "--with-dom=/usr --with-zlib-dir=/usr" \
- "" \
- "for DOMXML support" &&
+optional_depends "ming" \
+ "--with-ming" \
+ "--without-ming" \
+ "for dynamic FLASH generation"
-optional_depends "libxslt" \
- "--with-dom-xslt=/usr --with-dom-exslt=/usr" \
- "" \
- "for DOM Xslt support" &&
+optional_depends "Sablot" \
+ "--enable-xslt \
+ --with-xslt-sablot=/usr" \
+ "" \
+ "for XSLT support"
-optional_depends "openldap" \
- "--with-ldap" \
- "" \
- "For ldap support" &&
+optional_depends "expat" \
+ "--with-expat-dir=/usr" \
+ "" \
+ "for expat XML support"
-optional_depends "mm" \
- "--with-mm" \
- "" \
+optional_depends "libxml2" \
+ "--with-dom=/usr \
+ --with-zlib-dir=/usr" \
+ "" \
+ "for DOM XML support"
+
+optional_depends "libxslt" \
+ "--with-dom-xslt=/usr \
+ --with-dom-exslt=/usr" \
+ "" \
+ "for DOM XSLT support"
+
+optional_depends "openldap" \
+ "--with-ldap" \
+ "" \
+ "For ldap support"
+
+optional_depends "mm" \
+ "--with-mm" \
+ "" \
"for shared memory session support"
-
More information about the Lunar-commits
mailing list