Attachment #33225 for bug #54519

View | Details | Raw Unified | Return to bug 54519
Collapse All | Expand All




# New ports collection makefile for:	php5
# Date created:				Tue Feb 18 11:17:13 CET 2003
# Whom:					Alex Dupre <sysadmin@alexdupre.com>
#
# $FreeBSD: ports/lang/php5/Makefile,v 1.19 2003/07/04 02:26:08 nork Exp $
#
# There are many ways to select which extensions you want to enable, either
# in interactive mode or in batch mode.
#
# By default, the enabled extensions are: CTYPE, DOM, PCRE, POSIX, SESSION,
# SIMPLEXML, SQLITE, TOKENIZER and XML. This behaviour can be changed
# overriding the PHP5_OPTIONS variable (e.g. PHP5_OPTIONS="EXT1 EXT2 EXT3").
#
# Another way is to use the WITH_<EXT> and WITHOUT_<EXT> knobs, for additional
# and default extensions respectively (implies batch mode).
#
# The last way reads an "extension" file, located in ~/php5_options (the
# location is overridable by the PHP5_OPTFILE variable). You may find an
# example in scripts/php5_options (interactive mode only).
#

PORTNAME=	php5
PORTVERSION=	5.0.0.a1
PORTREVISION=	0
CATEGORIES?=	lang devel www
MASTER_SITES=	http://www.php.net/distributions/ \
		http://it.php.net/distributions/ \

		http://fr.php.net/distributions/ \
		http://es.php.net/distributions/ \
		http://se.php.net/distributions/ \
		http://www.sm.FreeBSD.org/~alex/ \
		http://downloads.php.net/jani/
.if defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
PKGNAMEPREFIX=	mod_

.endif
.endif
.endif
DISTNAME=	php-${PORTVERSION:S/.a/a/}

MAINTAINER?=	sysadmin@alexdupre.com
COMMENT=	PHP Scripting Language (Apache Module and CLI)

CONFIGURE_ARGS=	--enable-versioning \
		--enable-memory-limit \
		--with-layout=GNU \
		--with-zlib-dir=/usr \
		--disable-all

.if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"

EXT_DIR=	20020429
SAPI_FILE=	"@comment "

CONFLICTS=	php5-cli-5* mod_php5-5* php5-cgi-5*
.if defined(WITHOUT_APACHE)
.if defined(WITHOUT_CLI)
CONFLICTS=	php5-5* php5-cli-5* mod_php5-5*
.else
CONFLICTS=	php5-5* php5-cgi-5* mod_php5-5*
.endif
.else
.if defined(WITHOUT_CLI)
CONFLICTS=	php5-5* php5-cli-5* php5-cgi-5*
.endif
.endif
CONFLICTS+=	php4-4* php4-cli-4* mod_php4-4* php4-cgi-4*

.if defined(WITHOUT_APACHE)
CONFIGURE_ARGS+=--enable-discard-path

CONFIGURE_ARGS+=--disable-cli
PLIST_SUB+=	CLI="@comment "
.else
.if !defined(WITHOUT_PEAR)
CONFIGURE_ARGS+=--with-pear
PLIST_SUB+=	PEAR=""
.else
PLIST_SUB+=	PEAR="@comment "
.endif
MAN1=		php.1
PLIST_SUB+=	CLI=""
.endif

SAPI_FILE=	"bin/php"
.endif

ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DBASE DBX DOM EXIF \
		FILEPRO FTP GD GDBM GETTEXT GMP ICONV IMAP INTERBASE INIFILE \
		MBSTRING MCAL MCVE MCRYPT MHASH MIME MING MYSQL NCURSES \
		OPENLDAP OPENSSL ORACLE PCNTL PCRE PDFLIB POSIX POSTGRESQL \
		PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOCKETS \
		SQLITE SYBASEDB SYBASECT SYSVSEM SYSVSHM TOKENIZER UNIXODBC \
		WDDX XML XMLRPC XSL YAZ YP ZLIB

.for opt in ${ALL_OPTIONS}
.if defined(WITH_${opt}) || defined(WITHOUT_${opt})

IS_INTERACTIVE=	yes
.endif

PBDIR=		${PREFIX}/share/pear/boot

.include <bsd.port.pre.mk>

.if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)

.if defined(WITH_APACHE2)
APACHE_PORT?=	${PORTSDIR}/www/apache2
CONFIGURE_ARGS+=--with-apxs2=${APXS}
SAPI_FILE=	libexec/apache2/libphp5.so
.else
APACHE_PORT?=	${PORTSDIR}/www/apache13
CONFIGURE_ARGS+=--with-apxs=${APXS}
SAPI_FILE=	libexec/apache/libphp5.so
.endif

BUILD_DEPENDS+=	${APXS}:${APACHE_PORT}

		EXT_DIR=${EXT_DIR}

WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
PHP5_OPTFILE?=	${HOME}/php5_options

PHP5_OPTIONS?=	CTYPE DOM PCRE POSIX SESSION SIMPLEXML SQLITE TOKENIZER XML

.for opt in ${ALL_OPTIONS}
.if defined(WITH_${opt})
SEL_OPTIONS+=	${opt}
.endif
.endfor
.for opt in ${PHP5_OPTIONS}
.if !defined(WITHOUT_${opt})
SEL_OPTIONS+=	${opt}
.endif

.endfor

SCRIPTS_ENV+=	SEL_OPTIONS="${SEL_OPTIONS}" \
		OPTION_FILE="${PHP5_OPTFILE}" \
		WRKDIR="${WRKDIR}" \
		CAT="${CAT}" \
		SED="${SED}"

.ifmake describe
WITH_MYSQL=	yes
WITH_XML=	yes
.endif


WITH_DBA=	yes
.endif

.if defined(WITH_XSL)
WITH_DOM=	yes
.endif

.if defined(WITH_XMLRPC)
WITH_ICONV_DEP=	yes
.endif

.if defined(WITH_SNMP)
WITH_OPENSSL_DEP=	yes
.endif

.if defined(WITH_DOM) || defined(WITH_SIMPLEXML)
WITH_XML_DEP=	yes
.endif

.if defined(WITH_GD) || defined(WITH_MYSQL) || defined(WITH_PDFLIB)
WITH_ZLIB_DEP=	yes
.endif

.if defined(WITH_BCMATH)

CONFIGURE_ARGS+=--enable-dbx
.endif

.if defined(WITH_DOM)
CONFIGURE_ARGS+=--enable-dom
CONFIGURE_ARGS+=--with-dom=${LOCALBASE}
.endif

.if defined(WITH_DOMXSLT)
LIB_DEPENDS+=	xslt.1:${PORTSDIR}/textproc/libxslt
CONFIGURE_ARGS+=--with-dom-xslt=${LOCALBASE} --with-dom-exslt=${LOCALBASE}
.endif

.if defined(WITH_EXIF)

CONFIGURE_ARGS+=--enable-filepro
.endif

.if defined(WITH_FRIBIDI)
LIB_DEPENDS+=	fribidi.0:${PORTSDIR}/converters/fribidi
CONFIGURE_ARGS+=--with-fribidi=${LOCALBASE}
.endif

.if defined(WITH_FTP)
CONFIGURE_ARGS+=--enable-ftp
.endif

CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
.endif

.if defined(WITH_HYPERWAVE)
CONFIGURE_ARGS+=--with-hyperwave
.endif

.if defined(WITH_ICONV) || defined(WITH_ICONV_DEP)
LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
.endif

.endif

.if defined(WITH_MBSTRING)
CONFIGURE_ARGS+=--enable-mbstring
.endif

.if defined(WITH_MCAL)

CONFIGURE_ARGS+=--with-oracle=${LOCALBASE}/oracle7
.endif

.if defined(WITH_OVERLOAD)
CONFIGURE_ARGS+=--enable-overload
.endif

.if defined(WITH_PCNTL)
CONFIGURE_ARGS+=--enable-pcntl
.endif

.if defined(WITH_PCRE)
CONFIGURE_ARGS+=--with-pcre-regex
.endif

.if defined(WITH_PDFLIB)

CONFIGURE_ARGS+=--enable-shmop
.endif

.if defined(WITH_SIMPLEXML)
CONFIGURE_ARGS+=--enable-simplexml
.endif

.if defined(WITH_SNMP)
.if exists(${LOCALBASE}/lib/libsnmp.so.4)
LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net/net-snmp4
.else
LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
.endif
CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --with-openssl-dir=${OPENSSLBASE} --enable-ucd-snmp-hack
.endif

.if defined(WITH_SOCKETS)
CONFIGURE_ARGS+=--enable-sockets
.endif

.if defined(WITH_SQLITE)
CONFIGURE_ARGS+=--with-sqlite
.endif

.if defined(WITH_SYBASEDB)
LIB_DEPENDS+=	sybdb.3:${PORTSDIR}/databases/freetds
CONFIGURE_ARGS+=--with-sybase=${LOCALBASE}

.endif

.if defined(WITH_XML) || defined(WITH_XML_DEP)
LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
CONFIGURE_ARGS+=--with-libxml-dir=${LOCALBASE}
.endif

.if defined(WITH_XML)
CONFIGURE_ARGS+=--enable-xml
.endif

.if defined(WITH_XMLRPC)
LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2
CONFIGURE_ARGS+=--with-xmlrpc --with-expat-dir=${LOCALBASE} --with-iconv-dir=${LOCALBASE}
.endif

.if defined(WITH_XSL)
LIB_DEPENDS+=	xslt.1:${PORTSDIR}/textproc/libxslt
CONFIGURE_ARGS+=--with-xsl=${LOCALBASE}
.endif

.if defined(WITH_YAZ)

CONFIGURE_ARGS+=--enable-yp
.endif

.if defined(WITH_ZLIB) || defined(WITH_ZLIB_DEP)
CONFIGURE_ARGS+=--with-zlib-dir=/usr
CONFIGURE_ARGS+=--with-zip=${LOCALBASE}
.endif

.if defined(WITH_ZLIB)
CONFIGURE_ARGS+=--with-zlib
.endif

pre-patch:

	@${ECHO_CMD} "To enable LZW-compressed GIF support in GD define the WITH_LZW knob."
	@${ECHO_CMD} ""
.endif
.if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR) && (!defined(WITH_PCRE) || !defined(WITH_XML))
	@${ECHO_CMD} "PEAR requires PCRE and XML extensions."
	@${ECHO_CMD} "Define the WITHOUT_PEAR knob or enable these extensions."
	@${FALSE}
.endif
.if !defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI)
	@${ECHO_CMD} "You are building the Apache Module and the Command Line Interpreter of PHP."
	@${ECHO_CMD} ""
	@${ECHO_CMD} "Use port:"
	@${ECHO_CMD} "	lang/php5-cli		for Command Line Interpreter only"
	@${ECHO_CMD} "	www/php5-cgi		for Common Gateway Interface only"
	@${ECHO_CMD} "	www/mod_php5		for Apache Module only"
	@${ECHO_CMD} ""
.endif


.endif

post-install:
.if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR)
	@${INSTALL_SCRIPT} ${WRKSRC}/pear/scripts/pear ${PREFIX}/bin
.endif
	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
	@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
	@${TOUCH} ${PREFIX}/lib/php/${EXT_DIR}/.php
	@${TOUCH} ${PREFIX}/include/php/ext/xml/expat/.php
.if !defined(WITHOUT_APACHE)
	@${ECHO_CMD} "*****************************************************************************"
	@${ECHO_CMD} ""




# Just include this makefile after bsd.ports.pre.mk
#
# The user/port can now set this options in the makefiles.
#
# USE_PHPIZE=yes   - Use to build a php extension.
# WANT_PHP_CLI=yes - Want the CLI version of PHP.
# WANT_PHP_CGI=yes - Want the CGI version of PHP.
# WANT_PHP_MOD=yes - Want the Apache Module for PHP.
# WANT_PHP_WEB=yes - Want the Apache Module or the CGI version of PHP.
#
# You may combine multiple WANT_PHP_* knobs.
# Don't specify any WANT_PHP_* knob if your port will work with every PHP SAPI.
#

.if exists(${LOCALBASE}/bin/php) && exists(${LOCALBASE}/bin/pear)
HAVE_PHP_CLI=	yes
HAVE_PHP=	yes
PHP_PORT=	${PORTSDIR}/lang/php4-cli
.endif
.if exists(${LOCALBASE}/bin/php) && !exists(${LOCALBASE}/bin/pear)
HAVE_PHP_CGI=	yes
HAVE_PHP=	yes
PHP_PORT=	${PORTSDIR}/www/php4-cgi
.endif
.if exists(${LOCALBASE}/libexec/apache/libphp4.so) || exists(${LOCALBASE}/libexec/apache2/libphp4.so)
HAVE_PHP_MOD=	yes
HAVE_PHP=	yes
PHP_PORT=	${PORTSDIR}/www/mod_php4
.endif
.if defined(HAVE_PHP_CLI) && defined(HAVE_PHP_MOD)
PHP_PORT=	${PORTSDIR}/lang/php4
.endif

.if defined(WANT_PHP_CGI) && (defined(WANT_PHP_CLI) || defined(WANT_PHP_MOD))
.BEGIN:
	@${ECHO_CMD} "The CGI version of PHP avoids the installation of other SAPIs."
	@${ECHO_CMD} "Do not use WANT_PHP_CGI with other WANT_PHP_* knobs."
	@${FALSE}
.endif

.if defined(WANT_PHP_CLI) && !defined(WANT_PHP_MOD)
.if defined(HAVE_PHP) && !defined(HAVE_PHP_CLI)
.BEGIN:
	@${ECHO_CMD} "This port requires the CLI version of PHP, but you have already"
	@${ECHO_CMD} "installed a conflicting PHP port without CLI."
	@${FALSE}
.else
PHP_PORT?=	${PORTSDIR}/lang/php4-cli
.endif
.endif

.if defined(WANT_PHP_WEB)
.if defined(HAVE_PHP) && !defined(HAVE_PHP_CGI) && !defined(HAVE_PHP_MOD)
.BEGIN:
        @${ECHO_CMD} "This port requires the Apache Module or the CGI version of PHP, but you have"
        @${ECHO_CMD} "already installed a conflicting PHP port without them."
        @${FALSE}
.else
PHP_PORT?=	${PORTSDIR}/www/mod_php4
.endif
.endif

.if defined(WANT_PHP_CGI)
.if defined(HAVE_PHP) && !defined(HAVE_PHP_CGI)
.BEGIN:
	@${ECHO_CMD} "This port requires the CGI version of PHP, but you have already"
	@${ECHO_CMD} "installed a conflicting PHP port without CGI."
	@${FALSE}
.else
PHP_PORT?=	${PORTSDIR}/www/php4-cgi
.endif
.endif

.if defined(WANT_PHP_MOD) && !defined(WANT_PHP_CLI)
.if defined(HAVE_PHP) && !defined(HAVE_PHP_MOD)
.BEGIN:
	@${ECHO_CMD} "This port requires the Apache Module for PHP, but you have already"
	@${ECHO_CMD} "installed a conflicting PHP port without the Apache Module."
	@${FALSE}
.else
PHP_PORT?=	${PORTSDIR}/www/mod_php4
.endif
.endif

PHP_PORT?=	${PORTSDIR}/lang/php4
RUN_DEPENDS+=	${LOCALBASE}/include/php/main/php.h:${PHP_PORT}

PHP_EXT_DIR?=	20020429
PLIST_SUB+=	PHP_EXT_DIR=${PHP_EXT_DIR}

.if defined(USE_PHPIZE)
BUILD_DEPENDS+=	phpize:${PHP_PORT}
USE_LIBTOOL=	yes
WANT_AUTOMAKE_VER=	15
WANT_AUTOCONF_VER=	253
CONFIGURE_ARGS+=--with-php-config=${LOCALBASE}/bin/php-config

configure-message: phpize

phpize:
	@${ECHO_MSG} "===>  PHPizing for ${DISTNAME}"
	@(cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${LOCALBASE}/bin/phpize)
.endif

Line 1 Link Here

(-)php5/distinfo (-1 / +1 lines)
1	MD5 (php-4.3.3RC1.tar.bz2) = 2b3b4866bedd073d505c554c551fef92	1	MD5 (php-5.0.0a1.tar.bz2) = 470fbfdc2ba77a00e0d2e0bacf645103




--- configure.orig	Tue Jul 15 00:32:50 2003
+++ configure	Tue Jul 15 01:44:37 2003
@@ -620,6 +620,8 @@
 ac_help="$ac_help
   --enable-gd-jis-conv      GD: Enable JIS-mapped Japanese font support."
 ac_help="$ac_help

   --with-gettext[=DIR]    Include GNU gettext support."
 ac_help="$ac_help
   --with-gmp              Include GNU MP support"
@@ -29376,6 +29378,31 @@
 
 
 

 
 
 
@@ -29528,7 +29555,7 @@
                  libgd/gd_io_file.c libgd/gd_ss.c libgd/gd_io_ss.c libgd/gd_png.c libgd/gd_jpeg.c \
                  libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c libgd/gdfontmb.c libgd/gdfontl.c \
                  libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c libgd/gdkanji.c \

                  libgd/xbm.c"
 
   for ac_func in fabsf floorf
@@ -29603,6 +29630,11 @@
   fi
 
   

   if test "$PHP_JPEG_DIR" != "no"; then
 
     for i in /usr /usr/local $PHP_JPEG_DIR; do
@@ -31314,6 +31346,9 @@
 
   cat >> confdefs.h <<\EOF
 #define HAVE_GD_BUNDLED 1

 EOF
 
   cat >> confdefs.h <<\EOF
@@ -31364,6 +31399,14 @@
     GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
   fi
 

 else
 
  if test "$PHP_GD" != "no"; then
@@ -35713,6 +35756,137 @@
     esac
   done
 
+  echo $ac_n "checking for gdImageGifAnimBegin in -lgd""... $ac_c" 1>&6
+echo "configure:32250: checking for gdImageGifAnimBegin in -lgd" >&5
+ac_lib_var=`echo gd'_'gdImageGifAnimBegin | sed 'y%./+-%__p_%'`

+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+
+    LDFLAGS=$save_old_LDFLAGS
+    ext_shared=$save_ext_shared
+    cat >> confdefs.h <<\EOF
+#define HAVE_GD_GIF_ANIM 1
+EOF
+
+
+else
+  echo "$ac_t""no" 1>&6
+
+    LDFLAGS=$save_old_LDFLAGS
+    ext_shared=$save_ext_shared
+    unset ac_cv_func_gd
+
+
+fi
+
+
+  save_old_LDFLAGS=$LDFLAGS
+  ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
+
+  save_ext_shared=$ext_shared
+  ext_shared=yes
+
+  for ac_i in $ac_stuff; do
+    case $ac_i in
+    -l*)
+      ac_ii=`echo $ac_i|cut -c 3-`
+
+
+  case $ac_ii in
+  c|c_r|pthread*) ;;
+  *)
+    if test "$ext_shared" = "yes"; then
+        LDFLAGS="$LDFLAGS -l$ac_ii"
+    else
+
+
+  case $ac_ii in
+  c|c_r|pthread*) ;;
+  *)
+      LIBS="$LIBS -l$ac_ii"
+   ;;
+  esac
+
+
+    fi
+   ;;
+  esac
+
+
+    ;;
+    -L*)
+      ac_ii=`echo $ac_i|cut -c 3-`
+
+  if test "$ac_ii" != "/usr/lib"; then
+
+  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
+    ai_p=$ac_ii
+  else
+
+    ep_dir="`echo $ac_ii|sed 's%/*[^/][^/]*/*$%%'`"
+
+    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+  fi
+
+
+      if test "$ext_shared" = "yes"; then
+        LDFLAGS="$ld_runpath_switch$ai_p -L$ai_p $LDFLAGS"
+      else
+
+
+
+  unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
+
+  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
+  if test -n "$unique" && test "`eval $cmd`" = "" ; then
+    eval "LIBPATH$unique=set"
+
+    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
+    LDFLAGS="$LDFLAGS -L$ai_p"
+    PHP_RPATHS="$PHP_RPATHS $ai_p"
+
+  fi
+
+
+      fi
+
+  fi
+
+    ;;
+    esac
+  done
+
   echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
 echo "configure:35718: checking for gdCacheCreate in -lgd" >&5
 ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'`
@@ -57066,8 +57240,8 @@
   
   echo $ac_n "checking Oracle version""... $ac_c" 1>&6
 echo "configure:57069: checking Oracle version" >&5
-  if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
-  	ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
+  if test -s "$ORACLE_DIR/ocommon/install/partial.prd"; then

 	test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
   elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
     ORACLE_VERSION=9.0
@@ -58359,6 +58533,102 @@
 	    
 
   if test "$ext_shared" = "yes"; then

     ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
     if test -n "$ORACLE_DIR/lib"; then
       
@@ -77889,29 +78159,6 @@
   else
     
   

   case ct in
   c|c_r|pthread*) ;;
   *) 
@@ -77935,52 +78182,7 @@
 
     
   

   
     
   save_old_LDFLAGS=$LDFLAGS
@@ -78126,38 +78328,6 @@
 
     
   

-  echo "$ac_t""no" 1>&6
-
-    LDFLAGS=$save_old_LDFLAGS
-    ext_shared=$save_ext_shared
-    unset ac_cv_func_tcl
-     
-      

 fi
 
   
@@ -89822,10 +89992,7 @@
 CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
 
 all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'

Lines 1-7 Link Here

(-)php5/files/patch-ext::gd::gd_ctx.c (-16 / +26 lines)
1	--- ext/gd/gd_ctx.c.orig Wed Mar 12 05:16:31 2003	1	--- ext/gd/gd_ctx.c.orig Mon Jun 23 20:07:47 2003
2	+++ ext/gd/gd_ctx.c Sat Jun 28 15:47:56 2003	2	+++ ext/gd/gd_ctx.c Tue Jul 15 01:54:58 2003
3	@@ -24,17 +24,22 @@	3	@@ -44,23 +44,29 @@
4		4	/* {{{ _php_image_output_ctx */
5	static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type, char tn, void (func_p)())	5	static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type, char tn, void (func_p)())
6	{	6	{
7	- zval imgind, file, **quality;	7	- zval imgind, file, **quality;
Lines 16-42 Link Here
16	+#endif /* HAVE_GD_GIF_ANIM */	16	+#endif /* HAVE_GD_GIF_ANIM */
17	gdIOCtx *ctx;	17	gdIOCtx *ctx;
18		18
19	/* The quality parameter for Wbmp stands for the threshold when called from image2wbmp() */	19	/* The third (quality) parameter for Wbmp stands for the threshold when called from image2wbmp().
20	+ /* The quality parameter for GIF animation stands for colormap inclusion. 1==include local/global colormap */	20	* The third (quality) parameter for Wbmp and Xbm stands for the foreground color index when called
21	+ /* The LeftOfs parameter for GIF animation begin stands for NETSCAPE2.0 Loop count extension. */	21	* from imagey<type>().
		22	+ * The third (quality) parameter for GIF animation stands for colormap inclusion. 1==include
		23	+ * local/global colormap.
		24	+ * The fourth (LeftOfs) parameter for GIF animation begin stands for NETSCAPE2.0 Loop count extension.
		25	*/
22		26
		27	if (argc < 2 && image_type == PHP_GDIMG_TYPE_XBM) {
		28	WRONG_PARAM_COUNT;
		29	}
23	- if (argc < 1 \|\| argc > 3 \|\| zend_get_parameters_ex(argc, &imgind, &file, &quality) == FAILURE)	30	- if (argc < 1 \|\| argc > 3 \|\| zend_get_parameters_ex(argc, &imgind, &file, &quality) == FAILURE)
24	+ if (argc < 1 \|\| argc > 7 \|\| zend_get_parameters_ex(argc, &imgind, &file, &quality, &lo, &to, &del, &dis) == FAILURE)	31	+ if (argc < 1 \|\| argc > 7 \|\| zend_get_parameters_ex(argc, &imgind, &file, &quality, &lo, &to, &del, &dis) == FAILURE)
25	{	32	{
26	WRONG_PARAM_COUNT;	33	WRONG_PARAM_COUNT;
27	}	34	}
28	@@ -44,11 +49,29 @@	35	@@ -70,11 +76,29 @@
29	if (argc > 1) {	36	if (argc > 1) {
30	convert_to_string_ex(file);	37	convert_to_string_ex(file);
31	fn = Z_STRVAL_PP(file);	38	fn = Z_STRVAL_PP(file);
32	- if (argc == 3) {	39	- if (argc == 3) {
33	- convert_to_long_ex(quality);	40	- convert_to_long_ex(quality);
34	- q = Z_LVAL_PP(quality);	41	- q = Z_LVAL_PP(quality);/* or colorindex for foreground of BW images (defaults to black) */
35	- }	42	- }
36	}	43	}
37	+ if (argc >= 3) {	44	+ if (argc >= 3) {
38	+ convert_to_long_ex(quality);	45	+ convert_to_long_ex(quality);
39	+ q = Z_LVAL_PP(quality);	46	+ q = Z_LVAL_PP(quality);/* or colorindex for foreground of BW images (defaults to black) */
40	+ }	47	+ }
41	+#ifdef HAVE_GD_GIF_ANIM	48	+#ifdef HAVE_GD_GIF_ANIM
42	+ if (argc >= 4) {	49	+ if (argc >= 4) {
Lines 59-65 Link Here
59		66
60	if ((argc == 2) \|\| (argc > 2 && Z_STRLEN_PP(file))) {	67	if ((argc == 2) \|\| (argc > 2 && Z_STRLEN_PP(file))) {
61	if (!fn \|\| fn == empty_string \|\| php_check_open_basedir(fn TSRMLS_CC)) {	68	if (!fn \|\| fn == empty_string \|\| php_check_open_basedir(fn TSRMLS_CC)) {
62	@@ -56,7 +79,7 @@	69	@@ -82,7 +106,7 @@
63	RETURN_FALSE;	70	RETURN_FALSE;
64	}	71	}
65		72
Lines 68-76 Link Here
68	if (!fp) {	75	if (!fp) {
69	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open '%s' for writing", fn);	76	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open '%s' for writing", fn);
70	RETURN_FALSE;	77	RETURN_FALSE;
71	@@ -94,6 +117,14 @@	78	@@ -128,6 +152,14 @@
72	}	79	(*func_p)(im, q, ctx);
73	(*func_p)(im, i, ctx);	80	}
74	break;	81	break;
75	+#ifdef HAVE_GD_GIF_ANIM	82	+#ifdef HAVE_GD_GIF_ANIM
76	+ case PHP_GDIMG_TYPE_GIFANIMBEGIN:	83	+ case PHP_GDIMG_TYPE_GIFANIMBEGIN:
Lines 83-89 Link Here
83	default:	90	default:
84	(*func_p)(im, ctx);	91	(*func_p)(im, ctx);
85	break;	92	break;
86	@@ -112,3 +143,72 @@	93	@@ -146,6 +178,75 @@
87		94
88	RETURN_TRUE;	95	RETURN_TRUE;
89	}	96	}
Lines 156-158 Link Here
156	+}	163	+}
157	+/* }}} */	164	+/* }}} */
158	+#endif /* HAVE_GD_GIF_ANIM */	165	+#endif /* HAVE_GD_GIF_ANIM */
		166	/* }}} */
		167
		168	/*




--- main/main.c.orig    Sun Jun 22 11:16:39 2003
+++ main/main.c Sun Jun 22 11:17:00 2003

@@ -134,7 +134,6 @@ static int short_track_vars_names_length

 #define NUM_TRACK_VARS		(sizeof(short_track_vars_names_length)/sizeof(int))

-
 #define SAFE_FILENAME(f) ((f)?(f):"-")

 /* {{{ PHP_INI_MH
@@ -1362,7 +1361,7 @@ static void php_autoglobal_merge(HashTab
 static int php_hash_environment(TSRMLS_D)
 {
 	char *p;
-	unsigned char _gpc_flags[3] = {0, 0, 0};
+	int _gpc_flags[5] = {0, 0, 0, 0, 0};
 	zend_bool have_variables_order;
 	zval *dummy_track_vars_array = NULL;
 	zend_bool initialized_dummy_track_vars_array=0;
@@ -1409,42 +1408,48 @@ static int php_hash_environment(TSRMLS_D
 			case 'P':
 				if (!_gpc_flags[0] && !SG(headers_sent) && SG(request_info).request_method && !strcmp(SG(request_info).request_method, "POST")) {
 					sapi_module.treat_data(PARSE_POST, NULL, NULL TSRMLS_CC);	/* POST Data */
-					_gpc_flags[0]=1;
+					_gpc_flags[0]=TRACK_VARS_POST + 1;
 				}
 				break;
 			case 'c':
 			case 'C':
 				if (!_gpc_flags[1]) {
 					sapi_module.treat_data(PARSE_COOKIE, NULL, NULL TSRMLS_CC);	/* Cookie Data */
-					_gpc_flags[1]=1;
+					_gpc_flags[1]=TRACK_VARS_COOKIE + 1;
 				}
 				break;
 			case 'g':
 			case 'G':
 				if (!_gpc_flags[2]) {
 					sapi_module.treat_data(PARSE_GET, NULL, NULL TSRMLS_CC);	/* GET Data */
-					_gpc_flags[2]=1;
+					_gpc_flags[2]=TRACK_VARS_GET + 1;
 				}
 				break;
 			case 'e':
 			case 'E':
-				if (have_variables_order) {
-					ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]);
-					array_init(PG(http_globals)[TRACK_VARS_ENV]);
-					INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]);
-					php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC);
-				} else {
-					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported 'e' element (environment) used in gpc_order - use variables_order instead");
+				if (!_gpc_flags[3]) {
+					if (have_variables_order) {
+						ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]);
+						array_init(PG(http_globals)[TRACK_VARS_ENV]);
+						INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]);
+						php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC);
+					} else {
+						php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported 'e' element (environment) used in gpc_order - use variables_order instead");
+					}
+					_gpc_flags[3]=TRACK_VARS_ENV + 1;
 				}
 				break;
 			case 's':
 			case 'S':
