70 files changed, 54 insertions, 103 deletions

diff --git a/archivers/php53-bz2/Makefile b/archivers/php53-bz2/Makefile
index 51b165e707e6..1d6c3fcfd72f 100644
--- a/archivers/php53-bz2/Makefile
+++ b/archivers/php53-bz2/Makefile
@@ -2,7 +2,6 @@
 
 CATEGORIES=	archivers
 
-NO_STAGE=	yes
 MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-bz2
diff --git a/archivers/php53-phar/Makefile b/archivers/php53-phar/Makefile
index 0fad2d82fef2..d01230bca21b 100644
--- a/archivers/php53-phar/Makefile
+++ b/archivers/php53-phar/Makefile
@@ -2,7 +2,6 @@
 
 CATEGORIES=	archivers
 
-NO_STAGE=	yes
 MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-phar
diff --git a/archivers/php53-zip/Makefile b/archivers/php53-zip/Makefile
index 2f2cfe6237ba..f66c3111003a 100644
--- a/archivers/php53-zip/Makefile
+++ b/archivers/php53-zip/Makefile
@@ -2,7 +2,6 @@
 
 CATEGORIES=	archivers
 
-NO_STAGE=	yes
 MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-zip
diff --git a/archivers/php53-zlib/Makefile b/archivers/php53-zlib/Makefile
index c9ebb1b607c7..8f410d872b66 100644
--- a/archivers/php53-zlib/Makefile
+++ b/archivers/php53-zlib/Makefile
@@ -2,7 +2,6 @@
 
 CATEGORIES=	archivers
 
-NO_STAGE=	yes
 MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-zlib
