Index: head/lang/php4/Makefile =================================================================== --- head/lang/php4/Makefile (revision 86027) +++ head/lang/php4/Makefile (revision 86028) @@ -1,660 +1,665 @@ # New ports collection makefile for: php4 # Date created: Tue Feb 18 11:17:13 CET 2003 # Whom: Alex Dupre # # $FreeBSD$ # # 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, MYSQL, OVERLOAD, PCRE, POSIX, # SESSION, TOKENIZER, XML and ZLIB. This behaviour can be changed overriding # the PHP4_OPTIONS variable (e.g. PHP4_OPTIONS="EXT1 EXT2 EXT3"). # # Another way is to use the WITH_ and WITHOUT_ knobs, for additional # and default extensions respectively (implies batch mode). # # The last way reads an "extension" file, located in ~/php4_options (the # location is overridable by the PHP4_OPTFILE variable). You may find an # example in scripts/php4_options (interactive mode only). # PORTNAME= php4 -PORTVERSION= 4.3.3.r1 -PORTREVISION= 1 +PORTVERSION= 4.3.3.r2 +PORTREVISION= 0 CATEGORIES?= lang devel www MASTER_SITES= http://www.php.net/distributions/ \ http://it.php.net/distributions/ \ http://fi.php.net/distributions/ \ http://de.php.net/distributions/ \ http://gr.php.net/distributions/ \ http://fr.php.net/distributions/ \ http://es.php.net/distributions/ \ http://se.php.net/distributions/ \ http://downloads.php.net/jani/ .if defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE) PKGNAMEPREFIX= mod_ .else .if defined(WITHOUT_APACHE) .if defined(WITHOUT_CLI) PKGNAMESUFFIX= -cgi .else PKGNAMESUFFIX= -cli .endif .endif .endif DISTNAME= php-${PORTVERSION:S/.r/RC/} MAINTAINER?= sysadmin@alexdupre.com COMMENT= PHP Scripting Language (Apache Module and CLI) .if defined(WITHOUT_APACHE) .if defined(WITHOUT_CLI) COMMENT= PHP Common Gateway Interface .else COMMENT= PHP Command Line Interpreter .endif .else .if defined(WITHOUT_CLI) COMMENT= PHP Apache Module .endif .endif USE_BZIP2= yes USE_SUBMAKE= yes GNU_CONFIGURE= yes USE_BISON= yes USE_LIBTOOL_VER=14 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" CONFIGURE_ARGS+=--with-regex=php .else .if ${WITH_REGEX_TYPE} == "system" CONFIGURE_ARGS+=--with-regex=system .else .if ${WITH_REGEX_TYPE} == "apache" CONFIGURE_ARGS+=--with-regex=apache .endif .endif .endif EXT_DIR= 20020429 SAPI_FILE= "@comment " CONFLICTS= php4-cli-4* mod_php4-4* php4-cgi-4* .if defined(WITHOUT_APACHE) .if defined(WITHOUT_CLI) CONFLICTS= php4-4* php4-cli-4* mod_php4-4* .else CONFLICTS= php4-4* php4-cgi-4* mod_php4-4* .endif .else .if defined(WITHOUT_CLI) CONFLICTS= php4-4* php4-cli-4* php4-cgi-4* .endif .endif +CONFLICTS+= php5-5* php5-cli-5* mod_php5-5* php5-cgi-5* .if defined(WITHOUT_APACHE) CONFIGURE_ARGS+=--enable-discard-path PLIST_SUB+= APACHE="@comment " .else PLIST_SUB+= APACHE="" .endif .if defined(WITHOUT_CLI) CONFIGURE_ARGS+=--disable-cli PLIST_SUB+= CLI="@comment " .else MAN1= php.1 PLIST_SUB+= CLI="" .endif .if defined(WITHOUT_APACHE) && defined(WITHOUT_CLI) SAPI_FILE= "bin/php" .endif ALL_OPTIONS= BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DBASE DBX DOMXML \ DOMXSLT EXIF FILEPRO FRIBIDI FTP GD GDBM GETTEXT GMP HYPERWAVE \ ICONV IMAP INTERBASE INIFILE MBSTRING MCAL MCVE MCRYPT MHASH \ MIME MING MYSQL NCURSES OPENLDAP OPENSSL ORACLE OVERLOAD PCNTL \ PCRE PDFLIB POSIX POSTGRESQL PSPELL READLINE RECODE SESSION \ SHMOP SNMP SOCKETS SYBASEDB SYBASECT SYSVSEM SYSVSHM TOKENIZER \ UNIXODBC WDDX XML XMLRPC XSLT YAZ YP ZIP ZLIB .for opt in ${ALL_OPTIONS} .if defined(WITH_${opt}) || defined(WITHOUT_${opt}) BATCH= yes .endif .endfor .if !defined(BATCH) && !defined(PACKAGE_BUILDING) IS_INTERACTIVE= yes .endif PBDIR= ${PREFIX}/share/pear/boot .include .if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6) CONFIGURE_ARGS+=--disable-ipv6 .endif .if !defined(WITHOUT_APACHE) .if exists(${LOCALBASE}/include/apache2/apr.h) WITH_APACHE2= yes .endif APXS?= ${LOCALBASE}/sbin/apxs .if defined(WITH_APACHE2) APACHE_PORT?= ${PORTSDIR}/www/apache2 CONFIGURE_ARGS+=--with-apxs2=${APXS} SAPI_FILE= libexec/apache2/libphp4.so .else APACHE_PORT?= ${PORTSDIR}/www/apache13 CONFIGURE_ARGS+=--with-apxs=${APXS} SAPI_FILE= libexec/apache/libphp4.so .endif BUILD_DEPENDS+= ${APXS}:${APACHE_PORT} RUN_DEPENDS+= ${APXS}:${APACHE_PORT} PLIST_SUB+= APACHE="" .else PLIST_SUB+= APACHE="@comment " .endif PLIST_SUB+= SAPI_FILE=${SAPI_FILE} \ EXT_DIR=${EXT_DIR} WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work PHP4_OPTFILE?= ${HOME}/php4_options PHP4_OPTIONS?= CTYPE MYSQL OVERLOAD PCRE POSIX SESSION TOKENIZER XML ZLIB .for opt in ${ALL_OPTIONS} .if defined(WITH_${opt}) SEL_OPTIONS+= ${opt} .endif .endfor .for opt in ${PHP4_OPTIONS} .if !defined(WITHOUT_${opt}) SEL_OPTIONS+= ${opt} .endif SCRIPTS_ENV+= WITH_${opt}=ON .endfor SCRIPTS_ENV+= SEL_OPTIONS="${SEL_OPTIONS}" \ OPTION_FILE="${PHP4_OPTFILE}" \ WRKDIR="${WRKDIR}" \ CAT="${CAT}" \ SED="${SED}" .ifmake describe WITH_MYSQL= yes WITH_XML= yes .endif .if exists(${WRKDIR}/Makefile.inc) .include "${WRKDIR}/Makefile.inc" .endif .if defined(WITH_CDB) || defined(WITH_GDBM) || defined(WITH_INIFILE) WITH_DBA= yes .endif .if defined(WITH_DOMXSLT) WITH_DOMXML= yes .endif .if defined(WITH_XMLRPC) || defined(WITH_XSLT) WITH_ICONV_DEP= yes .endif .if defined(WITH_SNMP) WITH_OPENSSL= yes .endif .if defined(WITH_XMLRPC) || defined(WITH_XSLT) WITH_XML_DEP= yes .endif .if defined(WITH_WDDX) WITH_XML= yes .endif .if defined(WITH_BCMATH) CONFIGURE_ARGS+=--enable-bcmath .endif .if defined(WITH_BZIP2) .if exists(/usr/bin/bzip2) BZIP2BASE= /usr .else BZIP2BASE= ${LOCALBASE} LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 .endif CONFIGURE_ARGS+=--with-bz2=${BZIP2BASE} .endif .if defined(WITH_CALENDAR) CONFIGURE_ARGS+=--enable-calendar .endif .if defined(WITH_CDB) CONFIGURE_ARGS+=--with-cdb .endif .if defined(WITH_CRACK) BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib RUN_DEPENDS+= ${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib CONFIGURE_ARGS+=--with-crack=${LOCALBASE} .endif .if defined(WITH_CTYPE) CONFIGURE_ARGS+=--enable-ctype .endif .if defined(WITH_CURL) LIB_DEPENDS+= curl.2:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+=--with-curl=${LOCALBASE} .endif .if defined(WITH_DBA) CONFIGURE_ARGS+=--enable-dba .endif .if defined(WITH_DBASE) CONFIGURE_ARGS+=--enable-dbase .endif .if defined(WITH_DBX) CONFIGURE_ARGS+=--enable-dbx .endif .if defined(WITH_DOMXML) LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 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-exif .endif .if defined(WITH_FILEPRO) 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 .if defined(WITH_GD) LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg CONFIGURE_ARGS+=--with-gd \ --enable-gd-native-ttf \ --enable-gd-jis-conv \ --with-freetype-dir=${LOCALBASE} \ --with-jpeg-dir=${LOCALBASE} \ --with-png-dir=${LOCALBASE} .if !defined(WITHOUT_X11) LIB_DEPENDS+= Xpm.4:${PORTSDIR}/x11/XFree86-4-libraries CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} .endif .if defined(WITH_LZW) CONFIGURE_ARGS+=--enable-gd-lzw-gif .endif .endif .if defined(WITH_GDBM) LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE} .endif .if defined(WITH_GETTEXT) LIB_DEPENDS+= intl.4:${PORTSDIR}/devel/gettext CONFIGURE_ARGS+=--with-gettext=${LOCALBASE} .endif .if defined(WITH_GMP) LIB_DEPENDS+= gmp.6:${PORTSDIR}/math/libgmp4 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 .if defined(WITH_ICONV) CONFIGURE_ARGS+=--with-iconv=${LOCALBASE} .endif .if defined(WITH_IMAP) LIB_DEPENDS+= c-client4.8:${PORTSDIR}/mail/cclient .if !exists(${LOCALBASE}/lib/libc-client4.so) .if !defined(WITHOUT_SSL) CONFIGURE_ARGS+=--with-imap=${LOCALBASE} --with-imap-ssl=${LOCALBASE} .else CONFIGURE_ARGS+=--with-imap=${LOCALBASE} .endif .else WITH_IMAP_SSL!=/usr/bin/ldd ${LOCALBASE}/lib/libc-client4.so | ${GREP} libssl || ${TRUE} .if !empty(WITH_IMAP_SSL) CONFIGURE_ARGS+=--with-imap=${LOCALBASE} --with-imap-ssl=${LOCALBASE} .else CONFIGURE_ARGS+=--with-imap=${LOCALBASE} .endif .endif .endif .if defined(WITH_INIFILE) CONFIGURE_ARGS+=--with-inifile .endif .if defined(WITH_INTERBASE) LIB_DEPENDS+= gds.1:${PORTSDIR}/databases/firebird CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}/firebird .endif .if defined(WITH_MBSTRING) CONFIGURE_ARGS+=--enable-mbstring --enable-mbregex .endif .if defined(WITH_MCAL) LIB_DEPENDS+= mcal.0:${PORTSDIR}/misc/libmcal CONFIGURE_ARGS+=--with-mcal=${LOCALBASE} .endif .if defined(WITH_MCVE) LIB_DEPENDS+= mcve.3:${PORTSDIR}/devel/libmcve CONFIGURE_ARGS+=--with-mcve=${LOCALBASE} .endif .if defined(WITH_MCRYPT) LIB_DEPENDS+= mcrypt.8:${PORTSDIR}/security/libmcrypt CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE} .endif .if defined(WITH_MHASH) LIB_DEPENDS+= mhash.2:${PORTSDIR}/security/mhash CONFIGURE_ARGS+=--with-mhash=${LOCALBASE} .endif .if defined(WITH_MIME) CONFIGURE_ARGS+=--with-mime-magic=/usr/share/misc/magic.mime .endif .if defined(WITH_MING) LIB_DEPENDS+= ming.3:${PORTSDIR}/graphics/ming CONFIGURE_ARGS+=--with-ming=${LOCALBASE} .endif .if defined(WITH_MYSQL) .if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.10) LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -.else -.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14) +.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14) LIB_DEPENDS+= mysqlclient.14:${PORTSDIR}/databases/mysql41-client .else LIB_DEPENDS+= mysqlclient.12:${PORTSDIR}/databases/mysql40-client .endif -.endif CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} .endif .if defined(WITH_NCURSES) .if ${OSVERSION} < 400000 NCURSESBASE= ${LOCALBASE} LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses .else NCURSESBASE= /usr .endif CONFIGURE_ARGS+=--with-ncurses=${NCURSESBASE} .endif .if defined(WITH_OPENLDAP) .if exists(${LOCALBASE}/lib/libldap.so.1) LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12 -.else +.elif exists(${LOCALBASE}/lib/libldap.la) +.if exists(${LOCALBASE}/bin/ldapwhoami) LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21 +.else +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20 +.endif +.else +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap22 .endif CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} .endif .if defined(WITH_OPENSSL) || defined(WITH_OPENSSL_DEP) .if exists(${LOCALBASE}/lib/libcrypto.so.3) OPENSSLBASE= ${LOCALBASE} LIB_DEPENDS+= crypto.3:${PORTSDIR}/security/openssl .else OPENSSLBASE= /usr .endif .endif .if defined(WITH_OPENSSL) CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} .endif .if defined(WITH_ORACLE) BUILD_DEPENDS+= ${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client RUN_DEPENDS+= ${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client 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=yes .endif .if defined(WITH_PDFLIB) LIB_DEPENDS+= pdf.5:${PORTSDIR}/print/pdflib CONFIGURE_ARGS+=--with-pdflib=${LOCALBASE} .endif .if defined(WITH_POSIX) CONFIGURE_ARGS+=--enable-posix .endif .if defined(WITH_POSTGRESQL) LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} .endif .if defined(WITH_PSPELL) LIB_DEPENDS+= aspell.15:${PORTSDIR}/textproc/aspell CONFIGURE_ARGS+=--with-pspell=${LOCALBASE} .endif .if defined(WITH_READLINE) CONFIGURE_ARGS+=--with-readline .endif .if defined(WITH_RECODE) LIB_DEPENDS+= recode.3:${PORTSDIR}/converters/recode CONFIGURE_ARGS+=--with-recode=${LOCALBASE} .endif .if defined(WITH_SESSION) CONFIGURE_ARGS+=--enable-session .endif .if defined(WITH_SHMOP) CONFIGURE_ARGS+=--enable-shmop .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} --enable-ucd-snmp-hack .endif .if defined(WITH_SOCKETS) CONFIGURE_ARGS+=--enable-sockets .endif .if defined(WITH_SYBASEDB) LIB_DEPENDS+= sybdb.3:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+=--with-sybase=${LOCALBASE} .endif .if defined(WITH_SYBASECT) LIB_DEPENDS+= ct.1:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE} .endif .if defined(WITH_SYSVSEM) CONFIGURE_ARGS+=--enable-sysvsem .endif .if defined(WITH_SYSVSHM) CONFIGURE_ARGS+=--enable-sysvshm .endif .if defined(WITH_TOKENIZER) CONFIGURE_ARGS+=--enable-tokenizer .endif .if defined(WITH_UNIXODBC) LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE} .endif .if defined(WITH_WDDX) CONFIGURE_ARGS+=--enable-wddx .endif .if defined(WITH_XML) || defined(WITH_XML_DEP) LIB_DEPENDS+= expat.4:${PORTSDIR}/textproc/expat2 .endif .if defined(WITH_XML) CONFIGURE_ARGS+=--enable-xml --with-expat-dir=${LOCALBASE} .endif .if defined(WITH_XMLRPC) CONFIGURE_ARGS+=--with-xmlrpc .endif .if defined(WITH_XSLT) LIB_DEPENDS+= sablot.70:${PORTSDIR}/textproc/sablotron CONFIGURE_ARGS+=--enable-xslt --with-xslt-sablot=${LOCALBASE} .endif .if defined(WITH_YAZ) LIB_DEPENDS+= yaz.2:${PORTSDIR}/net/yaz CONFIGURE_ARGS+=--with-yaz=${LOCALBASE}/bin .endif .if defined(WITH_YP) CONFIGURE_ARGS+=--enable-yp .endif .if defined(WITH_ZIP) LIB_DEPENDS+= zzip-0.10:${PORTSDIR}/devel/zziplib CONFIGURE_ARGS+=--with-zip=${LOCALBASE} .endif .if defined(WITH_ZLIB) CONFIGURE_ARGS+=--with-zlib=yes .endif pre-patch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php post-patch: @${SED} "s|%%PREFIX%%|${PREFIX}|g" \ ${WRKSRC}/pear/scripts/pearcmd.php > ${WRKSRC}/pear/scripts/pear pre-configure: @${ECHO_CMD} "" .if defined(WITH_IMAP) && defined(WITH_RECODE) @${ECHO_CMD} "You cannot define WITH_IMAP *and* WITH_RECODE!" @${FALSE} .endif .if defined(WITH_IMAP) && defined(WITH_YAZ) @${ECHO_CMD} "You cannot define WITH_IMAP *and* WITH_YAZ!" @${FALSE} .endif .if defined(WITH_RECODE) && defined(WITH_YAZ) @${ECHO_CMD} "You cannot define WITH_RECODE *and* WITH_YAZ!" @${FALSE} .endif .if defined(WITH_SYBASEDB) && defined(WITH_SYBASECT) @${ECHO_CMD} "You cannot define WITH_SYBASEDB *and* WITH_SYBASECT!" @${FALSE} .endif .if defined(WITH_GD) && !defined(WITH_LZW) @${ECHO_CMD} "To enable LZW-compressed GIF support in GD define the WITH_LZW knob." @${ECHO_CMD} "" .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/php4-cli for Command Line Interpreter only" @${ECHO_CMD} " www/php4-cgi for Common Gateway Interface only" @${ECHO_CMD} " www/mod_php4 for Apache Module only" @${ECHO_CMD} "" .endif .if !defined(WITHOUT_CLI) post-build: @${ECHO_CMD} "You may run the tests from the PHP test framework, typing 'make test' now." @${ECHO_CMD} "(It is safe to ignore errors about timestamp-related tests," @${ECHO_CMD} "since they are due to the different FreeBSD mktime() implementation)." @${ECHO_CMD} "" test: all @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${.TARGET}) .endif post-install: .if !defined(WITHOUT_CLI) @${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 .if !defined(WITHOUT_APACHE) @${ECHO_CMD} "*****************************************************************************" @${ECHO_CMD} "" @${ECHO_CMD} "Make sure index.php is part of your DirectoryIndex." @${ECHO_CMD} "" @${ECHO_CMD} "You should add the following lines to your Apache configuration file:" @${ECHO_CMD} "" @${ECHO_CMD} "AddType application/x-httpd-php .php" @${ECHO_CMD} "AddType application/x-httpd-php-source .phps" @${ECHO_CMD} "" @${ECHO_CMD} "*****************************************************************************" .endif .include Property changes on: head/lang/php4/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.19 \ No newline at end of property +1.20 \ No newline at end of property Index: head/lang/php4/distinfo =================================================================== --- head/lang/php4/distinfo (revision 86027) +++ head/lang/php4/distinfo (revision 86028) @@ -1 +1 @@ -MD5 (php-4.3.3RC1.tar.bz2) = 2b3b4866bedd073d505c554c551fef92 +MD5 (php-4.3.3RC2.tar.bz2) = bc8cda0bd523c653d0900a460117c2af Property changes on: head/lang/php4/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/lang/php4/files/patch-configure =================================================================== --- head/lang/php4/files/patch-configure (revision 86027) +++ head/lang/php4/files/patch-configure (revision 86028) @@ -1,398 +1,476 @@ ---- configure.orig Thu Jun 19 00:06:29 2003 -+++ configure Sat Jun 28 16:45:44 2003 -@@ -597,6 +597,8 @@ +--- configure.orig Thu Jul 31 00:51:41 2003 ++++ configure Thu Jul 31 08:56:35 2003 +@@ -616,6 +616,8 @@ ac_help="$ac_help --enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support." ac_help="$ac_help + --enable-gd-lzw-gif GD: Enable LZW-compressed GIF support." +ac_help="$ac_help --with-gettext[=DIR] Include GNU gettext support." ac_help="$ac_help --with-gmp Include GNU MP support" -@@ -28224,6 +28226,31 @@ +@@ -29141,6 +29143,31 @@ +echo $ac_n "checking whether to enable LZW-compressed GIF support in GD""... $ac_c" 1>&6 +echo "configure:28220: checking whether to enable LZW-compressed GIF support in GD" >&5 +# Check whether --enable-gd-lzw-gif or --disable-gd-lzw-gif was given. +if test "${enable_gd_lzw_gif+set}" = set; then + enableval="$enable_gd_lzw_gif" + PHP_GD_LZW_GIF=$enableval +else + + PHP_GD_LZW_GIF=no + + if test "$PHP_ENABLE_ALL" && test "no" = "yes"; then + PHP_GD_LZW_GIF=$PHP_ENABLE_ALL + fi + +fi + + +ext_output=$PHP_GD_LZW_GIF +echo "$ac_t""$ext_output" 1>&6 + + + + + + -@@ -28248,7 +28275,7 @@ +@@ -29293,7 +29320,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/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c libgd/gd_topal.c libgd/gd_gif_in.c \ + libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c libgd/gd_topal.c libgd/gd_gif_in.c libgd/gd_biggif_out.c libgd/gd_lzw_out.c libgd/gd_gif_out.c \ libgd/xbm.c" for ac_func in fabsf floorf -@@ -28323,6 +28350,11 @@ +@@ -29368,6 +29395,11 @@ fi + if test "$PHP_GD_LZW_GIF" = "yes"; then + USE_GD_LZW_GIF=1 + fi + + if test "$PHP_JPEG_DIR" != "no"; then for i in /usr /usr/local $PHP_JPEG_DIR; do -@@ -29724,6 +29756,9 @@ +@@ -31077,6 +31109,9 @@ cat >> confdefs.h <<\EOF #define HAVE_GD_BUNDLED 1 +#define HAVE_GD_GIF_CREATE 1 +#define HAVE_GD_GIF_CTX 1 +#define HAVE_GD_GIF_ANIM 1 EOF cat >> confdefs.h <<\EOF -@@ -29774,6 +29809,14 @@ +@@ -31127,6 +31162,14 @@ GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208" fi + if test -n "$USE_GD_LZW_GIF"; then + cat >> confdefs.h <<\EOF +#define LZW_LICENCED 1 +EOF + + GDLIB_CFLAGS="$GDLIB_CFLAGS -DLZW_LICENCED" + fi + else if test "$PHP_GD" != "no"; then -@@ -32275,6 +32318,60 @@ - - save_old_LDFLAGS=$LDFLAGS - LDFLAGS=" -L$GD_LIB $GD_SHARED_LIBADD $LDFLAGS" +@@ -35474,6 +35517,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_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lgd $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +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 -+ LDFLAGS=" -L$GD_LIB $GD_SHARED_LIBADD $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:32280: checking for gdCacheCreate in -lgd" >&5 + echo "configure:35479: checking for gdCacheCreate in -lgd" >&5 ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'` -@@ -54325,8 +54422,8 @@ +@@ -58977,8 +59151,8 @@ echo $ac_n "checking Oracle version""... $ac_c" 1>&6 - echo "configure:54328: checking Oracle version" >&5 + echo "configure:58980: 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 + ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/ocommon/install/partial.prd | sed 's/ */:/g' | cut -d: -f 6 | cut -c 2-4` 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 -@@ -56589,6 +56686,102 @@ +@@ -60270,6 +60444,102 @@ if test "$ext_shared" = "yes"; then + ORACLE_SHARED_LIBADD="-lwrap $ORACLE_SHARED_LIBADD" + if test -n "$ORACLE_DIR/lib"; then + + if test "$ORACLE_DIR/lib" != "/usr/lib"; then + + if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then + ai_p=$ORACLE_DIR/lib + else + + ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`" + fi + + + if test "$ext_shared" = "yes"; then + ORACLE_SHARED_LIBADD="$ld_runpath_switch$ai_p -L$ai_p $ORACLE_SHARED_LIBADD" + 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 + + fi + else + + + if test -n "$ORACLE_DIR/lib"; then + + if test "$ORACLE_DIR/lib" != "/usr/lib"; then + + if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then + ai_p=$ORACLE_DIR/lib + else + + ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`" + fi + + + + + + 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 + + + case wrap in + c|c_r|pthread*) ;; + *) + LIBS="-lwrap $LIBS" + ;; + esac + + + + + fi + + + + + if test "$ext_shared" = "yes"; then ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD" if test -n "$ORACLE_DIR/lib"; then -@@ -71130,29 +71323,6 @@ +@@ -76670,29 +76940,6 @@ else - case cs in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" - else - - - case cs in - c|c_r|pthread*) ;; - *) - LIBS="-lcs $LIBS" - ;; - esac - - - fi - ;; - esac - - - - case ct in c|c_r|pthread*) ;; *) -@@ -71176,52 +71346,7 @@ +@@ -76716,52 +76963,7 @@ - case comn in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD" - else - - - case comn in - c|c_r|pthread*) ;; - *) - LIBS="-lcomn $LIBS" - ;; - esac - - - fi - ;; - esac - - - - - case intl in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD" - else - - - case intl in - c|c_r|pthread*) ;; - *) - LIBS="-lintl $LIBS" - ;; - esac - - - fi - ;; - esac - - - - SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl" + SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct" save_old_LDFLAGS=$LDFLAGS -@@ -71291,37 +71416,6 @@ +@@ -76907,38 +77109,6 @@ -else - echo "$ac_t""no" 1>&6 - - LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared - unset ac_cv_func_tcl - - - - case sybtcl in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then - SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" - else - - - case sybtcl in - c|c_r|pthread*) ;; - *) - LIBS="-lsybtcl $LIBS" - ;; - esac - - - fi - ;; - esac - - - - fi -@@ -84252,10 +84346,7 @@ +@@ -90711,10 +90881,7 @@ CXXFLAGS="$CXXFLAGS $standard_libtool_flag" all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)' -install_targets="install-sapi install-modules $install_pear install-build install-headers install-programs" -if test "$PHP_SAPI" != "cgi"; then - install_targets="$PHP_INSTALL_CLI_TARGET $install_targets" -fi +install_targets="install-sapi $PHP_INSTALL_CLI_TARGET install-modules $install_pear install-build install-headers install-programs" PHP_VAR_SUBST="$PHP_VAR_SUBST all_targets" Property changes on: head/lang/php4/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/lang/php4/pkg-plist =================================================================== --- head/lang/php4/pkg-plist (revision 86027) +++ head/lang/php4/pkg-plist (revision 86028) @@ -1,249 +1,250 @@ %%CLI%%bin/pear %%CLI%%bin/php bin/php-config bin/phpextdist bin/phpize etc/php.ini-dist etc/php.ini-recommended include/php/TSRM/TSRM.h include/php/TSRM/acconfig.h include/php/TSRM/readdir.h include/php/TSRM/tsrm_config.h include/php/TSRM/tsrm_config.nw.h include/php/TSRM/tsrm_config.w32.h include/php/TSRM/tsrm_config_common.h include/php/TSRM/tsrm_nw.h include/php/TSRM/tsrm_strtok_r.h include/php/TSRM/tsrm_virtual_cwd.h include/php/TSRM/tsrm_win32.h include/php/Zend/FlexLexer.h include/php/Zend/acconfig.h include/php/Zend/zend.h include/php/Zend/zend_API.h include/php/Zend/zend_alloc.h include/php/Zend/zend_builtin_functions.h include/php/Zend/zend_compile.h include/php/Zend/zend_config.h include/php/Zend/zend_config.w32.h include/php/Zend/zend_constants.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_globals.h include/php/Zend/zend_globals_macros.h include/php/Zend/zend_hash.h include/php/Zend/zend_highlight.h include/php/Zend/zend_indent.h include/php/Zend/zend_ini.h include/php/Zend/zend_ini_parser.h include/php/Zend/zend_ini_scanner.h include/php/Zend/zend_istdiostream.h include/php/Zend/zend_language_parser.h include/php/Zend/zend_language_scanner.h include/php/Zend/zend_list.h include/php/Zend/zend_llist.h include/php/Zend/zend_modules.h include/php/Zend/zend_multibyte.h include/php/Zend/zend_multiply.h include/php/Zend/zend_operators.h include/php/Zend/zend_ptr_stack.h include/php/Zend/zend_qsort.h include/php/Zend/zend_stack.h include/php/Zend/zend_static_allocator.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/mbfilter.h include/php/ext/mbstring/mbfilter_cn.h include/php/ext/mbstring/mbfilter_ja.h include/php/ext/mbstring/mbfilter_kr.h include/php/ext/mbstring/mbfilter_ru.h include/php/ext/mbstring/mbfilter_tw.h include/php/ext/mbstring/mbregex.h include/php/ext/mbstring/mbstring.h include/php/ext/mbstring/php_mbregex.h include/php/ext/mbstring/php_unicode.h include/php/ext/mbstring/unicode_data.h include/php/ext/mbstring/unicode_table.h include/php/ext/mbstring/unicode_table_cn.h include/php/ext/mbstring/unicode_table_ja.h include/php/ext/mbstring/unicode_table_kr.h include/php/ext/mbstring/unicode_table_ru.h include/php/ext/mbstring/unicode_table_tw.h include/php/ext/pgsql/php_pgsql.h include/php/ext/session/mod_files.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/credits.h include/php/ext/standard/credits_ext.h include/php/ext/standard/credits_sapi.h include/php/ext/standard/css.h include/php/ext/standard/cyr_convert.h include/php/ext/standard/datetime.h include/php/ext/standard/dl.h include/php/ext/standard/dns.h include/php/ext/standard/exec.h include/php/ext/standard/file.h include/php/ext/standard/flock_compat.h include/php/ext/standard/fsock.h include/php/ext/standard/head.h include/php/ext/standard/html.h include/php/ext/standard/info.h include/php/ext/standard/md5.h include/php/ext/standard/microtime.h include/php/ext/standard/pack.h include/php/ext/standard/pageinfo.h include/php/ext/standard/parsedate.h include/php/ext/standard/php_array.h include/php/ext/standard/php_assert.h include/php/ext/standard/php_browscap.h include/php/ext/standard/php_crypt.h include/php/ext/standard/php_dir.h include/php/ext/standard/php_ext_syslog.h include/php/ext/standard/php_filestat.h include/php/ext/standard/php_fopen_wrappers.h include/php/ext/standard/php_ftok.h include/php/ext/standard/php_image.h include/php/ext/standard/php_incomplete_class.h include/php/ext/standard/php_iptc.h include/php/ext/standard/php_lcg.h include/php/ext/standard/php_link.h include/php/ext/standard/php_mail.h include/php/ext/standard/php_math.h include/php/ext/standard/php_metaphone.h include/php/ext/standard/php_parsedate.h include/php/ext/standard/php_rand.h include/php/ext/standard/php_smart_str.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_type.h include/php/ext/standard/php_var.h include/php/ext/standard/php_versioning.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/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/ascii.h include/php/ext/xml/expat/asciitab.h include/php/ext/xml/expat/expat.h include/php/ext/xml/expat/iasciitab.h +include/php/ext/xml/expat/internal.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/config.nw.h include/php/main/config.w32.h include/php/main/fopen_wrappers.h include/php/main/internal_functions_registry.h include/php/main/logos.h include/php/main/php.h include/php/main/php3_compat.h include/php/main/php_compat.h include/php/main/php_config.h include/php/main/php_content_types.h include/php/main/php_embed.h include/php/main/php_globals.h include/php/main/php_ini.h include/php/main/php_logos.h include/php/main/php_main.h include/php/main/php_memory_streams.h include/php/main/php_network.h include/php/main/php_open_temporary_file.h include/php/main/php_output.h include/php/main/php_reentrancy.h include/php/main/php_regex.h include/php/main/php_scandir.h include/php/main/php_streams.h include/php/main/php_syslog.h include/php/main/php_ticks.h include/php/main/php_variables.h include/php/main/php_version.h include/php/main/rfc1867.h include/php/main/safe_mode.h include/php/main/snprintf.h include/php/main/spprintf.h include/php/main/win95nt.h include/php/regex/cclass.h include/php/regex/cname.h include/php/regex/regex.h include/php/regex/regex2.h include/php/regex/regex_extra.h include/php/regex/utils.h lib/php/%%EXT_DIR%%/.php lib/php/build/Makefile.global lib/php/build/acinclude.m4 lib/php/build/mkdep.awk lib/php/build/phpize.m4 lib/php/build/scan_makefile_in.awk lib/php/build/shtool %%SAPI_FILE%% %%APACHE%%@exec %D/sbin/apxs -e -a -n php4 %f %%APACHE%%@unexec %D/sbin/apxs -e -A -n php4 %f %%CLI%%share/pear/bootstrap/Archive/Tar.php %%CLI%%share/pear/bootstrap/PEAR.php %%CLI%%share/pear/bootstrap/System.php %%CLI%%share/pear/bootstrap/Console/Getopt.php %%CLI%%share/pear/bootstrap/OS/Guess.php %%CLI%%share/pear/bootstrap/PEAR/Command/Auth.php %%CLI%%share/pear/bootstrap/PEAR/Command/Build.php %%CLI%%share/pear/bootstrap/PEAR/Command/Common.php %%CLI%%share/pear/bootstrap/PEAR/Command/Config.php %%CLI%%share/pear/bootstrap/PEAR/Command/Install.php %%CLI%%share/pear/bootstrap/PEAR/Command/Package.php %%CLI%%share/pear/bootstrap/PEAR/Command/Registry.php %%CLI%%share/pear/bootstrap/PEAR/Command/Remote.php %%CLI%%share/pear/bootstrap/PEAR/Autoloader.php %%CLI%%share/pear/bootstrap/PEAR/Builder.php %%CLI%%share/pear/bootstrap/PEAR/Command.php %%CLI%%share/pear/bootstrap/PEAR/Common.php %%CLI%%share/pear/bootstrap/PEAR/Config.php %%CLI%%share/pear/bootstrap/PEAR/Dependency.php %%CLI%%share/pear/bootstrap/PEAR/Installer.php %%CLI%%share/pear/bootstrap/PEAR/Packager.php %%CLI%%share/pear/bootstrap/PEAR/Registry.php %%CLI%%share/pear/bootstrap/PEAR/Remote.php %%CLI%%share/pear/bootstrap/PEAR/Frontend/CLI.php @dirrm include/php/TSRM @dirrm include/php/Zend @dirrm include/php/ext/mbstring @dirrm include/php/ext/pgsql @dirrm include/php/ext/session @dirrm include/php/ext/standard @dirrm include/php/ext/xml/expat @dirrm include/php/ext/xml @dirrm include/php/ext @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%%@dirrm share/pear/bootstrap/Archive %%CLI%%@dirrm share/pear/bootstrap/Console %%CLI%%@dirrm share/pear/bootstrap/OS %%CLI%%@dirrm share/pear/bootstrap/PEAR/Command %%CLI%%@dirrm share/pear/bootstrap/PEAR/Frontend %%CLI%%@dirrm share/pear/bootstrap/PEAR %%CLI%%@dirrm share/pear/bootstrap %%CLI%%@unexec rmdir %D/share/pear 2> /dev/null || true Property changes on: head/lang/php4/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/lang/php4/scripts/configure.php =================================================================== --- head/lang/php4/scripts/configure.php (revision 86027) +++ head/lang/php4/scripts/configure.php (revision 86028) @@ -1,107 +1,107 @@ #!/bin/sh # $FreeBSD$ if [ -f ${WRKDIR}/Makefile.inc ]; then exit fi tempfile=`/usr/bin/mktemp -t checklist` if [ "${BATCH}" ]; then echo "${SEL_OPTIONS}" > $tempfile else if [ -f "${OPTION_FILE}" ]; then for i in `${CAT} ${OPTION_FILE}` do export $i done fi - /usr/bin/dialog --title "configuration options" --clear --checklist "\n\ + /usr/bin/dialog --title "PHP configuration options" --clear --checklist "\n\ Please select desired options:" -1 -1 16 \ BCMATH "bc style precision math functions" ${WITH_BCMATH:-OFF} \ BZIP2 "bzip2 library support" ${WITH_BZIP2:-OFF} \ CALENDAR "calendar conversion support" ${WITH_CALENDAR:-OFF} \ CDB "cdb database support (dba)" ${WITH_CDB:-OFF} \ CRACK "crack support" ${WITH_CRACK:-OFF} \ CTYPE "ctype functions" ${WITH_CTYPE:-OFF} \ CURL "CURL support" ${WITH_CURL:-OFF} \ DBASE "dBase library support" ${WITH_DBASE:-OFF} \ DBX "dbx support" ${WITH_DBX:-OFF} \ DOMXML "DOM support" ${WITH_DOMXML:-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} \ INTERBASE "Interbase 6 database support (Firebird)" ${WITH_INTERBASE:-OFF} \ MBSTRING "multibyte string support" ${WITH_MBSTRING:-OFF} \ MCAL "Modular Calendar Access Library support" ${WITH_MCAL:-OFF} \ MCVE "MCVE support" ${WITH_MCVE:-OFF} \ MCRYPT "Encryption support" ${WITH_MCRYPT:-OFF} \ MHASH "Crypto-hashing support" ${WITH_MHASH:-OFF} \ MIME "mime_magic support" ${WITH_MIME:-OFF} \ MING "ming shockwave flash support" ${WITH_MING:-OFF} \ MYSQL "MySQL database support" ${WITH_MYSQL:-OFF} \ NCURSES "ncurses support (CLI only)" ${WITH_NCURSES:-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} \ POSIX "POSIX-like functions" ${WITH_POSIX:-OFF} \ POSTGRESQL "PostgreSQL database support" ${WITH_POSTGRESQL:-OFF} \ PSPELL "pspell support" ${WITH_PSPELL:-OFF} \ READLINE "readline support (CLI only)" ${WITH_READLINE:-OFF} \ RECODE "recode support" ${WITH_RECODE:-OFF} \ SESSION "session support" ${WITH_SESSION:-OFF} \ SHMOP "shmop support" ${WITH_SHMOP:-OFF} \ SNMP "SNMP support (implies OPENSSL)" ${WITH_SNMP:-OFF} \ SOCKETS "sockets support" ${WITH_SOCKETS:-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} \ SYSVSHM "System V shared memory support" ${WITH_SYSVSHM:-OFF} \ TOKENIZER "tokenizer support" ${WITH_TOKENIZER:-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" ${WITH_XMLRPC:-OFF} \ XSLT "XSLT Sablotron support" ${WITH_XSLT:-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 retval=$? if [ -s $tempfile ]; then set `${CAT} $tempfile | ${SED} 's|"||g'` fi rm -f $tempfile case $retval in 0) if [ -z "$*" ]; then echo "Nothing selected" fi ;; 1) echo "Cancel pressed." exit 1 ;; esac exec > ${WRKDIR}/Makefile.inc while [ $1 ]; do echo "WITH_$1=yes"; shift done Property changes on: head/lang/php4/scripts/configure.php ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property