Attachment 20475 Details for Bug 36109 – mod_php4.diff

[patch] mod_php4.diff

mod_php4.diff (text/plain), 5.58 KB, created by Alex Dupre on 2002-03-19 20:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Dupre

Created: 2002-03-19 20:20:01 UTC

Size: 5.58 KB

patch

obsolete

>diff -ruN mod_php4.orig/Makefile mod_php4/Makefile
>--- mod_php4.orig/Makefile	Tue Mar 19 19:43:46 2002
>+++ mod_php4/Makefile	Tue Mar 19 19:45:51 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 19:43:46 2002
>+++ mod_php4/scripts/configure.php	Tue Mar 19 20:28:43 2002
>@@ -17,8 +17,11 @@
> 	/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 \
>+zziplib		"zziplib library support" OFF \
>+bzip2		"bzip2 library support" OFF \
> mcrypt		"Encryption support" OFF \
> mhash		"Crypto-hashing support" OFF \
> pdflib		"pdflib support" OFF \
>@@ -35,8 +38,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 +84,58 @@
> 
> 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
> 			;;
>+		\"zziplib\")
>+			echo "LIB_DEPENDS+=	zzip-0.10:\${PORTSDIR}/devel/zziplib"
>+			echo "CONFIGURE_ARGS+=--with-zip=\${LOCALBASE}"
>+			;;
>+		\"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 +186,8 @@
> 			;;
> 		\"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"
> 			if [ "$SYBASECT" ]; then
> 				echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
> 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
>@@ -155,9 +197,8 @@
> 			;;
> 		\"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"
> 			if [ "$SYBASEDB" ]; then
> 				echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
> 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
>@@ -212,13 +253,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 +276,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 +294,7 @@
> 			echo "CONFIGURE_ARGS+=--with-gettext=\${LOCALBASE}"
> 			;;
> 		\"iconv\")
>-			echo "LIB_DEPENDS+=	iconv.2:\${PORTSDIR}/converters/iconv"
>+			echo "LIB_DEPENDS+=	iconv.3:\${PORTSDIR}/converters/libiconv"
> 			echo "CONFIGURE_ARGS+=--with-iconv=\${LOCALBASE}"
> 			ICONV=1
> 			;;

Actions: View | Diff

Attachments on bug 36109: 20475