diff --git a/converters/php53-iconv/Makefile b/converters/php53-iconv/Makefile
index c69621dd919e..400ce3c0d9c5 100644
--- a/converters/php53-iconv/Makefile
+++ b/converters/php53-iconv/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-iconv
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/converters/php53-mbstring/Makefile b/converters/php53-mbstring/Makefile
index 991700dbcd1d..1a6b1d960ad4 100644
--- a/converters/php53-mbstring/Makefile
+++ b/converters/php53-mbstring/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-mbstring
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/converters/php53-recode/Makefile b/converters/php53-recode/Makefile
index ba1adbc1e617..1f33d889b7d0 100644
--- a/converters/php53-recode/Makefile
+++ b/converters/php53-recode/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-recode
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/php53-dba/Makefile b/databases/php53-dba/Makefile
index adc5c1bb6365..520f4ecd8491 100644
--- a/databases/php53-dba/Makefile
+++ b/databases/php53-dba/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-dba
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/php53-interbase/Makefile b/databases/php53-interbase/Makefile
index d40f60a3d1a3..6cc54195ec29 100644
--- a/databases/php53-interbase/Makefile
+++ b/databases/php53-interbase/Makefile
@@ -7,5 +7,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-interbase
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/php53-mssql/Makefile b/databases/php53-mssql/Makefile
index 9bfc56f9da2c..7fea4999caec 100644
--- a/databases/php53-mssql/Makefile
+++ b/databases/php53-mssql/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-mssql
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/php53-mysql/Makefile b/databases/php53-mysql/Makefile
index 5aa30c65f845..f41c1479f81e 100644
--- a/databases/php53-mysql/Makefile
+++ b/databases/php53-mysql/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-mysql
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/php53-mysqli/Makefile b/databases/php53-mysqli/Makefile
index 03f146de5361..bb07e6e10151 100644
--- a/databases/php53-mysqli/Makefile
+++ b/databases/php53-mysqli/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-mysqli
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/php53-odbc/Makefile b/databases/php53-odbc/Makefile
index 458c6688cd58..44bce3fbfed7 100644
--- a/databases/php53-odbc/Makefile
+++ b/databases/php53-odbc/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-odbc
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/php53-pdo/Makefile b/databases/php53-pdo/Makefile
index 9de3882d00c2..397da552b4f5 100644
--- a/databases/php53-pdo/Makefile
+++ b/databases/php53-pdo/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-pdo
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/php53-pdo_dblib/Makefile b/databases/php53-pdo_dblib/Makefile
index 2d5ccc0f48a4..46ba5a3761ad 100644
--- a/databases/php53-pdo_dblib/Makefile
+++ b/databases/php53-pdo_dblib/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-pdo_dblib
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/php53-pdo_firebird/Makefile b/databases/php53-pdo_firebird/Makefile
index 1f4f349f1d09..d8851f1c5b02 100644
--- a/databases/php53-pdo_firebird/Makefile
+++ b/databases/php53-pdo_firebird/Makefile
@@ -7,5 +7,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-pdo_firebird
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/php53-pdo_mysql/Makefile b/databases/php53-pdo_mysql/Makefile
index d8a50e09de0d..fa178f06476e 100644
--- a/databases/php53-pdo_mysql/Makefile
+++ b/databases/php53-pdo_mysql/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-pdo_mysql
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/php53-pdo_odbc/Makefile b/databases/php53-pdo_odbc/Makefile
index 8fec20304fe0..decb1e868695 100644
--- a/databases/php53-pdo_odbc/Makefile
+++ b/databases/php53-pdo_odbc/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-pdo_odbc
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/php53-pdo_pgsql/Makefile b/databases/php53-pdo_pgsql/Makefile
index fbfa45f6ebf3..27d12cecc4b6 100644
--- a/databases/php53-pdo_pgsql/Makefile
+++ b/databases/php53-pdo_pgsql/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-pdo_pgsql
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/php53-pdo_sqlite/Makefile b/databases/php53-pdo_sqlite/Makefile
index 09cc021b4450..a2f529bec95e 100644
--- a/databases/php53-pdo_sqlite/Makefile
+++ b/databases/php53-pdo_sqlite/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-pdo_sqlite
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/php53-pgsql/Makefile b/databases/php53-pgsql/Makefile
index ec5b35c31fbf..c7fe3f4dacf6 100644
--- a/databases/php53-pgsql/Makefile
+++ b/databases/php53-pgsql/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-pgsql
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/php53-redis/Makefile b/databases/php53-redis/Makefile
index 5607d367c9da..422d6ef8c00f 100644
--- a/databases/php53-redis/Makefile
+++ b/databases/php53-redis/Makefile
@@ -24,5 +24,4 @@ DEFAULT_PHP_VER=53
 
 PHP_MODNAME=	redis
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/databases/php53-sqlite/Makefile b/databases/php53-sqlite/Makefile
index 104952331aa5..07e5a2ca34e1 100644
--- a/databases/php53-sqlite/Makefile
+++ b/databases/php53-sqlite/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-sqlite
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/php53-sqlite3/Makefile b/databases/php53-sqlite3/Makefile
index 7dc84eab491e..83ad2a11b7df 100644
--- a/databases/php53-sqlite3/Makefile
+++ b/databases/php53-sqlite3/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-sqlite3
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/php53-sybase_ct/Makefile b/databases/php53-sybase_ct/Makefile
index 2542820e85c2..a70c7110d9c8 100644
--- a/databases/php53-sybase_ct/Makefile
+++ b/databases/php53-sybase_ct/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-sybase_ct
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php53-gettext/Makefile b/devel/php53-gettext/Makefile
index d3dddfb946a9..de9d01f70731 100644
--- a/devel/php53-gettext/Makefile
+++ b/devel/php53-gettext/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-gettext
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php53-json/Makefile b/devel/php53-json/Makefile
index e43f13977ee8..41590295167d 100644
--- a/devel/php53-json/Makefile
+++ b/devel/php53-json/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-json
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php53-pcntl/Makefile b/devel/php53-pcntl/Makefile
index 7173792c5b13..05263c5220ea 100644
--- a/devel/php53-pcntl/Makefile
+++ b/devel/php53-pcntl/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-pcntl
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php53-readline/Makefile b/devel/php53-readline/Makefile
index 14bb12e61d2a..efbe308d9bc1 100644
--- a/devel/php53-readline/Makefile
+++ b/devel/php53-readline/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-readline
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php53-shmop/Makefile b/devel/php53-shmop/Makefile
index 6ec4dd964ad3..edc730788431 100644
--- a/devel/php53-shmop/Makefile
+++ b/devel/php53-shmop/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-shmop
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php53-sysvmsg/Makefile b/devel/php53-sysvmsg/Makefile
index 146562a19a77..4728d1783cad 100644
--- a/devel/php53-sysvmsg/Makefile
+++ b/devel/php53-sysvmsg/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-sysvmsg
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php53-sysvsem/Makefile b/devel/php53-sysvsem/Makefile
index a92ccecbe9e3..989f13324c2f 100644
--- a/devel/php53-sysvsem/Makefile
+++ b/devel/php53-sysvsem/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-sysvsem
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php53-sysvshm/Makefile b/devel/php53-sysvshm/Makefile
index 2172b01f6d08..431ab141b268 100644
--- a/devel/php53-sysvshm/Makefile
+++ b/devel/php53-sysvshm/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-sysvshm
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/php53-tokenizer/Makefile b/devel/php53-tokenizer/Makefile
index 3c45161aa603..23747b1f4ec7 100644
--- a/devel/php53-tokenizer/Makefile
+++ b/devel/php53-tokenizer/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-tokenizer
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/ftp/php53-curl/Makefile b/ftp/php53-curl/Makefile
index 6128cf04ba8c..d8cbe3473eed 100644
--- a/ftp/php53-curl/Makefile
+++ b/ftp/php53-curl/Makefile
@@ -7,5 +7,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-curl
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/ftp/php53-ftp/Makefile b/ftp/php53-ftp/Makefile
index 0c4fac8621d2..aead40c91572 100644
--- a/ftp/php53-ftp/Makefile
+++ b/ftp/php53-ftp/Makefile
@@ -6,7 +6,6 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-ftp
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} s/HAVE_OPENSSL_EXT/__FreeBSD__/ \
 		${WRKSRC}/ftp.* ${WRKSRC}/php_ftp.*
diff --git a/graphics/php53-exif/Makefile b/graphics/php53-exif/Makefile
index 8727c1de3462..aedf2999fd48 100644
--- a/graphics/php53-exif/Makefile
+++ b/graphics/php53-exif/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-exif
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/php53-gd/Makefile b/graphics/php53-gd/Makefile
index 3798d4254c36..a28e120cba1d 100644
--- a/graphics/php53-gd/Makefile
+++ b/graphics/php53-gd/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-gd
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/php53-extensions/Makefile b/lang/php53-extensions/Makefile
index 5555bbee321e..f9b6e0a5408c 100644
--- a/lang/php53-extensions/Makefile
+++ b/lang/php53-extensions/Makefile
@@ -16,6 +16,7 @@ IGNORE_WITH_PHP=5 52
 USE_PHP_BUILD=	yes
 
 NO_BUILD=	yes
+NO_MTREE=	yes
 
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 
@@ -111,7 +112,6 @@ XSL_DESC=		XSL support (Implies DOM)
 ZIP_DESC=		ZIP support
 ZLIB_DESC=		ZLIB support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .for opt in ${OPTIONS_DEFINE}
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index e231091841c0..9df1f44f3735 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -18,7 +18,7 @@ USE_BZIP2=	yes
 .if !defined(PKGNAMESUFFIX)
 USE_AUTOTOOLS=	autoconf
 
-LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 CONFIGURE_ARGS=	\
 		--with-layout=GNU \
@@ -51,9 +51,8 @@ LINKTHR_DESC=	Link thread lib (for threaded extensions)
 
 CONFLICTS=	php52-5* php5-5*
 
-MAN1=		php-config.1 phpize.1
+DESTDIRNAME=	INSTALL_ROOT
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 PATCH_DIST_STRIP=	-p1
@@ -77,7 +76,6 @@ PATCH_SITES+=	http://choon.net/opensource/php/:mail
 .if ${PORT_OPTIONS:MCLI}
 PHP_SAPI+=	cli
 PLIST_SUB+=	CLI=""
-MAN1+=		php.1
 .else
 PLIST_SUB+=	CLI="@comment "
 CONFIGURE_ARGS+=--disable-cli
@@ -93,7 +91,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} \
@@ -180,16 +177,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"
diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext
index cf2d461c3fb7..8b488f0c822a 100644
--- a/lang/php53/Makefile.ext
+++ b/lang/php53/Makefile.ext
@@ -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
@@ -87,9 +87,9 @@ USE_OPENSSL=	yes
 .endif
 
 .if ${PHP_MODNAME} == "gd"
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		png15:${PORTSDIR}/graphics/png \
-		jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libfreetype.so.9:${PORTSDIR}/print/freetype2 \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libjpeg.so.11:${PORTSDIR}/graphics/jpeg
 
 CONFIGURE_ARGS+=--with-gd \
 		--with-freetype-dir=${LOCALBASE} \
@@ -114,7 +114,7 @@ USES+=		gettext
 .endif
 
 .if ${PHP_MODNAME} == "gmp"
-LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	libgmp.so.10:${PORTSDIR}/math/gmp
 
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 .endif
@@ -133,7 +133,7 @@ USES+=	iconv
 .if ${PHP_MODNAME} == "imap"
 OPTIONS_DEFINE=	SSL
 OPTIONS_DEFAULT=	SSL
