svn commit: r303973 - head/mail/squirrelmail

Adam Weinberger adamw at FreeBSD.org
Sun Sep 9 15:44:27 UTC 2012


Author: adamw
Date: Sun Sep  9 15:44:26 2012
New Revision: 303973
URL: http://svn.freebsd.org/changeset/ports/303973

Log:
  Convert the WITH_DATABASE and WITH_LDAP tunables to optionsNG.
  
  PR:	ports/171092

Modified:
  head/mail/squirrelmail/Makefile

Modified: head/mail/squirrelmail/Makefile
==============================================================================
--- head/mail/squirrelmail/Makefile	Sun Sep  9 15:33:37 2012	(r303972)
+++ head/mail/squirrelmail/Makefile	Sun Sep  9 15:44:26 2012	(r303973)
@@ -25,13 +25,8 @@ IGNORE_WITH_PHP=5 # known incompatibilit
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 
-.ifdef WITH_DATABASE
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
-.endif
-
-.ifdef WITH_LDAP
-USE_PHP+=	ldap
-.endif
+OPTIONS_DEFINE=	DATABASE LDAP
+DATABASE_DESC=	PEAR database support (must also intall a driver)
 
 .ifndef WITHOUT_WWWDIR
 SQUIRRELDIR?=	${PREFIX}/www/${PORTNAME}
@@ -49,15 +44,26 @@ PORTDOCS=	*
 
 CONFLICTS=	squirreloutlook-[0-9]*
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDATABASE}
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
+.endif
+
+.if ${PORT_OPTIONS:MLDAP}
+USE_PHP+=	ldap
+.endif
+
 pre-everything::
 	@${ECHO_CMD} "SquirrelMail is installed into ${SQUIRRELDIR}"
 	@${ECHO_CMD} "To use the old location ${PREFIX}/${PORTNAME} define"
 	@${ECHO_CMD} "WITHOUT_WWWDIR when patching or installing"
 	@${ECHO_CMD}
-	@${ECHO_CMD} "Use WITH_LDAP to ensure PHP LDAP support is installed"
-	@${ECHO_CMD} "Use WITH_DATABASE to ensure PEAR framework for database support is installed"
-	@${ECHO_CMD} "   (note that this does not install the database specific PEAR support, e.g. MySQL)"
+.if ${PORT_OPTIONS:MDATABASE}
+	@${ECHO_CMD} "Note that the PEAR database framework still requires you to install a"
+	@${ECHO_CMD} "database-specific PEAR driver, e.g. MySQL."
 	@${ECHO_CMD}
+.endif
 
 post-patch:
 .ifndef PATCH_DEBUG



More information about the svn-ports-all mailing list