-				php_register_server_variables(TSRMLS_C);
+				if (!_gpc_flags[4]) {
+					php_register_server_variables(TSRMLS_C);
+					_gpc_flags[4]=TRACK_VARS_SERVER + 1;
+				}
 				break;
 		}
 	}

-	if (!have_variables_order) {
+	if (!have_variables_order && !PG(http_globals)[TRACK_VARS_SERVER]) {
 		php_register_server_variables(TSRMLS_C);
 	}

@@ -1453,6 +1458,14 @@ static int php_hash_environment(TSRMLS_D
 		php_build_argv(SG(request_info).query_string TSRMLS_CC);
 	}

+	if (PG(register_globals)) {
+		for (i = 0; i < 5; i++) {
+			if (PG(http_globals)[i]) {
+				php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[i]) TSRMLS_CC);
+			}
+		}
+	}
+
 	for (i=0; i<NUM_TRACK_VARS; i++) {
 		if (!PG(http_globals)[i]) {
 			if (!initialized_dummy_track_vars_array) {
@@ -1478,39 +1491,12 @@ static int php_hash_environment(TSRMLS_D
 		array_init(form_variables);
 		INIT_PZVAL(form_variables);

-		for (p=variables_order; p && *p; p++) {
-			switch (*p) {
-				case 'g':
-				case 'G':
-					php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]) TSRMLS_CC);
-					break;
-				case 'p':
-				case 'P':
-					php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]) TSRMLS_CC);
-					break;
-				case 'c':
-				case 'C':
-					php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) TSRMLS_CC);
-					break;
-			}
-		}
-
-		if (PG(register_globals)) {
-			HashPosition pos;
-			zval **data;
-			char *string_key;
-			uint string_key_len;
-			ulong num_key;
-
-			zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(form_variables), &pos);
-			while (zend_hash_get_current_data_ex(Z_ARRVAL_P(form_variables), (void **)&data, &pos) == SUCCESS) {
-				/* we only register string keys, since we cannot have $1234 */
-				if (zend_hash_get_current_key_ex(Z_ARRVAL_P(form_variables), &string_key, &string_key_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING) {
-					ZEND_SET_SYMBOL_WITH_LENGTH(&EG(symbol_table), string_key, string_key_len, *data, (*data)->refcount+1, 0);
-				}
-				zend_hash_move_forward_ex(Z_ARRVAL_P(form_variables), &pos);
+		for (i = 0; i < 3; i++) {
+			if (_gpc_flags[i]) {
+				php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[(_gpc_flags[i] - 1)]) TSRMLS_CC);
 			}
 		}
+
 		zend_hash_update(&EG(symbol_table), "_REQUEST", sizeof("_REQUEST"), &form_variables, sizeof(zval *), NULL);
 	}




*****************************************************************************

You have installed the php5 package.

Have a look at the php5 port if you need additional extensions other than
CTYPE, DOM, PCRE, POSIX, SESSION, SIMPLEXML, SQLITE, TOKENIZER and XML.

You can find it at
ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/lang/php5.tar

Make sure index.php is part of your DirectoryIndex.





%%CLI%%%%PEAR%%bin/pear
%%CLI%%bin/php
bin/php-config
bin/phpextdist

include/php/Zend/zend_builtin_functions.h
include/php/Zend/zend_compile.h
include/php/Zend/zend_config.h
include/php/Zend/zend_config.nw.h
include/php/Zend/zend_config.w32.h
include/php/Zend/zend_constants.h
include/php/Zend/zend_default_classes.h
include/php/Zend/zend_dynamic_array.h
include/php/Zend/zend_errors.h
include/php/Zend/zend_execute.h
include/php/Zend/zend_execute_globals.h
include/php/Zend/zend_execute_locks.h
include/php/Zend/zend_extensions.h
include/php/Zend/zend_fast_cache.h

include/php/Zend/zend_language_scanner.h
include/php/Zend/zend_list.h
include/php/Zend/zend_llist.h
include/php/Zend/zend_mm.h
include/php/Zend/zend_modules.h
include/php/Zend/zend_multibyte.h
include/php/Zend/zend_multiply.h
include/php/Zend/zend_object_handlers.h
include/php/Zend/zend_objects.h
include/php/Zend/zend_objects_API.h
include/php/Zend/zend_operators.h
include/php/Zend/zend_ptr_stack.h
include/php/Zend/zend_qsort.h
include/php/Zend/zend_reflection_api.h
include/php/Zend/zend_stack.h
include/php/Zend/zend_static_allocator.h
include/php/Zend/zend_stream.h
include/php/Zend/zend_ts_hash.h
include/php/Zend/zend_types.h
include/php/Zend/zend_variables.h
include/php/acconfig.h
include/php/ext/mbstring/cp932_table.h
include/php/ext/mbstring/mb_gpc.h
include/php/ext/mbstring/mbfilter.h
include/php/ext/mbstring/mbfilter_cn.h
include/php/ext/mbstring/mbfilter_ja.h

include/php/ext/session/mod_mm.h
include/php/ext/session/mod_user.h
include/php/ext/session/php_session.h
include/php/ext/standard/aggregation.h
include/php/ext/standard/base64.h
include/php/ext/standard/basic_functions.h
include/php/ext/standard/crc32.h

include/php/ext/standard/php_smart_str_public.h
include/php/ext/standard/php_standard.h
include/php/ext/standard/php_string.h
include/php/ext/standard/php_sunfuncs.h
include/php/ext/standard/php_type.h
include/php/ext/standard/php_var.h
include/php/ext/standard/php_versioning.h
include/php/ext/standard/proc_open.h
include/php/ext/standard/quot_print.h
include/php/ext/standard/reg.h
include/php/ext/standard/scanf.h
include/php/ext/standard/sha1.h
include/php/ext/standard/streamsfuncs.h
include/php/ext/standard/uniqid.h
include/php/ext/standard/url.h
include/php/ext/standard/url_scanner.h
include/php/ext/standard/url_scanner_ex.h
include/php/ext/xml/expat_compat.h
include/php/ext/xml/expat/.php
include/php/ext/xml/expat/expat.h
include/php/ext/xml/expat/iasciitab.h
include/php/ext/xml/expat/latin1tab.h
include/php/ext/xml/expat/nametab.h
include/php/ext/xml/expat/utf8tab.h
include/php/ext/xml/expat/winconfig.h
include/php/ext/xml/expat/xmlrole.h
include/php/ext/xml/expat/xmltok.h
include/php/ext/xml/expat/xmltok_impl.h
include/php/ext/xml/php_xml.h
include/php/main/SAPI.h
include/php/main/build-defs.h

include/php/main/safe_mode.h
include/php/main/snprintf.h
include/php/main/spprintf.h
include/php/main/streams/php_stream_context.h
include/php/main/streams/php_stream_filter_api.h
include/php/main/streams/php_stream_mmap.h
include/php/main/streams/php_streams_int.h
include/php/main/streams/php_stream_transport.h
include/php/main/streams/php_stream_userspace.h
include/php/main/streams/php_stream_plain_wrapper.h
include/php/main/win95nt.h
include/php/regex/cclass.h
include/php/regex/cname.h

lib/php/build/scan_makefile_in.awk
lib/php/build/shtool
%%SAPI_FILE%%
%%APACHE%%@exec %D/sbin/apxs -e -a -n php5 %f
%%APACHE%%@unexec %D/sbin/apxs -e -A -n php5 %f
%%CLI%%%%PEAR%%share/pear/bootstrap/Archive/Tar.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR.php
%%CLI%%%%PEAR%%share/pear/bootstrap/System.php
%%CLI%%%%PEAR%%share/pear/bootstrap/Console/Getopt.php
%%CLI%%%%PEAR%%share/pear/bootstrap/OS/Guess.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Autoloader.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Builder.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Auth.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Build.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Common.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Config.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Install.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Mirror.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Package.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Registry.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Remote.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Common.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Config.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Dependency.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/DependencyDB.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Installer.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Packager.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Registry.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Remote.php
%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Frontend/CLI.php
@dirrm include/php/TSRM
@dirrm include/php/Zend
@dirrm include/php/ext/mbstring

@dirrm include/php/ext/xml/expat
@dirrm include/php/ext/xml
@dirrm include/php/ext
@dirrm include/php/main/streams
@dirrm include/php/main
@dirrm include/php/regex
@dirrm include/php/
@unexec rmdir %D/lib/php/%%EXT_DIR%% 2> /dev/null || true
@dirrm lib/php/build
@unexec rmdir %D/lib/php 2> /dev/null || true
%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/Archive
%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/Console
%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/OS
%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR/Command
%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR/Frontend
%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR
%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap
%%CLI%%%%PEAR%%@unexec rmdir %D/share/pear 2> /dev/null || true




#!/bin/sh
# $FreeBSD: ports/lang/php5/scripts/configure.php,v 1.6 2003/07/04 02:26:08 nork Exp $

if [ -f ${WRKDIR}/Makefile.inc ]; then
	exit

CURL		"CURL support" ${WITH_CURL:-OFF} \
DBASE		"dBase library support" ${WITH_DBASE:-OFF} \
DBX		"dbx support" ${WITH_DBX:-OFF} \
DOM		"DOM support" ${WITH_DOM:-OFF} \
DOMXSLT		"DOM XSLT and EXSLT support (implies DOMXML)" ${WITH_DOMXSLT:-OFF} \
EXIF		"EXIF support" ${WITH_EXIF:-OFF} \
FILEPRO		"filePro support" ${WITH_FILEPRO:-OFF} \
FRIBIDI		"FriBidi support" ${WITH_FRIBIDI:-OFF} \
FTP		"FTP support" ${WITH_FTP:-OFF} \
GD		"GD library support" ${WITH_GD:-OFF} \
GDBM		"GDBM database support (dba)" ${WITH_GDBM:-OFF} \
GETTEXT		"gettext library support" ${WITH_GETTEXT:-OFF} \
GMP		"GNU MP support" ${WITH_GMP:-OFF} \
HYPERWAVE	"Hyperwave support" ${WITH_HYPERWAVE:-OFF} \
ICONV		"iconv support" ${WITH_ICONV:-OFF} \
IMAP		"IMAP support" ${WITH_IMAP:-OFF} \
INIFILE		"INI file support (dba)" ${WITH_INIFILE:-OFF} \

OPENLDAP	"OpenLDAP support" ${WITH_OPENLDAP:-OFF} \
OPENSSL		"OpenSSL support" ${WITH_OPENSSL:-OFF} \
ORACLE		"Oracle support" ${WITH_ORACLE:-OFF} \
OVERLOAD	"user-space object overloading support" ${WITH_OVERLOAD:-OFF} \
PCNTL		"pcntl support (CLI only)" ${WITH_PCNTL:-OFF} \
PCRE		"Perl Compatible Regular Expression support" ${WITH_PCRE:-OFF} \
PDFLIB		"PDFlib support" ${WITH_PDFLIB:-OFF} \

RECODE		"recode support" ${WITH_RECODE:-OFF} \
SESSION		"session support" ${WITH_SESSION:-OFF} \
SHMOP		"shmop support" ${WITH_SHMOP:-OFF} \
SIMPLEXML	"simplexml support" ${WITH_SIMPLEXML:-OFF} \
SNMP		"SNMP support (implies OPENSSL)" ${WITH_SNMP:-OFF} \
SOCKETS		"sockets support" ${WITH_SOCKETS:-OFF} \
SQLITE		"sqlite support" ${WITH_SQLITE:-OFF} \
SYBASEDB	"Sybase/MS-SQL database support (DB-lib)" ${WITH_SYBASEDB:-OFF} \
SYBASECT	"Sybase/MS-SQL database support (CT-lib)" ${WITH_SYBASECT:-OFF} \
SYSVSEM		"System V semaphore support" ${WITH_SYSVSEM:-OFF} \

UNIXODBC	"unixODBC support" ${WITH_UNIXODBC:-OFF} \
WDDX		"WDDX support (implies XML)" ${WITH_WDDX:-OFF} \
XML		"XML support" ${WITH_XML:-OFF} \
XMLRPC		"XMLRPC-EPI support (implies ICONV)" ${WITH_XMLRPC:-OFF} \
XML		"XSL support" ${WITH_XSL:-OFF} \
YAZ		"YAZ support (ANSI/NISO Z39.50)" ${WITH_YAZ:-OFF} \
YP		"YP/NIS support" ${WITH_YP:-OFF} \
ZIP		"ZIP support" ${WITH_ZIP:-OFF} \
ZLIB		"ZLIB support" ${WITH_ZLIB:-OFF} \
2> $tempfile
fi




WITH_BCMATH=OFF
WITH_BZIP2=OFF
WITH_CALENDAR=OFF
WITH_CDB=OFF
WITH_CRACK=OFF
WITH_CTYPE=ON
WITH_CURL=OFF
WITH_DBASE=OFF
WITH_DBX=OFF
WITH_DOMXML=OFF
WITH_DOMXSLT=OFF
WITH_EXIF=OFF
WITH_FILEPRO=OFF
WITH_FRIBIDI=OFF
WITH_FTP=OFF
WITH_GD=OFF
WITH_GDBM=OFF
WITH_GETTEXT=OFF
WITH_GMP=OFF
WITH_HYPERWAVE=OFF
WITH_ICONV=OFF
WITH_IMAP=OFF
WITH_INIFILE=OFF
WITH_INTERBASE=OFF
WITH_MBSTRING=OFF
WITH_MCAL=OFF
WITH_MCVE=OFF
WITH_MCRYPT=OFF
WITH_MHASH=OFF
WITH_MIME=OFF
WITH_MING=OFF
WITH_MYSQL=ON
WITH_NCURSES=OFF
WITH_OPENLDAP=OFF
WITH_OPENSSL=OFF
WITH_ORACLE=OFF
WITH_OVERLOAD=ON
WITH_PCNTL=OFF
WITH_PCRE=ON
WITH_PDFLIB=OFF
WITH_POSIX=ON
WITH_POSTGRESQL=OFF
WITH_PSPELL=OFF
WITH_READLINE=OFF
WITH_RECODE=OFF
WITH_SESSION=ON
WITH_SHMOP=OFF
WITH_SNMP=OFF
WITH_SOCKETS=OFF
WITH_SYBASEDB=OFF
WITH_SYBASECT=OFF
WITH_SYSVSEM=OFF
WITH_SYSVSHM=OFF
WITH_TOKENIZER=ON
WITH_UNIXODBC=OFF
WITH_WDDX=OFF
WITH_XML=ON
WITH_XMLRPC=OFF
WITH_XSLT=OFF
WITH_YAZ=OFF
WITH_YP=OFF
WITH_ZIP=OFF
WITH_ZLIB=ON




