Index: head/databases/php5-pdo_sqlite/Makefile =================================================================== --- head/databases/php5-pdo_sqlite/Makefile (revision 389654) +++ head/databases/php5-pdo_sqlite/Makefile (revision 389655) @@ -1,11 +1,10 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= databases MASTERDIR= ${.CURDIR}/../../lang/php5 PKGNAMESUFFIX= -pdo_sqlite .include "${MASTERDIR}/Makefile" Index: head/databases/php5-sqlite3/Makefile =================================================================== --- head/databases/php5-sqlite3/Makefile (revision 389654) +++ head/databases/php5-sqlite3/Makefile (revision 389655) @@ -1,11 +1,10 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= databases MASTERDIR= ${.CURDIR}/../../lang/php5 PKGNAMESUFFIX= -sqlite3 .include "${MASTERDIR}/Makefile" Index: head/databases/php55-pdo_sqlite/Makefile =================================================================== --- head/databases/php55-pdo_sqlite/Makefile (revision 389654) +++ head/databases/php55-pdo_sqlite/Makefile (revision 389655) @@ -1,11 +1,10 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= databases MASTERDIR= ${.CURDIR}/../../lang/php55 PKGNAMESUFFIX= -pdo_sqlite .include "${MASTERDIR}/Makefile" Index: head/databases/php55-sqlite3/Makefile =================================================================== --- head/databases/php55-sqlite3/Makefile (revision 389654) +++ head/databases/php55-sqlite3/Makefile (revision 389655) @@ -1,11 +1,10 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= databases MASTERDIR= ${.CURDIR}/../../lang/php55 PKGNAMESUFFIX= -sqlite3 .include "${MASTERDIR}/Makefile" Index: head/graphics/php55-gd/Makefile =================================================================== --- head/graphics/php55-gd/Makefile (revision 389654) +++ head/graphics/php55-gd/Makefile (revision 389655) @@ -1,11 +1,10 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= graphics MASTERDIR= ${.CURDIR}/../../lang/php55 PKGNAMESUFFIX= -gd .include "${MASTERDIR}/Makefile" Index: head/graphics/php55-gd/files/patch-libgd_webpimg.c =================================================================== --- head/graphics/php55-gd/files/patch-libgd_webpimg.c (revision 389654) +++ head/graphics/php55-gd/files/patch-libgd_webpimg.c (nonexistent) @@ -1,29 +0,0 @@ -Adjust to libvpx 1.4.0 until the code is removed. - -https://chromium.googlesource.com/webm/libvpx/+/9cdaa3d%5E!/ -https://bitbucket.org/libgd/gd-libgd/commits/824a3aa - ---- libgd/webpimg.c.orig 2013-06-25 09:58:23 UTC -+++ libgd/webpimg.c -@@ -711,14 +711,14 @@ static WebPResult VPXEncode(const uint8* - codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0); - codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2); - -- vpx_img_wrap(&img, IMG_FMT_I420, -+ vpx_img_wrap(&img, VPX_IMG_FMT_I420, - y_width, y_height, 16, (uint8*)(Y)); -- img.planes[PLANE_Y] = (uint8*)(Y); -- img.planes[PLANE_U] = (uint8*)(U); -- img.planes[PLANE_V] = (uint8*)(V); -- img.stride[PLANE_Y] = y_stride; -- img.stride[PLANE_U] = uv_stride; -- img.stride[PLANE_V] = uv_stride; -+ img.planes[VPX_PLANE_Y] = (uint8*)(Y); -+ img.planes[VPX_PLANE_U] = (uint8*)(U); -+ img.planes[VPX_PLANE_V] = (uint8*)(V); -+ img.stride[VPX_PLANE_Y] = y_stride; -+ img.stride[VPX_PLANE_U] = uv_stride; -+ img.stride[VPX_PLANE_V] = uv_stride; - - res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY); - Property changes on: head/graphics/php55-gd/files/patch-libgd_webpimg.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/php56-gd/Makefile =================================================================== --- head/graphics/php56-gd/Makefile (revision 389654) +++ head/graphics/php56-gd/Makefile (revision 389655) @@ -1,11 +1,10 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= graphics MASTERDIR= ${.CURDIR}/../../lang/php56 PKGNAMESUFFIX= -gd .include "${MASTERDIR}/Makefile" Index: head/graphics/php56-gd/files/patch-libgd_webpimg.c =================================================================== --- head/graphics/php56-gd/files/patch-libgd_webpimg.c (revision 389654) +++ head/graphics/php56-gd/files/patch-libgd_webpimg.c (nonexistent) @@ -1,29 +0,0 @@ -Adjust to libvpx 1.4.0 until the code is removed. - -https://chromium.googlesource.com/webm/libvpx/+/9cdaa3d%5E!/ -https://bitbucket.org/libgd/gd-libgd/commits/824a3aa - ---- libgd/webpimg.c.orig 2013-06-25 09:58:23 UTC -+++ libgd/webpimg.c -@@ -711,14 +711,14 @@ static WebPResult VPXEncode(const uint8* - codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0); - codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2); - -- vpx_img_wrap(&img, IMG_FMT_I420, -+ vpx_img_wrap(&img, VPX_IMG_FMT_I420, - y_width, y_height, 16, (uint8*)(Y)); -- img.planes[PLANE_Y] = (uint8*)(Y); -- img.planes[PLANE_U] = (uint8*)(U); -- img.planes[PLANE_V] = (uint8*)(V); -- img.stride[PLANE_Y] = y_stride; -- img.stride[PLANE_U] = uv_stride; -- img.stride[PLANE_V] = uv_stride; -+ img.planes[VPX_PLANE_Y] = (uint8*)(Y); -+ img.planes[VPX_PLANE_U] = (uint8*)(U); -+ img.planes[VPX_PLANE_V] = (uint8*)(V); -+ img.stride[VPX_PLANE_Y] = y_stride; -+ img.stride[VPX_PLANE_U] = uv_stride; -+ img.stride[VPX_PLANE_V] = uv_stride; - - res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY); - Property changes on: head/graphics/php56-gd/files/patch-libgd_webpimg.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/php5/Makefile =================================================================== --- head/lang/php5/Makefile (revision 389654) +++ head/lang/php5/Makefile (revision 389655) @@ -1,210 +1,210 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= php5 -PORTVERSION= 5.4.41 +PORTVERSION= 5.4.42 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} MAINTAINER= ale@FreeBSD.org COMMENT= PHP Scripting Language LICENSE= PHP301 LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} USES= tar:bzip2 cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) USE_AUTOTOOLS= autoconf LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre CONFIGURE_ARGS+=--with-layout=GNU \ --localstatedir=/var \ --with-config-file-scan-dir=${PREFIX}/etc/php \ --disable-all \ --enable-libxml \ --enable-mysqlnd \ --with-libxml-dir=${LOCALBASE} \ --with-pcre-regex=${LOCALBASE} \ --with-zlib-dir=/usr \ --program-prefix="" USE_GNOME= libxml2 OPTIONS_DEFINE+=CLI CGI FPM EMBED DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR # Bug 197128: No ASM code for MIPS/MIPS64, disable FPM OPTIONS_EXCLUDE_mips=FPM OPTIONS_EXCLUDE_mips64=FPM OPTIONS_SUB= yes CLI_DESC= Build CLI version CGI_DESC= Build CGI version FPM_DESC= Build FPM version EMBED_DESC= Build embedded library DEBUG_DESC= Enable debug DTRACE_DESC= Enable DTrace support IPV6_DESC= Enable ipv6 support MAILHEAD_DESC= Enable mail header patch LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build CONFLICTS= php53-5* php55-5* php56-5* DESTDIRNAME= INSTALL_ROOT .include PATCH_DIST_STRIP= -p1 PATCH_SITES+= LOCAL/ale .if ${PORT_OPTIONS:MMAILHEAD} PATCHFILES+= php-5.4.x-mail-header.patch:mail PATCH_SITES+= http://choon.net/opensource/php/:mail .endif .if ${PORT_OPTIONS:MCLI} PHP_SAPI+= cli .else CONFIGURE_ARGS+=--disable-cli .endif .if ${PORT_OPTIONS:MCGI} PHP_SAPI+= cgi .else CONFIGURE_ARGS+=--disable-cgi .endif .if ${PORT_OPTIONS:MFPM} PHP_SAPI+= fpm USE_RC_SUBR+= php-fpm CONFIGURE_ARGS+=--enable-fpm \ --with-fpm-user=${WWWOWN} \ --with-fpm-group=${WWWGRP} .endif .if defined(OPTIONS_FILE_SET) && ${OPTIONS_FILE_SET:MAPACHE} IGNORE= doesn't install the Apache module anymore:\ update your OPTIONS and build www/mod_php5 port instead .endif .if defined(PKGNAMEPREFIX) USE_PHP= yes PHP_DEFAULT= 5.4 IGNORE_WITH_PHP=53 55 USE_APACHE= 22+ .include "${PORTSDIR}/Mk/bsd.apache.mk" .if ${PORT_OPTIONS:MAP2FILTER} CONFIGURE_ARGS+=--with-apxs2filter=${APXS} .else CONFIGURE_ARGS+=--with-apxs2=${APXS} .endif PLIST= ${PKGDIR}/pkg-plist.mod PKGMESSAGE= ${PKGDIR}/pkg-message.mod MODULENAME= libphp5 SHORTMODNAME= php5 WARNING= "!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!" .endif .if ${PORT_OPTIONS:MEMBED} PHP_SAPI+= embed CONFIGURE_ARGS+=--enable-embed .endif .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED} PLIST_SUB+= SAPI_INC="" .else PLIST_SUB+= SAPI_INC="@comment " .endif .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php" CONFIGURE_ARGS+=--with-regex=php .elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system" CONFIGURE_ARGS+=--with-regex=system .endif .if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL" CONFIGURE_ARGS+=--with-zend-vm=CALL .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH" CONFIGURE_ARGS+=--with-zend-vm=SWITCH .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO" CONFIGURE_ARGS+=--with-zend-vm=GOTO .endif CONFIGURE_ENV+= ac_cv_pthreads_lib="" \ ac_cv_pthreads_cflags="" \ ac_cv_decimal_fp_supported="no" \ pthreads_working="yes" \ lt_cv_path_SED="sed" .if ${PORT_OPTIONS:MLINKTHR} LIBS+= -lpthread .endif .if ${PORT_OPTIONS:MZTS} CONFIGURE_ARGS+=--enable-maintainer-zts .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug .endif .if ${PORT_OPTIONS:MDTRACE} .if ${OSVERSION} < 900000 IGNORE= cannot be built with DTrace support on FreeBSD < 9.x .endif CONFIGURE_ARGS+=--enable-dtrace PLIST_SUB+= DTRACE="" .else PLIST_SUB+= DTRACE="@comment " .endif .if empty(PORT_OPTIONS:MIPV6) CONFIGURE_ARGS+=--disable-ipv6 .endif post-patch: @${TOUCH} ${WRKSRC}/ext/php_config.h @${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-* .if ${PORT_OPTIONS:MFPM} @${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \ ${WRKSRC}/sapi/fpm/php-fpm.conf.in .endif # Work around issues with newer (>=2.64) autoconf pre-configure: @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` @${RM} ${WRKSRC}/configure @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 .if !defined(PKGNAMEPREFIX) post-build: @${ECHO_CMD} "PHP_VER=5" > ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf test: build @(cd ${WRKSRC} && ${MAKE} test) post-install: @${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \ ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc .else do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \ ${STAGEDIR}${PREFIX}/${APACHEMODDIR} .endif .else .include "${MASTERDIR}/Makefile.ext" .endif .include Index: head/lang/php5/distinfo =================================================================== --- head/lang/php5/distinfo (revision 389654) +++ head/lang/php5/distinfo (revision 389655) @@ -1,4 +1,4 @@ -SHA256 (php-5.4.41.tar.bz2) = 5bc4b45a1280ff80a3cf5b8563716f325cfd0121d7fd25aa54d56ff38b3b8272 -SIZE (php-5.4.41.tar.bz2) = 12487089 +SHA256 (php-5.4.42.tar.bz2) = 6285b2e64bfaa69e5d983d7d981b4f254f5259ad3fd591ca832722a4cc1ae0f9 +SIZE (php-5.4.42.tar.bz2) = 12708394 SHA256 (php-5.4.x-mail-header.patch) = 005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344 SIZE (php-5.4.x-mail-header.patch) = 3379 Index: head/lang/php55/Makefile =================================================================== --- head/lang/php55/Makefile (revision 389654) +++ head/lang/php55/Makefile (revision 389655) @@ -1,210 +1,210 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= php55 -PORTVERSION= 5.5.25 +PORTVERSION= 5.5.26 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} MAINTAINER= ale@FreeBSD.org COMMENT= PHP Scripting Language LICENSE= PHP301 LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} USES= tar:bzip2 cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) USE_AUTOTOOLS= autoconf LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre CONFIGURE_ARGS+=--with-layout=GNU \ --localstatedir=/var \ --with-config-file-scan-dir=${PREFIX}/etc/php \ --disable-all \ --enable-libxml \ --enable-mysqlnd \ --with-libxml-dir=${LOCALBASE} \ --with-pcre-regex=${LOCALBASE} \ --with-zlib-dir=/usr \ --program-prefix="" USE_GNOME= libxml2 OPTIONS_DEFINE+=CLI CGI FPM EMBED DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR # Bug 197128: No ASM code for MIPS/MIPS64, disable FPM OPTIONS_EXCLUDE_mips=FPM OPTIONS_EXCLUDE_mips64=FPM OPTIONS_SUB= yes CLI_DESC= Build CLI version CGI_DESC= Build CGI version FPM_DESC= Build FPM version EMBED_DESC= Build embedded library DEBUG_DESC= Enable debug DTRACE_DESC= Enable DTrace support IPV6_DESC= Enable ipv6 support MAILHEAD_DESC= Enable mail header patch LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build CONFLICTS= php53-5* php54-5* php56-5* php5-5* DESTDIRNAME= INSTALL_ROOT .include PATCH_DIST_STRIP= -p1 PATCH_SITES+= LOCAL/ale .if ${PORT_OPTIONS:MMAILHEAD} PATCHFILES+= php-5.5.x-mail-header.patch:mail PATCH_SITES+= http://choon.net/opensource/php/:mail .endif .if ${PORT_OPTIONS:MCLI} PHP_SAPI+= cli .else CONFIGURE_ARGS+=--disable-cli .endif .if ${PORT_OPTIONS:MCGI} PHP_SAPI+= cgi .else CONFIGURE_ARGS+=--disable-cgi .endif .if ${PORT_OPTIONS:MFPM} PHP_SAPI+= fpm USE_RC_SUBR+= php-fpm CONFIGURE_ARGS+=--enable-fpm \ --with-fpm-user=${WWWOWN} \ --with-fpm-group=${WWWGRP} .endif .if defined(OPTIONS_FILE_SET) && ${OPTIONS_FILE_SET:MAPACHE} IGNORE= doesn't install the Apache module anymore:\ update your OPTIONS and build www/mod_php55 port instead .endif .if defined(PKGNAMEPREFIX) USE_PHP= yes PHP_DEFAULT= 5.5 IGNORE_WITH_PHP=53 54 5 USE_APACHE= 22+ .include "${PORTSDIR}/Mk/bsd.apache.mk" .if ${PORT_OPTIONS:MAP2FILTER} CONFIGURE_ARGS+=--with-apxs2filter=${APXS} .else CONFIGURE_ARGS+=--with-apxs2=${APXS} .endif PLIST= ${PKGDIR}/pkg-plist.mod PKGMESSAGE= ${PKGDIR}/pkg-message.mod MODULENAME= libphp5 SHORTMODNAME= php5 WARNING= "!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!" .endif .if ${PORT_OPTIONS:MEMBED} PHP_SAPI+= embed CONFIGURE_ARGS+=--enable-embed .endif .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED} PLIST_SUB+= SAPI_INC="" .else PLIST_SUB+= SAPI_INC="@comment " .endif .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php" CONFIGURE_ARGS+=--with-regex=php .elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system" CONFIGURE_ARGS+=--with-regex=system .endif .if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL" CONFIGURE_ARGS+=--with-zend-vm=CALL .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH" CONFIGURE_ARGS+=--with-zend-vm=SWITCH .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO" CONFIGURE_ARGS+=--with-zend-vm=GOTO .endif CONFIGURE_ENV+= ac_cv_pthreads_lib="" \ ac_cv_pthreads_cflags="" \ ac_cv_decimal_fp_supported="no" \ pthreads_working="yes" \ lt_cv_path_SED="sed" .if ${PORT_OPTIONS:MLINKTHR} LIBS+= -lpthread .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug .endif .if ${PORT_OPTIONS:MZTS} CONFIGURE_ARGS+=--enable-maintainer-zts .endif .if ${PORT_OPTIONS:MDTRACE} .if ${OSVERSION} < 900000 IGNORE= cannot be built with DTrace support on FreeBSD < 9.x .endif CONFIGURE_ARGS+=--enable-dtrace PLIST_SUB+= DTRACE="" .else PLIST_SUB+= DTRACE="@comment " .endif .if empty(PORT_OPTIONS:MIPV6) CONFIGURE_ARGS+=--disable-ipv6 .endif post-patch: @${TOUCH} ${WRKSRC}/ext/php_config.h @${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-* .if ${PORT_OPTIONS:MFPM} @${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \ ${WRKSRC}/sapi/fpm/php-fpm.conf.in .endif # Work around issues with newer (>=2.64) autoconf pre-configure: @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` @${RM} ${WRKSRC}/configure @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 .if !defined(PKGNAMEPREFIX) post-build: @${ECHO_CMD} "PHP_VER=55" > ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf test: build @(cd ${WRKSRC} && ${MAKE} test) post-install: @${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \ ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc .else do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \ ${STAGEDIR}${PREFIX}/${APACHEMODDIR} .endif .else .include "${MASTERDIR}/Makefile.ext" .endif .include Index: head/lang/php55/distinfo =================================================================== --- head/lang/php55/distinfo (revision 389654) +++ head/lang/php55/distinfo (revision 389655) @@ -1,4 +1,4 @@ -SHA256 (php-5.5.25.tar.bz2) = 68df37e725ddd05675c0df906041038127938ecc52113a54d10e1e4029262c63 -SIZE (php-5.5.25.tar.bz2) = 13422002 +SHA256 (php-5.5.26.tar.bz2) = 816afffdb03ff4c542bc172a2f77f9c69b817df82d60cce05c1b4f578c2c926e +SIZE (php-5.5.26.tar.bz2) = 13671379 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 SIZE (php-5.5.x-mail-header.patch) = 3379 Index: head/lang/php56/Makefile =================================================================== --- head/lang/php56/Makefile (revision 389654) +++ head/lang/php56/Makefile (revision 389655) @@ -1,213 +1,213 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= php56 -PORTVERSION= 5.6.9 +PORTVERSION= 5.6.10 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} MAINTAINER= ale@FreeBSD.org COMMENT= PHP Scripting Language LICENSE= PHP301 LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} USES= tar:bzip2 cpe CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) USE_AUTOTOOLS= autoconf LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre CONFIGURE_ARGS+=--with-layout=GNU \ --localstatedir=/var \ --with-config-file-scan-dir=${PREFIX}/etc/php \ --disable-all \ --enable-libxml \ --enable-mysqlnd \ --with-libxml-dir=${LOCALBASE} \ --with-pcre-regex=${LOCALBASE} \ --with-zlib-dir=/usr \ --program-prefix="" USE_GNOME= libxml2 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR # Bug 197128: No ASM code for MIPS/MIPS64, disable FPM OPTIONS_EXCLUDE_mips=FPM OPTIONS_EXCLUDE_mips64=FPM OPTIONS_SUB= yes CLI_DESC= Build CLI version CGI_DESC= Build CGI version FPM_DESC= Build FPM version EMBED_DESC= Build embedded library DEBUG_DESC= Enable debug DTRACE_DESC= Enable DTrace support IPV6_DESC= Enable ipv6 support MAILHEAD_DESC= Enable mail header patch LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build CONFLICTS= php53-5* php54-5* php55-5* php5-5* DESTDIRNAME= INSTALL_ROOT .include PATCH_DIST_STRIP= -p1 PATCH_SITES+= LOCAL/ale .if ${PORT_OPTIONS:MMAILHEAD} PATCHFILES+= php-5.5.x-mail-header.patch:mail PATCH_SITES+= http://choon.net/opensource/php/:mail .endif .if ${PORT_OPTIONS:MCLI} PHP_SAPI+= cli .else CONFIGURE_ARGS+=--disable-cli .endif .if ${PORT_OPTIONS:MCGI} PHP_SAPI+= cgi .else CONFIGURE_ARGS+=--disable-cgi .endif .if ${PORT_OPTIONS:MFPM} PHP_SAPI+= fpm USE_RC_SUBR+= php-fpm CONFIGURE_ARGS+=--enable-fpm \ --with-fpm-user=${WWWOWN} \ --with-fpm-group=${WWWGRP} .endif .if defined(PKGNAMEPREFIX) USE_PHP= yes PHP_DEFAULT= 5.6 IGNORE_WITH_PHP=53 54 5 USE_APACHE= 22+ .include "${PORTSDIR}/Mk/bsd.apache.mk" .if ${PORT_OPTIONS:MAP2FILTER} CONFIGURE_ARGS+=--with-apxs2filter=${APXS} .else CONFIGURE_ARGS+=--with-apxs2=${APXS} .endif PLIST= ${PKGDIR}/pkg-plist.mod PKGMESSAGE= ${PKGDIR}/pkg-message.mod MODULENAME= libphp5 SHORTMODNAME= php5 WARNING= "!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!" .endif .if ${PORT_OPTIONS:MEMBED} PHP_SAPI+= embed CONFIGURE_ARGS+=--enable-embed .endif .if ${PORT_OPTIONS:MPHPDBG} PHP_SAPI+= phpdbg CONFIGURE_ARGS+=--enable-phpdbg .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-phpdbg-debug .endif .endif .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED} PLIST_SUB+= SAPI_INC="" .else PLIST_SUB+= SAPI_INC="@comment " .endif .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php" CONFIGURE_ARGS+=--with-regex=php .elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system" CONFIGURE_ARGS+=--with-regex=system .endif .if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL" CONFIGURE_ARGS+=--with-zend-vm=CALL .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH" CONFIGURE_ARGS+=--with-zend-vm=SWITCH .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO" CONFIGURE_ARGS+=--with-zend-vm=GOTO .endif CONFIGURE_ENV+= ac_cv_pthreads_lib="" \ ac_cv_pthreads_cflags="" \ ac_cv_decimal_fp_supported="no" \ pthreads_working="yes" \ lt_cv_path_SED="sed" .if ${PORT_OPTIONS:MLINKTHR} LIBS+= -lpthread .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug .endif .if ${PORT_OPTIONS:MZTS} CONFIGURE_ARGS+=--enable-maintainer-zts .endif .if ${PORT_OPTIONS:MDTRACE} .if ${OSVERSION} < 900000 IGNORE= cannot be built with DTrace support on FreeBSD < 9.x .endif CONFIGURE_ARGS+=--enable-dtrace PLIST_SUB+= DTRACE="" .else PLIST_SUB+= DTRACE="@comment " .endif .if empty(PORT_OPTIONS:MIPV6) CONFIGURE_ARGS+=--disable-ipv6 .endif post-patch: @${TOUCH} ${WRKSRC}/ext/php_config.h @${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-* .if ${PORT_OPTIONS:MFPM} @${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \ ${WRKSRC}/sapi/fpm/php-fpm.conf.in .endif # Work around issues with newer (>=2.64) autoconf pre-configure: @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` @${RM} ${WRKSRC}/configure @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 .if !defined(PKGNAMEPREFIX) post-build: @${ECHO_CMD} "PHP_VER=56" > ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf test: build @(cd ${WRKSRC} && ${MAKE} test) post-install: @${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \ ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc .else do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \ ${STAGEDIR}${PREFIX}/${APACHEMODDIR} .endif .else .include "${MASTERDIR}/Makefile.ext" .endif .include Index: head/lang/php56/distinfo =================================================================== --- head/lang/php56/distinfo (revision 389654) +++ head/lang/php56/distinfo (revision 389655) @@ -1,4 +1,4 @@ -SHA256 (php-5.6.9.tar.bz2) = 19d3b87b7b8bba3be24cf6d757d16b723a98881c3af8d15469fd25501e9abcb9 -SIZE (php-5.6.9.tar.bz2) = 14037070 +SHA256 (php-5.6.10.tar.bz2) = 0a579c81c724ea41815eee0caa8ea7d8eeb302458519d8cc4fc5b055577c8c45 +SIZE (php-5.6.10.tar.bz2) = 14080915 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 SIZE (php-5.5.x-mail-header.patch) = 3379 Index: head/security/php5-mcrypt/Makefile =================================================================== --- head/security/php5-mcrypt/Makefile (revision 389654) +++ head/security/php5-mcrypt/Makefile (revision 389655) @@ -1,11 +1,10 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= security MASTERDIR= ${.CURDIR}/../../lang/php5 PKGNAMESUFFIX= -mcrypt .include "${MASTERDIR}/Makefile" Index: head/security/php55-mcrypt/Makefile =================================================================== --- head/security/php55-mcrypt/Makefile (revision 389654) +++ head/security/php55-mcrypt/Makefile (revision 389655) @@ -1,11 +1,10 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= security MASTERDIR= ${.CURDIR}/../../lang/php55 PKGNAMESUFFIX= -mcrypt .include "${MASTERDIR}/Makefile" Index: head/textproc/php5-pspell/Makefile =================================================================== --- head/textproc/php5-pspell/Makefile (revision 389654) +++ head/textproc/php5-pspell/Makefile (revision 389655) @@ -1,11 +1,10 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= textproc MASTERDIR= ${.CURDIR}/../../lang/php5 PKGNAMESUFFIX= -pspell .include "${MASTERDIR}/Makefile" Index: head/textproc/php55-pspell/Makefile =================================================================== --- head/textproc/php55-pspell/Makefile (revision 389654) +++ head/textproc/php55-pspell/Makefile (revision 389655) @@ -1,11 +1,10 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= textproc MASTERDIR= ${.CURDIR}/../../lang/php55 PKGNAMESUFFIX= -pspell .include "${MASTERDIR}/Makefile"