Date: Fri, 18 Oct 2013 09:56:47 +0000 (UTC) From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330733 - in head/lang: php55 php55-extensions Message-ID: <201310180956.r9I9ulVX053940@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Fri Oct 18 09:56:47 2013 New Revision: 330733 URL: http://svnweb.freebsd.org/changeset/ports/330733 Log: Update to 5.5.5 release and STAGify. Modified: head/lang/php55-extensions/Makefile head/lang/php55/Makefile head/lang/php55/Makefile.ext head/lang/php55/distinfo head/lang/php55/pkg-plist Modified: head/lang/php55-extensions/Makefile ============================================================================== --- head/lang/php55-extensions/Makefile Fri Oct 18 09:47:00 2013 (r330732) +++ head/lang/php55-extensions/Makefile Fri Oct 18 09:56:47 2013 (r330733) @@ -18,6 +18,7 @@ IGNORE_WITH_PHP=52 53 54 5 USE_PHP_BUILD= yes NO_BUILD= yes +NO_MTREE= yes LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} Modified: head/lang/php55/Makefile ============================================================================== --- head/lang/php55/Makefile Fri Oct 18 09:47:00 2013 (r330732) +++ head/lang/php55/Makefile Fri Oct 18 09:56:47 2013 (r330733) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php55 -PORTVERSION= 5.5.4 +PORTVERSION= 5.5.5 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} @@ -21,7 +21,7 @@ NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) USE_AUTOTOOLS= autoconf -LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre +LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre CONFIGURE_ARGS= \ --with-layout=GNU \ @@ -55,9 +55,8 @@ ZTS_DESC= Force Zend Thread Safety (ZTS) CONFLICTS= php52-5* php53-5* php54-5* php5-5* -MAN1= php-config.1 phpize.1 +DESTDIRNAME= INSTALL_ROOT -NO_STAGE= yes .include <bsd.port.pre.mk> PATCH_DIST_STRIP= -p1 @@ -73,7 +72,6 @@ PATCH_SITES+= http://choon.net/opensourc .if ${PORT_OPTIONS:MCLI} PHP_SAPI+= cli PLIST_SUB+= CLI="" -MAN1+= php.1 .else PLIST_SUB+= CLI="@comment " CONFIGURE_ARGS+=--disable-cli @@ -82,7 +80,6 @@ CONFIGURE_ARGS+=--disable-cli .if ${PORT_OPTIONS:MCGI} PHP_SAPI+= cgi PLIST_SUB+= CGI="" -MAN1+= php-cgi.1 .else PLIST_SUB+= CGI="@comment " CONFIGURE_ARGS+=--disable-cgi @@ -90,7 +87,6 @@ CONFIGURE_ARGS+=--disable-cgi .if ${PORT_OPTIONS:MFPM} PHP_SAPI+= fpm -MAN8+= php-fpm.8 USE_RC_SUBR+= php-fpm CONFIGURE_ARGS+=--enable-fpm \ --with-fpm-user=${WWWOWN} \ @@ -196,16 +192,8 @@ test: build @(cd ${WRKSRC} && ${MAKE} test) post-install: - @${INSTALL_DATA} ${WRKSRC}/php.ini-development ${PREFIX}/etc - @${INSTALL_DATA} ${WRKSRC}/php.ini-production ${PREFIX}/etc - @${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc - @${TOUCH} ${PREFIX}/include/php/ext/php_config.h -.if ${PORT_OPTIONS:MFPM} - @${CP} -n ${PREFIX}/etc/php-fpm.conf.default ${PREFIX}/etc/php-fpm.conf || ${TRUE} -.endif -.if ${PORT_OPTIONS:MAPACHE} - @${CAT} ${PKGMESSAGE} -.endif + @${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \ + ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc .else .include "${MASTERDIR}/Makefile.ext" Modified: head/lang/php55/Makefile.ext ============================================================================== --- head/lang/php55/Makefile.ext Fri Oct 18 09:47:00 2013 (r330732) +++ head/lang/php55/Makefile.ext Fri Oct 18 09:56:47 2013 (r330733) @@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--enable-ctype .endif .if ${PHP_MODNAME} == "curl" -LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+=--with-curl=${LOCALBASE} .endif @@ -86,9 +86,9 @@ USE_OPENSSL= yes .endif .if ${PHP_MODNAME} == "gd" -LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \ - png15:${PORTSDIR}/graphics/png \ - jpeg:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ + libpng15.so:${PORTSDIR}/graphics/png \ + libjpeg.so:${PORTSDIR}/graphics/jpeg CONFIGURE_ARGS+=--with-gd \ --with-freetype-dir=${LOCALBASE} \ @@ -115,7 +115,7 @@ USES+= gettext .endif .if ${PHP_MODNAME} == "gmp" -LIB_DEPENDS+= gmp:${PORTSDIR}/math/gmp +LIB_DEPENDS+= libgmp.so:${PORTSDIR}/math/gmp CONFIGURE_ARGS+=--with-gmp=${LOCALBASE} .endif @@ -132,7 +132,7 @@ USES+= iconv .endif .if ${PHP_MODNAME} == "imap" -LIB_DEPENDS+= c-client4:${PORTSDIR}/mail/cclient +LIB_DEPENDS+= libc-client4.so:${PORTSDIR}/mail/cclient CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \ --with-pcre-dir=${LOCALBASE} @@ -178,7 +178,7 @@ PHP_HEADER_DIRS=libmbfl libmbfl/filters .endif .if ${PHP_MODNAME} == "mcrypt" -LIB_DEPENDS+= mcrypt:${PORTSDIR}/security/libmcrypt +LIB_DEPENDS+= libmcrypt.so:${PORTSDIR}/security/libmcrypt CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE} @@ -186,7 +186,7 @@ USE_AUTOTOOLS= libltdl .endif .if ${PHP_MODNAME} == "mssql" -LIB_DEPENDS+= sybdb:${PORTSDIR}/databases/freetds-msdblib +LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds-msdblib CONFIGURE_ARGS+=--with-mssql=${LOCALBASE} .endif @@ -307,7 +307,7 @@ CONFIGURE_ARGS+=--enable-posix .endif .if ${PHP_MODNAME} == "pspell" -LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell +LIB_DEPENDS+= libaspell.so:${PORTSDIR}/textproc/aspell CONFIGURE_ARGS+=--with-pspell=${LOCALBASE} @@ -321,7 +321,7 @@ CONFIGURE_ARGS+=--with-readline=/usr .endif .if ${PHP_MODNAME} == "recode" -LIB_DEPENDS+= recode:${PORTSDIR}/converters/recode +LIB_DEPENDS+= librecode.so:${PORTSDIR}/converters/recode CONFIGURE_ARGS+=--with-recode=${LOCALBASE} .endif @@ -349,7 +349,7 @@ CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} CONFIGURE_ENV+= ac_cv_buggy_snprint_value="no" -LIB_DEPENDS+= netsnmp:${PORTSDIR}/net-mgmt/net-snmp +LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USE_OPENSSL= yes .endif @@ -374,7 +374,7 @@ CONFIGURE_ARGS+=--with-sqlite3=${LOCALBA .endif .if ${PHP_MODNAME} == "sybase_ct" -LIB_DEPENDS+= ct:${PORTSDIR}/databases/freetds +LIB_DEPENDS+= libct.so:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE} .endif @@ -394,7 +394,7 @@ CONFIGURE_ARGS+=--enable-sysvshm .if ${PHP_MODNAME} == "tidy" CONFIGURE_ARGS+=--with-tidy=${LOCALBASE} -LIB_DEPENDS+= tidy-0.99:${PORTSDIR}/www/tidy-lib +LIB_DEPENDS+= libtidy-0.99.so:${PORTSDIR}/www/tidy-lib .endif .if ${PHP_MODNAME} == "tokenizer" @@ -479,17 +479,17 @@ USE_BDB= 40+ WITH_BDB_HIGHEST= yes . endif . if ${PORT_OPTIONS:MGDBM} -LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm +LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/databases/gdbm CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE} . endif . if ${PORT_OPTIONS:MQDBM} -LIB_DEPENDS+= qdbm:${PORTSDIR}/databases/qdbm +LIB_DEPENDS+= libqdbm.so:${PORTSDIR}/databases/qdbm CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE} . endif . if ${PORT_OPTIONS:MTOKYO} -LIB_DEPENDS+= tokyocabinet:${PORTSDIR}/databases/tokyocabinet +LIB_DEPENDS+= libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet CONFIGURE_ARGS+=--with-tcadb=${LOCALBASE} . endif @@ -503,7 +503,7 @@ CONFIGURE_ARGS+=--disable-flatfile .if ${PHP_MODNAME} == "gd" . if ${PORT_OPTIONS:MT1LIB} -LIB_DEPENDS+= t1:${PORTSDIR}/devel/t1lib +LIB_DEPENDS+= libt1.so:${PORTSDIR}/devel/t1lib CONFIGURE_ARGS+=--with-t1lib=${LOCALBASE} . endif @@ -519,7 +519,7 @@ USE_XORG= xpm CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} . endif . if ${PORT_OPTIONS:MVPX} -LIB_DEPENDS+= vpx:${PORTSDIR}/multimedia/libvpx +LIB_DEPENDS+= libvpx.so:${PORTSDIR}/multimedia/libvpx CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBASE} . endif @@ -527,7 +527,7 @@ CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBA .if ${PHP_MODNAME} == "mbstring" . if ${PORT_OPTIONS:MREGEX} -LIB_DEPENDS+= onig:${PORTSDIR}/devel/oniguruma4 +LIB_DEPENDS+= libonig.so:${PORTSDIR}/devel/oniguruma4 CONFIGURE_ARGS+=--with-onig=${LOCALBASE} . else CONFIGURE_ARGS+=--disable-mbregex @@ -562,11 +562,11 @@ post-extract: .if ${PHP_MODNAME} == "odbc" . if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc +LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE} . else -LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC +LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE} . endif @@ -574,19 +574,19 @@ CONFIGURE_ARGS+=--with-unixODBC=${LOCALB .if ${PHP_MODNAME} == "pdo_dblib" . if ${PORT_OPTIONS:MMSSQL} -LIB_DEPENDS+= sybdb:${PORTSDIR}/databases/freetds-msdblib +LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds-msdblib . else -LIB_DEPENDS+= ct:${PORTSDIR}/databases/freetds +LIB_DEPENDS+= libct.so:${PORTSDIR}/databases/freetds . endif .endif .if ${PHP_MODNAME} == "pdo_odbc" . if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc +LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc CONFIGURE_ARGS+=--with-pdo-odbc=iODBC,${LOCALBASE} . else -LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC +LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE} . endif Modified: head/lang/php55/distinfo ============================================================================== --- head/lang/php55/distinfo Fri Oct 18 09:47:00 2013 (r330732) +++ head/lang/php55/distinfo Fri Oct 18 09:56:47 2013 (r330733) @@ -1,4 +1,4 @@ -SHA256 (php-5.5.4.tar.bz2) = 49f87e8cf0bbec53a6e7f1c8ab132fcec37bb09990404c7c959f81dfb1637439 -SIZE (php-5.5.4.tar.bz2) = 12047184 +SHA256 (php-5.5.5.tar.bz2) = a400b324ae288eb0c9285e550fe5fd7f92c0f4e126496c3b05f9041da6cc04de +SIZE (php-5.5.5.tar.bz2) = 12547974 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 SIZE (php-5.5.x-mail-header.patch) = 3379 Modified: head/lang/php55/pkg-plist ============================================================================== --- head/lang/php55/pkg-plist Fri Oct 18 09:47:00 2013 (r330732) +++ head/lang/php55/pkg-plist Fri Oct 18 09:56:47 2013 (r330733) @@ -238,6 +238,11 @@ lib/php/build/shtool %%APACHE%%%%APACHEMODDIR%%/%%AP_MODULE%% %%APACHE%%@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f %%APACHE%%@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f +%%CGI%%man/man1/php-cgi.1.gz +man/man1/php-config.1.gz +%%CLI%%man/man1/php.1.gz +man/man1/phpize.1.gz +%%FPM%%man/man8/php-fpm.8.gz %%FPM%%share/php/fpm/status.html @dirrm include/php/TSRM @dirrm include/php/Zend
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310180956.r9I9ulVX053940>