Update to 5.4.10 release.

3 files changed, 30 insertions, 34 deletions

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 57fe429193d3..b864dfbaf82d 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5
-# Date created:				Tue Feb 18 11:17:13 CET 2003
-# Whom:					Alex Dupre <sysadmin@alexdupre.com>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	php5
-PORTVERSION=	5.4.9
-PORTREVISION?=	1
+PORTVERSION=	5.4.10
+PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
@@ -26,7 +22,7 @@ NO_OPTIONS_SORT=yes
 .if !defined(PKGNAMESUFFIX)
 USE_AUTOTOOLS=	autoconf
 
-LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
 
 CONFIGURE_ARGS=	\
 		--with-layout=GNU \
diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext
index 1616ca129a99..52ad9db482df 100644
--- a/lang/php5/Makefile.ext
+++ b/lang/php5/Makefile.ext
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 
 CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 .endif
@@ -86,9 +86,9 @@ USE_OPENSSL=	yes
 .endif
 
 .if ${PHP_MODNAME} == "gd"
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
+LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
 		png15:${PORTSDIR}/graphics/png \
-		jpeg.11:${PORTSDIR}/graphics/jpeg
+		jpeg:${PORTSDIR}/graphics/jpeg
 
 CONFIGURE_ARGS+=--with-gd \
 		--with-freetype-dir=${LOCALBASE} \
@@ -115,7 +115,7 @@ USE_GETTEXT=	yes
 .endif
 
 .if ${PHP_MODNAME} == "gmp"
-LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	gmp:${PORTSDIR}/math/gmp
 
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 .endif
@@ -132,7 +132,7 @@ USE_ICONV=	yes
 .endif
 
 .if ${PHP_MODNAME} == "imap"
-LIB_DEPENDS+=	c-client4.9:${PORTSDIR}/mail/cclient
+LIB_DEPENDS+=	c-client4:${PORTSDIR}/mail/cclient
 
 CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \
 		--with-pcre-dir=${LOCALBASE}
@@ -178,7 +178,7 @@ PHP_HEADER_DIRS=libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls
 .endif
 
 .if ${PHP_MODNAME} == "mcrypt"
-LIB_DEPENDS+=	mcrypt.8:${PORTSDIR}/security/libmcrypt
+LIB_DEPENDS+=	mcrypt:${PORTSDIR}/security/libmcrypt
 
 CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
 
@@ -186,7 +186,7 @@ USE_AUTOTOOLS=	libltdl
 .endif
 
 .if ${PHP_MODNAME} == "mssql"
-LIB_DEPENDS+=	sybdb.5:${PORTSDIR}/databases/freetds-msdblib
+LIB_DEPENDS+=	sybdb:${PORTSDIR}/databases/freetds-msdblib
 
 CONFIGURE_ARGS+=--with-mssql=${LOCALBASE}
 .endif
@@ -303,7 +303,7 @@ CONFIGURE_ARGS+=--enable-posix
 .endif
 
 .if ${PHP_MODNAME} == "pspell"
-LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
 
 CONFIGURE_ARGS+=--with-pspell=${LOCALBASE}
 
@@ -317,7 +317,7 @@ CONFIGURE_ARGS+=--with-readline=/usr
 .endif
 
 .if ${PHP_MODNAME} == "recode"
-LIB_DEPENDS+=	recode.3:${PORTSDIR}/converters/recode
+LIB_DEPENDS+=	recode:${PORTSDIR}/converters/recode
 
 CONFIGURE_ARGS+=--with-recode=${LOCALBASE}
 .endif
@@ -343,7 +343,7 @@ CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \
 
 CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"
 
-LIB_DEPENDS+=   netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS+=   netsnmp:${PORTSDIR}/net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
 .endif
@@ -368,7 +368,7 @@ CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sybase_ct"
-LIB_DEPENDS+=	ct.4:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	ct:${PORTSDIR}/databases/freetds
 
 CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE}
 .endif
@@ -388,7 +388,7 @@ CONFIGURE_ARGS+=--enable-sysvshm
 .if ${PHP_MODNAME} == "tidy"
 CONFIGURE_ARGS+=--with-tidy=${LOCALBASE}
 
