1 files changed, 30 insertions, 34 deletions

diff --git a/www/zend-framework/Makefile b/www/zend-framework/Makefile
index cc4d8b5bd4e8..5ca0b45c8e49 100644
--- a/www/zend-framework/Makefile
+++ b/www/zend-framework/Makefile
@@ -1,86 +1,82 @@
 # New ports collection makefile for:	zend-framework
-# Date created:        31 October 2006
-# Whom:                Greg Larkin <glarkin@sourcehosting.net>
+# Date created:		31 October 2006
+# Whom:			Greg Larkin <glarkin@sourcehosting.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ZendFramework
-PORTVERSION=	1.0.0rc3
+PORTVERSION=	1.0.0
 CATEGORIES=	www
-MASTER_SITES=	http://framework.zend.com/releases/${DISTNAME}/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/rc3/-RC3/}
+MASTER_SITES=	http://framework.zend.com/releases/${DISTNAME}/ GENTOO/distfiles
 
 MAINTAINER=	glarkin@sourcehosting.net
 COMMENT=	A framework for developing PHP web applications
 
 NO_BUILD=	yes
-USE_PHP=	pcre
+USE_PHP=	pcre spl
 WANT_PHP_WEB=	yes
 IGNORE_WITH_PHP=4
 
 USE_GETTEXT=	yes
 
 SUB_FILES=	pkg-message
-SUB_LIST=	DATADIR=${DATADIR} LOCALBASE=${LOCALBASE}
-
-WRKSRC=		${WRKDIR}/${DISTNAME}
 
 OPTIONS=	MYSQL "Install MySQL PDO support" Off \
 		DBLIB "Install DBLIB PDO support" Off \
 		PGSQL "Install PostgreSQL PDO support" Off \
 		OCI "Install Oracle OCI 8 PDO support" Off \
 		ODBC "Install ODBC PDO support" Off \
-		SQLITE "Install SQLite v3 PDO support" Off
+		SQLITE "Install SQLite v3 PDO support" Off \
+		REQPHP "Install required PHP dependencies" On \
+		OPTPHP "Install optional PHP dependencies" Off
 
 .include <bsd.port.pre.mk>
 
-DB_DEFINED=	no
+# Add all of the required and/or optional PHP extension dependencies,
+# if chosen by the user.
+#
+# See http://framework.zend.com/manual/en/requirements.extensions.html for
+# a table of what PHP extensions are required for what ZF classes.
+
+.if defined(WITH_REQPHP)
+USE_PHP+=	ctype curl dom gd iconv mbstring memcache \
+		session simplexml soap xml zlib
+.endif
+.if defined(WITH_OPTPHP)
+USE_PHP+=	bcmath bitset json posix
+.endif
 
 .if defined(WITH_MYSQL)
-DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_mysql.so:${PORTSDIR}/databases/php5-pdo_mysql
-DB_DEFINED=	yes
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_mysql.so:${PORTSDIR}/databases/php5-pdo_mysql
 .endif
 
 .if defined(WITH_DBLIB)
-DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_dblib.so:${PORTSDIR}/databases/php5-pdo_dblib
-DB_DEFINED=	yes
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_dblib.so:${PORTSDIR}/databases/php5-pdo_dblib
 .endif
 
 .if defined(WITH_PGSQL)
-DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql
-DB_DEFINED=	yes
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql
 .endif
 
 .if defined(WITH_OCI)
-DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_oci.so:${PORTSDIR}/databases/php5-pdo_oci
-DB_DEFINED=	yes
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_oci.so:${PORTSDIR}/databases/php5-pdo_oci
 .endif
 
 .if defined(WITH_ODBC)
-DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_odbc.so:${PORTSDIR}/databases/php5-pdo_odbc
-DB_DEFINED=	yes
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_odbc.so:${PORTSDIR}/databases/php5-pdo_odbc
 .endif
 
 .if defined(WITH_SQLITE)
-DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_sqlite.so:${PORTSDIR}/databases/php5-pdo_sqlite
-DB_DEFINED=	yes
-.endif
-
-.if ${DB_DEFINED} == "yes"
-USE_PHP+=	pdo
-RUN_DEPENDS+=	${DB_DEPENDS}
+USE_PHP+=	pdo_sqlite
 .endif
 
-# Fix USE_PHP after bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
 do-install:
 	@${MKDIR} ${DATADIR}
-	${CP} -R ${WRKSRC}/* ${DATADIR}
+	${CP} -R ${WRKSRC}/ ${DATADIR}
 	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DATADIR}
-	${FIND} ${DATADIR} -type f -print | ${XARGS} -n1 ${CHMOD} 644
-	${FIND} ${DATADIR} -type d -print | ${XARGS} -n1 ${CHMOD} 755
+	${FIND} ${DATADIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
+	${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 
 post-install:
 	@${CAT} ${PKGMESSAGE}