mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-01 05:45:45 +00:00
o Update to 5.0.0a4 snapshot.
o Add TIDY extension. o Remove MCAL extension. o Remove patch-ext::standard::datetime.c file. PR: ports/60504 Submitted by: Alex Dupre <sysadmin@alexdupre.com> (maintainer)
This commit is contained in:
parent
2989f4c752
commit
8afc958fbc
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=96451
@ -20,8 +20,8 @@
|
||||
#
|
||||
|
||||
PORTNAME= php5
|
||||
PORTVERSION= 5.0.0.a3
|
||||
PORTREVISION= 2
|
||||
PORTVERSION= 5.0.0.a4
|
||||
PORTREVISION= 0
|
||||
CATEGORIES?= lang devel www
|
||||
MASTER_SITES= http://www.php.net/distributions/:release \
|
||||
http://it.php.net/distributions/:release \
|
||||
@ -48,7 +48,7 @@ DISTNAME= php-${PORTVERSION:S/.a/a/}
|
||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:rc
|
||||
|
||||
MAINTAINER?= sysadmin@alexdupre.com
|
||||
COMMENT= PHP Scripting Language (Apache Module and CLI)
|
||||
COMMENT?= PHP Scripting Language (Apache Module and CLI)
|
||||
.if defined(WITHOUT_APACHE)
|
||||
.if defined(WITHOUT_CLI)
|
||||
COMMENT= PHP Common Gateway Interface
|
||||
@ -65,6 +65,7 @@ USE_BZIP2= yes
|
||||
USE_SUBMAKE= yes
|
||||
GNU_CONFIGURE= yes
|
||||
USE_BISON= yes
|
||||
USE_REINPLACE= yes
|
||||
|
||||
CONFIGURE_ARGS= --enable-versioning \
|
||||
--enable-memory-limit \
|
||||
@ -106,7 +107,11 @@ CONFLICTS= php5-5* php5-cli-5* php5-cgi-5*
|
||||
CONFLICTS+= php4-4* php4-cli-4* mod_php4-4* php4-cgi-4*
|
||||
|
||||
.if defined(WITHOUT_APACHE)
|
||||
.if defined(WITHOUT_CLI)
|
||||
CONFIGURE_ARGS+=--enable-discard-path
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-cgi
|
||||
.endif
|
||||
PLIST_SUB+= APACHE="@comment "
|
||||
.else
|
||||
PLIST_SUB+= APACHE=""
|
||||
@ -130,11 +135,11 @@ SAPI_FILE= "bin/php"
|
||||
|
||||
ALL_OPTIONS= BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX DOM \
|
||||
EXIF FILEPRO FTP GD GDBM GETTEXT GMP ICONV IMAP INTERBASE \
|
||||
INIFILE MBSTRING MCAL MCVE MCRYPT MHASH MIME MING MNOGOSEARCH \
|
||||
INIFILE MBSTRING MCVE MCRYPT MHASH MIME MING MNOGOSEARCH \
|
||||
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
|
||||
SOCKETS SQLITE SYBASEDB SYBASECT SYSVSEM SYSVSHM TIDY \
|
||||
TOKENIZER UNIXODBC WDDX XML XMLRPC XSL YAZ YP ZLIB
|
||||
|
||||
.for opt in ${ALL_OPTIONS}
|
||||
.if defined(WITH_${opt}) || defined(WITHOUT_${opt})
|
||||
@ -176,6 +181,11 @@ SCRIPTS_ENV+= SEL_OPTIONS="${SEL_OPTIONS}" \
|
||||
.include "${WRKDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR)
|
||||
WITH_PCRE= yes
|
||||
WITH_XML= yes
|
||||
.endif
|
||||
|
||||
.if defined(WITH_CDB) || defined(WITH_DB4) || defined(WITH_GDBM) || defined(WITH_INIFILE)
|
||||
WITH_DBA= yes
|
||||
.endif
|
||||
@ -326,11 +336,6 @@ CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}/firebird
|
||||
CONFIGURE_ARGS+=--enable-mbstring
|
||||
.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}
|
||||
@ -462,6 +467,11 @@ CONFIGURE_ARGS+=--enable-sysvsem
|
||||
CONFIGURE_ARGS+=--enable-sysvshm
|
||||
.endif
|
||||
|
||||
.if defined(WITH_TIDY)
|
||||
LIB_DEPENDS+= tidy-0.99.0:${PORTSDIR}/www/tidy-lib
|
||||
CONFIGURE_ARGS+=--with-tidy=${LOCALBASE}
|
||||
.endif
|
||||
|
||||
.if defined(WITH_TOKENIZER)
|
||||
CONFIGURE_ARGS+=--enable-tokenizer
|
||||
.endif
|
||||
@ -531,8 +541,7 @@ BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT}
|
||||
RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT}
|
||||
.endif
|
||||
|
||||
PLIST_SUB+= SAPI_FILE=${SAPI_FILE} \
|
||||
EXT_DIR=${EXT_DIR}
|
||||
PLIST_SUB+= SAPI_FILE=${SAPI_FILE}
|
||||
|
||||
.if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
|
||||
CONFIGURE_ARGS+=--disable-ipv6
|
||||
@ -579,6 +588,8 @@ pre-patch:
|
||||
@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e "s|orainst/unix.rgs|ocommon/install/partial.prd|g" \
|
||||
${WRKSRC}/configure
|
||||
@${SED} "s|%%PREFIX%%|${PREFIX}|g" \
|
||||
${WRKSRC}/pear/scripts/pearcmd.php > ${WRKSRC}/pear/scripts/pear
|
||||
|
||||
@ -604,11 +615,6 @@ pre-configure:
|
||||
@${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} ""
|
||||
@ -662,8 +668,6 @@ post-install:
|
||||
@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
|
||||
@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
|
||||
@${INSTALL_DATA} ${WRKDIR}/php.conf ${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} ""
|
||||
|
@ -1 +1 @@
|
||||
MD5 (php-5.0.0a3.tar.bz2) = f83cc6b735ccf312045d9178d107874f
|
||||
MD5 (php-5.0.0a4.tar.bz2) = 3fa6dcb3401c9085a51afadce7367cf8
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- configure.orig Tue Jul 15 00:32:50 2003
|
||||
+++ configure Tue Jul 15 01:44:37 2003
|
||||
@@ -620,6 +620,8 @@
|
||||
--- configure.orig Mon Dec 22 10:01:56 2003
|
||||
+++ configure Mon Dec 22 10:19:16 2003
|
||||
@@ -622,6 +622,8 @@
|
||||
ac_help="$ac_help
|
||||
--enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support."
|
||||
ac_help="$ac_help
|
||||
@ -8,8 +8,8 @@
|
||||
+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 @@
|
||||
--with-gmp[=DIR] Include GNU MP support"
|
||||
@@ -29640,6 +29642,31 @@
|
||||
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
|
||||
|
||||
|
||||
@@ -29528,7 +29555,7 @@
|
||||
@@ -29792,7 +29819,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 \
|
||||
@ -50,7 +50,7 @@
|
||||
libgd/xbm.c"
|
||||
|
||||
for ac_func in fabsf floorf
|
||||
@@ -29603,6 +29630,11 @@
|
||||
@@ -29867,6 +29894,11 @@
|
||||
fi
|
||||
|
||||
|
||||
@ -61,8 +61,8 @@
|
||||
+
|
||||
if test "$PHP_JPEG_DIR" != "no"; then
|
||||
|
||||
for i in /usr /usr/local $PHP_JPEG_DIR; do
|
||||
@@ -31314,6 +31346,9 @@
|
||||
for i in $PHP_JPEG_DIR /usr/local /usr; do
|
||||
@@ -31580,6 +31612,9 @@
|
||||
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_GD_BUNDLED 1
|
||||
@ -72,7 +72,7 @@
|
||||
EOF
|
||||
|
||||
cat >> confdefs.h <<\EOF
|
||||
@@ -31364,6 +31399,14 @@
|
||||
@@ -31634,6 +31669,14 @@
|
||||
GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
|
||||
fi
|
||||
|
||||
@ -87,7 +87,7 @@
|
||||
else
|
||||
|
||||
if test "$PHP_GD" != "no"; then
|
||||
@@ -35713,6 +35756,137 @@
|
||||
@@ -35985,6 +36028,137 @@
|
||||
esac
|
||||
done
|
||||
|
||||
@ -223,20 +223,9 @@
|
||||
+ done
|
||||
+
|
||||
echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
|
||||
echo "configure:35718: checking for gdCacheCreate in -lgd" >&5
|
||||
echo "configure:35990: 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:59505: 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
|
||||
@@ -58359,6 +58533,102 @@
|
||||
@@ -60181,6 +60355,102 @@
|
||||
|
||||
|
||||
if test "$ext_shared" = "yes"; then
|
||||
@ -339,7 +328,7 @@
|
||||
ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
|
||||
if test -n "$ORACLE_DIR/lib"; then
|
||||
|
||||
@@ -77889,29 +78159,6 @@
|
||||
@@ -79683,29 +79953,6 @@
|
||||
else
|
||||
|
||||
|
||||
@ -369,7 +358,7 @@
|
||||
case ct in
|
||||
c|c_r|pthread*) ;;
|
||||
*)
|
||||
@@ -77935,52 +78182,7 @@
|
||||
@@ -79729,52 +79976,7 @@
|
||||
|
||||
|
||||
|
||||
@ -423,10 +412,21 @@
|
||||
|
||||
|
||||
save_old_LDFLAGS=$LDFLAGS
|
||||
@@ -78126,38 +78328,6 @@
|
||||
|
||||
|
||||
|
||||
@@ -79909,38 +80111,6 @@
|
||||
c|c_r|pthread*) ;;
|
||||
*)
|
||||
LIBS="-ltcl $LIBS"
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
-
|
||||
- fi
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-else
|
||||
- echo "$ac_t""no" 1>&6
|
||||
-
|
||||
@ -448,29 +448,6 @@
|
||||
- c|c_r|pthread*) ;;
|
||||
- *)
|
||||
- LIBS="-lsybtcl $LIBS"
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
-
|
||||
- fi
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
@@ -89822,10 +89992,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"
|
||||
|
@ -1,17 +0,0 @@
|
||||
--- ext/standard/datetime.c.orig Tue Aug 26 11:06:04 2003
|
||||
+++ ext/standard/datetime.c Tue Aug 26 11:07:27 2003
|
||||
@@ -116,7 +116,13 @@
|
||||
/* Let DST be unknown. mktime() should compute the right value
|
||||
** and behave correctly. Unless the user overrides this.
|
||||
*/
|
||||
- ta->tm_isdst = -1;
|
||||
+ if (gm) {
|
||||
+ ta->tm_isdst = 0;
|
||||
+ is_dst = 0;
|
||||
+ } else {
|
||||
+ ta->tm_isdst = -1;
|
||||
+ is_dst = -1;
|
||||
+ }
|
||||
|
||||
/*
|
||||
** Now change date values with supplied parameters.
|
@ -140,7 +140,6 @@ 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/php_xml.h
|
||||
include/php/main/SAPI.h
|
||||
include/php/main/build-defs.h
|
||||
@ -189,7 +188,6 @@ 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
|
||||
@ -220,6 +218,7 @@ lib/php/build/shtool
|
||||
%%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/Downloader.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
|
||||
@ -233,14 +232,12 @@ lib/php/build/shtool
|
||||
@dirrm include/php/ext/sqlite/libsqlite
|
||||
@dirrm include/php/ext/sqlite
|
||||
@dirrm include/php/ext/standard
|
||||
@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
|
||||
|
@ -41,7 +41,6 @@ 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 (implies OPENSSL)" ${WITH_MCVE:-OFF} \
|
||||
MCRYPT "Encryption support" ${WITH_MCRYPT:-OFF} \
|
||||
MHASH "Crypto-hashing support" ${WITH_MHASH:-OFF} \
|
||||
@ -71,6 +70,7 @@ 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} \
|
||||
TIDY "TIDY support" ${WITH_TIDY:-OFF} \
|
||||
TOKENIZER "tokenizer support" ${WITH_TOKENIZER:-OFF} \
|
||||
UNIXODBC "unixODBC support" ${WITH_UNIXODBC:-OFF} \
|
||||
WDDX "WDDX support (implies XML)" ${WITH_WDDX:-OFF} \
|
||||
|
@ -21,7 +21,6 @@ WITH_IMAP=OFF
|
||||
WITH_INIFILE=OFF
|
||||
WITH_INTERBASE=OFF
|
||||
WITH_MBSTRING=OFF
|
||||
WITH_MCAL=OFF
|
||||
WITH_MCVE=OFF
|
||||
WITH_MCRYPT=OFF
|
||||
WITH_MHASH=OFF
|
||||
@ -51,6 +50,7 @@ WITH_SYBASEDB=OFF
|
||||
WITH_SYBASECT=OFF
|
||||
WITH_SYSVSEM=OFF
|
||||
WITH_SYSVSHM=OFF
|
||||
WITH_TIDY=OFF
|
||||
WITH_TOKENIZER=ON
|
||||
WITH_UNIXODBC=OFF
|
||||
WITH_WDDX=OFF
|
||||
|
@ -20,8 +20,8 @@
|
||||
#
|
||||
|
||||
PORTNAME= php5
|
||||
PORTVERSION= 5.0.0.a3
|
||||
PORTREVISION= 2
|
||||
PORTVERSION= 5.0.0.a4
|
||||
PORTREVISION= 0
|
||||
CATEGORIES?= lang devel www
|
||||
MASTER_SITES= http://www.php.net/distributions/:release \
|
||||
http://it.php.net/distributions/:release \
|
||||
@ -48,7 +48,7 @@ DISTNAME= php-${PORTVERSION:S/.a/a/}
|
||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:rc
|
||||
|
||||
MAINTAINER?= sysadmin@alexdupre.com
|
||||
COMMENT= PHP Scripting Language (Apache Module and CLI)
|
||||
COMMENT?= PHP Scripting Language (Apache Module and CLI)
|
||||
.if defined(WITHOUT_APACHE)
|
||||
.if defined(WITHOUT_CLI)
|
||||
COMMENT= PHP Common Gateway Interface
|
||||
@ -65,6 +65,7 @@ USE_BZIP2= yes
|
||||
USE_SUBMAKE= yes
|
||||
GNU_CONFIGURE= yes
|
||||
USE_BISON= yes
|
||||
USE_REINPLACE= yes
|
||||
|
||||
CONFIGURE_ARGS= --enable-versioning \
|
||||
--enable-memory-limit \
|
||||
@ -106,7 +107,11 @@ CONFLICTS= php5-5* php5-cli-5* php5-cgi-5*
|
||||
CONFLICTS+= php4-4* php4-cli-4* mod_php4-4* php4-cgi-4*
|
||||
|
||||
.if defined(WITHOUT_APACHE)
|
||||
.if defined(WITHOUT_CLI)
|
||||
CONFIGURE_ARGS+=--enable-discard-path
|
||||
.else
|
||||
CONFIGURE_ARGS+=--disable-cgi
|
||||
.endif
|
||||
PLIST_SUB+= APACHE="@comment "
|
||||
.else
|
||||
PLIST_SUB+= APACHE=""
|
||||
@ -130,11 +135,11 @@ SAPI_FILE= "bin/php"
|
||||
|
||||
ALL_OPTIONS= BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX DOM \
|
||||
EXIF FILEPRO FTP GD GDBM GETTEXT GMP ICONV IMAP INTERBASE \
|
||||
INIFILE MBSTRING MCAL MCVE MCRYPT MHASH MIME MING MNOGOSEARCH \
|
||||
INIFILE MBSTRING MCVE MCRYPT MHASH MIME MING MNOGOSEARCH \
|
||||
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
|
||||
SOCKETS SQLITE SYBASEDB SYBASECT SYSVSEM SYSVSHM TIDY \
|
||||
TOKENIZER UNIXODBC WDDX XML XMLRPC XSL YAZ YP ZLIB
|
||||
|
||||
.for opt in ${ALL_OPTIONS}
|
||||
.if defined(WITH_${opt}) || defined(WITHOUT_${opt})
|
||||
@ -176,6 +181,11 @@ SCRIPTS_ENV+= SEL_OPTIONS="${SEL_OPTIONS}" \
|
||||
.include "${WRKDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR)
|
||||
WITH_PCRE= yes
|
||||
WITH_XML= yes
|
||||
.endif
|
||||
|
||||
.if defined(WITH_CDB) || defined(WITH_DB4) || defined(WITH_GDBM) || defined(WITH_INIFILE)
|
||||
WITH_DBA= yes
|
||||
.endif
|
||||
@ -326,11 +336,6 @@ CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}/firebird
|
||||
CONFIGURE_ARGS+=--enable-mbstring
|
||||
.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}
|
||||
@ -462,6 +467,11 @@ CONFIGURE_ARGS+=--enable-sysvsem
|
||||
CONFIGURE_ARGS+=--enable-sysvshm
|
||||
.endif
|
||||
|
||||
.if defined(WITH_TIDY)
|
||||
LIB_DEPENDS+= tidy-0.99.0:${PORTSDIR}/www/tidy-lib
|
||||
CONFIGURE_ARGS+=--with-tidy=${LOCALBASE}
|
||||
.endif
|
||||
|
||||
.if defined(WITH_TOKENIZER)
|
||||
CONFIGURE_ARGS+=--enable-tokenizer
|
||||
.endif
|
||||
@ -531,8 +541,7 @@ BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT}
|
||||
RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT}
|
||||
.endif
|
||||
|
||||
PLIST_SUB+= SAPI_FILE=${SAPI_FILE} \
|
||||
EXT_DIR=${EXT_DIR}
|
||||
PLIST_SUB+= SAPI_FILE=${SAPI_FILE}
|
||||
|
||||
.if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
|
||||
CONFIGURE_ARGS+=--disable-ipv6
|
||||
@ -579,6 +588,8 @@ pre-patch:
|
||||
@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e "s|orainst/unix.rgs|ocommon/install/partial.prd|g" \
|
||||
${WRKSRC}/configure
|
||||
@${SED} "s|%%PREFIX%%|${PREFIX}|g" \
|
||||
${WRKSRC}/pear/scripts/pearcmd.php > ${WRKSRC}/pear/scripts/pear
|
||||
|
||||
@ -604,11 +615,6 @@ pre-configure:
|
||||
@${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} ""
|
||||
@ -662,8 +668,6 @@ post-install:
|
||||
@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
|
||||
@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
|
||||
@${INSTALL_DATA} ${WRKDIR}/php.conf ${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} ""
|
||||
|
@ -1 +1 @@
|
||||
MD5 (php-5.0.0a3.tar.bz2) = f83cc6b735ccf312045d9178d107874f
|
||||
MD5 (php-5.0.0a4.tar.bz2) = 3fa6dcb3401c9085a51afadce7367cf8
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- configure.orig Tue Jul 15 00:32:50 2003
|
||||
+++ configure Tue Jul 15 01:44:37 2003
|
||||
@@ -620,6 +620,8 @@
|
||||
--- configure.orig Mon Dec 22 10:01:56 2003
|
||||
+++ configure Mon Dec 22 10:19:16 2003
|
||||
@@ -622,6 +622,8 @@
|
||||
ac_help="$ac_help
|
||||
--enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support."
|
||||
ac_help="$ac_help
|
||||
@ -8,8 +8,8 @@
|
||||
+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 @@
|
||||
--with-gmp[=DIR] Include GNU MP support"
|
||||
@@ -29640,6 +29642,31 @@
|
||||
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
|
||||
|
||||
|
||||
@@ -29528,7 +29555,7 @@
|
||||
@@ -29792,7 +29819,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 \
|
||||
@ -50,7 +50,7 @@
|
||||
libgd/xbm.c"
|
||||
|
||||
for ac_func in fabsf floorf
|
||||
@@ -29603,6 +29630,11 @@
|
||||
@@ -29867,6 +29894,11 @@
|
||||
fi
|
||||
|
||||
|
||||
@ -61,8 +61,8 @@
|
||||
+
|
||||
if test "$PHP_JPEG_DIR" != "no"; then
|
||||
|
||||
for i in /usr /usr/local $PHP_JPEG_DIR; do
|
||||
@@ -31314,6 +31346,9 @@
|
||||
for i in $PHP_JPEG_DIR /usr/local /usr; do
|
||||
@@ -31580,6 +31612,9 @@
|
||||
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_GD_BUNDLED 1
|
||||
@ -72,7 +72,7 @@
|
||||
EOF
|
||||
|
||||
cat >> confdefs.h <<\EOF
|
||||
@@ -31364,6 +31399,14 @@
|
||||
@@ -31634,6 +31669,14 @@
|
||||
GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
|
||||
fi
|
||||
|
||||
@ -87,7 +87,7 @@
|
||||
else
|
||||
|
||||
if test "$PHP_GD" != "no"; then
|
||||
@@ -35713,6 +35756,137 @@
|
||||
@@ -35985,6 +36028,137 @@
|
||||
esac
|
||||
done
|
||||
|
||||
@ -223,20 +223,9 @@
|
||||
+ done
|
||||
+
|
||||
echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
|
||||
echo "configure:35718: checking for gdCacheCreate in -lgd" >&5
|
||||
echo "configure:35990: 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:59505: 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
|
||||
@@ -58359,6 +58533,102 @@
|
||||
@@ -60181,6 +60355,102 @@
|
||||
|
||||
|
||||
if test "$ext_shared" = "yes"; then
|
||||
@ -339,7 +328,7 @@
|
||||
ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
|
||||
if test -n "$ORACLE_DIR/lib"; then
|
||||
|
||||
@@ -77889,29 +78159,6 @@
|
||||
@@ -79683,29 +79953,6 @@
|
||||
else
|
||||
|
||||
|
||||
@ -369,7 +358,7 @@
|
||||
case ct in
|
||||
c|c_r|pthread*) ;;
|
||||
*)
|
||||
@@ -77935,52 +78182,7 @@
|
||||
@@ -79729,52 +79976,7 @@
|
||||
|
||||
|
||||
|
||||
@ -423,10 +412,21 @@
|
||||
|
||||
|
||||
save_old_LDFLAGS=$LDFLAGS
|
||||
@@ -78126,38 +78328,6 @@
|
||||
|
||||
|
||||
|
||||
@@ -79909,38 +80111,6 @@
|
||||
c|c_r|pthread*) ;;
|
||||
*)
|
||||
LIBS="-ltcl $LIBS"
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
-
|
||||
- fi
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-else
|
||||
- echo "$ac_t""no" 1>&6
|
||||
-
|
||||
@ -448,29 +448,6 @@
|
||||
- c|c_r|pthread*) ;;
|
||||
- *)
|
||||
- LIBS="-lsybtcl $LIBS"
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
-
|
||||
- fi
|
||||
- ;;
|
||||
- esac
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
@@ -89822,10 +89992,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"
|
||||
|
@ -1,17 +0,0 @@
|
||||
--- ext/standard/datetime.c.orig Tue Aug 26 11:06:04 2003
|
||||
+++ ext/standard/datetime.c Tue Aug 26 11:07:27 2003
|
||||
@@ -116,7 +116,13 @@
|
||||
/* Let DST be unknown. mktime() should compute the right value
|
||||
** and behave correctly. Unless the user overrides this.
|
||||
*/
|
||||
- ta->tm_isdst = -1;
|
||||
+ if (gm) {
|
||||
+ ta->tm_isdst = 0;
|
||||
+ is_dst = 0;
|
||||
+ } else {
|
||||
+ ta->tm_isdst = -1;
|
||||
+ is_dst = -1;
|
||||
+ }
|
||||
|
||||
/*
|
||||
** Now change date values with supplied parameters.
|
@ -140,7 +140,6 @@ 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/php_xml.h
|
||||
include/php/main/SAPI.h
|
||||
include/php/main/build-defs.h
|
||||
@ -189,7 +188,6 @@ 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
|
||||
@ -220,6 +218,7 @@ lib/php/build/shtool
|
||||
%%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/Downloader.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
|
||||
@ -233,14 +232,12 @@ lib/php/build/shtool
|
||||
@dirrm include/php/ext/sqlite/libsqlite
|
||||
@dirrm include/php/ext/sqlite
|
||||
@dirrm include/php/ext/standard
|
||||
@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
|
||||
|
@ -41,7 +41,6 @@ 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 (implies OPENSSL)" ${WITH_MCVE:-OFF} \
|
||||
MCRYPT "Encryption support" ${WITH_MCRYPT:-OFF} \
|
||||
MHASH "Crypto-hashing support" ${WITH_MHASH:-OFF} \
|
||||
@ -71,6 +70,7 @@ 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} \
|
||||
TIDY "TIDY support" ${WITH_TIDY:-OFF} \
|
||||
TOKENIZER "tokenizer support" ${WITH_TOKENIZER:-OFF} \
|
||||
UNIXODBC "unixODBC support" ${WITH_UNIXODBC:-OFF} \
|
||||
WDDX "WDDX support (implies XML)" ${WITH_WDDX:-OFF} \
|
||||
|
@ -21,7 +21,6 @@ WITH_IMAP=OFF
|
||||
WITH_INIFILE=OFF
|
||||
WITH_INTERBASE=OFF
|
||||
WITH_MBSTRING=OFF
|
||||
WITH_MCAL=OFF
|
||||
WITH_MCVE=OFF
|
||||
WITH_MCRYPT=OFF
|
||||
WITH_MHASH=OFF
|
||||
@ -51,6 +50,7 @@ WITH_SYBASEDB=OFF
|
||||
WITH_SYBASECT=OFF
|
||||
WITH_SYSVSEM=OFF
|
||||
WITH_SYSVSHM=OFF
|
||||
WITH_TIDY=OFF
|
||||
WITH_TOKENIZER=ON
|
||||
WITH_UNIXODBC=OFF
|
||||
WITH_WDDX=OFF
|
||||
|
Loading…
Reference in New Issue
Block a user