Date: Tue, 19 Mar 2002 14:33:44 +0100 (CET) From: Alex Dupre <alex@vaio.alexdupre.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/36098: [Patch/Update Port] www/mod_php4 (various fixes and new exts) Message-ID: <200203191333.g2JDXiC00259@vaio.alexdupre.com>
next in thread | raw e-mail | index | archive | help
>Number: 36098
>Category: ports
>Synopsis: [Patch/Update Port] www/mod_php4 (various fixes and new exts)
>Confidential: no
>Severity: critical
>Priority: high
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 19 05:40:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Alex Dupre
>Release: FreeBSD 4.5-ALEXDUPRE i386
>Organization:
>Environment:
System: FreeBSD vaio.alexdupre.com 4.5-ALEXDUPRE FreeBSD 4.5-ALEXDUPRE #0: Sun Mar 10 23:48:11 CET 2002 alex@vaio.alexdupre.com:/usr/obj/usr/src/sys/VAIO i386
>Description:
- Cleaned up Makefile (configure args)
- Added GD2 support
- Added bzip2 support
- Added XMLRPC support
- Added WDDX support
- Enabled gd-native-ttf support
- Fixed iconv/biconv/giconv library dependencies
- Cleaned up XML-related extensions
>How-To-Repeat:
>Fix:
--- mod_php4.diff begins here ---
diff -ruN mod_php4.orig/Makefile mod_php4/Makefile
--- mod_php4.orig/Makefile Tue Mar 19 11:26:22 2002
+++ mod_php4/Makefile Tue Mar 19 12:25:09 2002
@@ -50,11 +50,7 @@
.endif
CONFIGURE_ARGS+=--enable-versioning \
- --with-system-regex \
- --disable-debug \
- --enable-track-vars \
- --without-gd \
- --without-mysql
+ --enable-inline-optimization
CFLAGS+= -I${PREFIX}/include
diff -ruN mod_php4.orig/scripts/configure.php mod_php4/scripts/configure.php
--- mod_php4.orig/scripts/configure.php Tue Mar 19 11:26:22 2002
+++ mod_php4/scripts/configure.php Tue Mar 19 13:55:11 2002
@@ -17,8 +17,10 @@
/usr/bin/dialog --title "configuration options" --clear \
--checklist "\n\
Please select desired options:" -1 -1 16 \
-GD "GD library support" OFF \
+GD1 "GD 1.x library support" OFF \
+GD2 "GD 2.x library support" OFF \
zlib "zlib library support" ON \
+bzip2 "bzip2 library support" OFF \
mcrypt "Encryption support" OFF \
mhash "Crypto-hashing support" OFF \
pdflib "pdflib support" OFF \
@@ -35,8 +37,10 @@
OpenSSL "OpenSSL support" OFF \
SNMP "SNMP support" OFF \
XML "XML support" OFF \
+XMLRPC "XMLRPC-EPI support (implies XML)" OFF \
XSLT "Sablotron support (implies XML and iconv)" OFF \
DOMXML "DOM support" OFF \
+WDDX "WDDX support (implies XML)" OFF \
FTP "File Transfer Protocol support" OFF \
CURL "CURL support" OFF \
gettext "gettext library support" OFF \
@@ -79,20 +83,54 @@
while [ "$1" ]; do
case $1 in
- \"GD\")
+ \"GD1\")
echo "LIB_DEPENDS+= gd.2:\${PORTSDIR}/graphics/gd"
echo "LIB_DEPENDS+= freetype.9:\${PORTSDIR}/print/freetype2"
echo "LIB_DEPENDS+= png.5:\${PORTSDIR}/graphics/png"
echo "LIB_DEPENDS+= jpeg.9:\${PORTSDIR}/graphics/jpeg"
echo "CONFIGURE_ARGS+=--with-gd=\${LOCALBASE} \\"
+ echo " --enable-gd-native-ttf \\"
echo " --with-freetype-dir=\${LOCALBASE} \\"
echo " --with-jpeg-dir=\${LOCALBASE} \\"
echo " --with-png-dir=\${LOCALBASE}"
+ if [ "$GD2" ]; then
+ echo "GD1 and GD2 are mutually exclusive." > /dev/stderr
+ rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+ exit 1
+ fi
+ GD1=1
+ ;;
+ \"GD2\")
+ echo "LIB_DEPENDS+= gd.3:\${PORTSDIR}/graphics/gd2"
+ echo "LIB_DEPENDS+= freetype.9:\${PORTSDIR}/print/freetype2"
+ echo "LIB_DEPENDS+= png.5:\${PORTSDIR}/graphics/png"
+ echo "LIB_DEPENDS+= jpeg.9:\${PORTSDIR}/graphics/jpeg"
+ echo "CONFIGURE_ARGS+=--with-gd=\${LOCALBASE} \\"
+ echo " --enable-gd-native-ttf \\"
+ echo " --with-freetype-dir=\${LOCALBASE} \\"
+ echo " --with-jpeg-dir=\${LOCALBASE} \\"
+ echo " --with-png-dir=\${LOCALBASE}"
+ if [ "$GD1" ]; then
+ echo "GD1 and GD2 are mutually exclusive." > /dev/stderr
+ rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+ exit 1
+ fi
+ GD2=1
;;
\"zlib\")
echo "CONFIGURE_ARGS+=--with-zlib"
ZLIB=1
;;
+ \"bzip2\")
+ if [ -x /usr/bin/bzip2 ]; then
+ BZ2PREFIX=/usr
+ else
+ BZ2PREFIX=/usr/local
+ echo "LIB_DEPENDS+= bz2.1:\${PORTSDIR}/archivers/bzip2"
+ fi
+ echo "BZ2PREFIX=${BZ2PREFIX}"
+ echo "CONFIGURE_ARGS+=--with-bz2=\${BZ2PREFIX}"
+ ;;
\"mcrypt\")
echo "LIB_DEPENDS+= mcrypt.6:\${PORTSDIR}/security/libmcrypt"
echo "CONFIGURE_ARGS+=--with-mcrypt=\${LOCALBASE}"
@@ -143,9 +181,9 @@
;;
\"SybaseDB\")
echo "LIB_DEPENDS+= sybdb.1:\${PORTSDIR}/databases/freetds"
- echo "LIB_DEPENDS+= giconv.2:\${PORTSDIR}/converters/libiconv"
+ echo "LIB_DEPENDS+= iconv.3:\${PORTSDIR}/converters/libiconv"
echo "CONFIGURE_ARGS+=--with-sybase=\${LOCALBASE}"
- LIBS="${LIBS} -L\${LOCALBASE}/lib -lgiconv"
+ LIBS="${LIBS} -L\${LOCALBASE}/lib -liconv"
if [ "$SYBASECT" ]; then
echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
@@ -155,9 +193,9 @@
;;
\"SybaseCT\")
echo "LIB_DEPENDS+= ct.0:\${PORTSDIR}/databases/freetds"
- echo "LIB_DEPENDS+= giconv.2:\${PORTSDIR}/converters/libiconv"
+ echo "LIB_DEPENDS+= iconv.3:\${PORTSDIR}/converters/libiconv"
echo "CONFIGURE_ARGS+=--with-sybase-ct=\${LOCALBASE}"
- LIBS="${LIBS} -L\${LOCALBASE}/lib -lgiconv"
+ LIBS="${LIBS} -L\${LOCALBASE}/lib -liconv"
if [ "$SYBASEDB" ]; then
echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
@@ -212,13 +250,18 @@
;;
\"XML\")
echo "LIB_DEPENDS+= expat.2:\${PORTSDIR}/textproc/expat2"
- echo "CONFIGURE_ARGS+=--with-xml --with-expat-dir=\${LOCALBASE}"
+ echo "CONFIGURE_ARGS+= --with-expat-dir=\${LOCALBASE}"
XML=1
;;
+ \"XMLRPC\")
+ echo "CONFIGURE_ARGS+= --with-xmlrpc"
+ if [ -z "$XML" ]; then
+ set $* \"XML\"
+ fi
+ ;;
\"XSLT\")
echo "LIB_DEPENDS+= sablot.67:\${PORTSDIR}/textproc/sablotron"
echo "CONFIGURE_ARGS+=--enable-xslt --with-xslt-sablot"
- echo "CONFIGURE_ARGS+=--with-expat-dir=\${LOCALBASE}"
if [ -z "$XML" ]; then
set $* \"XML\"
fi
@@ -230,6 +273,12 @@
echo "LIB_DEPENDS+= xml2.5:\${PORTSDIR}/textproc/libxml2"
echo "CONFIGURE_ARGS+=--with-dom=\${LOCALBASE}"
;;
+ \"WDDX\")
+ echo "CONFIGURE_ARGS+=--enable-wddx"
+ if [ -z "$XML" ]; then
+ set $* \"XML\"
+ fi
+ ;;
\"FTP\")
echo "CONFIGURE_ARGS+=--enable-ftp"
;;
@@ -242,7 +291,7 @@
echo "CONFIGURE_ARGS+=--with-gettext=\${LOCALBASE}"
;;
\"iconv\")
- echo "LIB_DEPENDS+= iconv.2:\${PORTSDIR}/converters/iconv"
+ echo "LIB_DEPENDS+= biconv.2:\${PORTSDIR}/converters/iconv"
echo "CONFIGURE_ARGS+=--with-iconv=\${LOCALBASE}"
ICONV=1
;;
--- mod_php4.diff ends here ---
>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?200203191333.g2JDXiC00259>