o Update to 4.3.3RC1.

o Add inifile and cdb extensions.
o Fix imap without ssl(inspired from ports/53141).
o Rename some variable for future compatability (PHP => PHP4)
  (inspired from ports/53113, points 1 and 4 - point 2 is useless).

PR:		ports/53498
Submitted by:	Alex Dupre <sysadmin@alexdupre.com> (maintainer)
Inspired by:	ports/53141 (Torsten Schneider <fbsd-bugs@tschneider.org>)
Inspired by:	ports/53113 (Jens Rehsack      <rehsack@liwing.de>)
This commit is contained in:
Norikatsu Shigemura 2003-06-20 05:25:24 +00:00
parent 21331df12e
commit 4c61dd39cd
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=83339
15 changed files with 366 additions and 87 deletions

View file

@ -9,18 +9,18 @@
#
# By default, the enabled extensions are: CTYPE, MYSQL, PCRE, POSIX, SESSION,
# TOKENIZER, XML and ZLIB. This behaviour can be changed overriding the
# PHP_OPTIONS variable (e.g. PHP_OPTIONS="EXT1 EXT2 EXT3").
# PHP4_OPTIONS variable (e.g. PHP4_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 ~/php_options (the
# location is overridable by the OPTION_FILE variable). You may find an
# example in scripts/php_options (interactive mode only).
# 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.2
PORTVERSION= 4.3.3.r1
CATEGORIES?= lang devel www
MASTER_SITES= http://www.php.net/distributions/ \
http://it.php.net/distributions/ \
@ -29,7 +29,8 @@ MASTER_SITES= http://www.php.net/distributions/ \
http://gr.php.net/distributions/ \
http://fr.php.net/distributions/ \
http://es.php.net/distributions/ \
http://se.php.net/distributions/
http://se.php.net/distributions/ \
http://downloads.php.net/jani/
.if defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
PKGNAMEPREFIX= mod_
.else
@ -41,7 +42,7 @@ PKGNAMESUFFIX= -cli
.endif
.endif
.endif
DISTNAME= php-${PORTVERSION}
DISTNAME= php-${PORTVERSION:S/.r/RC/}
MAINTAINER?= sysadmin@alexdupre.com
COMMENT= PHP Scripting Language (Apache Module and CLI)
@ -102,13 +103,13 @@ PLIST_SUB+= CLI=""
SAPI_FILE= "bin/php"
.endif
ALL_OPTIONS= BCMATH BZIP2 CALENDAR CRACK CTYPE CURL DBASE DBX DOMXML \
ALL_OPTIONS= BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DBASE DBX DOMXML \
DOMXSLT EXIF FILEPRO FTP GD GDBM GETTEXT GMP HYPERWAVE ICONV \
IMAP INTERBASE MBSTRING MCAL MCVE MCRYPT MHASH MIME MING MYSQL \
NCURSES OPENLDAP OPENSSL ORACLE 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
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 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})
@ -157,16 +158,16 @@ PLIST_SUB+= SAPI_FILE=${SAPI_FILE} \
EXT_DIR=${EXT_DIR}
WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
OPTION_FILE?= ${HOME}/php_options
PHP4_OPTFILE?= ${HOME}/php4_options
PHP_OPTIONS?= CTYPE MYSQL PCRE POSIX SESSION TOKENIZER XML ZLIB
PHP4_OPTIONS?= CTYPE MYSQL PCRE POSIX SESSION TOKENIZER XML ZLIB
.for opt in ${ALL_OPTIONS}
.if defined(WITH_${opt})
SEL_OPTIONS+= ${opt}
.endif
.endfor
.for opt in ${PHP_OPTIONS}
.for opt in ${PHP4_OPTIONS}
.if !defined(WITHOUT_${opt})
SEL_OPTIONS+= ${opt}
.endif
@ -174,7 +175,7 @@ SCRIPTS_ENV+= WITH_${opt}=ON
.endfor
SCRIPTS_ENV+= SEL_OPTIONS="${SEL_OPTIONS}" \
OPTION_FILE="${OPTION_FILE}" \
OPTION_FILE="${PHP4_OPTFILE}" \
WRKDIR="${WRKDIR}" \
CAT="${CAT}" \
SED="${SED}"
@ -188,6 +189,10 @@ WITH_XML= yes
.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
@ -222,6 +227,10 @@ CONFIGURE_ARGS+=--with-bz2=${BZIP2BASE}
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
@ -237,6 +246,10 @@ 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
@ -284,7 +297,7 @@ CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE}
.if defined(WITH_GDBM)
LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm
CONFIGURE_ARGS+=--enable-dba --with-gdbm=${LOCALBASE}
CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
.endif
.if defined(WITH_GETTEXT)
@ -311,7 +324,24 @@ CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
.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)