-LIB_DEPENDS+=	c-client4.9:${PORTSDIR}/mail/cclient
+LIB_DEPENDS+=	libc-client4.so.9:${PORTSDIR}/mail/cclient
 
 CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \
 		--with-pcre-dir=${LOCALBASE}
@@ -174,7 +174,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+=	libmcrypt.so.8:${PORTSDIR}/security/libmcrypt
 
 CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
 
@@ -182,7 +182,7 @@ USE_AUTOTOOLS=	libltdl
 .endif
 
 .if ${PHP_MODNAME} == "mssql"
-LIB_DEPENDS+=	sybdb.5:${PORTSDIR}/databases/freetds-msdblib
+LIB_DEPENDS+=	libsybdb.so.5:${PORTSDIR}/databases/freetds-msdblib
 
 CONFIGURE_ARGS+=--with-mssql=${LOCALBASE}
 .endif
@@ -297,7 +297,7 @@ CONFIGURE_ARGS+=--enable-posix
 .endif
 
 .if ${PHP_MODNAME} == "pspell"
-LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS+=	libaspell.so.16:${PORTSDIR}/textproc/aspell
 
 CONFIGURE_ARGS+=--with-pspell=${LOCALBASE}
 
@@ -311,7 +311,7 @@ CONFIGURE_ARGS+=--with-readline=/usr
 .endif
 
 .if ${PHP_MODNAME} == "recode"
-LIB_DEPENDS+=	recode.3:${PORTSDIR}/converters/recode
+LIB_DEPENDS+=	librecode.so.3:${PORTSDIR}/converters/recode
 
 CONFIGURE_ARGS+=--with-recode=${LOCALBASE}
 .endif
@@ -338,7 +338,7 @@ CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \
 		--with-openssl-dir=${OPENSSLBASE} \
 		--enable-ucd-snmp-hack
 
-LIB_DEPENDS+=   netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS+=   libnetsnmp.so.30:${PORTSDIR}/net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
 .endif
@@ -375,7 +375,7 @@ CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sybase_ct"
-LIB_DEPENDS+=	ct.4:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	libct.so.4:${PORTSDIR}/databases/freetds
 
 CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE}
 .endif
@@ -395,7 +395,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+=	libtidy-0.99.so.0:${PORTSDIR}/www/tidy-lib
 .endif
 
 .if ${PHP_MODNAME} == "tokenizer"
@@ -480,12 +480,12 @@ USE_BDB=		40+
 WITH_BDB_HIGHEST=	yes
 .	endif
 .	if ${PORT_OPTIONS:MGDBM}
-LIB_DEPENDS+=	gdbm.4:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=	libgdbm.so.4:${PORTSDIR}/databases/gdbm
 
 CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MQDBM}
-LIB_DEPENDS+=	qdbm.14:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS+=	libqdbm.so.14:${PORTSDIR}/databases/qdbm
 
 CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE}
 .	endif
@@ -507,7 +507,7 @@ CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE}
 .	endif
 
 .	if ${PORT_OPTIONS:MT1LIB}
-LIB_DEPENDS+=	t1.5:${PORTSDIR}/devel/t1lib
+LIB_DEPENDS+=	libt1.so.5:${PORTSDIR}/devel/t1lib
 
 CONFIGURE_ARGS+=--with-t1lib=${LOCALBASE}
 .	endif
@@ -528,7 +528,7 @@ LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 
 .if ${PHP_MODNAME} == "mbstring"
 .	if ${PORT_OPTIONS:MREGEX}
-LIB_DEPENDS+=	onig.1:${PORTSDIR}/devel/oniguruma4
+LIB_DEPENDS+=	libonig.so.1:${PORTSDIR}/devel/oniguruma4
 CONFIGURE_ARGS+=--with-onig=${LOCALBASE}
 .	else
 CONFIGURE_ARGS+=--disable-mbregex
@@ -563,11 +563,11 @@ post-extract:
 
 .if ${PHP_MODNAME} == "odbc"
 .if ${PORT_OPTIONS:MIODBC}
-LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
+LIB_DEPENDS+=	libiodbc.so.3:${PORTSDIR}/databases/libiodbc
 
 CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE}
 .else
-LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so.2:${PORTSDIR}/databases/unixODBC
 
 CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE}
 .endif
@@ -575,19 +575,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+=	libsybdb.so.5:${PORTSDIR}/databases/freetds-msdblib
 .else