WITH_BCMATH=OFF
WITH_BZIP2=OFF
WITH_CALENDAR=OFF
WITH_CDB=OFF
WITH_CRACK=OFF
WITH_CTYPE=ON
WITH_CURL=OFF
WITH_DBASE=OFF
WITH_DBX=OFF
WITH_DOM=ON
WITH_EXIF=OFF
WITH_FILEPRO=OFF
WITH_FTP=OFF
WITH_GD=OFF
WITH_GDBM=OFF
WITH_GETTEXT=OFF
WITH_GMP=OFF
WITH_ICONV=OFF
WITH_IMAP=OFF
WITH_INIFILE=OFF
WITH_INTERBASE=OFF
WITH_MBSTRING=OFF
WITH_MCAL=OFF
WITH_MCVE=OFF
WITH_MCRYPT=OFF
WITH_MHASH=OFF
WITH_MIME=OFF
WITH_MING=OFF
WITH_MYSQL=OFF
WITH_NCURSES=OFF
WITH_OPENLDAP=OFF
WITH_OPENSSL=OFF
WITH_ORACLE=OFF
WITH_PCNTL=OFF
WITH_PCRE=ON
WITH_PDFLIB=OFF
WITH_POSIX=ON
WITH_POSTGRESQL=OFF
WITH_PSPELL=OFF
WITH_READLINE=OFF
WITH_RECODE=OFF
WITH_SESSION=ON
WITH_SHMOP=OFF
WITH_SIMPLEXML=ON
WITH_SNMP=OFF
WITH_SOCKETS=OFF
WITH_SQLITE=ON
WITH_SYBASEDB=OFF
WITH_SYBASECT=OFF
WITH_SYSVSEM=OFF
WITH_SYSVSHM=OFF
WITH_TOKENIZER=ON
WITH_UNIXODBC=OFF
WITH_WDDX=OFF
WITH_XML=ON
WITH_XMLRPC=OFF
WITH_XSL=OFF
WITH_YAZ=OFF
WITH_YP=OFF
WITH_ZLIB=ON

Return to bug 54519

Lines 1-27 Link Here

(-)php5/Makefile (-78 / +78 lines)
1	# New ports collection makefile for: php4	1	# New ports collection makefile for: php5
2	# Date created: Tue Feb 18 11:17:13 CET 2003	2	# Date created: Tue Feb 18 11:17:13 CET 2003
3	# Whom: Alex Dupre <sysadmin@alexdupre.com>	3	# Whom: Alex Dupre <sysadmin@alexdupre.com>
4	#	4	#
5	# $FreeBSD: ports/lang/php4/Makefile,v 1.19 2003/07/04 02:26:08 nork Exp $	5	# $FreeBSD: ports/lang/php5/Makefile,v 1.19 2003/07/04 02:26:08 nork Exp $
6	#	6	#
7	# There are many ways to select which extensions you want to enable, either	7	# There are many ways to select which extensions you want to enable, either
8	# in interactive mode or in batch mode.	8	# in interactive mode or in batch mode.
9	#	9	#
10	# By default, the enabled extensions are: CTYPE, MYSQL, OVERLOAD, PCRE, POSIX,	10	# By default, the enabled extensions are: CTYPE, DOM, PCRE, POSIX, SESSION,
11	# SESSION, TOKENIZER, XML and ZLIB. This behaviour can be changed overriding	11	# SIMPLEXML, SQLITE, TOKENIZER and XML. This behaviour can be changed
12	# the PHP4_OPTIONS variable (e.g. PHP4_OPTIONS="EXT1 EXT2 EXT3").	12	# overriding the PHP5_OPTIONS variable (e.g. PHP5_OPTIONS="EXT1 EXT2 EXT3").
13	#	13	#
14	# Another way is to use the WITH_<EXT> and WITHOUT_<EXT> knobs, for additional	14	# Another way is to use the WITH_<EXT> and WITHOUT_<EXT> knobs, for additional
15	# and default extensions respectively (implies batch mode).	15	# and default extensions respectively (implies batch mode).
16	#	16	#
17	# The last way reads an "extension" file, located in ~/php4_options (the	17	# The last way reads an "extension" file, located in ~/php5_options (the
18	# location is overridable by the PHP4_OPTFILE variable). You may find an	18	# location is overridable by the PHP5_OPTFILE variable). You may find an
19	# example in scripts/php4_options (interactive mode only).	19	# example in scripts/php5_options (interactive mode only).
20	#	20	#
21		21
22	PORTNAME= php4	22	PORTNAME= php5
23	PORTVERSION= 4.3.3.r1	23	PORTVERSION= 5.0.0.a1
24	PORTREVISION= 1	24	PORTREVISION= 0
25	CATEGORIES?= lang devel www	25	CATEGORIES?= lang devel www
26	MASTER_SITES= http://www.php.net/distributions/ \	26	MASTER_SITES= http://www.php.net/distributions/ \
27	http://it.php.net/distributions/ \	27	http://it.php.net/distributions/ \
Lines 31-36 Link Here
31	http://fr.php.net/distributions/ \	31	http://fr.php.net/distributions/ \
32	http://es.php.net/distributions/ \	32	http://es.php.net/distributions/ \
33	http://se.php.net/distributions/ \	33	http://se.php.net/distributions/ \
		34	http://www.sm.FreeBSD.org/~alex/ \
34	http://downloads.php.net/jani/	35	http://downloads.php.net/jani/
35	.if defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)	36	.if defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
36	PKGNAMEPREFIX= mod_	37	PKGNAMEPREFIX= mod_
Lines 43-49 Link Here
43	.endif	44	.endif
44	.endif	45	.endif
45	.endif	46	.endif
46	DISTNAME= php-${PORTVERSION:S/.r/RC/}	47	DISTNAME= php-${PORTVERSION:S/.a/a/}
47		48
48	MAINTAINER?= sysadmin@alexdupre.com	49	MAINTAINER?= sysadmin@alexdupre.com
49	COMMENT= PHP Scripting Language (Apache Module and CLI)	50	COMMENT= PHP Scripting Language (Apache Module and CLI)
Lines 68-74 Link Here
68	CONFIGURE_ARGS= --enable-versioning \	69	CONFIGURE_ARGS= --enable-versioning \
69	--enable-memory-limit \	70	--enable-memory-limit \
70	--with-layout=GNU \	71	--with-layout=GNU \
71	--with-zlib-dir=/usr \
72	--disable-all	72	--disable-all
73		73
74	.if !defined(WITH_REGEX_TYPE) \|\| ${WITH_REGEX_TYPE} == "php"	74	.if !defined(WITH_REGEX_TYPE) \|\| ${WITH_REGEX_TYPE} == "php"
Lines 86-103 Link Here
86	EXT_DIR= 20020429	86	EXT_DIR= 20020429
87	SAPI_FILE= "@comment "	87	SAPI_FILE= "@comment "
88		88
89	CONFLICTS= php4-cli-4* mod_php4-4* php4-cgi-4*	89	CONFLICTS= php5-cli-5* mod_php5-5* php5-cgi-5*
90	.if defined(WITHOUT_APACHE)	90	.if defined(WITHOUT_APACHE)
91	.if defined(WITHOUT_CLI)	91	.if defined(WITHOUT_CLI)
92	CONFLICTS= php4-4* php4-cli-4* mod_php4-4*	92	CONFLICTS= php5-5* php5-cli-5* mod_php5-5*
93	.else	93	.else
94	CONFLICTS= php4-4* php4-cgi-4* mod_php4-4*	94	CONFLICTS= php5-5* php5-cgi-5* mod_php5-5*
95	.endif	95	.endif
96	.else	96	.else
97	.if defined(WITHOUT_CLI)	97	.if defined(WITHOUT_CLI)
98	CONFLICTS= php4-4* php4-cli-4* php4-cgi-4*	98	CONFLICTS= php5-5* php5-cli-5* php5-cgi-5*
99	.endif	99	.endif
100	.endif	100	.endif
		101	CONFLICTS+= php4-4* php4-cli-4* mod_php4-4* php4-cgi-4*
101		102
102	.if defined(WITHOUT_APACHE)	103	.if defined(WITHOUT_APACHE)
103	CONFIGURE_ARGS+=--enable-discard-path	104	CONFIGURE_ARGS+=--enable-discard-path
Lines 109-114 Link Here
109	CONFIGURE_ARGS+=--disable-cli	110	CONFIGURE_ARGS+=--disable-cli
110	PLIST_SUB+= CLI="@comment "	111	PLIST_SUB+= CLI="@comment "
111	.else	112	.else
		113	.if !defined(WITHOUT_PEAR)
		114	CONFIGURE_ARGS+=--with-pear
		115	PLIST_SUB+= PEAR=""
		116	.else
		117	PLIST_SUB+= PEAR="@comment "
		118	.endif
112	MAN1= php.1	119	MAN1= php.1
113	PLIST_SUB+= CLI=""	120	PLIST_SUB+= CLI=""
114	.endif	121	.endif
Lines 116-128 Link Here
116	SAPI_FILE= "bin/php"	123	SAPI_FILE= "bin/php"
117	.endif	124	.endif
118		125
119	ALL_OPTIONS= BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DBASE DBX DOMXML \	126	ALL_OPTIONS= BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DBASE DBX DOM EXIF \
120	DOMXSLT EXIF FILEPRO FRIBIDI FTP GD GDBM GETTEXT GMP HYPERWAVE \	127	FILEPRO FTP GD GDBM GETTEXT GMP ICONV IMAP INTERBASE INIFILE \
121	ICONV IMAP INTERBASE INIFILE MBSTRING MCAL MCVE MCRYPT MHASH \	128	MBSTRING MCAL MCVE MCRYPT MHASH MIME MING MYSQL NCURSES \
122	MIME MING MYSQL NCURSES OPENLDAP OPENSSL ORACLE OVERLOAD PCNTL \	129	OPENLDAP OPENSSL ORACLE PCNTL PCRE PDFLIB POSIX POSTGRESQL \
123	PCRE PDFLIB POSIX POSTGRESQL PSPELL READLINE RECODE SESSION \	130	PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOCKETS \
124	SHMOP SNMP SOCKETS SYBASEDB SYBASECT SYSVSEM SYSVSHM TOKENIZER \	131	SQLITE SYBASEDB SYBASECT SYSVSEM SYSVSHM TOKENIZER UNIXODBC \
125	UNIXODBC WDDX XML XMLRPC XSLT YAZ YP ZIP ZLIB	132	WDDX XML XMLRPC XSL YAZ YP ZLIB
126		133
127	.for opt in ${ALL_OPTIONS}	134	.for opt in ${ALL_OPTIONS}
128	.if defined(WITH_${opt}) \|\| defined(WITHOUT_${opt})	135	.if defined(WITH_${opt}) \|\| defined(WITHOUT_${opt})
Lines 134-141 Link Here
134	IS_INTERACTIVE= yes	141	IS_INTERACTIVE= yes
135	.endif	142	.endif
136		143
137	PBDIR= ${PREFIX}/share/pear/boot
138
139	.include <bsd.port.pre.mk>	144	.include <bsd.port.pre.mk>
140		145
141	.if ${OSVERSION} < 400014 \|\| defined(WITHOUT_IPV6)	146	.if ${OSVERSION} < 400014 \|\| defined(WITHOUT_IPV6)
Lines 152-162 Link Here
152	.if defined(WITH_APACHE2)	157	.if defined(WITH_APACHE2)
153	APACHE_PORT?= ${PORTSDIR}/www/apache2	158	APACHE_PORT?= ${PORTSDIR}/www/apache2
154	CONFIGURE_ARGS+=--with-apxs2=${APXS}	159	CONFIGURE_ARGS+=--with-apxs2=${APXS}
155	SAPI_FILE= libexec/apache2/libphp4.so	160	SAPI_FILE= libexec/apache2/libphp5.so
156	.else	161	.else
157	APACHE_PORT?= ${PORTSDIR}/www/apache13	162	APACHE_PORT?= ${PORTSDIR}/www/apache13
158	CONFIGURE_ARGS+=--with-apxs=${APXS}	163	CONFIGURE_ARGS+=--with-apxs=${APXS}
159	SAPI_FILE= libexec/apache/libphp4.so	164	SAPI_FILE= libexec/apache/libphp5.so
160	.endif	165	.endif
161		166
162	BUILD_DEPENDS+= ${APXS}:${APACHE_PORT}	167	BUILD_DEPENDS+= ${APXS}:${APACHE_PORT}
Lines 171-186 Link Here
171	EXT_DIR=${EXT_DIR}	176	EXT_DIR=${EXT_DIR}
172		177
173	WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work	178	WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
174	PHP4_OPTFILE?= ${HOME}/php4_options	179	PHP5_OPTFILE?= ${HOME}/php5_options
175		180
176	PHP4_OPTIONS?= CTYPE MYSQL OVERLOAD PCRE POSIX SESSION TOKENIZER XML ZLIB	181	PHP5_OPTIONS?= CTYPE DOM PCRE POSIX SESSION SIMPLEXML SQLITE TOKENIZER XML
177		182
178	.for opt in ${ALL_OPTIONS}	183	.for opt in ${ALL_OPTIONS}
179	.if defined(WITH_${opt})	184	.if defined(WITH_${opt})
180	SEL_OPTIONS+= ${opt}	185	SEL_OPTIONS+= ${opt}
181	.endif	186	.endif
182	.endfor	187	.endfor
183	.for opt in ${PHP4_OPTIONS}	188	.for opt in ${PHP5_OPTIONS}
184	.if !defined(WITHOUT_${opt})	189	.if !defined(WITHOUT_${opt})
185	SEL_OPTIONS+= ${opt}	190	SEL_OPTIONS+= ${opt}
186	.endif	191	.endif
Lines 188-200 Link Here
188	.endfor	193	.endfor
189		194
190	SCRIPTS_ENV+= SEL_OPTIONS="${SEL_OPTIONS}" \	195	SCRIPTS_ENV+= SEL_OPTIONS="${SEL_OPTIONS}" \
191	OPTION_FILE="${PHP4_OPTFILE}" \	196	OPTION_FILE="${PHP5_OPTFILE}" \
192	WRKDIR="${WRKDIR}" \	197	WRKDIR="${WRKDIR}" \
193	CAT="${CAT}" \	198	CAT="${CAT}" \
194	SED="${SED}"	199	SED="${SED}"
195		200
196	.ifmake describe	201	.ifmake describe
197	WITH_MYSQL= yes
198	WITH_XML= yes	202	WITH_XML= yes
199	.endif	203	.endif
200		204
Lines 206-229 Link Here
206	WITH_DBA= yes	210	WITH_DBA= yes
207	.endif	211	.endif
208		212
209	.if defined(WITH_DOMXSLT)	213	.if defined(WITH_XSL)
210	WITH_DOMXML= yes	214	WITH_DOM= yes
211	.endif	215	.endif
212		216
213	.if defined(WITH_XMLRPC) \|\| defined(WITH_XSLT)	217	.if defined(WITH_XMLRPC)
214	WITH_ICONV_DEP= yes	218	WITH_ICONV_DEP= yes
215	.endif	219	.endif
216		220
217	.if defined(WITH_SNMP)	221	.if defined(WITH_SNMP)
218	WITH_OPENSSL= yes	222	WITH_OPENSSL_DEP= yes
219	.endif	223	.endif
220		224
221	.if defined(WITH_XMLRPC) \|\| defined(WITH_XSLT)	225	.if defined(WITH_DOM) \|\| defined(WITH_SIMPLEXML)
222	WITH_XML_DEP= yes	226	WITH_XML_DEP= yes
223	.endif	227	.endif
224		228
225	.if defined(WITH_WDDX)	229	.if defined(WITH_GD) \|\| defined(WITH_MYSQL) \|\| defined(WITH_PDFLIB)
226	WITH_XML= yes	230	WITH_ZLIB_DEP= yes
227	.endif	231	.endif
228		232
229	.if defined(WITH_BCMATH)	233	.if defined(WITH_BCMATH)
Lines 275-288 Link Here
275	CONFIGURE_ARGS+=--enable-dbx	279	CONFIGURE_ARGS+=--enable-dbx
276	.endif	280	.endif
277		281
278	.if defined(WITH_DOMXML)	282	.if defined(WITH_DOM)
279	LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2	283	CONFIGURE_ARGS+=--enable-dom
280	CONFIGURE_ARGS+=--with-dom=${LOCALBASE}
281	.endif
282
283	.if defined(WITH_DOMXSLT)
284	LIB_DEPENDS+= xslt.1:${PORTSDIR}/textproc/libxslt
285	CONFIGURE_ARGS+=--with-dom-xslt=${LOCALBASE} --with-dom-exslt=${LOCALBASE}
286	.endif	284	.endif
287		285
288	.if defined(WITH_EXIF)	286	.if defined(WITH_EXIF)
Lines 293-303 Link Here
293	CONFIGURE_ARGS+=--enable-filepro	291	CONFIGURE_ARGS+=--enable-filepro
294	.endif	292	.endif
295		293
296	.if defined(WITH_FRIBIDI)
297	LIB_DEPENDS+= fribidi.0:${PORTSDIR}/converters/fribidi
298	CONFIGURE_ARGS+=--with-fribidi=${LOCALBASE}
299	.endif
300
301	.if defined(WITH_FTP)	294	.if defined(WITH_FTP)
302	CONFIGURE_ARGS+=--enable-ftp	295	CONFIGURE_ARGS+=--enable-ftp
303	.endif	296	.endif
Lines 336-345 Link Here
336	CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}	329	CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
337	.endif	330	.endif
338		331
339	.if defined(WITH_HYPERWAVE)
340	CONFIGURE_ARGS+=--with-hyperwave
341	.endif
342
343	.if defined(WITH_ICONV) \|\| defined(WITH_ICONV_DEP)	332	.if defined(WITH_ICONV) \|\| defined(WITH_ICONV_DEP)
344	LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv	333	LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
345	.endif	334	.endif
Lines 376-382 Link Here
376	.endif	365	.endif
377		366
378	.if defined(WITH_MBSTRING)	367	.if defined(WITH_MBSTRING)
379	CONFIGURE_ARGS+=--enable-mbstring --enable-mbregex	368	CONFIGURE_ARGS+=--enable-mbstring
380	.endif	369	.endif
381		370
382	.if defined(WITH_MCAL)	371	.if defined(WITH_MCAL)
Lines 459-474 Link Here
459	CONFIGURE_ARGS+=--with-oracle=${LOCALBASE}/oracle7	448	CONFIGURE_ARGS+=--with-oracle=${LOCALBASE}/oracle7
460	.endif	449	.endif
461		450
462	.if defined(WITH_OVERLOAD)
463	CONFIGURE_ARGS+=--enable-overload
464	.endif
465
466	.if defined(WITH_PCNTL)	451	.if defined(WITH_PCNTL)
467	CONFIGURE_ARGS+=--enable-pcntl	452	CONFIGURE_ARGS+=--enable-pcntl
468	.endif	453	.endif
469		454
470	.if defined(WITH_PCRE)	455	.if defined(WITH_PCRE)
471	CONFIGURE_ARGS+=--with-pcre-regex=yes	456	CONFIGURE_ARGS+=--with-pcre-regex
472	.endif	457	.endif
473		458
474	.if defined(WITH_PDFLIB)	459	.if defined(WITH_PDFLIB)
Lines 507-525 Link Here
507	CONFIGURE_ARGS+=--enable-shmop	492	CONFIGURE_ARGS+=--enable-shmop
508	.endif	493	.endif
509		494
		495	.if defined(WITH_SIMPLEXML)
		496	CONFIGURE_ARGS+=--enable-simplexml
		497	.endif
		498