View file

@ -1 +1 @@
MD5 (php-4.3.2.tar.bz2) = 8aec1bb2dbcca1c92835c71e2e30d9c5
MD5 (php-4.3.3RC1.tar.bz2) = 2b3b4866bedd073d505c554c551fef92

View file

@ -1,9 +1,9 @@
--- configure.orig Wed May 28 14:36:29 2003
+++ configure Sat Jun 7 15:37:45 2003
@@ -54106,8 +54106,8 @@
--- configure.orig Thu Jun 19 00:06:29 2003
+++ configure Thu Jun 19 11:27:23 2003
@@ -54325,8 +54325,8 @@
echo $ac_n "checking Oracle version""... $ac_c" 1>&6
echo "configure:54109: checking Oracle version" >&5
echo "configure:54328: 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
@ -11,7 +11,7 @@
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
@@ -56370,6 +56370,102 @@
@@ -56589,6 +56589,102 @@
if test "$ext_shared" = "yes"; then
@ -114,7 +114,7 @@
ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
if test -n "$ORACLE_DIR/lib"; then
@@ -70911,29 +71007,6 @@
@@ -71130,29 +71226,6 @@
else
@ -144,7 +144,7 @@
case ct in
c|c_r|pthread*) ;;
*)
@@ -70957,52 +71030,7 @@
@@ -71176,52 +71249,7 @@
@ -198,7 +198,7 @@
save_old_LDFLAGS=$LDFLAGS
@@ -71072,37 +71100,6 @@
@@ -71291,37 +71319,6 @@
@ -236,7 +236,7 @@
fi
@@ -84033,10 +84030,7 @@
@@ -84252,10 +84249,7 @@
CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'

View file

@ -21,6 +21,7 @@ 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} \
@ -32,12 +33,13 @@ EXIF "EXIF support" ${WITH_EXIF:-OFF} \
FILEPRO "filePro support" ${WITH_FILEPRO:-OFF} \
FTP "FTP support" ${WITH_FTP:-OFF} \
GD "GD library support" ${WITH_GD:-OFF} \
GDBM "GDBM database support" ${WITH_GDBM:-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} \

View file

@ -0,0 +1,61 @@
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_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_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

View file

