Index: head/lang/php4/Makefile
===================================================================
--- head/lang/php4/Makefile	(revision 98233)
+++ head/lang/php4/Makefile	(revision 98234)
@@ -1,696 +1,701 @@
 # New ports collection makefile for:	php4
 # Date created:				Tue Feb 18 11:17:13 CET 2003
 # Whom:					Alex Dupre <sysadmin@alexdupre.com>
 #
 # $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_<EXT> and WITHOUT_<EXT> 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.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://www.php.net/distributions/:release \
 		http://it.php.net/distributions/:release \
 		http://fi.php.net/distributions/:release \
 		http://de.php.net/distributions/:release \
 		http://gr.php.net/distributions/:release \
 		http://fr.php.net/distributions/:release \
 		http://es.php.net/distributions/:release \
 		http://se.php.net/distributions/:release \
 		http://downloads.php.net/ilia/:rc \
 		http://downloads.php.net/jani/:rc
 .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/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:release
 
 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
 
 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
 .if !defined(WITHOUT_PEAR)
 CONFIGURE_ARGS+=--with-pear
 PLIST_SUB+=	PEAR=""
 .else
 PLIST_SUB+=	PEAR="@comment "
 .endif
 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 DB4 DBASE DBX \
 		DOMXML DOMXSLT EXIF FILEPRO FRIBIDI FTP GD GDBM GETTEXT \
 		GMP HYPERWAVE ICONV IMAP INTERBASE INIFILE MBSTRING MCAL MCVE \
-		MCRYPT MHASH MIME MING MNOGOSEARCH 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
+		MCRYPT MHASH MIME MING MNOGOSEARCH MSSQL 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
 
 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}
 .if !exists(${WRKDIR}/Makefile.inc)
 WITH_${opt}=	yes
 .endif
 .endif
 SCRIPTS_ENV+=	WITH_${opt}=ON
 .endfor
 
 SCRIPTS_ENV+=	SEL_OPTIONS="${SEL_OPTIONS}" \
 		OPTION_FILE="${PHP4_OPTFILE}" \
 		WRKDIR="${WRKDIR}" \
 		CAT="${CAT}" \
 		SED="${SED}"
 
 .if exists(${WRKDIR}/Makefile.inc)
 .include "${WRKDIR}/Makefile.inc"
 .endif
 
 .if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR)
 WITH_PCRE=	yes
 WITH_XML=	yes
 WITH_XMLRPC=	yes
 .endif
 
 .if defined(WITH_CDB) || defined(WITH_DB4) || 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_MCVE) || defined(WITH_SNMP)
 WITH_OPENSSL_DEP=	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_DB4)
 LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
 CONFIGURE_ARGS+=--with-db4=${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.2:${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.5:${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
 CONFIGURE_ARGS+=--with-iconv-dir=${LOCALBASE}
 .endif
 
 .if defined(WITH_ICONV)
 CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
 .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
 .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
 LIB_DEPENDS+=	ltdl.4:${PORTSDIR}/devel/libltdl
 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_MNOGOSEARCH)
 LIB_DEPENDS+=	udmsearch.1:${PORTSDIR}/www/mnogosearch
 CONFIGURE_ARGS+=--with-mnogosearch=${LOCALBASE}
 .endif
 
+.if defined(WITH_MSSQL)
+LIB_DEPENDS+=	sybdb.4:${PORTSDIR}/databases/freetds-msdblib
+CONFIGURE_ARGS+=--with-mssql=${LOCALBASE}
+.endif
+
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}
 .endif
 
 .if defined(WITH_OPENLDAP)
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 .endif
 
 .if defined(WITH_OPENSSL) || defined(WITH_OPENSSL_DEP)
 USE_OPENSSL=	yes
 LDFLAGS+=	-lcrypto -lssl
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--with-openssl-dir=${OPENSSLBASE}
 .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.6:${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/postgresql-client
 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_SOCKETS)
 CONFIGURE_ARGS+=--enable-sockets
 .endif
 
 .if defined(WITH_SYBASEDB)
-LIB_DEPENDS+=	sybdb.3:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	sybdb.4:${PORTSDIR}/databases/freetds
 CONFIGURE_ARGS+=--with-sybase=${LOCALBASE}
 .endif
 
 .if defined(WITH_SYBASECT)
-LIB_DEPENDS+=	ct.1:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	ct.2:${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
 CONFIGURE_ARGS+=--with-expat-dir=${LOCALBASE}
 .endif
 
 .if defined(WITH_XML)
 CONFIGURE_ARGS+=--enable-xml
 .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.10:${PORTSDIR}/devel/zziplib
 CONFIGURE_ARGS+=--with-zip=${LOCALBASE}
 .endif
 
 .if defined(WITH_ZLIB)
 CONFIGURE_ARGS+=--with-zlib=yes
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_APACHE)
 .if exists(${LOCALBASE}/include/apache2/apr.h)
 WITH_APACHE2=	yes
 APACHE_MPM!=	${APXS} -q MPM_NAME
 .endif
 .if defined(WITH_APACHE2)
 APACHE_MPM?=	${WITH_MPM}
 APACHE_PORT=	www/apache2
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 SAPI_FILE=	libexec/apache2/libphp4.so
 .if ${APACHE_MPM} == "worker"
 EXT_DIR:=	${EXT_DIR}-zts
 .endif
 .else
 APACHE_PORT?=	www/apache13
 CONFIGURE_ARGS+=--with-apxs=${APXS}
 SAPI_FILE=	libexec/apache/libphp4.so
 .endif
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 .endif
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 EXT_DIR:=	${EXT_DIR}-debug
 .endif
 
 PLIST_SUB+=	SAPI_FILE=${SAPI_FILE} \
 		EXT_DIR=${EXT_DIR}
 
 .if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=--disable-ipv6
 .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_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_SNMP)
 .if exists(${LOCALBASE}/lib/libsnmp.so.4)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net/net-snmp4
 .else
 LIB_DEPENDS+=	netsnmp.6:${PORTSDIR}/net/net-snmp
 .endif
 CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --enable-ucd-snmp-hack
 .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
 
 post-build:
 	@${ECHO_CMD} "PHP_VER=4" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_DIR=${EXT_DIR}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_PORT=${.CURDIR}" >> ${WRKDIR}/php.conf
 .if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR)
 	@${ECHO_CMD} "PHP_PEAR=yes" >> ${WRKDIR}/php.conf
 .else
 	@${ECHO_CMD} "PHP_PEAR=no" >> ${WRKDIR}/php.conf
 .endif
 .if !defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI)
 	@${ECHO_CMD} "PHP_SAPI=full" >> ${WRKDIR}/php.conf
 .else
 .if defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI)
 	@${ECHO_CMD} "PHP_SAPI=cli" >> ${WRKDIR}/php.conf
 .endif
 .if !defined(WITHOUT_APACHE) && defined(WITHOUT_CLI)
 	@${ECHO_CMD} "PHP_SAPI=mod" >> ${WRKDIR}/php.conf
 .endif
 .if defined(WITHOUT_APACHE) && defined(WITHOUT_CLI)
 	@${ECHO_CMD} "PHP_SAPI=cgi" >> ${WRKDIR}/php.conf
 .endif
 .endif
 .if !defined(WITHOUT_CLI)
 	@${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} ""
 .endif
 
 .if !defined(WITHOUT_CLI)
 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
 	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
 .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 <bsd.port.post.mk>

