Add MS-SQL support.

Chase freetds lib. Bump PORTREVISION.

Requested by:	many
Submitted by:	Michael Ranner <mranner@inode.at>
Approved by:	nork (mentor/implicitly)

9 files changed, 43 insertions, 22 deletions

diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index 7a3a04e19d74..0379b6bfabf7 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -21,7 +21,7 @@
 
 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 \
@@ -127,11 +127,11 @@ SAPI_FILE=	"bin/php"
 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})
@@ -379,6 +379,11 @@ 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}
@@ -459,12 +464,12 @@ 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
 
diff --git a/lang/php4/scripts/configure.php b/lang/php4/scripts/configure.php
index 5c9b96862b5a..0e8a17f3b677 100644
--- a/lang/php4/scripts/configure.php
+++ b/lang/php4/scripts/configure.php
@@ -51,6 +51,7 @@ 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} \
@@ -69,8 +70,8 @@ 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} \
diff --git a/lang/php4/scripts/php4_options b/lang/php4/scripts/php4_options
index 1a50c04229bc..6658088c8811 100644
--- a/lang/php4/scripts/php4_options
+++ b/lang/php4/scripts/php4_options
@@ -31,6 +31,7 @@ WITH_MHASH=OFF
 WITH_MIME=OFF
 WITH_MING=OFF
 WITH_MNOGOSEARCH=OFF
+WITH_MSSQL=OFF
 WITH_MYSQL=ON
 WITH_NCURSES=OFF
 WITH_OPENLDAP=OFF
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 16342a80468f..7fea05ed57f9 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -21,7 +21,7 @@
 
 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 \
@@ -130,7 +130,7 @@ SAPI_FILE=	"bin/php"
 
 ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX DOM \
 		EXIF FILEPRO FTP GD GDBM GETTEXT GMP ICONV IMAP INTERBASE \
-		INIFILE MBSTRING 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 \
@@ -361,6 +361,11 @@ 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}
@@ -445,12 +450,12 @@ 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
 
diff --git a/lang/php5/scripts/configure.php b/lang/php5/scripts/configure.php
index 24156c67a9a6..8f31a239cc9f 100644
--- a/lang/php5/scripts/configure.php
+++ b/lang/php5/scripts/configure.php
@@ -47,6 +47,7 @@ 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} \
@@ -66,8 +67,8 @@ 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} \
diff --git a/lang/php5/scripts/php5_options b/lang/php5/scripts/php5_options
index 859bdaec7f9c..b8886dfe0c76 100644
--- a/lang/php5/scripts/php5_options
+++ b/lang/php5/scripts/php5_options
@@ -27,6 +27,7 @@ WITH_MHASH=OFF
 WITH_MIME=OFF
 WITH_MING=OFF
 WITH_MNOGOSEARCH=OFF
+WITH_MSSQL=OFF
 WITH_MYSQL=OFF
 WITH_NCURSES=OFF
 WITH_OPENLDAP=OFF
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 16342a80468f..7fea05ed57f9 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -21,7 +21,7 @@
 
 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 \
@@ -130,7 +130,7 @@ SAPI_FILE=	"bin/php"
 
 ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX DOM \
 		EXIF FILEPRO FTP GD GDBM GETTEXT GMP ICONV IMAP INTERBASE \
-		INIFILE MBSTRING 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 \
@@ -361,6 +361,11 @@ 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}
@@ -445,12 +450,12 @@ 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
 
diff --git a/lang/php53/scripts/configure.php b/lang/php53/scripts/configure.php
index 24156c67a9a6..8f31a239cc9f 100644
--- a/lang/php53/scripts/configure.php
+++ b/lang/php53/scripts/configure.php
@@ -47,6 +47,7 @@ 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} \
@@ -66,8 +67,8 @@ 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} \
diff --git a/lang/php53/scripts/php5_options b/lang/php53/scripts/php5_options
index 859bdaec7f9c..b8886dfe0c76 100644
--- a/lang/php53/scripts/php5_options
+++ b/lang/php53/scripts/php5_options
@@ -27,6 +27,7 @@ WITH_MHASH=OFF
 WITH_MIME=OFF
 WITH_MING=OFF
 WITH_MNOGOSEARCH=OFF
+WITH_MSSQL=OFF
 WITH_MYSQL=OFF
 WITH_NCURSES=OFF
 WITH_OPENLDAP=OFF