@ -9,18 +9,18 @@
#
# By default, the enabled extensions are: CTYPE, MYSQL, PCRE, POSIX, SESSION,
# TOKENIZER, XML and ZLIB. This behaviour can be changed overriding the
# PHP_OPTIONS variable (e.g. PHP_OPTIONS="EXT1 EXT2 EXT3").
# PHP4_OPTIONS variable (e.g. PHP4_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 ~/php_options (the
# location is overridable by the OPTION_FILE variable). You may find an
# example in scripts/php_options (interactive mode only).
# 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.2
PORTVERSION= 4.3.3.r1
CATEGORIES?= lang devel www
MASTER_SITES= http://www.php.net/distributions/ \
http://it.php.net/distributions/ \
@ -29,7 +29,8 @@ MASTER_SITES= http://www.php.net/distributions/ \
http://gr.php.net/distributions/ \
http://fr.php.net/distributions/ \
http://es.php.net/distributions/ \
http://se.php.net/distributions/
http://se.php.net/distributions/ \
http://downloads.php.net/jani/
.if defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
PKGNAMEPREFIX= mod_
.else
@ -41,7 +42,7 @@ PKGNAMESUFFIX= -cli
.endif
.endif
.endif
DISTNAME= php-${PORTVERSION}
DISTNAME= php-${PORTVERSION:S/.r/RC/}
MAINTAINER?= sysadmin@alexdupre.com
COMMENT= PHP Scripting Language (Apache Module and CLI)
@ -102,13 +103,13 @@ PLIST_SUB+= CLI=""
SAPI_FILE= "bin/php"
.endif
ALL_OPTIONS= BCMATH BZIP2 CALENDAR CRACK CTYPE CURL DBASE DBX DOMXML \
ALL_OPTIONS= BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DBASE DBX DOMXML \
DOMXSLT EXIF FILEPRO FTP GD GDBM GETTEXT GMP HYPERWAVE ICONV \
IMAP INTERBASE MBSTRING MCAL MCVE MCRYPT MHASH MIME MING MYSQL \
NCURSES OPENLDAP OPENSSL ORACLE 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
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 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})
@ -157,16 +158,16 @@ PLIST_SUB+= SAPI_FILE=${SAPI_FILE} \
EXT_DIR=${EXT_DIR}
WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
OPTION_FILE?= ${HOME}/php_options
PHP4_OPTFILE?= ${HOME}/php4_options
PHP_OPTIONS?= CTYPE MYSQL PCRE POSIX SESSION TOKENIZER XML ZLIB
PHP4_OPTIONS?= CTYPE MYSQL PCRE POSIX SESSION TOKENIZER XML ZLIB
.for opt in ${ALL_OPTIONS}
.if defined(WITH_${opt})
SEL_OPTIONS+= ${opt}
.endif
.endfor
.for opt in ${PHP_OPTIONS}
.for opt in ${PHP4_OPTIONS}
.if !defined(WITHOUT_${opt})
SEL_OPTIONS+= ${opt}
.endif
@ -174,7 +175,7 @@ SCRIPTS_ENV+= WITH_${opt}=ON
.endfor
SCRIPTS_ENV+= SEL_OPTIONS="${SEL_OPTIONS}" \
OPTION_FILE="${OPTION_FILE}" \
OPTION_FILE="${PHP4_OPTFILE}" \
WRKDIR="${WRKDIR}" \
CAT="${CAT}" \
SED="${SED}"
@ -188,6 +189,10 @@ WITH_XML= yes
.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
@ -222,6 +227,10 @@ CONFIGURE_ARGS+=--with-bz2=${BZIP2BASE}
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
@ -237,6 +246,10 @@ 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
@ -284,7 +297,7 @@ CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE}
.if defined(WITH_GDBM)
LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm
CONFIGURE_ARGS+=--enable-dba --with-gdbm=${LOCALBASE}
CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
.endif
.if defined(WITH_GETTEXT)
@ -311,7 +324,24 @@ CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
.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)

View file

@ -1 +1 @@
MD5 (php-4.3.2.tar.bz2) = 8aec1bb2dbcca1c92835c71e2e30d9c5
MD5 (php-4.3.3RC1.tar.bz2) = 2b3b4866bedd073d505c554c551fef92

View file