Property changes on: head/lang/php4/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.44
\ No newline at end of property
+1.45
\ No newline at end of property
Index: head/lang/php4/scripts/configure.php
===================================================================
--- head/lang/php4/scripts/configure.php	(revision 98233)
+++ head/lang/php4/scripts/configure.php	(revision 98234)
@@ -1,109 +1,110 @@
 #!/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 "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} \
 DB4		"Berkeley DB4 support" ${WITH_DB4:-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 (implies OPENSSL)" ${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} \
 MNOGOSEARCH	"mnoGoSearch support" ${WITH_MNOGOSEARCH:-OFF} \
+MSSQL		"MS-SQL database support" ${WITH_MSSQL:-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} \
+SYBASEDB	"Sybase database support (DB-lib)" ${WITH_SYBASEDB:-OFF} \
+SYBASECT	"Sybase 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.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/lang/php4/scripts/php4_options
===================================================================
--- head/lang/php4/scripts/php4_options	(revision 98233)
+++ head/lang/php4/scripts/php4_options	(revision 98234)
@@ -1,65 +1,66 @@
 WITH_BCMATH=OFF
 WITH_BZIP2=OFF
 WITH_CALENDAR=OFF
 WITH_CDB=OFF
 WITH_CRACK=OFF
 WITH_CTYPE=ON
 WITH_CURL=OFF
 WITH_DB4=OFF
 WITH_DBASE=OFF
 WITH_DBX=OFF
 WITH_DOMXML=OFF
 WITH_DOMXSLT=OFF
 WITH_EXIF=OFF
 WITH_FILEPRO=OFF
 WITH_FRIBIDI=OFF
 WITH_FTP=OFF
 WITH_GD=OFF
 WITH_GDBM=OFF
 WITH_GETTEXT=OFF
 WITH_GMP=OFF
 WITH_HYPERWAVE=OFF
 WITH_ICONV=OFF
 WITH_IMAP=OFF
 WITH_INIFILE=OFF
 WITH_INTERBASE=OFF
 WITH_MBSTRING=OFF
 WITH_MCAL=OFF
 WITH_MCVE=OFF
 WITH_MCRYPT=OFF
 WITH_MHASH=OFF
 WITH_MIME=OFF
 WITH_MING=OFF
 WITH_MNOGOSEARCH=OFF
+WITH_MSSQL=OFF
 WITH_MYSQL=ON
 WITH_NCURSES=OFF
 WITH_OPENLDAP=OFF
 WITH_OPENSSL=OFF
 WITH_ORACLE=OFF
 WITH_OVERLOAD=ON
 WITH_PCNTL=OFF
 WITH_PCRE=ON
 WITH_PDFLIB=OFF
 WITH_POSIX=ON
 WITH_POSTGRESQL=OFF
 WITH_PSPELL=OFF
 WITH_READLINE=OFF
 WITH_RECODE=OFF
 WITH_SESSION=ON
 WITH_SHMOP=OFF
 WITH_SNMP=OFF
 WITH_SOCKETS=OFF
 WITH_SYBASEDB=OFF
 WITH_SYBASECT=OFF
 WITH_SYSVSEM=OFF
 WITH_SYSVSHM=OFF
 WITH_TOKENIZER=ON
 WITH_UNIXODBC=OFF
 WITH_WDDX=OFF
 WITH_XML=ON
 WITH_XMLRPC=OFF
 WITH_XSLT=OFF
 WITH_YAZ=OFF
 WITH_YP=OFF
 WITH_ZIP=OFF
 WITH_ZLIB=ON

Property changes on: head/lang/php4/scripts/php4_options
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/lang/php5/Makefile
===================================================================
--- head/lang/php5/Makefile	(revision 98233)
+++ head/lang/php5/Makefile	(revision 98234)
@@ -1,690 +1,695 @@
 # New ports collection makefile for:	php5
 # Date created:				Tue Feb 18 11:17:13 CET 2003
 # Whom:					Alex Dupre <sysadmin@alexdupre.com>
 #
 # $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, DOM, PCRE, POSIX, SESSION,
 # SIMPLEXML, SQLITE, TOKENIZER and XML. This behaviour can be changed
 # overriding the PHP5_OPTIONS variable (e.g. PHP5_OPTIONS="EXT1 EXT2 EXT3").
 #
 # Another way is to use the WITH_<EXT> and WITHOUT_<EXT> knobs, for additional
 # and default extensions respectively (implies batch mode).
 #
 # The last way reads an "extension" file, located in ~/php5_options (the
 # location is overridable by the PHP5_OPTFILE variable). You may find an
 # example in scripts/php5_options (interactive mode only).
 #
 
 PORTNAME=	php5
 PORTVERSION=	5.0.0.a4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://www.php.net/distributions/:release \
 		http://it.php.net/distributions/:release \
 		http://fi.php.net/distributions/:release \
 		http://de.php.net/distributions/:release \
 		http://gr.php.net/distributions/:release \
 		http://fr.php.net/distributions/:release \
 		http://es.php.net/distributions/:release \
 		http://se.php.net/distributions/:release \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ale
 .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/.a/a/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 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_REINPLACE=	yes
 
 CONFIGURE_ARGS=	--enable-versioning \
 		--enable-memory-limit \
 		--with-layout=GNU \
 		--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=	php5-cli-5* mod_php5-5* php5-cgi-5*
 .if defined(WITHOUT_APACHE)
 .if defined(WITHOUT_CLI)
 CONFLICTS=	php5-5* php5-cli-5* mod_php5-5*
 .else
 CONFLICTS=	php5-5* php5-cgi-5* mod_php5-5*
 .endif
 .else
 .if defined(WITHOUT_CLI)
 CONFLICTS=	php5-5* php5-cli-5* php5-cgi-5*
 .endif
 .endif
 CONFLICTS+=	php4-4* php4-cli-4* mod_php4-4* php4-cgi-4*
 
 .if defined(WITHOUT_APACHE)
 .if defined(WITHOUT_CLI)
 CONFIGURE_ARGS+=--enable-discard-path
 .else
 CONFIGURE_ARGS+=--disable-cgi
 .endif
 PLIST_SUB+=	APACHE="@comment "
 .else
 PLIST_SUB+=	APACHE=""
 .endif
 .if defined(WITHOUT_CLI)
 CONFIGURE_ARGS+=--disable-cli
 PLIST_SUB+=	CLI="@comment "
 .else
 .if !defined(WITHOUT_PEAR)
 CONFIGURE_ARGS+=--with-pear
 PLIST_SUB+=	PEAR=""
 .else
 PLIST_SUB+=	PEAR="@comment "
 .endif
 MAN1=		php.1
 PLIST_SUB+=	CLI=""
 .endif
 .if defined(WITHOUT_APACHE) && defined(WITHOUT_CLI)
 SAPI_FILE=	"bin/php"
 .endif
 
 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 MCVE MCRYPT MHASH MIME MING MNOGOSEARCH \
+		INIFILE MBSTRING MCVE MCRYPT MHASH MIME MING MNOGOSEARCH MSSQL \
 		MYSQL NCURSES OPENLDAP OPENSSL ORACLE PCNTL PCRE PDFLIB POSIX \
 		POSTGRESQL PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP \
 		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})
 BATCH=		yes
 .endif
 .endfor
 
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 IS_INTERACTIVE=	yes
 .endif
 
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PHP5_OPTFILE?=	${HOME}/php5_options
 
 PHP5_OPTIONS?=	CTYPE DOM PCRE POSIX SESSION SIMPLEXML SQLITE TOKENIZER XML
 
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt})
 SEL_OPTIONS+=	${opt}
 .endif
 .endfor
 .for opt in ${PHP5_OPTIONS}
 .if !defined(WITHOUT_${opt})
 SEL_OPTIONS+=	${opt}
 .if !exists(${WRKDIR}/Makefile.inc)
 WITH_${opt}=	yes
 .endif
 .endif
 SCRIPTS_ENV+=	WITH_${opt}=ON
 .endfor
 
 SCRIPTS_ENV+=	SEL_OPTIONS="${SEL_OPTIONS}" \
 		OPTION_FILE="${PHP5_OPTFILE}" \
 		WRKDIR="${WRKDIR}" \
 		CAT="${CAT}" \
 		SED="${SED}"
 
 .if exists(${WRKDIR}/Makefile.inc)
 .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
 
 .if defined(WITH_XSL)
 WITH_DOM=	yes
 .endif
 
 .if defined(WITH_XMLRPC)
 WITH_ICONV_DEP=	yes
 .endif
 
 .if defined(WITH_MCVE) || defined(WITH_SNMP)
 WITH_OPENSSL_DEP=	yes
 .endif
 
 .if defined(WITH_DOM) || defined(WITH_SIMPLEXML)
 WITH_XML_DEP=	yes
 .endif
 
 .if defined(WITH_GD) || defined(WITH_MYSQL) || defined(WITH_PDFLIB)
 WITH_ZLIB_DEP=	yes
 .endif
 
 .if defined(WITH_BCMATH)
 CONFIGURE_ARGS+=--enable-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_DB4)
 LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
 CONFIGURE_ARGS+=--with-db4=${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_DOM)
 CONFIGURE_ARGS+=--enable-dom
 .endif
 
 .if defined(WITH_EXIF)
 CONFIGURE_ARGS+=--enable-exif
 .endif
 
 .if defined(WITH_FILEPRO)
 CONFIGURE_ARGS+=--enable-filepro
 .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.5:${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_ICONV) || defined(WITH_ICONV_DEP)
 LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
 CONFIGURE_ARGS+=--with-iconv-dir=${LOCALBASE}
 .endif
 
 .if defined(WITH_ICONV)
 CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
 .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
 .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
 LIB_DEPENDS+=	ltdl.4:${PORTSDIR}/devel/libltdl
 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_MNOGOSEARCH)
 LIB_DEPENDS+=	udmsearch.1:${PORTSDIR}/www/mnogosearch
 CONFIGURE_ARGS+=--with-mnogosearch=${LOCALBASE}
 .endif
 
+.if defined(WITH_MSSQL)
+LIB_DEPENDS+=	sybdb.4:${PORTSDIR}/databases/freetds-msdblib
+CONFIGURE_ARGS+=--with-mssql=${LOCALBASE}
+.endif
+
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}
 .endif
 
 .if defined(WITH_OPENLDAP)
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 .endif
 
 .if defined(WITH_OPENSSL) || defined(WITH_OPENSSL_DEP)
 USE_OPENSSL=	yes
 LDFLAGS+=	-lcrypto -lssl
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--with-openssl-dir=${OPENSSLBASE}
 .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_PCNTL)
 CONFIGURE_ARGS+=--enable-pcntl
 .endif
 
 .if defined(WITH_PCRE)
 CONFIGURE_ARGS+=--with-pcre-regex
 .endif
 
 .if defined(WITH_PDFLIB)
 LIB_DEPENDS+=	pdf.6:${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/postgresql-client
 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_SIMPLEXML)
 CONFIGURE_ARGS+=--enable-simplexml
 .endif
 
 .if defined(WITH_SOCKETS)
 CONFIGURE_ARGS+=--enable-sockets
 .endif
 
 .if defined(WITH_SQLITE)
 CONFIGURE_ARGS+=--with-sqlite
 .endif
 
 .if defined(WITH_SYBASEDB)