-LIB_DEPENDS+=	tidy-0.99.0:${PORTSDIR}/www/tidy-lib
+LIB_DEPENDS+=	tidy-0.99:${PORTSDIR}/www/tidy-lib
 .endif
 
 .if ${PHP_MODNAME} == "tokenizer"
@@ -474,17 +474,17 @@ USE_BDB=		40+
 WITH_BDB_HIGHEST=	yes
 .	endif
 .	if ${PORT_OPTIONS:MGDBM}
-LIB_DEPENDS+=	gdbm.4:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=	gdbm:${PORTSDIR}/databases/gdbm
 
 CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MQDBM}
-LIB_DEPENDS+=	qdbm.14:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS+=	qdbm:${PORTSDIR}/databases/qdbm
 
 CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MTOKYO}
-LIB_DEPENDS+=	tokyocabinet.9:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS+=	tokyocabinet:${PORTSDIR}/databases/tokyocabinet
 
 CONFIGURE_ARGS+=--with-tcadb=${LOCALBASE}
 .	endif
@@ -498,7 +498,7 @@ CONFIGURE_ARGS+=--disable-flatfile
 
 .if ${PHP_MODNAME} == "gd"
 .	if ${PORT_OPTIONS:MT1LIB}
-LIB_DEPENDS+=	t1.5:${PORTSDIR}/devel/t1lib
+LIB_DEPENDS+=	t1:${PORTSDIR}/devel/t1lib
 
 CONFIGURE_ARGS+=--with-t1lib=${LOCALBASE}
 .	endif
@@ -514,7 +514,7 @@ USE_XORG=	xpm
 CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MVPX}
-LIB_DEPENDS+=	vpx.1:${PORTSDIR}/multimedia/libvpx
+LIB_DEPENDS+=	vpx:${PORTSDIR}/multimedia/libvpx
 
 CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBASE}
 .	endif
@@ -522,7 +522,7 @@ CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBASE}
 
 .if ${PHP_MODNAME} == "mbstring"
 .	if ${PORT_OPTIONS:MREGEX}
-LIB_DEPENDS+=	onig.1:${PORTSDIR}/devel/oniguruma4
+LIB_DEPENDS+=	onig:${PORTSDIR}/devel/oniguruma4
 CONFIGURE_ARGS+=--with-onig=${LOCALBASE}
 .	else
 CONFIGURE_ARGS+=--disable-mbregex
@@ -557,11 +557,11 @@ post-extract:
 
 .if ${PHP_MODNAME} == "odbc"
 .	if ${PORT_OPTIONS:MIODBC}
-LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
+LIB_DEPENDS+=	iodbc:${PORTSDIR}/databases/libiodbc
 
 CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE}
 .	else
-LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
 
 CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE}
 .	endif
@@ -569,19 +569,19 @@ CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE}
 
 .if ${PHP_MODNAME} == "pdo_dblib"
 .	if ${PORT_OPTIONS:MMSSQL}
-LIB_DEPENDS+=	sybdb.5:${PORTSDIR}/databases/freetds-msdblib
+LIB_DEPENDS+=	sybdb:${PORTSDIR}/databases/freetds-msdblib
 .	else
-LIB_DEPENDS+=	ct.4:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	ct:${PORTSDIR}/databases/freetds
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
 .	if ${PORT_OPTIONS:MIODBC}
-LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
+LIB_DEPENDS+=	iodbc:${PORTSDIR}/databases/libiodbc
 
 CONFIGURE_ARGS+=--with-pdo-odbc=iODBC,${LOCALBASE}
 .	else
-LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
 
 CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
 .	endif
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index da5dcffc2b33..6b642a66ea17 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,4 +1,4 @@
-SHA256 (php-5.4.9.tar.bz2) = c0649971cfa9723701d085e227376374569689689b8421e4dcfac56c2f6fcac5
-SIZE (php-5.4.9.tar.bz2) = 11144400
+SHA256 (php-5.4.10.tar.bz2) = c5bffda2154aedd9851c1e9b7da66f6c44c199716bd202054dd5d4a4f5f997e4
+SIZE (php-5.4.10.tar.bz2) = 11145757
 SHA256 (php-5.4.x-mail-header.patch) = 005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344
 SIZE (php-5.4.x-mail-header.patch) = 3379