Index: head/www/itop/Makefile
===================================================================
--- head/www/itop/Makefile	(revision 421684)
+++ head/www/itop/Makefile	(revision 421685)
@@ -1,60 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	itop
-PORTVERSION=	2.2.0
+PORTVERSION=	2.3.1
 CATEGORIES=	www
 MASTER_SITES=	SF
-DISTNAME=	iTop-${PORTVERSION}-2459
+DISTNAME=	iTop-${PORTVERSION}-2832
 
 MAINTAINER=	olevole@olevole.ru
 COMMENT=	Simple, web based IT Service Management tool
 
 LICENSE=	AGPLv3
+LICENSE_FILE=	${WRKDIR}/LICENSE
 
 RUN_DEPENDS=	${LOCALBASE}/bin/dot:graphics/graphviz
 
-USES=		cpe shebangfix zip
+USES=		cpe shebangfix php zip
 SHEBANG_FILES=	lib/tcpdf/tools/tcpdf_addfont.php setup/install/install.sh
 
 CPE_VENDOR=	combodo
 USE_PHP=	ctype gd iconv mbstring pcre session xml zlib readline \
 		dom simplexml hash json soap mcrypt filter zip
 
 WRKSRC=		${WRKDIR}/web
 NO_BUILD=	yes
 
 ITOPDIR=	${WWWDIR}/${PORTNAME}
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	MYSQL PGSQL LDAP
 OPTIONS_DEFAULT=MYSQL
 
-.include <bsd.port.options.mk>
+MYSQL_USES=	mysql
+MYSQL_USE=	PHP=mysqli
+PGSQL_USE=	PHP=pgsql
+LDAP_USE=	PHP=ldap
 
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	client
-USE_PHP+=	mysql mysqli
-.endif
+do-install:
+	@${MKDIR} ${STAGEDIR}${WWWDIR}
+	${CP} -a ${WRKDIR}/web/ ${STAGEDIR}${WWWDIR}
 
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PHP+=	pgsql
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_PHP+=	ldap
-.endif
-
 post-install:
 	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}
 	@${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
-	${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
+		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	@${ECHO} @dir ${WWWDIR} >> ${TMPPLIST}
 	@${ECHO_CMD} "@group" >> ${TMPPLIST}
 	@${ECHO_CMD} "@owner" >> ${TMPPLIST}
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${WWWDIR}
-	${CP} -a ${WRKDIR}/web/ ${STAGEDIR}${WWWDIR}
 
 .include <bsd.port.mk>
Index: head/www/itop/distinfo
===================================================================
--- head/www/itop/distinfo	(revision 421684)
+++ head/www/itop/distinfo	(revision 421685)
@@ -1,2 +1,3 @@
-SHA256 (iTop-2.2.0-2459.zip) = d56982c2c6e0d3c0466fd10d292844e7c67a5fa6d5175022bdc4c6585337a44f
-SIZE (iTop-2.2.0-2459.zip) = 8602790
+TIMESTAMP = 1472066911
+SHA256 (iTop-2.3.1-2832.zip) = a653d75c6c0fde9006834436d4dd920c4fa92b5dfd9169c08cc641305743ba9a
+SIZE (iTop-2.3.1-2832.zip) = 11490596