-LIB_DEPENDS+=	ct.4:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	libct.so.4:${PORTSDIR}/databases/freetds
 .endif
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
 .if ${PORT_OPTIONS:MIODBC}
-LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
+LIB_DEPENDS+=	libiodbc.so.3:${PORTSDIR}/databases/libiodbc
 
 CONFIGURE_ARGS+=--with-pdo-odbc=iODBC,${LOCALBASE}
 .else
-LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so.2:${PORTSDIR}/databases/unixODBC
 
 CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
 .endif
diff --git a/lang/php53/files/patch-sapi_apache2filter_config.m4 b/lang/php53/files/patch-sapi_apache2filter_config.m4
new file mode 100644
index 000000000000..ce71383f9fa4
--- /dev/null
+++ b/lang/php53/files/patch-sapi_apache2filter_config.m4
@@ -0,0 +1,11 @@
+--- sapi/apache2filter/config.m4.orig	2013-10-18 12:17:14.622544934 +0000
++++ sapi/apache2filter/config.m4	2013-10-18 12:22:13.032234760 +0000
+@@ -68,7 +68,7 @@
+   fi
+ 
+   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+-  if test -z `$APXS -q SYSCONFDIR`; then
++  if true; then
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+                        -i -n php5"
diff --git a/lang/php53/files/patch-sapi_apache2handler_config.m4 b/lang/php53/files/patch-sapi_apache2handler_config.m4
new file mode 100644
index 000000000000..149c4ef0fc80
--- /dev/null
+++ b/lang/php53/files/patch-sapi_apache2handler_config.m4
@@ -0,0 +1,11 @@
+--- sapi/apache2handler/config.m4.orig	2013-10-18 12:22:26.576545216 +0000
++++ sapi/apache2handler/config.m4	2013-10-18 12:23:00.903131412 +0000
+@@ -67,7 +67,7 @@
+   fi
+ 
+   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+-  if test -z `$APXS -q SYSCONFDIR`; then
++  if true; then
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+                        -i -n php5"
diff --git a/lang/php53/pkg-plist b/lang/php53/pkg-plist
index 26bbd01e52ce..ac4fcacd6aaa 100644
--- a/lang/php53/pkg-plist
+++ b/lang/php53/pkg-plist
@@ -233,6 +233,10 @@ lib/php/build/phpize.m4
 lib/php/build/run-tests.php
 lib/php/build/scan_makefile_in.awk
 lib/php/build/shtool
+man/man1/php-config.1.gz
+man/man1/phpize.1.gz
+%%CLI%%man/man1/php.1.gz
+%%FPM%%man/man8/php-fpm.8.gz
 %%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