@ -1,9 +1,9 @@
--- configure.orig Wed May 28 14:36:29 2003
+++ configure Sat Jun 7 15:37:45 2003
@@ -54106,8 +54106,8 @@
--- configure.orig Thu Jun 19 00:06:29 2003
+++ configure Thu Jun 19 11:27:23 2003
@@ -54325,8 +54325,8 @@
echo $ac_n "checking Oracle version""... $ac_c" 1>&6
echo "configure:54109: checking Oracle version" >&5
echo "configure:54328: 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
@ -11,7 +11,7 @@
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
@@ -56370,6 +56370,102 @@
@@ -56589,6 +56589,102 @@
if test "$ext_shared" = "yes"; then
@ -114,7 +114,7 @@
ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
if test -n "$ORACLE_DIR/lib"; then
@@ -70911,29 +71007,6 @@
@@ -71130,29 +71226,6 @@
else
@ -144,7 +144,7 @@
case ct in
c|c_r|pthread*) ;;
*)
@@ -70957,52 +71030,7 @@
@@ -71176,52 +71249,7 @@
@ -198,7 +198,7 @@
save_old_LDFLAGS=$LDFLAGS
@@ -71072,37 +71100,6 @@
@@ -71291,37 +71319,6 @@
@ -236,7 +236,7 @@
fi
@@ -84033,10 +84030,7 @@
@@ -84252,10 +84249,7 @@
CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'

View file

@ -21,6 +21,7 @@ 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} \
@ -32,12 +33,13 @@ EXIF "EXIF support" ${WITH_EXIF:-OFF} \
FILEPRO "filePro support" ${WITH_FILEPRO:-OFF} \
FTP "FTP support" ${WITH_FTP:-OFF} \
GD "GD library support" ${WITH_GD:-OFF} \
GDBM "GDBM database support" ${WITH_GDBM:-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} \

View file

@ -0,0 +1,61 @@
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_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_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

View file

@ -9,18 +9,18 @@
#
# By default, the enabled extensions are: CTYPE, MYSQL, PCRE, POSIX, SESSION,
# TOKENIZER, XML and ZLIB. This behaviour can be changed overriding the
# PHP_OPTIONS variable (e.g. PHP_OPTIONS="EXT1 EXT2 EXT3").
# PHP4_OPTIONS variable (e.g. PHP4_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 ~/php_options (the
# location is overridable by the OPTION_FILE variable). You may find an
# example in scripts/php_options (interactive mode only).
# 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.2
PORTVERSION= 4.3.3.r1
CATEGORIES?= lang devel www
MASTER_SITES= http://www.php.net/distributions/ \
http://it.php.net/distributions/ \
@ -29,7 +29,8 @@ MASTER_SITES= http://www.php.net/distributions/ \
http://gr.php.net/distributions/ \
http://fr.php.net/distributions/ \
http://es.php.net/distributions/ \
http://se.php.net/distributions/
http://se.php.net/distributions/ \
http://downloads.php.net/jani/
.if defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
PKGNAMEPREFIX= mod_
.else
@ -41,7 +42,7 @@ PKGNAMESUFFIX= -cli
.endif
.endif
.endif
DISTNAME= php-${PORTVERSION}
DISTNAME= php-${PORTVERSION:S/.r/RC/}
MAINTAINER?= sysadmin@alexdupre.com
COMMENT= PHP Scripting Language (Apache Module and CLI)
@ -102,13 +103,13 @@ PLIST_SUB+= CLI=""
SAPI_FILE= "bin/php"
.endif
ALL_OPTIONS= BCMATH BZIP2 CALENDAR CRACK CTYPE CURL DBASE DBX DOMXML \
ALL_OPTIONS= BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DBASE DBX DOMXML \
DOMXSLT EXIF FILEPRO FTP GD GDBM GETTEXT GMP HYPERWAVE ICONV \
IMAP INTERBASE MBSTRING MCAL MCVE MCRYPT MHASH MIME MING MYSQL \
NCURSES OPENLDAP OPENSSL ORACLE 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
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 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})
@ -157,16 +158,16 @@ PLIST_SUB+= SAPI_FILE=${SAPI_FILE} \
EXT_DIR=${EXT_DIR}
WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
OPTION_FILE?= ${HOME}/php_options
PHP4_OPTFILE?= ${HOME}/php4_options
PHP_OPTIONS?= CTYPE MYSQL PCRE POSIX SESSION TOKENIZER XML ZLIB
PHP4_OPTIONS?= CTYPE MYSQL PCRE POSIX SESSION TOKENIZER XML ZLIB
.for opt in ${ALL_OPTIONS}
.if defined(WITH_${opt})
SEL_OPTIONS+= ${opt}
.endif
.endfor
.for opt in ${PHP_OPTIONS}
.for opt in ${PHP4_OPTIONS}
.if !defined(WITHOUT_${opt})
SEL_OPTIONS+= ${opt}
.endif
@ -174,7 +175,7 @@ SCRIPTS_ENV+= WITH_${opt}=ON
.endfor
SCRIPTS_ENV+= SEL_OPTIONS="${SEL_OPTIONS}" \
OPTION_FILE="${OPTION_FILE}" \
OPTION_FILE="${PHP4_OPTFILE}" \
WRKDIR="${WRKDIR}" \
CAT="${CAT}" \
SED="${SED}"
@ -188,6 +189,10 @@ WITH_XML= yes
.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
@ -222,6 +227,10 @@ CONFIGURE_ARGS+=--with-bz2=${BZIP2BASE}
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
@ -237,6 +246,10 @@ 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
@ -284,7 +297,7 @@ CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE}
.if defined(WITH_GDBM)
LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm
CONFIGURE_ARGS+=--enable-dba --with-gdbm=${LOCALBASE}
CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
.endif
.if defined(WITH_GETTEXT)
@ -311,7 +324,24 @@ CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
.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)

