From owner-svn-ports-all@freebsd.org Mon Feb 24 21:37:18 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B82CE2450CA; Mon, 24 Feb 2020 21:37:18 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48RFlL46KGz49j6; Mon, 24 Feb 2020 21:37:18 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6CFA33F5C; Mon, 24 Feb 2020 21:37:18 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01OLbIBW016341; Mon, 24 Feb 2020 21:37:18 GMT (envelope-from flo@FreeBSD.org) Received: (from flo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01OLbHio016336; Mon, 24 Feb 2020 21:37:17 GMT (envelope-from flo@FreeBSD.org) Message-Id: <202002242137.01OLbHio016336@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: flo set sender to flo@FreeBSD.org using -f From: Florian Smeets Date: Mon, 24 Feb 2020 21:37:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527051 - in head: . www www/limesurvey www/limesurvey/files X-SVN-Group: ports-head X-SVN-Commit-Author: flo X-SVN-Commit-Paths: in head: . www www/limesurvey www/limesurvey/files X-SVN-Commit-Revision: 527051 X-SVN-Commit-Repository: ports 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.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Feb 2020 21:37:18 -0000 Author: flo Date: Mon Feb 24 21:37:16 2020 New Revision: 527051 URL: https://svnweb.freebsd.org/changeset/ports/527051 Log: Resurrect LimeSurvey and update to 3.22.7 Added: head/www/limesurvey/ - copied from r488748, head/www/limesurvey/ Modified: head/MOVED head/www/Makefile head/www/limesurvey/Makefile head/www/limesurvey/distinfo head/www/limesurvey/files/pkg-message.in Modified: head/MOVED ============================================================================== --- head/MOVED Mon Feb 24 21:15:42 2020 (r527050) +++ head/MOVED Mon Feb 24 21:37:16 2020 (r527051) @@ -10916,7 +10916,6 @@ www/pecl-yaf2|www/pecl-yaf|2018-12-30|Has expired: Wor www/redaxo||2018-12-30|Has expired: Works only with EOL php 5.6 www/dotproject||2018-12-30|Has expired: Works only with EOL php 5.6 www/sitebar||2018-12-30|Has expired: Works only with EOL php 5.6 -www/limesurvey||2018-12-30|Has expired: Works only with EOL php 5.6 www/mahara||2018-12-30|Has expired: Works only with EOL php 5.6 www/mysar||2018-12-30|Has expired: Works only with EOL php 5.6 www/oscommerce||2018-12-30|Has expired: Works only with EOL php 5.6 Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Mon Feb 24 21:15:42 2020 (r527050) +++ head/www/Makefile Mon Feb 24 21:37:16 2020 (r527051) @@ -299,6 +299,7 @@ SUBDIR += lightsquid SUBDIR += lighttpd SUBDIR += lighttpd-mod_h264_streaming + SUBDIR += limesurvey SUBDIR += linkcheck SUBDIR += linklint SUBDIR += links Modified: head/www/limesurvey/Makefile ============================================================================== --- head/www/limesurvey/Makefile Sun Dec 30 22:50:15 2018 (r488748) +++ head/www/limesurvey/Makefile Mon Feb 24 21:37:16 2020 (r527051) @@ -2,44 +2,32 @@ # $FreeBSD$ PORTNAME= limesurvey -PORTVERSION= 1.91 -PORTREVISION= 1 +PORTVERSION= 3.22.7 CATEGORIES= www -MASTER_SITES= SF/${PORTNAME}/1._LimeSurvey_stable/${PORTVERSION}+/ -DISTNAME= ${PORTNAME}${PORTVERSION:S^.^^}plus-build10232-20110608 +MASTER_SITES= http://download.limesurvey.org/lts-releases/ +DISTNAME= ${PORTNAME}${PORTVERSION}+200225 -MAINTAINER= jmohacsi@bsd.hu +MAINTAINER= flo@FreeBSD.org COMMENT= PHP-based survey building and runing system -DEPRECATED= Works only with EOL php 5.6 -EXPIRATION_DATE= 2018-12-30 - LICENSE= GPLv2 -IGNORE_WITH_PHP= 71 72 73 +USES= cpe php:web tar:bz2 -USES= cpe php:web - -# http://docs.limesurvey.org/Installation&structure=English+Instructions+for+LimeSurvey -OPTIONS_DEFINE= PGSQL GD LDAP ZIP +OPTIONS_DEFINE= GD LDAP PGSQL 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 +PGSQL_DESC= Use PostgreSQL (instead of MySQL) +GD_DESC= Install PHP gd extension +LDAP_DESC= Install PHP LDAP extension .include -# http://docs.limesurvey.org/Installation&structure=English+Instructions+for+LimeSurvey#Make_sure_you_can_use_LimeSurvey_on_your_website .if ${PORT_OPTIONS:MPGSQL} -USES+= pgsql -USE_PHP= pgsql +USE_PHP= pdo_pgsql .else # server is not necessary on this host. -#USE_MYSQL= server -USE_MYSQL= client -USE_PHP= mysql +USE_PHP= pdo_mysql .endif .if ${PORT_OPTIONS:MGD} USE_PHP+= gd @@ -47,11 +35,8 @@ USE_PHP+= gd .if ${PORT_OPTIONS:MLDAP} USE_PHP+= ldap .endif -.if ${PORT_OPTIONS:MZIP} -USE_PHP+= zip -.endif -USE_PHP+= ctype dom iconv json mbstring pcre \ - simplexml session xmlwriter +USE_PHP+= ctype dom hash iconv json mbstring openssl pcre session \ + simplexml xmlwriter zip WWWDOCROOT?= www PHPSURVEYORURL?= ${PORTNAME} @@ -59,26 +44,16 @@ PHPSURVEYORURL?= ${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes SUB_FILES= pkg-message -SUB_LIST= PHPSURVEYORURL="${PHPSURVEYORURL}" \ - PHPSURVEYORDIR="${PHPSURVEYORDIR}" +SUB_LIST= PHPSURVEYORDIR="${PHPSURVEYORDIR}" \ + PHPSURVEYORURL="${PHPSURVEYORURL}" PHPSURVEYORDIR= ${WWWDOCROOT}/${PHPSURVEYORURL} do-install: ${MKDIR} "${STAGEDIR}${WWWDIR}" -.if ${PORT_OPTIONS:MPGSQL} - ${SED} -E \ - -e 's/^(\$$databasetype[[:space:]]*=[[:space:]]*'"')mysql('"'.*)$$/\1postgres\2/' \ - -e 's/^(\$$databaseuser[[:space:]]*=[[:space:]]*'"')root('"'.*)$$/\1pgsql\2/' \ - "${WRKSRC}"/config.php >"${WRKSRC}"/config.php-dist - ${RM} "${WRKSRC}"/config.php -.else - ${MV} "${WRKSRC}"/config.php "${WRKSRC}"/config.php-dist -.endif @cd "${WRKSRC}" && ${COPYTREE_SHARE} . "${STAGEDIR}${WWWDIR}" ${MKDIR} "${STAGEDIR}${WWWDIR}"/tmp ${CHMOD} 755 "${STAGEDIR}${WWWDIR}"/tmp - ${CHMOD} 755 "${STAGEDIR}${WWWDIR}"/templates ${CHMOD} 755 "${STAGEDIR}${WWWDIR}"/upload ${CHMOD} -R go-w "${STAGEDIR}${WWWDIR}"/admin Modified: head/www/limesurvey/distinfo ============================================================================== --- head/www/limesurvey/distinfo Sun Dec 30 22:50:15 2018 (r488748) +++ head/www/limesurvey/distinfo Mon Feb 24 21:37:16 2020 (r527051) @@ -1,2 +1,3 @@ -SHA256 (limesurvey191plus-build10232-20110608.tar.gz) = 6db5d2162b033d5d8ddc52374397dba9891218c627e888e59c4b337acfe760ac -SIZE (limesurvey191plus-build10232-20110608.tar.gz) = 26652385 +TIMESTAMP = 1582572355 +SHA256 (limesurvey3.22.7+200225.tar.bz2) = 8bf18fca09d2a1b9b5319c7157a4b69ee7f85badb757bee5f6f23247b95035f1 +SIZE (limesurvey3.22.7+200225.tar.bz2) = 64294437 Modified: head/www/limesurvey/files/pkg-message.in ============================================================================== --- head/www/limesurvey/files/pkg-message.in Sun Dec 30 22:50:15 2018 (r488748) +++ head/www/limesurvey/files/pkg-message.in Mon Feb 24 21:37:16 2020 (r527051) @@ -1,3 +1,6 @@ +[ +{ type: install + message: <