diff --git a/mail/php53-imap/Makefile b/mail/php53-imap/Makefile
index 2bfee7e09675..f007d4cd79c2 100644
--- a/mail/php53-imap/Makefile
+++ b/mail/php53-imap/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-imap
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/math/php53-bcmath/Makefile b/math/php53-bcmath/Makefile
index 1bd1894dd7d6..09c101f55e07 100644
--- a/math/php53-bcmath/Makefile
+++ b/math/php53-bcmath/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-bcmath
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/math/php53-gmp/Makefile b/math/php53-gmp/Makefile
index bd766758a2d7..8ecc88ed4baf 100644
--- a/math/php53-gmp/Makefile
+++ b/math/php53-gmp/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-gmp
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/misc/php53-calendar/Makefile b/misc/php53-calendar/Makefile
index 56e8d189164f..edd5d84addaf 100644
--- a/misc/php53-calendar/Makefile
+++ b/misc/php53-calendar/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-calendar
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/net-mgmt/php53-snmp/Makefile b/net-mgmt/php53-snmp/Makefile
index ffe770fef840..a2777da4769b 100644
--- a/net-mgmt/php53-snmp/Makefile
+++ b/net-mgmt/php53-snmp/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-snmp
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/net/php53-ldap/Makefile b/net/php53-ldap/Makefile
index e4923413ef61..8dc461d238db 100644
--- a/net/php53-ldap/Makefile
+++ b/net/php53-ldap/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-ldap
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/net/php53-soap/Makefile b/net/php53-soap/Makefile
index adcaa2c03e24..9679fc1d7ae9 100644
--- a/net/php53-soap/Makefile
+++ b/net/php53-soap/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-soap
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/net/php53-sockets/Makefile b/net/php53-sockets/Makefile
index 68594b1d67f4..94d5e70840f1 100644
--- a/net/php53-sockets/Makefile
+++ b/net/php53-sockets/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-sockets
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/net/php53-xmlrpc/Makefile b/net/php53-xmlrpc/Makefile
index fbe87ea24c19..a48877f37e6a 100644
--- a/net/php53-xmlrpc/Makefile
+++ b/net/php53-xmlrpc/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-xmlrpc
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/security/php53-filter/Makefile b/security/php53-filter/Makefile
index c75f86f5574c..76001bbc2b1f 100644
--- a/security/php53-filter/Makefile
+++ b/security/php53-filter/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-filter
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/security/php53-hash/Makefile b/security/php53-hash/Makefile
index 49f4bc2fdfa3..a373c7eeb95e 100644
--- a/security/php53-hash/Makefile
+++ b/security/php53-hash/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-hash
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/security/php53-mcrypt/Makefile b/security/php53-mcrypt/Makefile
index 9b9ec4907619..ac2bf03af598 100644
--- a/security/php53-mcrypt/Makefile
+++ b/security/php53-mcrypt/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-mcrypt
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/security/php53-openssl/Makefile b/security/php53-openssl/Makefile
index cfd7ad2e4ecc..40154ad54d24 100644
--- a/security/php53-openssl/Makefile
+++ b/security/php53-openssl/Makefile
@@ -8,5 +8,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-openssl
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/php53-fileinfo/Makefile b/sysutils/php53-fileinfo/Makefile
index 52b7da4a85d7..645849a73f88 100644
--- a/sysutils/php53-fileinfo/Makefile
+++ b/sysutils/php53-fileinfo/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-fileinfo
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/php53-posix/Makefile b/sysutils/php53-posix/Makefile
index e896c2c36a86..bac6b7c994c8 100644
--- a/sysutils/php53-posix/Makefile
+++ b/sysutils/php53-posix/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-posix
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/php53-ctype/Makefile b/textproc/php53-ctype/Makefile
index c97c5c0329a0..35fcdb4b6412 100644
--- a/textproc/php53-ctype/Makefile
+++ b/textproc/php53-ctype/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-ctype
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/php53-dom/Makefile b/textproc/php53-dom/Makefile
index 8ccac4598c0f..d5587169cf38 100644
--- a/textproc/php53-dom/Makefile
+++ b/textproc/php53-dom/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-dom
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/php53-pspell/Makefile b/textproc/php53-pspell/Makefile
index ea39a3773df9..83602ffe4d5c 100644
--- a/textproc/php53-pspell/Makefile
+++ b/textproc/php53-pspell/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-pspell
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/php53-simplexml/Makefile b/textproc/php53-simplexml/Makefile
index 229e975ac844..cb6476d0cfc5 100644
--- a/textproc/php53-simplexml/Makefile
+++ b/textproc/php53-simplexml/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-simplexml
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/php53-wddx/Makefile b/textproc/php53-wddx/Makefile
index 7a5fe9c00203..5676477120c2 100644
--- a/textproc/php53-wddx/Makefile
+++ b/textproc/php53-wddx/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-wddx
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/php53-xml/Makefile b/textproc/php53-xml/Makefile
index 2a850f0ac1f6..a8f5049f1784 100644
--- a/textproc/php53-xml/Makefile
+++ b/textproc/php53-xml/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-xml
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/php53-xmlreader/Makefile b/textproc/php53-xmlreader/Makefile
index 19cada083db5..02cf815b51d5 100644
--- a/textproc/php53-xmlreader/Makefile
+++ b/textproc/php53-xmlreader/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-xmlreader
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/php53-xmlwriter/Makefile b/textproc/php53-xmlwriter/Makefile
index 033d21d2d8ae..abd477522597 100644
--- a/textproc/php53-xmlwriter/Makefile
+++ b/textproc/php53-xmlwriter/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-xmlwriter
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/php53-xsl/Makefile b/textproc/php53-xsl/Makefile
index a0f9e3122a13..190af5c50fc4 100644
--- a/textproc/php53-xsl/Makefile
+++ b/textproc/php53-xsl/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-xsl
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/www/php53-session/Makefile b/www/php53-session/Makefile
index c6948759d195..6a07c71d477a 100644
--- a/www/php53-session/Makefile
+++ b/www/php53-session/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-session
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/www/php53-tidy/Makefile b/www/php53-tidy/Makefile
index 86f8601704c6..529d7bdb5eaa 100644
--- a/www/php53-tidy/Makefile
+++ b/www/php53-tidy/Makefile
@@ -6,5 +6,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php53
 
 PKGNAMESUFFIX=	-tidy
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"