From owner-svn-ports-all@FreeBSD.ORG  Sun Oct 28 19:51:54 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 564F388B;
 Sun, 28 Oct 2012 19:51:54 +0000 (UTC) (envelope-from pgj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 206A48FC08;
 Sun, 28 Oct 2012 19:51:54 +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 q9SJprsq086583;
 Sun, 28 Oct 2012 19:51:53 GMT (envelope-from pgj@svn.freebsd.org)
Received: (from pgj@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9SJprCc086581;
 Sun, 28 Oct 2012 19:51:53 GMT (envelope-from pgj@svn.freebsd.org)
Message-Id: <201210281951.q9SJprCc086581@svn.freebsd.org>
From: Gabor Pali <pgj@FreeBSD.org>
Date: Sun, 28 Oct 2012 19:51:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r306563 - head/www/limesurvey
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Oct 2012 19:51:54 -0000

Author: pgj
Date: Sun Oct 28 19:51:53 2012
New Revision: 306563
URL: http://svn.freebsd.org/changeset/ports/306563

Log:
  - Convert options to the new format
  
  PR:		ports/172531
  Submitted by:	pgj
  Approved by:	maintainer
  Feature safe:	yes

Modified:
  head/www/limesurvey/Makefile

Modified: head/www/limesurvey/Makefile
==============================================================================
--- head/www/limesurvey/Makefile	Sun Oct 28 19:49:13 2012	(r306562)
+++ head/www/limesurvey/Makefile	Sun Oct 28 19:51:53 2012	(r306563)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	phpsurveyor
-# Date created:		21 March 2005
-# Whom:	      		janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	limesurvey
 PORTVERSION=	1.91
@@ -17,16 +13,18 @@ COMMENT=	A PHP-based survey building and
 LICENSE=	GPLv2
 
 # http://docs.limesurvey.org/Installation&structure=English+Instructions+for+LimeSurvey
-OPTIONS=	PGSQL "Use PostgreSQL (instead of MySQL)" off \
-		GD   "Install PHP gd extention" on \
-		LDAP "Install PHP LDAP extention" off \
-		ZIP  "Install PHP zip extention" off
-#		ZLIB "Install PHP zlib extention" off # For ComfortUpdate
+OPTIONS_DEFINE=		PGSQL GD LDAP ZIP
+OPTIONS_DEFAULT=	GD
+
+PGSQL_DESC=		Use PostgreSQL (instead of MySQL)
+GD_DESC=		Install PHP gd extension
+LDAP_DESC=		Install PHP LDAP extension
+ZIP_DESC=		Install PHP zip extension
 
 .include <bsd.port.options.mk>
 
 # http://docs.limesurvey.org/Installation&structure=English+Instructions+for+LimeSurvey#Make_sure_you_can_use_LimeSurvey_on_your_website
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 USE_PHP=	pgsql
 .else
@@ -35,13 +33,13 @@ USE_PHP=	pgsql
 USE_MYSQL=	client
 USE_PHP=	mysql
 .endif
-.if defined(WITH_GD)
+.if ${PORT_OPTIONS:MGD}
 USE_PHP+=	gd
 .endif
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_PHP+=	ldap
 .endif
-.if defined(WITH_ZIP)
+.if ${PORT_OPTIONS:MZIP}
 USE_PHP+=	zip
 .endif
 USE_PHP+=	ctype dom iconv json mbstring pcre \
@@ -61,7 +59,7 @@ PHPSURVEYORDIR=	${WWWDOCROOT}/${PHPSURVE
 
 do-install:
 	${MKDIR} "${WWWDIR}"
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 	${SED} -E \
 	  -e 's/^(\$$databasetype[[:space:]]*=[[:space:]]*'"')mysql('"'.*)$$/\1postgres\2/'	\
 	  -e 's/^(\$$databaseuser[[:space:]]*=[[:space:]]*'"')root('"'.*)$$/\1pgsql\2/' \