Date: Thu, 24 Oct 2013 02:10:01 GMT From: dfilter@FreeBSD.ORG (dfilter service) To: ruby@FreeBSD.org Subject: Re: ports/182131: commit references a PR Message-ID: <201310240210.r9O2A19L015950@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/182131; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/182131: commit references a PR Date: Thu, 24 Oct 2013 02:09:48 +0000 (UTC) Author: swills Date: Thu Oct 24 02:09:41 2013 New Revision: 331451 URL: http://svnweb.freebsd.org/changeset/ports/331451 Log: - Require LDAP, it's not optional - Fix dependency on coderay - Fix permissions on pid file dir - Fix permissions on Gemfile.lock PR: ports/182131 Submitted by: "David Demelier" <markand@malikania.fr> Modified: head/www/redmine/Makefile head/www/redmine/files/patch-Gemfile Modified: head/www/redmine/Makefile ============================================================================== --- head/www/redmine/Makefile Thu Oct 24 01:45:27 2013 (r331450) +++ head/www/redmine/Makefile Thu Oct 24 02:09:41 2013 (r331451) @@ -18,7 +18,8 @@ RUN_DEPENDS= rubygem-rubytree>=0:${PORTS rubygem-rack-openid>=0:${PORTSDIR}/www/rubygem-rack-openid \ rubygem-coderay>=1.0.9:${PORTSDIR}/textproc/rubygem-coderay \ rubygem-fastercsv>=1.5.0:${PORTSDIR}/devel/rubygem-fastercsv \ - rubygem-builder>=3.0.0:${PORTSDIR}/devel/rubygem-builder + rubygem-builder>=3.0.0:${PORTSDIR}/devel/rubygem-builder \ + rubygem-net-ldap>=0.3.1:${PORTSDIR}/net/rubygem-net-ldap USE_RUBY= yes USE_RUBY_FEATURES= iconv @@ -26,7 +27,7 @@ USE_RAKE= yes NO_BUILD= yes SUB_LIST+= RUBY_NAME=${RUBY_NAME} -OPTIONS_DEFINE= MYSQL MYSQL2 POSTGRESQL RMAGIC WWWSERVER LDAP +OPTIONS_DEFINE= MYSQL MYSQL2 POSTGRESQL RMAGIC WWWSERVER OPTIONS_DEFAULT=MYSQL2 RMAGIC WWWSERVER THIN OPTIONS_SINGLE= WWWSERVER OPTIONS_SINGLE_WWWSERVER= THIN PASSENGER @@ -72,10 +73,6 @@ RUN_DEPENDS+= passenger-config:${PORTSDI .endif .endif -.if ${PORT_OPTIONS:MLDAP} -RUN_DEPENDS+= rubygem-net-ldap>=0.3.1:${PORTSDIR}/net/rubygem-net-ldap -.endif - post-extract: ${MV} ${WRKSRC}/config/settings.yml ${WRKSRC}/config/settings.yml-dist @@ -84,11 +81,15 @@ pre-install: do-install: ${MKDIR} ${WWWDIR} + ${MKDIR} ${WWWDIR}/tmp/pids cd ${WRKSRC} && \ ${COPYTREE_SHARE} "*" ${WWWDIR} "! ( -name *\.orig -o -name *\.bak )" ${FIND} ${WRKSRC}/script -type f -print | ${XARGS} ${CHMOD} 755 post-install: + ${TOUCH} ${WWWDIR}/Gemfile.lock + ${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}/Gemfile.lock + if ! [ -r ${WWWDIR}/config/settings.yml ]; then \ ${INSTALL_DATA} ${WWWDIR}/config/settings.yml-dist \ ${WWWDIR}/config/settings.yml; \ Modified: head/www/redmine/files/patch-Gemfile ============================================================================== --- head/www/redmine/files/patch-Gemfile Thu Oct 24 01:45:27 2013 (r331450) +++ head/www/redmine/files/patch-Gemfile Thu Oct 24 02:09:41 2013 (r331451) @@ -1,5 +1,5 @@ --- Gemfile.orig 2013-07-14 16:51:09.000000000 +0000 -+++ Gemfile 2013-07-21 12:56:04.025404096 +0000 ++++ Gemfile 2013-10-24 01:36:14.746224376 +0000 @@ -1,11 +1,11 @@ source 'https://rubygems.org' @@ -7,7 +7,8 @@ -gem "jquery-rails", "~> 2.0.2" +gem "jquery-rails", "~> 3.0" gem "i18n", "~> 0.6.0" - gem "coderay", "~> 1.0.9" +-gem "coderay", "~> 1.0.9" ++gem "coderay", "~> 1.1.0" gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby] -gem "builder", "3.0.0" +gem "builder", "~> 3.0.0" _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310240210.r9O2A19L015950>