Date: Fri, 13 Jul 2001 07:36:21 -0700 (PDT) From: Richard Stockley <rws@procopia.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/28948: Add domxml and imap-ssl support to mod_php4 Message-ID: <200107131436.f6DEaL006962@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 28948
>Category: ports
>Synopsis: Add domxml and imap-ssl support to mod_php4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 13 07:40:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: Richard Stockley
>Release: FreeBSD 4-3-Stable
>Organization:
Procopia
>Environment:
>Description:
This diff adds patches for domxml and imap-ssl options under mod_php4
which configure does not properly detect under freebsd.
LibXML2, for domxml support, is not detected normally due to its location under freebsd and ssl support in IMAP does not work due to the library name used for c-client under freebsd. The patches fix configure in mod_php4 and add these options to configure.php
>How-To-Repeat:
>Fix:
diff -ruP mod_php4.orig/files/patch-au mod_php4/files/patch-au
--- mod_php4.orig/files/patch-domxml Thu Jan 1 01:00:00 1970
+++ mod_php4/files/patch-domxml Fri Jul 13 00:16:00 2001
@@ -0,0 +1,49 @@
+--- configure.orig Fri Jul 13 00:00:47 2001
++++ configure Fri Jul 13 00:09:45 2001
+@@ -15339,13 +15339,13 @@
+
+ if test "$PHP_DOM" != "no"; then
+
+- if test -r $PHP_DOM/include/libxml/tree.h; then
++ if test -r $PHP_DOM/include/libxml2/libxml/tree.h; then
+ DOMXML_DIR=$PHP_DOM
+ else
+ echo $ac_n "checking for DOM in default path""... $ac_c" 1>&6
+ echo "configure:15347: checking for DOM in default path" >&5
+ for i in /usr/local /usr; do
+- if test -r $i/include/libxml/tree.h; then
++ if test -r $i/include/libxml2/libxml/tree.h; then
+ DOMXML_DIR=$i
+ echo "$ac_t""found in $i" 1>&6
+ fi
+@@ -15359,7 +15359,7 @@
+
+
+ old_CPPFLAGS=$CPPFLAGS
+- CPPFLAGS=-I$DOMXML_DIR/include
++ CPPFLAGS=-I$DOMXML_DIR/include/libxml2
+ echo $ac_n "checking for libxml version""... $ac_c" 1>&6
+ echo "configure:15365: checking for libxml version" >&5
+ cat > conftest.$ac_ext <<EOF
+@@ -15390,16 +15390,16 @@
+
+
+
+- if test "$DOMXML_DIR/include" != "/usr/include"; then
++ if test "$DOMXML_DIR/include/libxml2" != "/usr/include"; then
+
+- if test -z "$DOMXML_DIR/include" || echo "$DOMXML_DIR/include" | grep '^/' >/dev/null ; then
+- ai_p="$DOMXML_DIR/include"
++ if test -z "$DOMXML_DIR/include/libxml2" || echo "$DOMXML_DIR/include/libxml2" | grep '^/' >/dev/null ; then
++ ai_p="$DOMXML_DIR/include/libxml2"
+ else
+
+- ep_dir="`echo $DOMXML_DIR/include|sed 's%/*[^/][^/]*/*$%%'`"
++ ep_dir="`echo $DOMXML_DIR/include/libxml2|sed 's%/*[^/][^/]*/*$%%'`"
+
+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+- ai_p="$ep_realdir/`basename \"$DOMXML_DIR/include\"`"
++ ai_p="$ep_realdir/`basename \"$DOMXML_DIR/include/libxml2\"`"
+ fi
+
+
diff -ruP mod_php4.orig/files/patch-av mod_php4/files/patch-av
--- mod_php4.orig/files/patch-imap-ssl Thu Jan 1 01:00:00 1970
+++ mod_php4/files/patch-imap-ssl Fri Jul 13 14:39:17 2001
@@ -0,0 +1,11 @@
+--- configure.orig Thu Jun 21 07:28:57 2001
++++ configure Fri Jul 13 14:35:00 2001
+@@ -22877,7 +22877,7 @@
+
+
+ old_LIBS=$LIBS
+- LIBS="$LIBS -lc-client"
++ LIBS="$LIBS -l$IMAP_LIB"
+ if test $PHP_KERBEROS != "no"; then
+ LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+ fi
diff -ruP mod_php4.orig/scripts/configure.php mod_php4/scripts/configure.php
--- mod_php4.orig/scripts/configure.php Tue Jun 26 09:10:59 2001
+++ mod_php4/scripts/configure.php Fri Jul 13 14:19:05 2001
@@ -20,6 +20,7 @@
mhash "Crypto-hashing support" OFF \
pdflib "pdflib support" OFF \
IMAP "IMAP support" OFF \
+IMAP-SSL "IMAP-SSL support (implies IMAP)" OFF \
MySQL "MySQL database support" ON \
PostgreSQL "PostgreSQL database support" OFF \
SybaseDB "Sybase/MS-SQL database support (DB-lib)" OFF \
@@ -31,6 +32,7 @@
SNMP "SNMP support" OFF \
XML "XML support" OFF \
XSLT "Sablotron support (implies XML and iconv)" OFF \
+XMLDOM "LibXML2 support (implies iconv)" OFF \
FTP "File Transfer Protocol support" OFF \
CURL "CURL support" OFF \
gettext "gettext library support" OFF \
@@ -109,6 +111,13 @@
\"IMAP\")
echo "LIB_DEPENDS+= c-client4.8:\${PORTSDIR}/mail/cclient"
echo "CONFIGURE_ARGS+=--with-imap=\${PREFIX}"
+ IMAP=1
+ ;;
+ \"IMAP-SSL\")
+ echo "CONFIGURE_ARGS+=--with-imap-ssl=\${PREFIX}"
+ if [ -z "$IMAP" ]; then
+ set $* \"IMAP\"
+ fi
;;
\"MySQL\")
echo "LIB_DEPENDS+= mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
@@ -186,6 +195,13 @@
if [ -z "$XML" ]; then
set $* \"XML\"
fi
+ if [ -z "$ICONV" ]; then
+ set $* \"iconv\"
+ fi
+ ;;
+ \"XMLDOM\")
+ echo "LIB_DEPENDS+= xml2.5:\${PORTSDIR}/textproc/libxml2"
+ echo "CONFIGURE_ARGS+=--with-dom=\${PREFIX}"
if [ -z "$ICONV" ]; then
set $* \"iconv\"
fi
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200107131436.f6DEaL006962>