510	.if defined(WITH_SNMP)	499	.if defined(WITH_SNMP)
511	.if exists(${LOCALBASE}/lib/libsnmp.so.4)	500	.if exists(${LOCALBASE}/lib/libsnmp.so.4)
512	LIB_DEPENDS+= snmp.4:${PORTSDIR}/net/net-snmp4	501	LIB_DEPENDS+= snmp.4:${PORTSDIR}/net/net-snmp4
513	.else	502	.else
514	LIB_DEPENDS+= netsnmp.5:${PORTSDIR}/net/net-snmp	503	LIB_DEPENDS+= netsnmp.5:${PORTSDIR}/net/net-snmp
515	.endif	504	.endif
516	CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --enable-ucd-snmp-hack	505	CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --with-openssl-dir=${OPENSSLBASE} --enable-ucd-snmp-hack
517	.endif	506	.endif
518		507
519	.if defined(WITH_SOCKETS)	508	.if defined(WITH_SOCKETS)
520	CONFIGURE_ARGS+=--enable-sockets	509	CONFIGURE_ARGS+=--enable-sockets
521	.endif	510	.endif
522		511
		512	.if defined(WITH_SQLITE)
		513	CONFIGURE_ARGS+=--with-sqlite
		514	.endif
		515
523	.if defined(WITH_SYBASEDB)	516	.if defined(WITH_SYBASEDB)
524	LIB_DEPENDS+= sybdb.3:${PORTSDIR}/databases/freetds	517	LIB_DEPENDS+= sybdb.3:${PORTSDIR}/databases/freetds
525	CONFIGURE_ARGS+=--with-sybase=${LOCALBASE}	518	CONFIGURE_ARGS+=--with-sybase=${LOCALBASE}
Lines 552-571 Link Here
552	.endif	545	.endif
553		546
554	.if defined(WITH_XML) \|\| defined(WITH_XML_DEP)	547	.if defined(WITH_XML) \|\| defined(WITH_XML_DEP)
555	LIB_DEPENDS+= expat.4:${PORTSDIR}/textproc/expat2	548	LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2
		549	CONFIGURE_ARGS+=--with-libxml-dir=${LOCALBASE}
556	.endif	550	.endif
557		551
558	.if defined(WITH_XML)	552	.if defined(WITH_XML)
559	CONFIGURE_ARGS+=--enable-xml --with-expat-dir=${LOCALBASE}	553	CONFIGURE_ARGS+=--enable-xml
560	.endif	554	.endif
561		555
562	.if defined(WITH_XMLRPC)	556	.if defined(WITH_XMLRPC)
563	CONFIGURE_ARGS+=--with-xmlrpc	557	LIB_DEPENDS+= expat.4:${PORTSDIR}/textproc/expat2
		558	CONFIGURE_ARGS+=--with-xmlrpc --with-expat-dir=${LOCALBASE} --with-iconv-dir=${LOCALBASE}
564	.endif	559	.endif
565		560
566	.if defined(WITH_XSLT)	561	.if defined(WITH_XSL)
567	LIB_DEPENDS+= sablot.70:${PORTSDIR}/textproc/sablotron	562	LIB_DEPENDS+= xslt.1:${PORTSDIR}/textproc/libxslt
568	CONFIGURE_ARGS+=--enable-xslt --with-xslt-sablot=${LOCALBASE}	563	CONFIGURE_ARGS+=--with-xsl=${LOCALBASE}
569	.endif	564	.endif
570		565
571	.if defined(WITH_YAZ)	566	.if defined(WITH_YAZ)
Lines 577-589 Link Here
577	CONFIGURE_ARGS+=--enable-yp	572	CONFIGURE_ARGS+=--enable-yp
578	.endif	573	.endif
579		574
580	.if defined(WITH_ZIP)	575	.if defined(WITH_ZLIB) \|\| defined(WITH_ZLIB_DEP)
581	LIB_DEPENDS+= zzip-0.10:${PORTSDIR}/devel/zziplib	576	CONFIGURE_ARGS+=--with-zlib-dir=/usr
582	CONFIGURE_ARGS+=--with-zip=${LOCALBASE}
583	.endif	577	.endif
584		578
585	.if defined(WITH_ZLIB)	579	.if defined(WITH_ZLIB)
586	CONFIGURE_ARGS+=--with-zlib=yes	580	CONFIGURE_ARGS+=--with-zlib
587	.endif	581	.endif
588		582
589	pre-patch:	583	pre-patch:
Lines 615-627 Link Here
615	@${ECHO_CMD} "To enable LZW-compressed GIF support in GD define the WITH_LZW knob."	609	@${ECHO_CMD} "To enable LZW-compressed GIF support in GD define the WITH_LZW knob."
616	@${ECHO_CMD} ""	610	@${ECHO_CMD} ""
617	.endif	611	.endif
		612	.if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR) && (!defined(WITH_PCRE) \|\| !defined(WITH_XML))
		613	@${ECHO_CMD} "PEAR requires PCRE and XML extensions."
		614	@${ECHO_CMD} "Define the WITHOUT_PEAR knob or enable these extensions."
		615	@${FALSE}
		616	.endif
618	.if !defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI)	617	.if !defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI)
619	@${ECHO_CMD} "You are building the Apache Module and the Command Line Interpreter of PHP."	618	@${ECHO_CMD} "You are building the Apache Module and the Command Line Interpreter of PHP."
620	@${ECHO_CMD} ""	619	@${ECHO_CMD} ""
621	@${ECHO_CMD} "Use port:"	620	@${ECHO_CMD} "Use port:"
622	@${ECHO_CMD} " lang/php4-cli for Command Line Interpreter only"	621	@${ECHO_CMD} " lang/php5-cli for Command Line Interpreter only"
623	@${ECHO_CMD} " www/php4-cgi for Common Gateway Interface only"	622	@${ECHO_CMD} " www/php5-cgi for Common Gateway Interface only"
624	@${ECHO_CMD} " www/mod_php4 for Apache Module only"	623	@${ECHO_CMD} " www/mod_php5 for Apache Module only"
625	@${ECHO_CMD} ""	624	@${ECHO_CMD} ""
626	.endif	625	.endif
627		626
Lines 638-649 Link Here
638	.endif	637	.endif
639		638
640	post-install:	639	post-install:
641	.if !defined(WITHOUT_CLI)	640	.if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR)
642	@${INSTALL_SCRIPT} ${WRKSRC}/pear/scripts/pear ${PREFIX}/bin	641	@${INSTALL_SCRIPT} ${WRKSRC}/pear/scripts/pear ${PREFIX}/bin
643	.endif	642	.endif
644	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc	643	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
645	@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc	644	@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
646	@${TOUCH} ${PREFIX}/lib/php/${EXT_DIR}/.php	645	@${TOUCH} ${PREFIX}/lib/php/${EXT_DIR}/.php
		646	@${TOUCH} ${PREFIX}/include/php/ext/xml/expat/.php
647	.if !defined(WITHOUT_APACHE)	647	.if !defined(WITHOUT_APACHE)
648	@${ECHO_CMD} "*****************************************************************************"	648	@${ECHO_CMD} "*****************************************************************************"
649	@${ECHO_CMD} ""	649	@${ECHO_CMD} ""

Lines 1-103 Link Here

(-)php5/bsd.php.mk (-103 lines)
1	# Just include this makefile after bsd.ports.pre.mk
2	#
3	# The user/port can now set this options in the makefiles.
4	#
5	# USE_PHPIZE=yes - Use to build a php extension.
6	# WANT_PHP_CLI=yes - Want the CLI version of PHP.
7	# WANT_PHP_CGI=yes - Want the CGI version of PHP.
8	# WANT_PHP_MOD=yes - Want the Apache Module for PHP.
9	# WANT_PHP_WEB=yes - Want the Apache Module or the CGI version of PHP.
10	#
11	# You may combine multiple WANT_PHP_* knobs.
12	# Don't specify any WANT_PHP_* knob if your port will work with every PHP SAPI.
13	#
14
15	.if exists(${LOCALBASE}/bin/php) && exists(${LOCALBASE}/bin/pear)
16	HAVE_PHP_CLI= yes
17	HAVE_PHP= yes
18	PHP_PORT= ${PORTSDIR}/lang/php4-cli
19	.endif
20	.if exists(${LOCALBASE}/bin/php) && !exists(${LOCALBASE}/bin/pear)
21	HAVE_PHP_CGI= yes
22	HAVE_PHP= yes
23	PHP_PORT= ${PORTSDIR}/www/php4-cgi
24	.endif
25	.if exists(${LOCALBASE}/libexec/apache/libphp4.so) \|\| exists(${LOCALBASE}/libexec/apache2/libphp4.so)
26	HAVE_PHP_MOD= yes
27	HAVE_PHP= yes
28	PHP_PORT= ${PORTSDIR}/www/mod_php4
29	.endif
30	.if defined(HAVE_PHP_CLI) && defined(HAVE_PHP_MOD)
31	PHP_PORT= ${PORTSDIR}/lang/php4
32	.endif
33
34	.if defined(WANT_PHP_CGI) && (defined(WANT_PHP_CLI) \|\| defined(WANT_PHP_MOD))
35	.BEGIN:
36	@${ECHO_CMD} "The CGI version of PHP avoids the installation of other SAPIs."
37	@${ECHO_CMD} "Do not use WANT_PHP_CGI with other WANT_PHP_* knobs."
38	@${FALSE}
39	.endif
40
41	.if defined(WANT_PHP_CLI) && !defined(WANT_PHP_MOD)
42	.if defined(HAVE_PHP) && !defined(HAVE_PHP_CLI)
43	.BEGIN:
44	@${ECHO_CMD} "This port requires the CLI version of PHP, but you have already"
45	@${ECHO_CMD} "installed a conflicting PHP port without CLI."
46	@${FALSE}
47	.else
48	PHP_PORT?= ${PORTSDIR}/lang/php4-cli
49	.endif
50	.endif
51
52	.if defined(WANT_PHP_WEB)
53	.if defined(HAVE_PHP) && !defined(HAVE_PHP_CGI) && !defined(HAVE_PHP_MOD)
54	.BEGIN:
55	@${ECHO_CMD} "This port requires the Apache Module or the CGI version of PHP, but you have"
56	@${ECHO_CMD} "already installed a conflicting PHP port without them."
57	@${FALSE}
58	.else
59	PHP_PORT?= ${PORTSDIR}/www/mod_php4
60	.endif
61	.endif
62
63	.if defined(WANT_PHP_CGI)
64	.if defined(HAVE_PHP) && !defined(HAVE_PHP_CGI)
65	.BEGIN:
66	@${ECHO_CMD} "This port requires the CGI version of PHP, but you have already"
67	@${ECHO_CMD} "installed a conflicting PHP port without CGI."
68	@${FALSE}
69	.else
70	PHP_PORT?= ${PORTSDIR}/www/php4-cgi
71	.endif
72	.endif
73
74	.if defined(WANT_PHP_MOD) && !defined(WANT_PHP_CLI)
75	.if defined(HAVE_PHP) && !defined(HAVE_PHP_MOD)
76	.BEGIN:
77	@${ECHO_CMD} "This port requires the Apache Module for PHP, but you have already"
78	@${ECHO_CMD} "installed a conflicting PHP port without the Apache Module."
79	@${FALSE}
80	.else
81	PHP_PORT?= ${PORTSDIR}/www/mod_php4
82	.endif
83	.endif
84
85	PHP_PORT?= ${PORTSDIR}/lang/php4
86	RUN_DEPENDS+= ${LOCALBASE}/include/php/main/php.h:${PHP_PORT}
87
88	PHP_EXT_DIR?= 20020429
89	PLIST_SUB+= PHP_EXT_DIR=${PHP_EXT_DIR}
90
91	.if defined(USE_PHPIZE)
92	BUILD_DEPENDS+= phpize:${PHP_PORT}
93	USE_LIBTOOL= yes
94	WANT_AUTOMAKE_VER= 15
95	WANT_AUTOCONF_VER= 253
96	CONFIGURE_ARGS+=--with-php-config=${LOCALBASE}/bin/php-config
97
98	configure-message: phpize
99
100	phpize:
101	@${ECHO_MSG} "===> PHPizing for ${DISTNAME}"
102	@(cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${LOCALBASE}/bin/phpize)
103	.endif

