1 files changed, 12 insertions, 28 deletions

diff --git a/www/ismail/Makefile b/www/ismail/Makefile
index dc862349546a..cbcbf36a070e 100644
--- a/www/ismail/Makefile
+++ b/www/ismail/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ismail
-# Date created:			18 June 2004
-# Whom:				Kelley Reynolds <kelley@insidesystems.net>
-#
+# Created by: Kelley Reynolds <kelley@insidesystems.net>
 # $FreeBSD$
-#
 
 PORTNAME=	ismail
 PORTVERSION=	2.1
@@ -24,38 +20,26 @@ WANT_PHP_WEB=	yes
 
 SUB_FILES=	pkg-message
 
-OPTIONS=	DOMXML "Use DOMXML for datastore (only with php4.x)" off \
-		MYSQL "Use MySQL for datastore" on \
-		POSTGRESQL "Use PostgresQL for datastore" off
+OPTIONS_DEFINE=	DOCS
+OPTIONS_SINGLE=	DATASTORE
+OPTIONS_SINGLE_DATASTORE=	MYSQL PGSQL
+OPTIONS_DEFAULT=	MYSQL
 
 .include <bsd.port.options.mk>
 
-.ifdef(WITH_DOMXML)
-USE_PHP+=	domxml
-IGNORE_WITH_PHP=	5
-.endif
-
-.ifdef(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_PHP+=	mysql
 PLIST_FILES+=	${EXAMPLESDIR_REL}/mysql4.schema
 PLIST_DIRS+=	${EXAMPLESDIR_REL}
 .endif
 
-.ifdef(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pgsql
 PLIST_FILES+=	${EXAMPLESDIR_REL}/pgsql.schema
 PLIST_DIRS+=	${EXAMPLESDIR_REL}
 .endif
 
-.include <bsd.port.pre.mk>
-
-LIB_DEPENDS+=	c-client4.9:${PORTSDIR}/mail/cclient
-
-.pre-extract:
-.if !defined(WITH_DOMXML) && !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
-	@${ECHO_MSG} "Pleasee choose at least one of DOMXML, MYSQL, POSTGRESQL"
-	@${FALSE}
-.endif
+LIB_DEPENDS+=	c-client4:${PORTSDIR}/mail/cclient
 
 pre-install:
 	@${ECHO_MSG} ""
@@ -67,15 +51,15 @@ do-install:
 	@${MKDIR} ${WWWDIR}
 	${TAR} --exclude '*~' -C ${WRKSRC}/${PORTNAME} -cf - . | ${TAR} -C ${WWWDIR} -xf -
 	@${CHOWN} -R www:www ${WWWDIR}
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs.html ${DOCSDIR}
 .endif
-.ifdef(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/mysql4.schema ${EXAMPLESDIR}
 .endif
-.ifdef(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPGSQL}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/pgsql.schema ${EXAMPLESDIR}
 .endif
@@ -83,4 +67,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMEASSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>