head	1.1;
access;
symbols
	RELEASE_8_3_0:1.1
	RELEASE_9_0_0:1.1
	RELEASE_7_4_0:1.1
	RELEASE_8_2_0:1.1;
locks; strict;
comment	@# @;


1.1
date	2011.01.09.22.06.07;	author ohauer;	state Exp;
branches;
next	;


desc
@@


1.1
log
@ - update to version 2.6.0
 - rewrite the rc script so it works with this version
 - patch the Gemfile, else it will not detect
   rubygem-sqlite3 or ruby-dbd_sqlite3

PR:		153293
Submitted by:	Dax Labrador <semprix at bsdmail.org> (maintainer)
@
text
@--- ./server/Gemfile.orig	2010-11-30 17:45:17.000000000 +0100
+++ ./server/Gemfile	2011-01-09 22:37:36.000000000 +0100
@@@@ -11,11 +11,11 @@@@
 #
 gem 'RedCloth', :require => 'redcloth'
 
-if !( (RUBY_PLATFORM =~ /mswin/i) || (RUBY_PLATFORM =~ /mingw/i) )
-  gem 'sqlite3-ruby', '1.2.5', :require => 'sqlite3'
-else
+#if !( (RUBY_PLATFORM =~ /mswin/i) || (RUBY_PLATFORM =~ /mingw/i) )
+#  gem 'sqlite3-ruby', '1.2.5', :require => 'sqlite3'
+#else
   gem 'sqlite3-ruby', '1.3.2', :require => 'sqlite3'
-end
+#end
 
 # Bundle gems for the local environment. Make sure to
 # put test-only gems in this group so their generators
@