Lines 1-6 Link Here

(-)php5/files/patch-configure (-26 / +104 lines)
1	--- configure.orig Thu Jun 19 00:06:29 2003	1	--- configure.orig Tue Jul 15 00:32:50 2003
2	+++ configure Sat Jun 28 16:45:44 2003	2	+++ configure Tue Jul 15 01:44:37 2003
3	@@ -597,6 +597,8 @@	3	@@ -620,6 +620,8 @@
4	ac_help="$ac_help	4	ac_help="$ac_help
5	--enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support."	5	--enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support."
6	ac_help="$ac_help	6	ac_help="$ac_help
Lines 9-15 Link Here
9	--with-gettext[=DIR] Include GNU gettext support."	9	--with-gettext[=DIR] Include GNU gettext support."
10	ac_help="$ac_help	10	ac_help="$ac_help
11	--with-gmp Include GNU MP support"	11	--with-gmp Include GNU MP support"
12	@@ -28224,6 +28226,31 @@	12	@@ -29376,6 +29378,31 @@
13		13
14		14
15		15
Lines 41-47 Link Here
41		41
42		42
43		43
44	@@ -28248,7 +28275,7 @@	44	@@ -29528,7 +29555,7 @@
45	libgd/gd_io_file.c libgd/gd_ss.c libgd/gd_io_ss.c libgd/gd_png.c libgd/gd_jpeg.c \	45	libgd/gd_io_file.c libgd/gd_ss.c libgd/gd_io_ss.c libgd/gd_png.c libgd/gd_jpeg.c \
46	libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c libgd/gdfontmb.c libgd/gdfontl.c \	46	libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c libgd/gdfontmb.c libgd/gdfontl.c \
47	libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c libgd/gdkanji.c \	47	libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c libgd/gdkanji.c \
Lines 50-56 Link Here
50	libgd/xbm.c"	50	libgd/xbm.c"
51		51
52	for ac_func in fabsf floorf	52	for ac_func in fabsf floorf
53	@@ -28323,6 +28350,11 @@	53	@@ -29603,6 +29630,11 @@
54	fi	54	fi
55		55
56		56
Lines 62-68 Link Here
62	if test "$PHP_JPEG_DIR" != "no"; then	62	if test "$PHP_JPEG_DIR" != "no"; then
63		63
64	for i in /usr /usr/local $PHP_JPEG_DIR; do	64	for i in /usr /usr/local $PHP_JPEG_DIR; do
65	@@ -29724,6 +29756,9 @@	65	@@ -31314,6 +31346,9 @@
66		66
67	cat >> confdefs.h <<\EOF	67	cat >> confdefs.h <<\EOF
68	#define HAVE_GD_BUNDLED 1	68	#define HAVE_GD_BUNDLED 1
Lines 72-78 Link Here
72	EOF	72	EOF
73		73
74	cat >> confdefs.h <<\EOF	74	cat >> confdefs.h <<\EOF
75	@@ -29774,6 +29809,14 @@	75	@@ -31364,6 +31399,14 @@
76	GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"	76	GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
77	fi	77	fi
78		78
Lines 87-96 Link Here
87	else	87	else
88		88
89	if test "$PHP_GD" != "no"; then	89	if test "$PHP_GD" != "no"; then
90	@@ -32275,6 +32318,60 @@	90	@@ -35713,6 +35756,137 @@
91		91	esac
92	save_old_LDFLAGS=$LDFLAGS	92	done
93	LDFLAGS=" -L$GD_LIB $GD_SHARED_LIBADD $LDFLAGS"	93
94	+ echo $ac_n "checking for gdImageGifAnimBegin in -lgd""... $ac_c" 1>&6	94	+ echo $ac_n "checking for gdImageGifAnimBegin in -lgd""... $ac_c" 1>&6
95	+echo "configure:32250: checking for gdImageGifAnimBegin in -lgd" >&5	95	+echo "configure:32250: checking for gdImageGifAnimBegin in -lgd" >&5
96	+ac_lib_var=`echo gd'_'gdImageGifAnimBegin \| sed 'y%./+-%__p_%'`	96	+ac_lib_var=`echo gd'_'gdImageGifAnimBegin \| sed 'y%./+-%__p_%'`
Lines 126-157 Link Here
126	+fi	126	+fi
127	+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then	127	+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
128	+ echo "$ac_t""yes" 1>&6	128	+ echo "$ac_t""yes" 1>&6
129	+	129	+
130	+ LDFLAGS=$save_old_LDFLAGS	130	+ LDFLAGS=$save_old_LDFLAGS
		131	+ ext_shared=$save_ext_shared
131	+ cat >> confdefs.h <<\EOF	132	+ cat >> confdefs.h <<\EOF
132	+#define HAVE_GD_GIF_ANIM 1	133	+#define HAVE_GD_GIF_ANIM 1
133	+EOF	134	+EOF
134	+	135	+
135	+	136	+
136	+else	137	+else
137	+ echo "$ac_t""no" 1>&6	138	+ echo "$ac_t""no" 1>&6
138	+	139	+
139	+ LDFLAGS=$save_old_LDFLAGS	140	+ LDFLAGS=$save_old_LDFLAGS
		141	+ ext_shared=$save_ext_shared
140	+ unset ac_cv_func_gd	142	+ unset ac_cv_func_gd
141	+	143	+
142	+	144	+
143	+fi	145	+fi
144	+	146	+
145	+	147	+
146	+ save_old_LDFLAGS=$LDFLAGS	148	+ save_old_LDFLAGS=$LDFLAGS
147	+ LDFLAGS=" -L$GD_LIB $GD_SHARED_LIBADD $LDFLAGS"	149	+ ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
		150	+
		151	+ save_ext_shared=$ext_shared
		152	+ ext_shared=yes
		153	+
		154	+ for ac_i in $ac_stuff; do
		155	+ case $ac_i in
		156	+ -l*)
		157	+ ac_ii=`echo $ac_i\|cut -c 3-`
		158	+
		159	+
		160	+ case $ac_ii in
		161	+ c\|c_r\|pthread*) ;;
		162	+ *)
		163	+ if test "$ext_shared" = "yes"; then
		164	+ LDFLAGS="$LDFLAGS -l$ac_ii"
		165	+ else
		166	+
		167	+
		168	+ case $ac_ii in
		169	+ c\|c_r\|pthread*) ;;
		170	+ *)
		171	+ LIBS="$LIBS -l$ac_ii"
		172	+ ;;
		173	+ esac
		174	+
		175	+
		176	+ fi
		177	+ ;;
		178	+ esac
		179	+
		180	+
		181	+ ;;
		182	+ -L*)
		183	+ ac_ii=`echo $ac_i\|cut -c 3-`
		184	+
		185	+ if test "$ac_ii" != "/usr/lib"; then
		186	+
		187	+ if test -z "$ac_ii" \|\| echo "$ac_ii" \| grep '^/' >/dev/null ; then
		188	+ ai_p=$ac_ii
		189	+ else
		190	+
		191	+ ep_dir="`echo $ac_ii\|sed 's%/[^/][^/]/*$%%'`"
		192	+
		193	+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
		194	+ ai_p="$ep_realdir/`basename \"$ac_ii\"`"
		195	+ fi
		196	+
		197	+
		198	+ if test "$ext_shared" = "yes"; then
		199	+ LDFLAGS="$ld_runpath_switch$ai_p -L$ai_p $LDFLAGS"
		200	+ else
		201	+
		202	+
		203	+
		204	+ unique=`echo $ai_p\|sed 's/[^a-zA-Z0-9]/_/g'`
		205	+
		206	+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
		207	+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
		208	+ eval "LIBPATH$unique=set"
		209	+
		210	+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
		211	+ LDFLAGS="$LDFLAGS -L$ai_p"
		212	+ PHP_RPATHS="$PHP_RPATHS $ai_p"
		213	+
214	+ fi
215	+
216	+
217	+ fi
218	+
219	+ fi
220	+
221	+ ;;
222	+ esac
223	+ done
224	+
148	echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6	225	echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
149	echo "configure:32280: checking for gdCacheCreate in -lgd" >&5	226	echo "configure:35718: checking for gdCacheCreate in -lgd" >&5
150	ac_lib_var=`echo gd'_'gdCacheCreate \| sed 'y%./+-%__p_%'`	227	ac_lib_var=`echo gd'_'gdCacheCreate \| sed 'y%./+-%__p_%'`
151	@@ -54325,8 +54422,8 @@	228	@@ -57066,8 +57240,8 @@
152		229
153	echo $ac_n "checking Oracle version""... $ac_c" 1>&6	230	echo $ac_n "checking Oracle version""... $ac_c" 1>&6
154	echo "configure:54328: checking Oracle version" >&5	231	echo "configure:57069: checking Oracle version" >&5
155	- if test -s "$ORACLE_DIR/orainst/unix.rgs"; then	232	- if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
156	- ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs \| sed 's/ */:/g' \| cut -d: -f 6 \| cut -c 2-4`	233	- ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs \| sed 's/ */:/g' \| cut -d: -f 6 \| cut -c 2-4`
157	+ if test -s "$ORACLE_DIR/ocommon/install/partial.prd"; then	234	+ if test -s "$ORACLE_DIR/ocommon/install/partial.prd"; then
Lines 159-165 Link Here
159	test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3	236	test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
160	elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then	237	elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
161	ORACLE_VERSION=9.0	238	ORACLE_VERSION=9.0
162	@@ -56589,6 +56686,102 @@	239	@@ -58359,6 +58533,102 @@
163		240
164		241
165	if test "$ext_shared" = "yes"; then	242	if test "$ext_shared" = "yes"; then
Lines 262-268 Link Here
262	ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"	339	ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
263	if test -n "$ORACLE_DIR/lib"; then	340	if test -n "$ORACLE_DIR/lib"; then
264		341
265	@@ -71130,29 +71323,6 @@	342	@@ -77889,29 +78159,6 @@
266	else	343	else
267		344
268		345
Lines 292-298 Link Here
292	case ct in	369	case ct in
293	c\|c_r\|pthread*) ;;	370	c\|c_r\|pthread*) ;;
294	*)	371	*)
295	@@ -71176,52 +71346,7 @@	372	@@ -77935,52 +78182,7 @@
296		373
297		374
298		375
Lines 346-352 Link Here
346		423
347		424
348	save_old_LDFLAGS=$LDFLAGS	425	save_old_LDFLAGS=$LDFLAGS
349	@@ -71291,37 +71416,6 @@	426	@@ -78126,38 +78328,6 @@
350		427
351		428
352		429
Lines 354-359 Link Here
354	- echo "$ac_t""no" 1>&6	431	- echo "$ac_t""no" 1>&6
355	-	432	-
356	- LDFLAGS=$save_old_LDFLAGS	433	- LDFLAGS=$save_old_LDFLAGS
		434	- ext_shared=$save_ext_shared
357	- unset ac_cv_func_tcl	435	- unset ac_cv_func_tcl
358	-	436	-
359	-	437	-
Lines 384-390 Link Here
384	fi	462	fi
385		463
386		464
387	@@ -84252,10 +84346,7 @@	465	@@ -89822,10 +89992,7 @@
388	CXXFLAGS="$CXXFLAGS $standard_libtool_flag"	466	CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
389		467
390	all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'	468	all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'

Lines 1-139 Link Here

(-)php5/files/patch-main::main.c (-139 lines)
1	--- main/main.c.orig Sun Jun 22 11:16:39 2003
2	+++ main/main.c Sun Jun 22 11:17:00 2003
3
4	@@ -134,7 +134,6 @@ static int short_track_vars_names_length
5
6	#define NUM_TRACK_VARS (sizeof(short_track_vars_names_length)/sizeof(int))
7
8	-
9	#define SAFE_FILENAME(f) ((f)?(f):"-")
10
11	/* {{{ PHP_INI_MH
12	@@ -1362,7 +1361,7 @@ static void php_autoglobal_merge(HashTab
13	static int php_hash_environment(TSRMLS_D)
14	{
15	char *p;
16	- unsigned char _gpc_flags[3] = {0, 0, 0};
17	+ int _gpc_flags[5] = {0, 0, 0, 0, 0};
18	zend_bool have_variables_order;
19	zval *dummy_track_vars_array = NULL;
20	zend_bool initialized_dummy_track_vars_array=0;
21	@@ -1409,42 +1408,48 @@ static int php_hash_environment(TSRMLS_D
22	case 'P':
23	if (!_gpc_flags[0] && !SG(headers_sent) && SG(request_info).request_method && !strcmp(SG(request_info).request_method, "POST")) {
24	sapi_module.treat_data(PARSE_POST, NULL, NULL TSRMLS_CC); /* POST Data */
25	- _gpc_flags[0]=1;
26	+ _gpc_flags[0]=TRACK_VARS_POST + 1;
27	}
28	break;
29	case 'c':
30	case 'C':
31	if (!_gpc_flags[1]) {
32	sapi_module.treat_data(PARSE_COOKIE, NULL, NULL TSRMLS_CC); /* Cookie Data */
33	- _gpc_flags[1]=1;
34	+ _gpc_flags[1]=TRACK_VARS_COOKIE + 1;
35	}
36	break;
37	case 'g':
38	case 'G':
39	if (!_gpc_flags[2]) {
40	sapi_module.treat_data(PARSE_GET, NULL, NULL TSRMLS_CC); /* GET Data */
41	- _gpc_flags[2]=1;
42	+ _gpc_flags[2]=TRACK_VARS_GET + 1;
43	}
44	break;
45	case 'e':
46	case 'E':
47	- if (have_variables_order) {
48	- ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]);
49	- array_init(PG(http_globals)[TRACK_VARS_ENV]);
50	- INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]);
51	- php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC);
52	- } else {
53	- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported 'e' element (environment) used in gpc_order - use variables_order instead");
54	+ if (!_gpc_flags[3]) {
55	+ if (have_variables_order) {
56	+ ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]);
57	+ array_init(PG(http_globals)[TRACK_VARS_ENV]);
58	+ INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]);
59	+ php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC);
60	+ } else {
61	+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported 'e' element (environment) used in gpc_order - use variables_order instead");
62	+ }
63	+ _gpc_flags[3]=TRACK_VARS_ENV + 1;
64	}
65	break;
66	case 's':
67	case 'S':
68	- php_register_server_variables(TSRMLS_C);
69	+ if (!_gpc_flags[4]) {
70	+ php_register_server_variables(TSRMLS_C);
71	+ _gpc_flags[4]=TRACK_VARS_SERVER + 1;
72	+ }
73	break;
74	}
75	}
76
77	- if (!have_variables_order) {
78	+ if (!have_variables_order && !PG(http_globals)[TRACK_VARS_SERVER]) {
79	php_register_server_variables(TSRMLS_C);
80	}
81
82	@@ -1453,6 +1458,14 @@ static int php_hash_environment(TSRMLS_D
83	php_build_argv(SG(request_info).query_string TSRMLS_CC);
84	}
85
86	+ if (PG(register_globals)) {
87	+ for (i = 0; i < 5; i++) {
88	+ if (PG(http_globals)[i]) {
89	+ php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[i]) TSRMLS_CC);
90	+ }
91	+ }
92	+ }
93	+
94	for (i=0; i<NUM_TRACK_VARS; i++) {
95	if (!PG(http_globals)[i]) {
96	if (!initialized_dummy_track_vars_array) {
97	@@ -1478,39 +1491,12 @@ static int php_hash_environment(TSRMLS_D
98	array_init(form_variables);
99	INIT_PZVAL(form_variables);
100
101	- for (p=variables_order; p && *p; p++) {
102	- switch (*p) {
103	- case 'g':
104	- case 'G':
105	- php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]) TSRMLS_CC);
106	- break;
107	- case 'p':
108	- case 'P':
109	- php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]) TSRMLS_CC);
110	- break;
111	- case 'c':
112	- case 'C':
113	- php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) TSRMLS_CC);
114	- break;
115	- }
116	- }
117	-
118	- if (PG(register_globals)) {
119	- HashPosition pos;
120	- zval **data;
121	- char *string_key;
122	- uint string_key_len;
123	- ulong num_key;
124	-
125	- zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(form_variables), &pos);
126	- while (zend_hash_get_current_data_ex(Z_ARRVAL_P(form_variables), (void **)&data, &pos) == SUCCESS) {
127	- /* we only register string keys, since we cannot have $1234 */
128	- if (zend_hash_get_current_key_ex(Z_ARRVAL_P(form_variables), &string_key, &string_key_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING) {
129	- ZEND_SET_SYMBOL_WITH_LENGTH(&EG(symbol_table), string_key, string_key_len, data, (data)->refcount+1, 0);
130	- }
131	- zend_hash_move_forward_ex(Z_ARRVAL_P(form_variables), &pos);
132	+ for (i = 0; i < 3; i++) {
133	+ if (_gpc_flags[i]) {
134	+ php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[(_gpc_flags[i] - 1)]) TSRMLS_CC);
135	}
136	}
137	+
138	zend_hash_update(&EG(symbol_table), "_REQUEST", sizeof("_REQUEST"), &form_variables, sizeof(zval *), NULL);
139	}

Lines 1-12 Link Here

(-)php5/pkg-message (-4 / +4 lines)
1	*****************************************************************************	1	*****************************************************************************
2		2
3	You have installed the php4 package.	3	You have installed the php5 package.
4		4
5	Have a look at the php4 port if you need additional extensions other than	5	Have a look at the php5 port if you need additional extensions other than
6	CTYPE, MYSQL, OVERLOAD, PCRE, POSIX, SESSION, TOKENIZER, XML and ZLIB.	6	CTYPE, DOM, PCRE, POSIX, SESSION, SIMPLEXML, SQLITE, TOKENIZER and XML.
7		7
8	You can find it at	8	You can find it at
9	ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/lang/php4.tar	9	ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/lang/php5.tar
10		10
11	Make sure index.php is part of your DirectoryIndex.	11	Make sure index.php is part of your DirectoryIndex.
12		12

Lines 1-4 Link Here

(-)php5/pkg-plist (-49 / +60 lines)
1	%%CLI%%bin/pear	1	%%CLI%%%%PEAR%%bin/pear
2	%%CLI%%bin/php	2	%%CLI%%bin/php
3	bin/php-config	3	bin/php-config
4	bin/phpextdist	4	bin/phpextdist
Lines 24-35 Link Here
24	include/php/Zend/zend_builtin_functions.h	24	include/php/Zend/zend_builtin_functions.h
25	include/php/Zend/zend_compile.h	25	include/php/Zend/zend_compile.h
26	include/php/Zend/zend_config.h	26	include/php/Zend/zend_config.h
		27	include/php/Zend/zend_config.nw.h
27	include/php/Zend/zend_config.w32.h	28	include/php/Zend/zend_config.w32.h
28	include/php/Zend/zend_constants.h	29	include/php/Zend/zend_constants.h
		30	include/php/Zend/zend_default_classes.h
29	include/php/Zend/zend_dynamic_array.h	31	include/php/Zend/zend_dynamic_array.h
30	include/php/Zend/zend_errors.h	32	include/php/Zend/zend_errors.h
31	include/php/Zend/zend_execute.h	33	include/php/Zend/zend_execute.h
32	include/php/Zend/zend_execute_globals.h
33	include/php/Zend/zend_execute_locks.h	34	include/php/Zend/zend_execute_locks.h
34	include/php/Zend/zend_extensions.h	35	include/php/Zend/zend_extensions.h
35	include/php/Zend/zend_fast_cache.h	36	include/php/Zend/zend_fast_cache.h
Lines 46-63 Link Here
46	include/php/Zend/zend_language_scanner.h	47	include/php/Zend/zend_language_scanner.h
47	include/php/Zend/zend_list.h	48	include/php/Zend/zend_list.h
48	include/php/Zend/zend_llist.h	49	include/php/Zend/zend_llist.h
		50	include/php/Zend/zend_mm.h
49	include/php/Zend/zend_modules.h	51	include/php/Zend/zend_modules.h
50	include/php/Zend/zend_multibyte.h
51	include/php/Zend/zend_multiply.h	52	include/php/Zend/zend_multiply.h
		53	include/php/Zend/zend_object_handlers.h
		54	include/php/Zend/zend_objects.h
		55	include/php/Zend/zend_objects_API.h
52	include/php/Zend/zend_operators.h	56	include/php/Zend/zend_operators.h
53	include/php/Zend/zend_ptr_stack.h	57	include/php/Zend/zend_ptr_stack.h
54	include/php/Zend/zend_qsort.h	58	include/php/Zend/zend_qsort.h
		59	include/php/Zend/zend_reflection_api.h
55	include/php/Zend/zend_stack.h	60	include/php/Zend/zend_stack.h
56	include/php/Zend/zend_static_allocator.h	61	include/php/Zend/zend_static_allocator.h
		62	include/php/Zend/zend_stream.h
		63	include/php/Zend/zend_ts_hash.h
57	include/php/Zend/zend_types.h	64	include/php/Zend/zend_types.h
58	include/php/Zend/zend_variables.h	65	include/php/Zend/zend_variables.h
59	include/php/acconfig.h	66	include/php/acconfig.h
60	include/php/ext/mbstring/cp932_table.h	67	include/php/ext/mbstring/cp932_table.h
		68	include/php/ext/mbstring/mb_gpc.h
61	include/php/ext/mbstring/mbfilter.h	69	include/php/ext/mbstring/mbfilter.h
62	include/php/ext/mbstring/mbfilter_cn.h	70	include/php/ext/mbstring/mbfilter_cn.h
63	include/php/ext/mbstring/mbfilter_ja.h	71	include/php/ext/mbstring/mbfilter_ja.h
Lines 80-86 Link Here
80	include/php/ext/session/mod_mm.h	88	include/php/ext/session/mod_mm.h
81	include/php/ext/session/mod_user.h	89	include/php/ext/session/mod_user.h
82	include/php/ext/session/php_session.h	90	include/php/ext/session/php_session.h
83	include/php/ext/standard/aggregation.h
84	include/php/ext/standard/base64.h	91	include/php/ext/standard/base64.h
85	include/php/ext/standard/basic_functions.h	92	include/php/ext/standard/basic_functions.h
86	include/php/ext/standard/crc32.h	93	include/php/ext/standard/crc32.h
Lines 127-154 Link Here
127	include/php/ext/standard/php_smart_str_public.h	134	include/php/ext/standard/php_smart_str_public.h
128	include/php/ext/standard/php_standard.h	135	include/php/ext/standard/php_standard.h
129	include/php/ext/standard/php_string.h	136	include/php/ext/standard/php_string.h
		137	include/php/ext/standard/php_sunfuncs.h
130	include/php/ext/standard/php_type.h	138	include/php/ext/standard/php_type.h
131	include/php/ext/standard/php_var.h	139	include/php/ext/standard/php_var.h
132	include/php/ext/standard/php_versioning.h	140	include/php/ext/standard/php_versioning.h
		141	include/php/ext/standard/proc_open.h
133	include/php/ext/standard/quot_print.h	142	include/php/ext/standard/quot_print.h
134	include/php/ext/standard/reg.h	143	include/php/ext/standard/reg.h
135	include/php/ext/standard/scanf.h	144	include/php/ext/standard/scanf.h
136	include/php/ext/standard/sha1.h	145	include/php/ext/standard/sha1.h
		146	include/php/ext/standard/streamsfuncs.h
137	include/php/ext/standard/uniqid.h	147	include/php/ext/standard/uniqid.h
138	include/php/ext/standard/url.h	148	include/php/ext/standard/url.h
139	include/php/ext/standard/url_scanner.h	149	include/php/ext/standard/url_scanner.h
140	include/php/ext/standard/url_scanner_ex.h	150	include/php/ext/standard/url_scanner_ex.h
141	include/php/ext/xml/expat/ascii.h	151	include/php/ext/xml/expat_compat.h
142	include/php/ext/xml/expat/asciitab.h	152	include/php/ext/xml/expat/.php
143	include/php/ext/xml/expat/expat.h
144	include/php/ext/xml/expat/iasciitab.h
145	include/php/ext/xml/expat/latin1tab.h
146	include/php/ext/xml/expat/nametab.h
147	include/php/ext/xml/expat/utf8tab.h
148	include/php/ext/xml/expat/winconfig.h
149	include/php/ext/xml/expat/xmlrole.h
150	include/php/ext/xml/expat/xmltok.h
151	include/php/ext/xml/expat/xmltok_impl.h
152	include/php/ext/xml/php_xml.h	153	include/php/ext/xml/php_xml.h
153	include/php/main/SAPI.h	154	include/php/main/SAPI.h
154	include/php/main/build-defs.h	155	include/php/main/build-defs.h
Lines 183-188 Link Here
183	include/php/main/safe_mode.h	184	include/php/main/safe_mode.h
184	include/php/main/snprintf.h	185	include/php/main/snprintf.h
185	include/php/main/spprintf.h	186	include/php/main/spprintf.h
		187	include/php/main/streams/php_stream_context.h
		188	include/php/main/streams/php_stream_filter_api.h
		189	include/php/main/streams/php_stream_mmap.h
		190	include/php/main/streams/php_streams_int.h
		191	include/php/main/streams/php_stream_transport.h
		192	include/php/main/streams/php_stream_userspace.h
		193	include/php/main/streams/php_stream_plain_wrapper.h
186	include/php/main/win95nt.h	194	include/php/main/win95nt.h
187	include/php/regex/cclass.h	195	include/php/regex/cclass.h
188	include/php/regex/cname.h	196	include/php/regex/cname.h
Lines 198-229 Link Here
198	lib/php/build/scan_makefile_in.awk	206	lib/php/build/scan_makefile_in.awk
199	lib/php/build/shtool	207	lib/php/build/shtool
200	%%SAPI_FILE%%	208	%%SAPI_FILE%%
201	%%APACHE%%@exec %D/sbin/apxs -e -a -n php4 %f	209	%%APACHE%%@exec %D/sbin/apxs -e -a -n php5 %f
202	%%APACHE%%@unexec %D/sbin/apxs -e -A -n php4 %f	210	%%APACHE%%@unexec %D/sbin/apxs -e -A -n php5 %f
203	%%CLI%%share/pear/bootstrap/Archive/Tar.php	211	%%CLI%%%%PEAR%%share/pear/bootstrap/Archive/Tar.php
204	%%CLI%%share/pear/bootstrap/PEAR.php	212	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR.php
205	%%CLI%%share/pear/bootstrap/System.php	213	%%CLI%%%%PEAR%%share/pear/bootstrap/System.php
206	%%CLI%%share/pear/bootstrap/Console/Getopt.php	214	%%CLI%%%%PEAR%%share/pear/bootstrap/Console/Getopt.php
207	%%CLI%%share/pear/bootstrap/OS/Guess.php	215	%%CLI%%%%PEAR%%share/pear/bootstrap/OS/Guess.php
208	%%CLI%%share/pear/bootstrap/PEAR/Command/Auth.php	216	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Autoloader.php
209	%%CLI%%share/pear/bootstrap/PEAR/Command/Build.php	217	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Builder.php
210	%%CLI%%share/pear/bootstrap/PEAR/Command/Common.php	218	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command.php
211	%%CLI%%share/pear/bootstrap/PEAR/Command/Config.php	219	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Auth.php
212	%%CLI%%share/pear/bootstrap/PEAR/Command/Install.php	220	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Build.php
213	%%CLI%%share/pear/bootstrap/PEAR/Command/Package.php	221	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Common.php
214	%%CLI%%share/pear/bootstrap/PEAR/Command/Registry.php	222	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Config.php
215	%%CLI%%share/pear/bootstrap/PEAR/Command/Remote.php	223	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Install.php
216	%%CLI%%share/pear/bootstrap/PEAR/Autoloader.php	224	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Mirror.php
217	%%CLI%%share/pear/bootstrap/PEAR/Builder.php	225	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Package.php
218	%%CLI%%share/pear/bootstrap/PEAR/Command.php	226	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Registry.php
219	%%CLI%%share/pear/bootstrap/PEAR/Common.php	227	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Remote.php
220	%%CLI%%share/pear/bootstrap/PEAR/Config.php	228	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Common.php
221	%%CLI%%share/pear/bootstrap/PEAR/Dependency.php	229	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Config.php
222	%%CLI%%share/pear/bootstrap/PEAR/Installer.php	230	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Dependency.php
223	%%CLI%%share/pear/bootstrap/PEAR/Packager.php	231	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/DependencyDB.php
224	%%CLI%%share/pear/bootstrap/PEAR/Registry.php	232	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Installer.php
225	%%CLI%%share/pear/bootstrap/PEAR/Remote.php	233	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Packager.php
226	%%CLI%%share/pear/bootstrap/PEAR/Frontend/CLI.php	234	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Registry.php
		235	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Remote.php
		236	%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Frontend/CLI.php
