[SM-Commit] PERFORCE change 78000 by Sergey A. Lipnevich for review

Perforce Review Daemon p4review at smee.org
Wed Apr 19 00:45:00 EDT 2006


Change 78000 by sergey_lipnevich at laptop on 2006/04/19 05:42:38

	Straighten out PHP 5 dependencies

Affected files ...

... //sgl/grimoires/devel/php-pear/php/BUILD#5 edit
... //sgl/grimoires/devel/php-pear/php/CONFIGURE#5 edit
... //sgl/grimoires/devel/php-pear/php/DEPENDS#7 edit
... //sgl/grimoires/devel/php-pear/php/HISTORY#23 edit

Differences ...

==== //sgl/grimoires/devel/php-pear/php/BUILD#5 (xtext) ====

@@ -54,7 +54,6 @@
                  --enable-dbase                    \
                  --enable-sockets                  \
                    --with-iconv                    \
-                   --with-xmlrpc                   \
                    --with-versioning               \
                    --with-mod_charset              \
                    --with-pear                     \

==== //sgl/grimoires/devel/php-pear/php/CONFIGURE#5 (xtext) ====

@@ -24,4 +24,4 @@
                      '--disable-fastcgi'                                   &&
 
 config_query_list    PHP4_APACHE    'Which Apache module to build?'        \
-                     handler filter none
+                     none  handler filter

==== //sgl/grimoires/devel/php-pear/php/DEPENDS#7 (xtext) ====

@@ -4,6 +4,9 @@
 # optional extensions depend on it, and it"s omnipresent anyway.
 depends  zlib  "--with-zlib --with-zlib-dir=/usr"  &&
 
+# This is required since PHP 5
+depends  libxml2  '--enable-xml --with-dom --with-xmlrpc'  &&
+
 case  "$PHP4_APACHE"  in
   handler)  depends  APACHE;;
   filter)   depends  APACHE2;;
@@ -95,16 +98,6 @@
                   "--without-ldap"    \
                   "for LDAP support"  &&
 
-optional_depends  expat                                 \
-                  "--enable-xml --with-expat-dir=/usr"  \
-                  "--disable-xml"                       \
-                  "for XML parsing"                     &&
-
-optional_depends  libxml2                \
-                  "--with-dom=/usr"      \
-                  "--without-dom"        \
-                  "for DOM XML support"  &&
-
 optional_depends  libxslt                                       \
                   "--with-dom-xslt=/usr --with-dom-exslt=/usr"  \
                   "--without-dom-xslt --without-dom-exslt"      \

==== //sgl/grimoires/devel/php-pear/php/HISTORY#23 (text) ====

@@ -1,3 +1,9 @@
+2006-04-19 Sergey Lipnevich <sergey at sourcemage.org>
+	* CONFIGURE: put "none" as first choice in Apache module kinds to be
+	  consistent with sorcery prompts;
+	* BUILD: remove XMLRPC option;
+	* DEPENDS: libxml2 mandatory; expat removed; XMLRPC option added.
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 



More information about the SM-Commit mailing list