-LIB_DEPENDS+=	sybdb.3:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	sybdb.4:${PORTSDIR}/databases/freetds
 CONFIGURE_ARGS+=--with-sybase=${LOCALBASE}
 .endif
 
 .if defined(WITH_SYBASECT)
-LIB_DEPENDS+=	ct.1:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	ct.2:${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_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
 
 .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+=	xml2.5:${PORTSDIR}/textproc/libxml2
 CONFIGURE_ARGS+=--enable-libxml --with-libxml-dir=${LOCALBASE}
 .endif
 
 .if defined(WITH_XML)
 CONFIGURE_ARGS+=--enable-xml
 .endif
 
 .if defined(WITH_XMLRPC)
 LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2
 CONFIGURE_ARGS+=--with-xmlrpc --with-expat-dir=${LOCALBASE}
 .endif
 
 .if defined(WITH_XSL)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 CONFIGURE_ARGS+=--with-xsl=${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_ZLIB) || defined(WITH_ZLIB_DEP)
 CONFIGURE_ARGS+=--with-zlib-dir=/usr
 .endif
 
 .if defined(WITH_ZLIB)
 CONFIGURE_ARGS+=--with-zlib
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_APACHE)
 APXS?=		${LOCALBASE}/sbin/apxs
 .if exists(${LOCALBASE}/include/apache2/apr.h)
 WITH_APACHE2=	yes
 APACHE_MPM!=	${APXS} -q MPM_NAME
 .endif
 .if defined(WITH_APACHE2)
 APACHE_MPM?=	${WITH_MPM}
 APACHE_PORT=	www/apache2
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 SAPI_FILE=	libexec/apache2/libphp5.so
 .if ${APACHE_MPM} == "worker"
 EXT_DIR:=	${EXT_DIR}-zts
 .endif
 .else
 APACHE_PORT?=	www/apache13
 CONFIGURE_ARGS+=--with-apxs=${APXS}
 SAPI_FILE=	libexec/apache/libphp5.so
 .endif
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 .endif
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 EXT_DIR:=	${EXT_DIR}-debug
 .endif
 
 PLIST_SUB+=	SAPI_FILE=${SAPI_FILE}
 
 .if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=--disable-ipv6
 .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_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_SNMP)
 .if exists(${LOCALBASE}/lib/libsnmp.so.4)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net/net-snmp4
 .else
 LIB_DEPENDS+=	netsnmp.6:${PORTSDIR}/net/net-snmp
 .endif
 CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --enable-ucd-snmp-hack
 .endif
 
 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
 
 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/php5-cli		for Command Line Interpreter only"
 	@${ECHO_CMD} "	www/php5-cgi		for Common Gateway Interface only"
 	@${ECHO_CMD} "	www/mod_php5		for Apache Module only"
 	@${ECHO_CMD} ""
 .endif
 
 post-build:
 	@${ECHO_CMD} "PHP_VER=5" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_DIR=${EXT_DIR}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_PORT=${.CURDIR}" >> ${WRKDIR}/php.conf
 .if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR)
 	@${ECHO_CMD} "PHP_PEAR=yes" >> ${WRKDIR}/php.conf
 .else
 	@${ECHO_CMD} "PHP_PEAR=no" >> ${WRKDIR}/php.conf
 .endif
 .if !defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI)
 	@${ECHO_CMD} "PHP_SAPI=full" >> ${WRKDIR}/php.conf
 .else
 .if defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI)
 	@${ECHO_CMD} "PHP_SAPI=cli" >> ${WRKDIR}/php.conf
 .endif
 .if !defined(WITHOUT_APACHE) && defined(WITHOUT_CLI)
 	@${ECHO_CMD} "PHP_SAPI=mod" >> ${WRKDIR}/php.conf
 .endif
 .if defined(WITHOUT_APACHE) && defined(WITHOUT_CLI)
 	@${ECHO_CMD} "PHP_SAPI=cgi" >> ${WRKDIR}/php.conf
 .endif
 .endif
 .if !defined(WITHOUT_CLI)
 	@${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} ""
 .endif
 
 .if !defined(WITHOUT_CLI)
 test: all
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${.TARGET})
 .endif
 
 post-install:
 .if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR)
 	@${INSTALL_SCRIPT} ${WRKSRC}/pear/scripts/pear ${PREFIX}/bin
 .endif
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
 	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
 	@${TOUCH} ${PREFIX}/include/php/ext/sqlite/libsqlite/src/sqlite.h
 .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 <bsd.port.post.mk>

