[Midnightbsd-cvs] mports: lang/php5: Update to 5.2.4.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Oct 9 12:29:02 EDT 2007 

Log Message:
-----------
Update to 5.2.4. 

Extensions are coming...

Modified Files:
--------------
    mports/lang/php5:
        Makefile (r1.7 -> r1.8)
        distinfo (r1.5 -> r1.6)
    mports/lang/php5/files:
        patch-sapi_cgi_config9.m4 (r1.2 -> r1.3)
        patch-scripts::phpize.in (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/lang/php5/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -Llang/php5/Makefile -Llang/php5/Makefile -u -r1.7 -r1.8
--- lang/php5/Makefile
+++ lang/php5/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.2.3
+PORTVERSION=	5.2.4
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
@@ -25,7 +25,7 @@
 
 USE_BZIP2=	yes
 .if !defined(PKGNAMESUFFIX)
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_GETOPT_LONG=yes
 
 CONFIGURE_ARGS=	--enable-versioning \
@@ -54,8 +54,6 @@
 		FASTCGI "Enable fastcgi support (CGI only)" on \
 		PATHINFO "Enable path-info-check support (CGI only)" on
 
-CONFLICTS=	php4-4*
-
 MAN1=		php-config.1 phpize.1
 
 .include <bsd.port.pre.mk>
@@ -100,13 +98,9 @@
 
 .if defined(WITH_APACHE)
 PHP_SAPI+=	mod
-USE_APACHE=	1.3+
+USE_APACHE=	2.0+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
-.if ${APACHE_VERSION} > 13
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
-.else
-CONFIGURE_ARGS+=--with-apxs=${APXS}
-.endif
 PKGMESSAGE=	${PKGDIR}/pkg-message.mod
 MODULENAME=	lib${PORTNAME}
 SHORTMODNAME=	${PORTNAME}
@@ -166,9 +160,6 @@
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
 	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
 	@${TOUCH} ${PREFIX}/include/php/ext/php_config.h
-.if defined(WITH_APACHE)
-	@${CAT} ${PKGMESSAGE}
-.endif
 
 .else
 .include "${MASTERDIR}/Makefile.ext"
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/lang/php5/distinfo,v
retrieving revision 1.5
retrieving revision 1.6
diff -Llang/php5/distinfo -Llang/php5/distinfo -u -r1.5 -r1.6
--- lang/php5/distinfo
+++ lang/php5/distinfo
@@ -1,6 +1,6 @@
-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.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
Index: patch-scripts::phpize.in
===================================================================
RCS file: /home/cvs/mports/lang/php5/files/patch-scripts::phpize.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Llang/php5/files/patch-scripts::phpize.in -Llang/php5/files/patch-scripts::phpize.in -u -r1.1 -r1.2
--- lang/php5/files/patch-scripts::phpize.in
+++ lang/php5/files/patch-scripts::phpize.in
@@ -6,8 +6,8 @@
  {
 -  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf
 -  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader
-+  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf259
-+  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader259
++  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.61
++  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.61
    
    if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then
      cat <<EOF
Index: patch-sapi_cgi_config9.m4
===================================================================
RCS file: /home/cvs/mports/lang/php5/files/patch-sapi_cgi_config9.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -Llang/php5/files/patch-sapi_cgi_config9.m4 -Llang/php5/files/patch-sapi_cgi_config9.m4 -u -r1.2 -r1.3
--- lang/php5/files/patch-sapi_cgi_config9.m4
+++ lang/php5/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

More information about the Midnightbsd-cvs mailing list