From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 9 22:30:15 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8A2A0314 for ; Tue, 9 Oct 2012 22:30:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id 623BA8FC26 for ; Tue, 9 Oct 2012 22:30:15 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q99MUFRh043455 for ; Tue, 9 Oct 2012 22:30:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q99MUFjW043454; Tue, 9 Oct 2012 22:30:15 GMT (envelope-from gnats) Resent-Date: Tue, 9 Oct 2012 22:30:15 GMT Resent-Message-Id: <201210092230.q99MUFjW043454@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Gabor Pali Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 908DCC3D for ; Tue, 9 Oct 2012 18:51:38 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 60E6D8FC0A for ; Tue, 9 Oct 2012 18:51:38 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q99IpcqV074895 for ; Tue, 9 Oct 2012 18:51:38 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q99IpcJM074894; Tue, 9 Oct 2012 18:51:38 GMT (envelope-from nobody) Message-Id: <201210091851.q99IpcJM074894@red.freebsd.org> Date: Tue, 9 Oct 2012 18:51:38 GMT From: Gabor Pali To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/172531: [www/limesurvey] OptionsNG Conversion X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Oct 2012 22:30:15 -0000 >Number: 172531 >Category: ports >Synopsis: [www/limesurvey] OptionsNG Conversion >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Oct 09 22:30:15 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Gabor Pali >Release: n/a >Organization: The FreeBSD Project >Environment: n/a >Description: - Convert options to OptionsNG format >How-To-Repeat: >Fix: See the attached patch. Patch attached with submission follows: diff --git a/www/limesurvey/Makefile b/www/limesurvey/Makefile index c499015..b78162e 100644 --- a/www/limesurvey/Makefile +++ b/www/limesurvey/Makefile @@ -17,16 +17,18 @@ COMMENT= A PHP-based survey building and runing system 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 # 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 +37,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 +63,7 @@ PHPSURVEYORDIR= ${WWWDOCROOT}/${PHPSURVEYORURL} 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/' \ >Release-Note: >Audit-Trail: >Unformatted: