Date: Mon, 19 Aug 2013 16:04:23 +0000 (UTC) From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325001 - in head/www/redmine: . files Message-ID: <201308191604.r7JG4N8l025723@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zi Date: Mon Aug 19 16:04:22 2013 New Revision: 325001 URL: http://svnweb.freebsd.org/changeset/ports/325001 Log: - Enable MYSQL2 support as an OPTION Added: head/www/redmine/files/extra-patch-Gemfile (contents, props changed) Modified: head/www/redmine/Makefile Modified: head/www/redmine/Makefile ============================================================================== --- head/www/redmine/Makefile Mon Aug 19 15:42:16 2013 (r325000) +++ head/www/redmine/Makefile Mon Aug 19 16:04:22 2013 (r325001) @@ -26,14 +26,15 @@ USE_RAKE= yes NO_BUILD= yes SUB_LIST+= RUBY_NAME=${RUBY_NAME} -OPTIONS_DEFINE= MYSQL POSTGRESQL RMAGIC WWWSERVER LDAP -OPTIONS_DEFAULT=MYSQL RMAGIC WWWSERVER THIN +OPTIONS_DEFINE= MYSQL MYSQL2 POSTGRESQL RMAGIC WWWSERVER LDAP +OPTIONS_DEFAULT=MYSQL2 RMAGIC WWWSERVER THIN OPTIONS_SINGLE= WWWSERVER OPTIONS_SINGLE_WWWSERVER= THIN PASSENGER POSTGRESQL_DESC=Enable PostgreSQL support RMAGIC_DESC= Enable Gantt charts support THIN_DESC= Use Thin WEB server PASSENGER_DESC= Use Apache/Nginx WEB server +MYSQL2_DESC= MySQL database support (via mysql2 rubygem) NO_OPTIONS_SORT=yes .include <bsd.port.pre.mk> @@ -42,12 +43,18 @@ NO_OPTIONS_SORT=yes RUN_DEPENDS+= rubygem-mysql>=2.8.1:${PORTSDIR}/databases/rubygem-mysql .endif +.if ${PORT_OPTIONS:MMYSQL2} +RUN_DEPENDS+= rubygem-mysql2>=0:${PORTSDIR}/databases/rubygem-mysql2 +.endif + .if ${PORT_OPTIONS:MPOSTGRESQL} RUN_DEPENDS+= rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg .endif .if ${PORT_OPTIONS:MRMAGIC} RUN_DEPENDS+= rubygem-rmagick>=2.0.0:${PORTSDIR}/graphics/rubygem-rmagick +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Gemfile .endif .if ${PORT_OPTIONS:MWWWSERVER} Added: head/www/redmine/files/extra-patch-Gemfile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/redmine/files/extra-patch-Gemfile Mon Aug 19 16:04:22 2013 (r325001) @@ -0,0 +1,19 @@ +--- ./Gemfile.orig 2013-07-30 12:49:03.000000000 -0400 ++++ ./Gemfile 2013-07-30 12:49:13.000000000 -0400 +@@ -18,16 +18,6 @@ + gem "rack-openid" + end + +-# Optional gem for exporting the gantt to a PNG file, not supported with jruby +-platforms :mri, :mingw do +- group :rmagick do +- # RMagick 2 supports ruby 1.9 +- # RMagick 1 would be fine for ruby 1.8 but Bundler does not support +- # different requirements for the same gem on different platforms +- gem "rmagick", ">= 2.0.0" +- end +-end +- + platforms :jruby do + # jruby-openssl is bundled with JRuby 1.7.0 + gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308191604.r7JG4N8l025723>