227	@dirrm include/php/TSRM	237	@dirrm include/php/TSRM
228	@dirrm include/php/Zend	238	@dirrm include/php/Zend
229	@dirrm include/php/ext/mbstring	239	@dirrm include/php/ext/mbstring
Lines 233-249 Link Here
233	@dirrm include/php/ext/xml/expat	243	@dirrm include/php/ext/xml/expat
234	@dirrm include/php/ext/xml	244	@dirrm include/php/ext/xml
235	@dirrm include/php/ext	245	@dirrm include/php/ext
		246	@dirrm include/php/main/streams
236	@dirrm include/php/main	247	@dirrm include/php/main
237	@dirrm include/php/regex	248	@dirrm include/php/regex
238	@dirrm include/php/	249	@dirrm include/php/
239	@unexec rmdir %D/lib/php/%%EXT_DIR%% 2> /dev/null \|\| true	250	@unexec rmdir %D/lib/php/%%EXT_DIR%% 2> /dev/null \|\| true
240	@dirrm lib/php/build	251	@dirrm lib/php/build
241	@unexec rmdir %D/lib/php 2> /dev/null \|\| true	252	@unexec rmdir %D/lib/php 2> /dev/null \|\| true
242	%%CLI%%@dirrm share/pear/bootstrap/Archive	253	%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/Archive
243	%%CLI%%@dirrm share/pear/bootstrap/Console	254	%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/Console
244	%%CLI%%@dirrm share/pear/bootstrap/OS	255	%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/OS
245	%%CLI%%@dirrm share/pear/bootstrap/PEAR/Command	256	%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR/Command
246	%%CLI%%@dirrm share/pear/bootstrap/PEAR/Frontend	257	%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR/Frontend
247	%%CLI%%@dirrm share/pear/bootstrap/PEAR	258	%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR
248	%%CLI%%@dirrm share/pear/bootstrap	259	%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap
249	%%CLI%%@unexec rmdir %D/share/pear 2> /dev/null \|\| true	260	%%CLI%%%%PEAR%%@unexec rmdir %D/share/pear 2> /dev/null \|\| true

Lines 1-5 Link Here

(-)php5/scripts/configure.php (-9 / +6 lines)
1	#!/bin/sh	1	#!/bin/sh
2	# $FreeBSD: ports/lang/php4/scripts/configure.php,v 1.6 2003/07/04 02:26:08 nork Exp $	2	# $FreeBSD: ports/lang/php5/scripts/configure.php,v 1.6 2003/07/04 02:26:08 nork Exp $
3		3
4	if [ -f ${WRKDIR}/Makefile.inc ]; then	4	if [ -f ${WRKDIR}/Makefile.inc ]; then
5	exit	5	exit
Lines 27-43 Link Here
27	CURL "CURL support" ${WITH_CURL:-OFF} \	27	CURL "CURL support" ${WITH_CURL:-OFF} \
28	DBASE "dBase library support" ${WITH_DBASE:-OFF} \	28	DBASE "dBase library support" ${WITH_DBASE:-OFF} \
29	DBX "dbx support" ${WITH_DBX:-OFF} \	29	DBX "dbx support" ${WITH_DBX:-OFF} \
30	DOMXML "DOM support" ${WITH_DOMXML:-OFF} \	30	DOM "DOM support" ${WITH_DOM:-OFF} \
31	DOMXSLT "DOM XSLT and EXSLT support (implies DOMXML)" ${WITH_DOMXSLT:-OFF} \
32	EXIF "EXIF support" ${WITH_EXIF:-OFF} \	31	EXIF "EXIF support" ${WITH_EXIF:-OFF} \
33	FILEPRO "filePro support" ${WITH_FILEPRO:-OFF} \	32	FILEPRO "filePro support" ${WITH_FILEPRO:-OFF} \
34	FRIBIDI "FriBidi support" ${WITH_FRIBIDI:-OFF} \
35	FTP "FTP support" ${WITH_FTP:-OFF} \	33	FTP "FTP support" ${WITH_FTP:-OFF} \
36	GD "GD library support" ${WITH_GD:-OFF} \	34	GD "GD library support" ${WITH_GD:-OFF} \
37	GDBM "GDBM database support (dba)" ${WITH_GDBM:-OFF} \	35	GDBM "GDBM database support (dba)" ${WITH_GDBM:-OFF} \
38	GETTEXT "gettext library support" ${WITH_GETTEXT:-OFF} \	36	GETTEXT "gettext library support" ${WITH_GETTEXT:-OFF} \
39	GMP "GNU MP support" ${WITH_GMP:-OFF} \	37	GMP "GNU MP support" ${WITH_GMP:-OFF} \
40	HYPERWAVE "Hyperwave support" ${WITH_HYPERWAVE:-OFF} \
41	ICONV "iconv support" ${WITH_ICONV:-OFF} \	38	ICONV "iconv support" ${WITH_ICONV:-OFF} \
42	IMAP "IMAP support" ${WITH_IMAP:-OFF} \	39	IMAP "IMAP support" ${WITH_IMAP:-OFF} \
43	INIFILE "INI file support (dba)" ${WITH_INIFILE:-OFF} \	40	INIFILE "INI file support (dba)" ${WITH_INIFILE:-OFF} \
Lines 54-60 Link Here
54	OPENLDAP "OpenLDAP support" ${WITH_OPENLDAP:-OFF} \	51	OPENLDAP "OpenLDAP support" ${WITH_OPENLDAP:-OFF} \
55	OPENSSL "OpenSSL support" ${WITH_OPENSSL:-OFF} \	52	OPENSSL "OpenSSL support" ${WITH_OPENSSL:-OFF} \
56	ORACLE "Oracle support" ${WITH_ORACLE:-OFF} \	53	ORACLE "Oracle support" ${WITH_ORACLE:-OFF} \
57	OVERLOAD "user-space object overloading support" ${WITH_OVERLOAD:-OFF} \
58	PCNTL "pcntl support (CLI only)" ${WITH_PCNTL:-OFF} \	54	PCNTL "pcntl support (CLI only)" ${WITH_PCNTL:-OFF} \
59	PCRE "Perl Compatible Regular Expression support" ${WITH_PCRE:-OFF} \	55	PCRE "Perl Compatible Regular Expression support" ${WITH_PCRE:-OFF} \
60	PDFLIB "PDFlib support" ${WITH_PDFLIB:-OFF} \	56	PDFLIB "PDFlib support" ${WITH_PDFLIB:-OFF} \
Lines 65-72 Link Here
65	RECODE "recode support" ${WITH_RECODE:-OFF} \	61	RECODE "recode support" ${WITH_RECODE:-OFF} \
66	SESSION "session support" ${WITH_SESSION:-OFF} \	62	SESSION "session support" ${WITH_SESSION:-OFF} \
67	SHMOP "shmop support" ${WITH_SHMOP:-OFF} \	63	SHMOP "shmop support" ${WITH_SHMOP:-OFF} \
		64	SIMPLEXML "simplexml support" ${WITH_SIMPLEXML:-OFF} \
68	SNMP "SNMP support (implies OPENSSL)" ${WITH_SNMP:-OFF} \	65	SNMP "SNMP support (implies OPENSSL)" ${WITH_SNMP:-OFF} \
69	SOCKETS "sockets support" ${WITH_SOCKETS:-OFF} \	66	SOCKETS "sockets support" ${WITH_SOCKETS:-OFF} \
		67	SQLITE "sqlite support" ${WITH_SQLITE:-OFF} \
70	SYBASEDB "Sybase/MS-SQL database support (DB-lib)" ${WITH_SYBASEDB:-OFF} \	68	SYBASEDB "Sybase/MS-SQL database support (DB-lib)" ${WITH_SYBASEDB:-OFF} \
71	SYBASECT "Sybase/MS-SQL database support (CT-lib)" ${WITH_SYBASECT:-OFF} \	69	SYBASECT "Sybase/MS-SQL database support (CT-lib)" ${WITH_SYBASECT:-OFF} \
72	SYSVSEM "System V semaphore support" ${WITH_SYSVSEM:-OFF} \	70	SYSVSEM "System V semaphore support" ${WITH_SYSVSEM:-OFF} \
Lines 75-85 Link Here
75	UNIXODBC "unixODBC support" ${WITH_UNIXODBC:-OFF} \	73	UNIXODBC "unixODBC support" ${WITH_UNIXODBC:-OFF} \
76	WDDX "WDDX support (implies XML)" ${WITH_WDDX:-OFF} \	74	WDDX "WDDX support (implies XML)" ${WITH_WDDX:-OFF} \
77	XML "XML support" ${WITH_XML:-OFF} \	75	XML "XML support" ${WITH_XML:-OFF} \
78	XMLRPC "XMLRPC-EPI support" ${WITH_XMLRPC:-OFF} \	76	XMLRPC "XMLRPC-EPI support (implies ICONV)" ${WITH_XMLRPC:-OFF} \
79	XSLT "XSLT Sablotron support" ${WITH_XSLT:-OFF} \	77	XML "XSL support" ${WITH_XSL:-OFF} \
80	YAZ "YAZ support (ANSI/NISO Z39.50)" ${WITH_YAZ:-OFF} \	78	YAZ "YAZ support (ANSI/NISO Z39.50)" ${WITH_YAZ:-OFF} \
81	YP "YP/NIS support" ${WITH_YP:-OFF} \	79	YP "YP/NIS support" ${WITH_YP:-OFF} \
82	ZIP "ZIP support" ${WITH_ZIP:-OFF} \
83	ZLIB "ZLIB support" ${WITH_ZLIB:-OFF} \	80	ZLIB "ZLIB support" ${WITH_ZLIB:-OFF} \
84	2> $tempfile	81	2> $tempfile
85	fi	82	fi

Lines 1-63 Link Here

(-)php5/scripts/php4_options (-63 lines)
1	WITH_BCMATH=OFF
2	WITH_BZIP2=OFF
3	WITH_CALENDAR=OFF
4	WITH_CDB=OFF
5	WITH_CRACK=OFF
6	WITH_CTYPE=ON
7	WITH_CURL=OFF
8	WITH_DBASE=OFF
9	WITH_DBX=OFF
10	WITH_DOMXML=OFF
11	WITH_DOMXSLT=OFF
12	WITH_EXIF=OFF
13	WITH_FILEPRO=OFF
14	WITH_FRIBIDI=OFF
15	WITH_FTP=OFF
16	WITH_GD=OFF
17	WITH_GDBM=OFF
18	WITH_GETTEXT=OFF
19	WITH_GMP=OFF
20	WITH_HYPERWAVE=OFF
21	WITH_ICONV=OFF
22	WITH_IMAP=OFF
23	WITH_INIFILE=OFF
24	WITH_INTERBASE=OFF
25	WITH_MBSTRING=OFF
26	WITH_MCAL=OFF
27	WITH_MCVE=OFF
28	WITH_MCRYPT=OFF
29	WITH_MHASH=OFF
30	WITH_MIME=OFF
31	WITH_MING=OFF
32	WITH_MYSQL=ON
33	WITH_NCURSES=OFF
34	WITH_OPENLDAP=OFF
35	WITH_OPENSSL=OFF
36	WITH_ORACLE=OFF
37	WITH_OVERLOAD=ON
38	WITH_PCNTL=OFF
39	WITH_PCRE=ON
40	WITH_PDFLIB=OFF
41	WITH_POSIX=ON
42	WITH_POSTGRESQL=OFF
43	WITH_PSPELL=OFF
44	WITH_READLINE=OFF
45	WITH_RECODE=OFF
46	WITH_SESSION=ON
47	WITH_SHMOP=OFF
48	WITH_SNMP=OFF
49	WITH_SOCKETS=OFF
50	WITH_SYBASEDB=OFF
51	WITH_SYBASECT=OFF
52	WITH_SYSVSEM=OFF
53	WITH_SYSVSHM=OFF
54	WITH_TOKENIZER=ON
55	WITH_UNIXODBC=OFF
56	WITH_WDDX=OFF
57	WITH_XML=ON
58	WITH_XMLRPC=OFF
59	WITH_XSLT=OFF
60	WITH_YAZ=OFF
61	WITH_YP=OFF
62	WITH_ZIP=OFF
63	WITH_ZLIB=ON

Line 0 Link Here

(-)php5/scripts/php5_options (+60 lines)
	1	WITH_BCMATH=OFF
	2	WITH_BZIP2=OFF
	3	WITH_CALENDAR=OFF
	4	WITH_CDB=OFF
	5	WITH_CRACK=OFF
	6	WITH_CTYPE=ON
	7	WITH_CURL=OFF
	8	WITH_DBASE=OFF
	9	WITH_DBX=OFF
	10	WITH_DOM=ON
	11	WITH_EXIF=OFF
	12	WITH_FILEPRO=OFF
	13	WITH_FTP=OFF
	14	WITH_GD=OFF
	15	WITH_GDBM=OFF
	16	WITH_GETTEXT=OFF
	17	WITH_GMP=OFF
	18	WITH_ICONV=OFF
	19	WITH_IMAP=OFF
	20	WITH_INIFILE=OFF
	21	WITH_INTERBASE=OFF
	22	WITH_MBSTRING=OFF
	23	WITH_MCAL=OFF
	24	WITH_MCVE=OFF
	25	WITH_MCRYPT=OFF
	26	WITH_MHASH=OFF
	27	WITH_MIME=OFF
	28	WITH_MING=OFF
	29	WITH_MYSQL=OFF
	30	WITH_NCURSES=OFF
	31	WITH_OPENLDAP=OFF
	32	WITH_OPENSSL=OFF
	33	WITH_ORACLE=OFF
	34	WITH_PCNTL=OFF
	35	WITH_PCRE=ON
	36	WITH_PDFLIB=OFF
	37	WITH_POSIX=ON
	38	WITH_POSTGRESQL=OFF
	39	WITH_PSPELL=OFF
	40	WITH_READLINE=OFF
	41	WITH_RECODE=OFF
	42	WITH_SESSION=ON
	43	WITH_SHMOP=OFF
	44	WITH_SIMPLEXML=ON
	45	WITH_SNMP=OFF
	46	WITH_SOCKETS=OFF
	47	WITH_SQLITE=ON
	48	WITH_SYBASEDB=OFF
	49	WITH_SYBASECT=OFF
	50	WITH_SYSVSEM=OFF
	51	WITH_SYSVSHM=OFF
	52	WITH_TOKENIZER=ON
	53	WITH_UNIXODBC=OFF
	54	WITH_WDDX=OFF
	55	WITH_XML=ON
	56	WITH_XMLRPC=OFF
	57	WITH_XSL=OFF
	58	WITH_YAZ=OFF
	59	WITH_YP=OFF
	60	WITH_ZLIB=ON