Date: Tue, 9 Oct 2012 18:51:38 GMT From: Gabor Pali <pgj@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/172531: [www/limesurvey] OptionsNG Conversion Message-ID: <201210091851.q99IpcJM074894@red.freebsd.org> Resent-Message-ID: <201210092230.q99MUFjW043454@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <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 +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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210091851.q99IpcJM074894>