From owner-svn-ports-head@FreeBSD.ORG  Fri Aug  3 13:02:46 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 02DEB106567B;
	Fri,  3 Aug 2012 13:02:46 +0000 (UTC) (envelope-from wen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C8CC58FC1A;
	Fri,  3 Aug 2012 13:02:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q73D2jkO023053;
	Fri, 3 Aug 2012 13:02:45 GMT (envelope-from wen@svn.freebsd.org)
Received: (from wen@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q73D2jqs023050;
	Fri, 3 Aug 2012 13:02:45 GMT (envelope-from wen@svn.freebsd.org)
Message-Id: <201208031302.q73D2jqs023050@svn.freebsd.org>
From: Wen Heping <wen@FreeBSD.org>
Date: Fri, 3 Aug 2012 13:02:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301951 - head/www/ilias
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Aug 2012 13:02:46 -0000

Author: wen
Date: Fri Aug  3 13:02:45 2012
New Revision: 301951
URL: http://svn.freebsd.org/changeset/ports/301951

Log:
  - Update to 3.2.5
  - Use the new options framework

Modified:
  head/www/ilias/Makefile
  head/www/ilias/distinfo

Modified: head/www/ilias/Makefile
==============================================================================
--- head/www/ilias/Makefile	Fri Aug  3 11:50:36 2012	(r301950)
+++ head/www/ilias/Makefile	Fri Aug  3 13:02:45 2012	(r301951)
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ilias
-PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTVERSION=	4.2.5
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/1.%20ILIAS%204.2/ILIAS%20${PORTVERSION}
 
@@ -37,21 +36,19 @@ PLIST_SUB=	ILIASDATADIR=${ILIASDATADIR}
 SUB_FILES=	pkg-message
 SUB_LIST=	ILIASDATADIR=${ILIASDATADIR}
 
-OPTIONS=	SCORM2004 "Using SCORM2004 support" off	\
-		Checker "Link Checker" off \
-		Mail "Internet compliant E-Mail addresses" off
+OPTIONS_DEFINE=	SCORM2004 Checker Mail Docs
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_SCORM2004)
+.if ${PORT_OPTIONS:MSCORM2004}
 USE_PHP+=	json
 .endif
 
-.if defined(WITH_Checker)
+.if ${PORT_OPTIONS:MChecker}
 RUN_DEPENDS+=	 ${LOCALBASE}/share/pear/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
 .endif
 
-.if defined(WITH_Mail)
+.if ${PORT_OPTIONS:MMail}
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/Mail.php:${PORTSDIR}/mail/pear-Mail
 .endif
 
@@ -77,10 +74,10 @@ do-install:
 		>> ${TMPPLIST}
 	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${PREFIX}/${ILIASDATADIR}' >>${TMPPLIST}
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@cd ${WRKDIR}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
 
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/ilias/distinfo
==============================================================================
--- head/www/ilias/distinfo	Fri Aug  3 11:50:36 2012	(r301950)
+++ head/www/ilias/distinfo	Fri Aug  3 13:02:45 2012	(r301951)
@@ -1,2 +1,2 @@
-SHA256 (ilias-4.2.3.tar.gz) = a32b3f86da22e2168c4132088f2adaeb0256d753409d1ddae8f3bffa781f5e30
-SIZE (ilias-4.2.3.tar.gz) = 94191186
+SHA256 (ilias-4.2.5.tar.gz) = b454d9376f19ab1cf570833c109451d5536bdc5c686b855c44edaee5d820c8fc
+SIZE (ilias-4.2.5.tar.gz) = 94218152