View file

@ -1 +1 @@
MD5 (php-4.3.2.tar.bz2) = 8aec1bb2dbcca1c92835c71e2e30d9c5
MD5 (php-4.3.3RC1.tar.bz2) = 2b3b4866bedd073d505c554c551fef92

View file

@ -1,9 +1,9 @@
--- configure.orig Wed May 28 14:36:29 2003
+++ configure Sat Jun 7 15:37:45 2003
@@ -54106,8 +54106,8 @@
--- configure.orig Thu Jun 19 00:06:29 2003
+++ configure Thu Jun 19 11:27:23 2003
@@ -54325,8 +54325,8 @@
echo $ac_n "checking Oracle version""... $ac_c" 1>&6
echo "configure:54109: checking Oracle version" >&5
echo "configure:54328: 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
@ -11,7 +11,7 @@
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
@@ -56370,6 +56370,102 @@
@@ -56589,6 +56589,102 @@
if test "$ext_shared" = "yes"; then
@ -114,7 +114,7 @@
ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
if test -n "$ORACLE_DIR/lib"; then
@@ -70911,29 +71007,6 @@
@@ -71130,29 +71226,6 @@
else
@ -144,7 +144,7 @@
case ct in
c|c_r|pthread*) ;;
*)
@@ -70957,52 +71030,7 @@
@@ -71176,52 +71249,7 @@
@ -198,7 +198,7 @@
save_old_LDFLAGS=$LDFLAGS
@@ -71072,37 +71100,6 @@
@@ -71291,37 +71319,6 @@
@ -236,7 +236,7 @@
fi
@@ -84033,10 +84030,7 @@
@@ -84252,10 +84249,7 @@
CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'

View file

@ -21,6 +21,7 @@ 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} \
@ -32,12 +33,13 @@ EXIF "EXIF support" ${WITH_EXIF:-OFF} \
FILEPRO "filePro support" ${WITH_FILEPRO:-OFF} \
FTP "FTP support" ${WITH_FTP:-OFF} \
GD "GD library support" ${WITH_GD:-OFF} \
GDBM "GDBM database support" ${WITH_GDBM:-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} \

View file

@ -0,0 +1,61 @@
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_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_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