Property changes on: head/lang/php5/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.38
\ No newline at end of property
+1.39
\ No newline at end of property
Index: head/lang/php5/scripts/configure.php
===================================================================
--- head/lang/php5/scripts/configure.php	(revision 98233)
+++ head/lang/php5/scripts/configure.php	(revision 98234)
@@ -1,106 +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\
 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} \
 DB4		"Berkeley DB4 support" ${WITH_DB4:-OFF} \
 DBASE		"dBase library support" ${WITH_DBASE:-OFF} \
 DBX		"dbx support" ${WITH_DBX:-OFF} \
 DOM		"DOM support" ${WITH_DOM:-OFF} \
 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 (dba)" ${WITH_GDBM:-OFF} \
 GETTEXT		"gettext library support" ${WITH_GETTEXT:-OFF} \
 GMP		"GNU MP support" ${WITH_GMP:-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} \
 MCVE		"MCVE support (implies OPENSSL)" ${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} \
 MNOGOSEARCH	"mnoGoSearch support" ${WITH_MNOGOSEARCH:-OFF} \
+MSSQL		"MS-SQL database support" ${WITH_MSSQL:-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} \
 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} \
 SIMPLEXML	"simplexml support" ${WITH_SIMPLEXML:-OFF} \
 SNMP		"SNMP support (implies OPENSSL)" ${WITH_SNMP:-OFF} \
 SOCKETS		"sockets support" ${WITH_SOCKETS:-OFF} \
 SQLITE		"sqlite support" ${WITH_SQLITE:-OFF} \
-SYBASEDB	"Sybase/MS-SQL database support (DB-lib)" ${WITH_SYBASEDB:-OFF} \
-SYBASECT	"Sybase/MS-SQL database support (CT-lib)" ${WITH_SYBASECT:-OFF} \
+SYBASEDB	"Sybase database support (DB-lib)" ${WITH_SYBASEDB:-OFF} \
+SYBASECT	"Sybase 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} \
 XML		"XML support" ${WITH_XML:-OFF} \
 XMLRPC		"XMLRPC-EPI support (implies ICONV)" ${WITH_XMLRPC:-OFF} \
 XSL		"XSL support" ${WITH_XSL:-OFF} \
 YAZ		"YAZ support (ANSI/NISO Z39.50)" ${WITH_YAZ:-OFF} \
 YP		"YP/NIS support" ${WITH_YP:-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/php5/scripts/configure.php
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12
\ No newline at end of property
+1.13
\ No newline at end of property
Index: head/lang/php5/scripts/php5_options
===================================================================
--- head/lang/php5/scripts/php5_options	(revision 98233)
+++ head/lang/php5/scripts/php5_options	(revision 98234)
@@ -1,62 +1,63 @@
 WITH_BCMATH=OFF
 WITH_BZIP2=OFF
 WITH_CALENDAR=OFF
 WITH_CDB=OFF
 WITH_CRACK=OFF
 WITH_CTYPE=ON
 WITH_CURL=OFF
 WITH_DB4=OFF
 WITH_DBASE=OFF
 WITH_DBX=OFF
 WITH_DOM=ON
 WITH_EXIF=OFF
 WITH_FILEPRO=OFF
 WITH_FTP=OFF
 WITH_GD=OFF
 WITH_GDBM=OFF
 WITH_GETTEXT=OFF
 WITH_GMP=OFF
 WITH_ICONV=OFF
 WITH_IMAP=OFF
 WITH_INIFILE=OFF
 WITH_INTERBASE=OFF
 WITH_MBSTRING=OFF
 WITH_MCVE=OFF
 WITH_MCRYPT=OFF
 WITH_MHASH=OFF
 WITH_MIME=OFF
 WITH_MING=OFF
 WITH_MNOGOSEARCH=OFF
+WITH_MSSQL=OFF
 WITH_MYSQL=OFF
 WITH_NCURSES=OFF
 WITH_OPENLDAP=OFF
 WITH_OPENSSL=OFF
 WITH_ORACLE=OFF
 WITH_PCNTL=OFF
 WITH_PCRE=ON
 WITH_PDFLIB=OFF
 WITH_POSIX=ON
 WITH_POSTGRESQL=OFF
 WITH_PSPELL=OFF
 WITH_READLINE=OFF
 WITH_RECODE=OFF
 WITH_SESSION=ON
 WITH_SHMOP=OFF
 WITH_SIMPLEXML=ON
 WITH_SNMP=OFF
 WITH_SOCKETS=OFF
 WITH_SQLITE=ON
 WITH_SYBASEDB=OFF
 WITH_SYBASECT=OFF
 WITH_SYSVSEM=OFF
 WITH_SYSVSHM=OFF
 WITH_TIDY=OFF
 WITH_TOKENIZER=ON
 WITH_UNIXODBC=OFF
 WITH_WDDX=OFF
 WITH_XML=ON
 WITH_XMLRPC=OFF
 WITH_XSL=OFF
 WITH_YAZ=OFF
 WITH_YP=OFF
 WITH_ZLIB=ON

Property changes on: head/lang/php5/scripts/php5_options
___________________________________________________________________
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/php53/Makefile
===================================================================
--- head/lang/php53/Makefile	(revision 98233)
+++ head/lang/php53/Makefile	(revision 98234)
@@ -1,690 +1,695 @@
 # New ports collection makefile for:	php5
 # Date created:				Tue Feb 18 11:17:13 CET 2003
 # Whom:					Alex Dupre <sysadmin@alexdupre.com>
 #
 # $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, DOM, PCRE, POSIX, SESSION,
 # SIMPLEXML, SQLITE, TOKENIZER and XML. This behaviour can be changed
 # overriding the PHP5_OPTIONS variable (e.g. PHP5_OPTIONS="EXT1 EXT2 EXT3").
 #
 # Another way is to use the WITH_<EXT> and WITHOUT_<EXT> knobs, for additional
 # and default extensions respectively (implies batch mode).
 #
 # The last way reads an "extension" file, located in ~/php5_options (the
 # location is overridable by the PHP5_OPTFILE variable). You may find an
 # example in scripts/php5_options (interactive mode only).
 #
 
 PORTNAME=	php5
 PORTVERSION=	5.0.0.a4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://www.php.net/distributions/:release \
 		http://it.php.net/distributions/:release \
 		http://fi.php.net/distributions/:release \
 		http://de.php.net/distributions/:release \
 		http://gr.php.net/distributions/:release \
 		http://fr.php.net/distributions/:release \
 		http://es.php.net/distributions/:release \
 		http://se.php.net/distributions/:release \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ale
 .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/.a/a/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 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_REINPLACE=	yes
 
 CONFIGURE_ARGS=	--enable-versioning \
 		--enable-memory-limit \
 		--with-layout=GNU \
 		--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=	php5-cli-5* mod_php5-5* php5-cgi-5*
 .if defined(WITHOUT_APACHE)
 .if defined(WITHOUT_CLI)
 CONFLICTS=	php5-5* php5-cli-5* mod_php5-5*
 .else
 CONFLICTS=	php5-5* php5-cgi-5* mod_php5-5*
 .endif
 .else
 .if defined(WITHOUT_CLI)
 CONFLICTS=	php5-5* php5-cli-5* php5-cgi-5*
 .endif
 .endif
 CONFLICTS+=	php4-4* php4-cli-4* mod_php4-4* php4-cgi-4*
 
 .if defined(WITHOUT_APACHE)
 .if defined(WITHOUT_CLI)
 CONFIGURE_ARGS+=--enable-discard-path
 .else
 CONFIGURE_ARGS+=--disable-cgi
 .endif
 PLIST_SUB+=	APACHE="@comment "
 .else
 PLIST_SUB+=	APACHE=""
 .endif
 .if defined(WITHOUT_CLI)
 CONFIGURE_ARGS+=--disable-cli
 PLIST_SUB+=	CLI="@comment "
 .else
 .if !defined(WITHOUT_PEAR)
 CONFIGURE_ARGS+=--with-pear
 PLIST_SUB+=	PEAR=""
 .else
 PLIST_SUB+=	PEAR="@comment "
 .endif
 MAN1=		php.1
 PLIST_SUB+=	CLI=""
 .endif
 .if defined(WITHOUT_APACHE) && defined(WITHOUT_CLI)
 SAPI_FILE=	"bin/php"
 .endif
 
 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 MCVE MCRYPT MHASH MIME MING MNOGOSEARCH \
+		INIFILE MBSTRING MCVE MCRYPT MHASH MIME MING MNOGOSEARCH MSSQL \
 		MYSQL NCURSES OPENLDAP OPENSSL ORACLE PCNTL PCRE PDFLIB POSIX \
 		POSTGRESQL PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP \
 		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})
 BATCH=		yes
 .endif
 .endfor
 
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 IS_INTERACTIVE=	yes
 .endif
 
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PHP5_OPTFILE?=	${HOME}/php5_options
 
 PHP5_OPTIONS?=	CTYPE DOM PCRE POSIX SESSION SIMPLEXML SQLITE TOKENIZER XML
 
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt})
 SEL_OPTIONS+=	${opt}
 .endif
 .endfor
 .for opt in ${PHP5_OPTIONS}
 .if !defined(WITHOUT_${opt})
 SEL_OPTIONS+=	${opt}
 .if !exists(${WRKDIR}/Makefile.inc)
 WITH_${opt}=	yes
 .endif
 .endif
 SCRIPTS_ENV+=	WITH_${opt}=ON
 .endfor
 
 SCRIPTS_ENV+=	SEL_OPTIONS="${SEL_OPTIONS}" \
 		OPTION_FILE="${PHP5_OPTFILE}" \
 		WRKDIR="${WRKDIR}" \
 		CAT="${CAT}" \
 		SED="${SED}"
 
 .if exists(${WRKDIR}/Makefile.inc)
 .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
 
 .if defined(WITH_XSL)
 WITH_DOM=	yes
 .endif
 
 .if defined(WITH_XMLRPC)
 WITH_ICONV_DEP=	yes
 .endif
 
 .if defined(WITH_MCVE) || defined(WITH_SNMP)
 WITH_OPENSSL_DEP=	yes
 .endif
 
 .if defined(WITH_DOM) || defined(WITH_SIMPLEXML)
 WITH_XML_DEP=	yes
 .endif
 
 .if defined(WITH_GD) || defined(WITH_MYSQL) || defined(WITH_PDFLIB)
 WITH_ZLIB_DEP=	yes
 .endif
 
 .if defined(WITH_BCMATH)
 CONFIGURE_ARGS+=--enable-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_DB4)
 LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
 CONFIGURE_ARGS+=--with-db4=${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_DOM)
 CONFIGURE_ARGS+=--enable-dom
 .endif
 
 .if defined(WITH_EXIF)
 CONFIGURE_ARGS+=--enable-exif
 .endif
 
 .if defined(WITH_FILEPRO)
 CONFIGURE_ARGS+=--enable-filepro
 .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.5:${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_ICONV) || defined(WITH_ICONV_DEP)
 LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
 CONFIGURE_ARGS+=--with-iconv-dir=${LOCALBASE}
 .endif
 
 .if defined(WITH_ICONV)
 CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
 .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
 .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
 LIB_DEPENDS+=	ltdl.4:${PORTSDIR}/devel/libltdl
 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_MNOGOSEARCH)
 LIB_DEPENDS+=	udmsearch.1:${PORTSDIR}/www/mnogosearch
 CONFIGURE_ARGS+=--with-mnogosearch=${LOCALBASE}
 .endif
 
