1 files changed, 15 insertions, 22 deletions

diff --git a/www/cakephp13/Makefile b/www/cakephp13/Makefile
index 03347d3a2052..57e90a182d6b 100644
--- a/www/cakephp13/Makefile
+++ b/www/cakephp13/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cakephp13
-# Date created:        			19 September 2011
-# Whom:                			Christoph Theis <theis@gmx.at>
-#
+# Created by: Christoph Theis <theis@gmx.at>
 # $FreeBSD$
-#
 
 PORTNAME=	cakephp
 PORTVERSION=	1.3.15
@@ -44,13 +40,10 @@ CAKE_CONF_FILES=	\
 		app/config/routes.php
 CAKE_CONSOLE=	cake/console/cake
 
-OPTIONS=	PROD "Install for production server (make confighelp)" Off \
-		AP "Add Apache 2.2+ dependency" Off \
-		MYSQL "Check for/install MySQL support in PHP" Off \
-		PGSQL "Check for/install PostgreSQL support in PHP" Off \
-		SQLITE "Check for/install SQLite support in PHP" Off \
-		APC "Enable APC caching engine" Off \
-		MEMCACHE "Enable Memcached caching engine client" Off
+OPTIONS_DEFINE=	PROD AP MYSQL PGSQL SQLITE APC MEMCACHE DOCS
+PROD_DESC=	Install for production server (make confighelp)
+APC_DESC=	APC caching engine
+MEMCACHE_DESC=	Memcached caching engine client
 
 CONFDIR=	${PREFIX}/${CONFDIR_REL}
 CONFDIR_REL=	${APACHEETCDIR}/Includes
@@ -67,7 +60,7 @@ CGI_EXT=
 
 SUB_LIST+=	PHPCGI=${WITH_PHP_CGI}
 
-.if defined(WITH_AP)
+.if ${PORT_OPTIONS:MAP}
 SUB_FILES=	pkg-message
 USE_APACHE_RUN=	22+
 PKGMESSAGE=	pkg-message
@@ -78,7 +71,7 @@ PKGMESSAGE=	pkg-message-no-apache
 APDEP=		"@comment "
 .endif
 
-.if defined(WITH_PROD)
+.if ${PORT_OPTIONS:MPROD}
 PROD=		production
 HTACCESS=	""
 .else
@@ -95,17 +88,17 @@ PLIST_SUB+=	CONFDIR=${CONFDIR_REL} ECHO_MSG=${ECHO_MSG} \
 
 DB_DEFINED=	no
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_mysql.so:${PORTSDIR}/databases/php5-pdo_mysql
 DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql
 DB_DEFINED=	yes
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_sqlite.so:${PORTSDIR}/databases/php5-pdo_sqlite
 DB_DEFINED=	yes
 .endif
@@ -115,11 +108,11 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo.so:${PORTSDIR}/databases/p
 		${DB_DEPENDS}
 .endif
 
-.if defined(WITH_APC)
+.if ${PORT_OPTIONS:MAPC}
 USE_PHP+=	apc
 .endif
 
-.if defined(WITH_MEMCACHE)
+.if ${PORT_OPTIONS:MMEMCACHE}
 USE_PHP+=	memcache
 .endif
 
@@ -156,7 +149,7 @@ do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		".htaccess app cake index.php vendors" ${WWWDIR}
 
-.if !defined(WITH_PROD)
+.if ! ${PORT_OPTIONS:MPROD}
 # If installed in development mode, get rid of .htaccess files,
 # as noted by:
 # http://book.cakephp.org/view/42/The-Configuration-Class#CakePHP-Core-Configuration-Variables-44
@@ -188,7 +181,7 @@ post-install:
 			${INSTALL_DATA} ${WRKSRC}/$$i.default ${WWWDIR}/$$i; \
 		fi \
 	done
-.if defined(WITH_AP)
+.if ${PORT_OPTIONS:MAP}
 	@if [ -d "${CONFDIR}" ]; then \
 	  ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/cakephp.conf; \
 	else \
@@ -200,7 +193,7 @@ post-install:
 	  ${FALSE} ; \
 	fi
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL} -d ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif