Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (d490e85490280cb068728decf2daa32e69b3cb28)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (d490e85490280cb068728decf2daa32e69b3cb28)
  • Date: Mon, 9 Oct 2006 08:02:10 -0500

GIT changes to master grimoire by George Sherwood <chat AT sourcemage.org>:

php-pear/php4/BUILD | 14 ++++++++++++++
php-pear/php4/CONFIGURE | 7 ++++++-
php-pear/php4/DEPENDS | 32 +++++++++++++++++++++-----------
php-pear/php4/DETAILS | 5 ++---
php-pear/php4/HISTORY | 11 +++++++++++
php-pear/php4/INSTALL | 5 ++---
6 files changed, 56 insertions(+), 18 deletions(-)

New commits:
commit d490e85490280cb068728decf2daa32e69b3cb28
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

Updated php4 to 4.4.4. Bug #11565. Added numerous fixed from php 5
series.

diff --git a/php-pear/php4/BUILD b/php-pear/php4/BUILD
index 842966e..bdf6fea 100755
--- a/php-pear/php4/BUILD
+++ b/php-pear/php4/BUILD
@@ -36,6 +36,20 @@ case "$PHP4_APACHE" in
;;
esac &&

+#Check for xorg or xserver and pass location of xpm
+if [ "$PHP4_X11LIBS" == "y" ]; then
+ if check_if_xorg_modular_libs; then
+ OPTS="$OPTS --with-xpm-dir=/usr"
+ else
+ OPTS="$OPTS --with-xpm-dir=/usr/X11R6"
+ fi
+fi &&
+
+#check to see if internal GD requested
+if [ "$PHP4_GD" == "internal" ]; then
+ OPTS="--with-gd --enable-gd-native-ttf $OPTS"
+fi &&
+
./configure --prefix=${INSTALL_ROOT}/usr \
--sysconfdir=${INSTALL_ROOT}/etc \
--with-exec-dir=${INSTALL_ROOT}/usr/bin \
diff --git a/php-pear/php4/CONFIGURE b/php-pear/php4/CONFIGURE
index c2c9118..58adca6 100755
--- a/php-pear/php4/CONFIGURE
+++ b/php-pear/php4/CONFIGURE
@@ -23,4 +23,9 @@ config_query_option PHP4_FCGI 'Ena
'--disable-fastcgi' &&

config_query_list PHP4_APACHE 'Which Apache module to build?' \
- handler filter none
+ handler filter none &&
+
+config_query PHP4_X11LIBS "Would you like to use libxpm? (Requires
X11-libs)" n &&
+
+config_query_list PHP4_GD "Which GD library to use?" \
+ none internal external
diff --git a/php-pear/php4/DEPENDS b/php-pear/php4/DEPENDS
index 41ffe3c..23905a4 100755
--- a/php-pear/php4/DEPENDS
+++ b/php-pear/php4/DEPENDS
@@ -1,4 +1,7 @@
+source $GRIMOIRE/FUNCTIONS &&
+
depends flex &&
+depends readline "--with-readline=/usr" &&

# Officially ZLib is optional, but we require it because some other
# optional extensions depend on it, and it"s omnipresent anyway.
@@ -9,6 +12,17 @@ case "$PHP4_APACHE" in
filter) depends APACHE2;;
esac &&

+if [ "$PHP4_X11LIBS" == "y" ]; then
+ depends X11-LIBS
+ if check_if_xorg_modular_libs; then
+ depends libxpm
+ fi
+fi &&
+
+if [ "$PHP4_GD" == "external" ]; then
+ depends gd "--with-gd=/usr --enable-gd-native-ttf"
+fi &&
+
optional_depends C-CLIENT \
"--with-imap" \
"--without-imap" \
@@ -125,14 +139,10 @@ optional_depends libpng
"--without-png-dir" \
"for PNG support (also required for GD)" &&

-optional_depends gd
\
- "--with-gd --enable-gd-native-ttf
--with-freetype-dir=/usr/lib" \
- "--without-gd"
\
- "for on the fly graphics creation (GD support)"
&&
-
-optional_depends X11-LIBS \
- "--with-xpm-dir=/usr/X11R6 \
- --with-x-includes=/usr/X11/include \
- --with-x-libraries=/usr/X11/lib" \
- "" \
- "for XFree86 support"
+if [ "$PHP4_GD" != "none" ]; then
+ optional_depends freetype2 \
+ "--with-freetype-dir=/usr" \
+ "--without-freetype-dir" \
+ "for freetype2 support"
+fi
+
diff --git a/php-pear/php4/DETAILS b/php-pear/php4/DETAILS
index 48479cf..cb312f8 100755
--- a/php-pear/php4/DETAILS
+++ b/php-pear/php4/DETAILS
@@ -1,6 +1,6 @@
SPELL=php4
- VERSION=4.4.2
-
SOURCE_HASH='sha512:fdc842187ac97feb06ea8ab0bf93611dca5bee141c3350f3df9cbca8559199be6580a83ff9f2dd954ddb609f44b5986a006c0eb715c58bc006ca4ead84988470'
+ VERSION=4.4.4
+
SOURCE_HASH=sha512:73b3411e33fb4760b3e88f2436469c5c59d9191ea13870ec385b37ed2b9cf484b7ebdb7d557acfaea24301930636bc69fceae4578488cde168c9ad22c81b6d19
SOURCE=php-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/php-$VERSION
if [ "${VERSION//RC/}" == "$VERSION" ]; then
@@ -10,7 +10,6 @@ else
fi
WEB_SITE=http://www.php.net/
ENTERED=20011024
- UPDATED=20040330
SECURITY_PATCH=1
LICENSE[0]=http://www.php.net/license/3_0.txt
KEYWORDS="php"
diff --git a/php-pear/php4/HISTORY b/php-pear/php4/HISTORY
index 014ae69..8aee61d 100644
--- a/php-pear/php4/HISTORY
+++ b/php-pear/php4/HISTORY
@@ -1,3 +1,14 @@
+2009-10-09 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to 4.4.4. (Bug 11565). Removed UPDATED.
+ * CONFIGURE: Added query for using libxpm. Added query for GD.
+ * BUILD: Added check for xorg or xserver. Added check for
+ internal GD.
+ * DEPENDS: source GRIMOIRE/FUNCTIONS. Added depends readline.
+ Added depends X11_LIBS or libxpm if selected.
+ Added depends gd if external GD requested.
+ Added optional_depends freetype2
+ * INSTALL: Use install_config_file
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/php-pear/php4/INSTALL b/php-pear/php4/INSTALL
index 61ee253..a28f6af 100755
--- a/php-pear/php4/INSTALL
+++ b/php-pear/php4/INSTALL
@@ -1,5 +1,4 @@
make install &&

-if ! [ -e ${INSTALL_ROOT}/etc/php.ini ]; then
- cp php.ini-dist ${INSTALL_ROOT}/etc/php.ini
-fi
+install_config_file php.ini-dist ${INSTALL_ROOT}/etc/php.ini
+



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (d490e85490280cb068728decf2daa32e69b3cb28), George Sherwood, 10/09/2006

Archive powered by MHonArc 2.6.24.

Top of Page