+.if defined(WITH_MSSQL)
+LIB_DEPENDS+=	sybdb.4:${PORTSDIR}/databases/freetds-msdblib
+CONFIGURE_ARGS+=--with-mssql=${LOCALBASE}
+.endif
+
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}
 .endif
 
 .if defined(WITH_OPENLDAP)
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 .endif
 
 .if defined(WITH_OPENSSL) || defined(WITH_OPENSSL_DEP)
 USE_OPENSSL=	yes
 LDFLAGS+=	-lcrypto -lssl
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--with-openssl-dir=${OPENSSLBASE}
 .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_PCNTL)
 CONFIGURE_ARGS+=--enable-pcntl
 .endif
 
 .if defined(WITH_PCRE)
 CONFIGURE_ARGS+=--with-pcre-regex
 .endif
 
 .if defined(WITH_PDFLIB)
 LIB_DEPENDS+=	pdf.6:${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/postgresql-client
 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_SIMPLEXML)
 CONFIGURE_ARGS+=--enable-simplexml
 .endif
 
 .if defined(WITH_SOCKETS)
 CONFIGURE_ARGS+=--enable-sockets
 .endif
 
 .if defined(WITH_SQLITE)
 CONFIGURE_ARGS+=--with-sqlite
 .endif
 
 .if defined(WITH_SYBASEDB)
