Update to 5.2.4 release.

4 files changed, 41 insertions, 33 deletions

diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 1cb92d61ce21..1550c9f9ac19 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.2.3
-PORTREVISION?=	1
+PORTVERSION=	5.2.4
+PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
 DISTNAME=	php-${PORTVERSION}
 
-MAINTAINER?=	ale@FreeBSD.org
-COMMENT?=	PHP Scripting Language (Apache Module and CLI)
+MAINTAINER=	ale@FreeBSD.org
+COMMENT=	PHP Scripting Language
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 USE_AUTOTOOLS=	autoconf:259
 USE_GETOPT_LONG=yes
 
-CONFIGURE_ARGS=	--enable-versioning \
+CONFIGURE_ARGS=	\
 		--with-layout=GNU \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all \
diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext
index cdda06b15ee2..050feae1faf8 100644
--- a/lang/php53/Makefile.ext
+++ b/lang/php53/Makefile.ext
@@ -87,7 +87,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 .	if !defined(WITHOUT_X11)
-USE_XPM=	yes
+USE_XORG=	xpm
 .	endif
 
 CONFIGURE_ARGS+=--with-gd \
@@ -502,7 +502,13 @@ CONFIGURE_ARGS+=--with-zlib=/usr
 CONFIGURE_ARGS+=--without-cdb
 .	endif
 .	if defined(WITH_DB4)
-WITH_DB4_VER?=	44
+WITH_DB4_VER?=	46
+.		if ${WITH_DB4_VER} == 45
+LIB_DEPENDS+=	db-4.5.0:${PORTSDIR}/databases/db45
+.		else
+.		if ${WITH_DB4_VER} == 44
+LIB_DEPENDS+=	db-4.4.0:${PORTSDIR}/databases/db44
+.		else
 .		if ${WITH_DB4_VER} == 43
 LIB_DEPENDS+=	db-4.3.0:${PORTSDIR}/databases/db43
 .		else
@@ -515,7 +521,9 @@ LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
 .		if ${WITH_DB4_VER} == 4
 LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
 .		else
-LIB_DEPENDS+=	db-4.4.0:${PORTSDIR}/databases/db44
+LIB_DEPENDS+=	db-4.6.0:${PORTSDIR}/databases/db46
+.		endif
+.		endif
 .		endif
 .		endif
 .		endif
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index fae57f100a84..cd1203c580de 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,9 +1,9 @@
-MD5 (php-5.2.3.tar.bz2) = eb50b751c8e1ced05bd012d5a0e4dec3
-SHA256 (php-5.2.3.tar.bz2) = eedffda5069caa801a7fec217c77619657416a5fcaefb79ba4620432f0befe29
-SIZE (php-5.2.3.tar.bz2) = 7417635
-MD5 (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = f217d04f9513222e48cea6588ac65b89
-SHA256 (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = 214c43e4808483f0700f36ffa57aba909a669cb335c179d46c1e8f765d70bd1f
-SIZE (suhosin-patch-5.2.3-0.9.6.2.patch.gz) = 22789
-MD5 (php-5.2.3-mail-header.patch) = c48ef565c02a2aeb6aadd3d12cea7bb8
-SHA256 (php-5.2.3-mail-header.patch) = dc80159705c2e2806fdab1632d573218383487dce3ad5aa700e92b909dcd03e5
-SIZE (php-5.2.3-mail-header.patch) = 3420
+MD5 (php-5.2.4.tar.bz2) = 55c97a671fdabf462cc7a82971a656d2
+SHA256 (php-5.2.4.tar.bz2) = 502f5259e4619ba3549cd9f9bdeb4152c7effa66672348f3b108fccc8e1ca1c0
+SIZE (php-5.2.4.tar.bz2) = 7608429
+MD5 (suhosin-patch-5.2.4-0.9.6.2.patch.gz) = 58b18d0db00bc52b004fc749190a958f
+SHA256 (suhosin-patch-5.2.4-0.9.6.2.patch.gz) = 08dc68e53188dec7f851e2bc5392eba4c2ccc70cfba91eab1ddbd41dde6bcc14
+SIZE (suhosin-patch-5.2.4-0.9.6.2.patch.gz) = 22736
+MD5 (php-5.2.4-mail-header.patch) = d1b5bbfe95078a367821b74fbbd45e3f
+SHA256 (php-5.2.4-mail-header.patch) = c84ecc5619c900d3ec0c98fd5c09dbfb78afe572f298c00d68f9254596e6e708
+SIZE (php-5.2.4-mail-header.patch) = 3420
diff --git a/lang/php53/files/patch-sapi_cgi_config9.m4 b/lang/php53/files/patch-sapi_cgi_config9.m4
index d3f012498cd6..c40894155cc8 100644
--- a/lang/php53/files/patch-sapi_cgi_config9.m4
+++ b/lang/php53/files/patch-sapi_cgi_config9.m4
@@ -1,26 +1,26 @@
---- sapi/cgi/config9.m4.orig	Thu Feb  2 10:59:23 2006
-+++ sapi/cgi/config9.m4	Thu May  4 11:19:41 2006
-@@ -80,7 +80,6 @@
- ])
- 
- 
+--- sapi/cgi/config9.m4.orig	Thu Jul 12 01:20:36 2007
++++ sapi/cgi/config9.m4	Wed Sep  5 07:55:06 2007
+@@ -25,7 +25,6 @@
+ dnl
+ dnl CGI setup
+ dnl
 -if test "$PHP_SAPI" = "default"; then
-   AC_MSG_CHECKING(for CGI build)
-   if test "$PHP_SAPI_CGI" != "no"; then
+   AC_MSG_CHECKING(whether to build CGI binary)
+   if test "$PHP_CGI" != "no"; then
      AC_MSG_RESULT(yes)
-@@ -145,8 +144,9 @@
-     AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ])
-     AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
+@@ -85,8 +84,9 @@
+     AC_MSG_RESULT($PHP_PATH_INFO_CHECK)
  
+     dnl Set install target and select SAPI
 -    INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
--    PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, , '$(SAPI_CGI_PATH)')
-+    INSTALL_CGI="@echo \"Installing PHP CGI binary: $(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
+-    PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c,, '$(SAPI_CGI_PATH)')
++    INSTALL_CGI="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
 +    PHP_ADD_SOURCES(sapi/cgi, $PHP_FCGI_FILES cgi_main.c getopt.c,, cgi)
 +    PHP_ADD_SOURCES(/main, internal_functions.c,,cgi)
  
      case $host_alias in
        *aix*)
-@@ -156,17 +156,29 @@
+@@ -96,17 +96,29 @@
          BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
        ;;
        *)
@@ -37,7 +37,7 @@
 +    PHP_SUBST(PHP_CGI_TARGET)
 +    PHP_SUBST(PHP_INSTALL_CGI_TARGET)
  
--  elif test "$PHP_SAPI_CLI" != "no"; then
+-  elif test "$PHP_CLI" != "no"; then
 -    AC_MSG_RESULT(no)
 +    if test "$PHP_SAPI" = "default" ; then
 +      PHP_BUILD_PROGRAM($SAPI_CGI_PATH)
@@ -45,7 +45,7 @@
 + else
 +  AC_MSG_RESULT(no)
 +  if test "$PHP_SAPI" = "default" ; then
-+    if test "$PHP_SAPI_CLI" != "no" ; then
++    if test "$PHP_CLI" != "no" ; then
      OVERALL_TARGET=
      PHP_SAPI=cli   
    else