-LIB_DEPENDS+=	sybdb.3:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	sybdb.4:${PORTSDIR}/databases/freetds
 CONFIGURE_ARGS+=--with-sybase=${LOCALBASE}
 .endif
 
 .if defined(WITH_SYBASECT)
-LIB_DEPENDS+=	ct.1:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	ct.2:${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_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
 
 .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+=	xml2.5:${PORTSDIR}/textproc/libxml2
 CONFIGURE_ARGS+=--enable-libxml --with-libxml-dir=${LOCALBASE}
 .endif
 
 .if defined(WITH_XML)
 CONFIGURE_ARGS+=--enable-xml
 .endif
 
 .if defined(WITH_XMLRPC)
 LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2
 CONFIGURE_ARGS+=--with-xmlrpc --with-expat-dir=${LOCALBASE}
 .endif
 
 .if defined(WITH_XSL)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 CONFIGURE_ARGS+=--with-xsl=${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_ZLIB) || defined(WITH_ZLIB_DEP)
 CONFIGURE_ARGS+=--with-zlib-dir=/usr
 .endif
 
 .if defined(WITH_ZLIB)
 CONFIGURE_ARGS+=--with-zlib
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_APACHE)
 APXS?=		${LOCALBASE}/sbin/apxs
 .if exists(${LOCALBASE}/include/apache2/apr.h)
 WITH_APACHE2=	yes
 APACHE_MPM!=	${APXS} -q MPM_NAME
 .endif
 .if defined(WITH_APACHE2)
 APACHE_MPM?=	${WITH_MPM}
 APACHE_PORT=	www/apache2
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 SAPI_FILE=	libexec/apache2/libphp5.so
 .if ${APACHE_MPM} == "worker"
 EXT_DIR:=	${EXT_DIR}-zts
 .endif
 .else
 APACHE_PORT?=	www/apache13
 CONFIGURE_ARGS+=--with-apxs=${APXS}
 SAPI_FILE=	libexec/apache/libphp5.so
 .endif
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 .endif
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 EXT_DIR:=	${EXT_DIR}-debug
 .endif
 
 PLIST_SUB+=	SAPI_FILE=${SAPI_FILE}
 
 .if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=--disable-ipv6
 .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_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_SNMP)
 .if exists(${LOCALBASE}/lib/libsnmp.so.4)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net/net-snmp4
 .else
 LIB_DEPENDS+=	netsnmp.6:${PORTSDIR}/net/net-snmp
 .endif
 CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --enable-ucd-snmp-hack
 .endif
 
 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
 
 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/php5-cli		for Command Line Interpreter only"
 	@${ECHO_CMD} "	www/php5-cgi		for Common Gateway Interface only"
 	@${ECHO_CMD} "	www/mod_php5		for Apache Module only"
 	@${ECHO_CMD} ""
 .endif
 
 post-build:
 	@${ECHO_CMD} "PHP_VER=5" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_DIR=${EXT_DIR}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_PORT=${.CURDIR}" >> ${WRKDIR}/php.conf
 .if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR)
 	@${ECHO_CMD} "PHP_PEAR=yes" >> ${WRKDIR}/php.conf
 .else
 	@${ECHO_CMD} "PHP_PEAR=no" >> ${WRKDIR}/php.conf
 .endif
 .if !defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI)
 	@${ECHO_CMD} "PHP_SAPI=full" >> ${WRKDIR}/php.conf
 .else
 .if defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI)
 	@${ECHO_CMD} "PHP_SAPI=cli" >> ${WRKDIR}/php.conf
 .endif
 .if !defined(WITHOUT_APACHE) && defined(WITHOUT_CLI)
 	@${ECHO_CMD} "PHP_SAPI=mod" >> ${WRKDIR}/php.conf
 .endif
 .if defined(WITHOUT_APACHE) && defined(WITHOUT_CLI)
 	@${ECHO_CMD} "PHP_SAPI=cgi" >> ${WRKDIR}/php.conf
 .endif
 .endif
 .if !defined(WITHOUT_CLI)
 	@${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} ""
 .endif
 
 .if !defined(WITHOUT_CLI)
 test: all
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${.TARGET})
 .endif
 
 post-install:
 .if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR)
 	@${INSTALL_SCRIPT} ${WRKSRC}/pear/scripts/pear ${PREFIX}/bin
 .endif
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
 	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
 	@${TOUCH} ${PREFIX}/include/php/ext/sqlite/libsqlite/src/sqlite.h
 .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 <bsd.port.post.mk>

Property changes on: head/lang/php53/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.38
\ No newline at end of property
+1.39
\ No newline at end of property
Index: head/lang/php53/scripts/configure.php
===================================================================
--- head/lang/php53/scripts/configure.php	(revision 98233)
+++ head/lang/php53/scripts/configure.php	(revision 98234)
@@ -1,106 +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\
 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} \
 DB4		"Berkeley DB4 support" ${WITH_DB4:-OFF} \
 DBASE		"dBase library support" ${WITH_DBASE:-OFF} \
 DBX		"dbx support" ${WITH_DBX:-OFF} \
 DOM		"DOM support" ${WITH_DOM:-OFF} \
 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 (dba)" ${WITH_GDBM:-OFF} \
 GETTEXT		"gettext library support" ${WITH_GETTEXT:-OFF} \
 GMP		"GNU MP support" ${WITH_GMP:-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} \
 MCVE		"MCVE support (implies OPENSSL)" ${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} \
 MNOGOSEARCH	"mnoGoSearch support" ${WITH_MNOGOSEARCH:-OFF} \
+MSSQL		"MS-SQL database support" ${WITH_MSSQL:-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} \
 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} \
 SIMPLEXML	"simplexml support" ${WITH_SIMPLEXML:-OFF} \
 SNMP		"SNMP support (implies OPENSSL)" ${WITH_SNMP:-OFF} \
 SOCKETS		"sockets support" ${WITH_SOCKETS:-OFF} \
 SQLITE		"sqlite support" ${WITH_SQLITE:-OFF} \
-SYBASEDB	"Sybase/MS-SQL database support (DB-lib)" ${WITH_SYBASEDB:-OFF} \
-SYBASECT	"Sybase/MS-SQL database support (CT-lib)" ${WITH_SYBASECT:-OFF} \
+SYBASEDB	"Sybase database support (DB-lib)" ${WITH_SYBASEDB:-OFF} \
+SYBASECT	"Sybase 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} \
 XML		"XML support" ${WITH_XML:-OFF} \
 XMLRPC		"XMLRPC-EPI support (implies ICONV)" ${WITH_XMLRPC:-OFF} \
 XSL		"XSL support" ${WITH_XSL:-OFF} \
 YAZ		"YAZ support (ANSI/NISO Z39.50)" ${WITH_YAZ:-OFF} \
 YP		"YP/NIS support" ${WITH_YP:-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/php53/scripts/configure.php
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12
\ No newline at end of property
+1.13
\ No newline at end of property
Index: head/lang/php53/scripts/php5_options
===================================================================
--- head/lang/php53/scripts/php5_options	(revision 98233)
+++ head/lang/php53/scripts/php5_options	(revision 98234)
@@ -1,62 +1,63 @@
 WITH_BCMATH=OFF
 WITH_BZIP2=OFF
 WITH_CALENDAR=OFF
 WITH_CDB=OFF
 WITH_CRACK=OFF
 WITH_CTYPE=ON
 WITH_CURL=OFF
 WITH_DB4=OFF
 WITH_DBASE=OFF
 WITH_DBX=OFF
 WITH_DOM=ON
 WITH_EXIF=OFF
 WITH_FILEPRO=OFF
 WITH_FTP=OFF
 WITH_GD=OFF
 WITH_GDBM=OFF
 WITH_GETTEXT=OFF
 WITH_GMP=OFF
 WITH_ICONV=OFF
 WITH_IMAP=OFF
 WITH_INIFILE=OFF
 WITH_INTERBASE=OFF
 WITH_MBSTRING=OFF
 WITH_MCVE=OFF
 WITH_MCRYPT=OFF
 WITH_MHASH=OFF
 WITH_MIME=OFF
 WITH_MING=OFF
 WITH_MNOGOSEARCH=OFF
+WITH_MSSQL=OFF
 WITH_MYSQL=OFF
 WITH_NCURSES=OFF
 WITH_OPENLDAP=OFF
 WITH_OPENSSL=OFF
 WITH_ORACLE=OFF
 WITH_PCNTL=OFF
 WITH_PCRE=ON
 WITH_PDFLIB=OFF
 WITH_POSIX=ON
 WITH_POSTGRESQL=OFF
 WITH_PSPELL=OFF
 WITH_READLINE=OFF
 WITH_RECODE=OFF
 WITH_SESSION=ON
 WITH_SHMOP=OFF
 WITH_SIMPLEXML=ON
 WITH_SNMP=OFF
 WITH_SOCKETS=OFF
 WITH_SQLITE=ON
 WITH_SYBASEDB=OFF
 WITH_SYBASECT=OFF
 WITH_SYSVSEM=OFF
 WITH_SYSVSHM=OFF
 WITH_TIDY=OFF
 WITH_TOKENIZER=ON
 WITH_UNIXODBC=OFF
 WITH_WDDX=OFF
 WITH_XML=ON
 WITH_XMLRPC=OFF
 WITH_XSL=OFF
 WITH_YAZ=OFF
 WITH_YP=OFF
 WITH_ZLIB=ON

Property changes on: head/lang/php53/scripts/php5_options
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property