diff --git a/databases/ruby-swift/Makefile b/databases/ruby-swift/Makefile index 435d046b48d..bf052cd7785 100644 --- a/databases/ruby-swift/Makefile +++ b/databases/ruby-swift/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.8 2013/03/11 02:52:08 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2013/05/25 22:22:35 jeremy Exp $ -COMMENT = fast database API and ORM for ruby 1.9 +COMMENT = fast database API and ORM for ruby 1.9+ -DISTNAME = swift-0.14.0 -REVISION = 0 +DISTNAME = swift-1.2.0 CATEGORIES = databases MAINTAINER = Jeremy Evans @@ -12,13 +11,9 @@ MAINTAINER = Jeremy Evans PERMIT_PACKAGE_CDROM = Yes MODULES = lang/ruby -FLAVORS = ruby19 -FLAVOR = ruby19 +FLAVORS = ruby19 ruby20 +FLAVOR ?= ruby19 -WANTLIB = c m stdc++ e2fs-uuid pcrecpp -BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = databases/dbic++>=0.6.0 - -CONFIGURE_STYLE = ruby gem ext +CONFIGURE_STYLE = ruby gem .include diff --git a/databases/ruby-swift/distinfo b/databases/ruby-swift/distinfo index 745b72c92da..ea1a77a4468 100644 --- a/databases/ruby-swift/distinfo +++ b/databases/ruby-swift/distinfo @@ -1,5 +1,2 @@ -MD5 (swift-0.14.0.gem) = 8EX4l0mPBe5GJtU/EYr1xw== -RMD160 (swift-0.14.0.gem) = iCs5X3p1XSmeLSxYMPGUzi5hzhw= -SHA1 (swift-0.14.0.gem) = /PB3XHpwYcmcQJIx43Jq9qlL53M= -SHA256 (swift-0.14.0.gem) = 1V3URFCN0Zduq87LWLdkpOrwpSwfRi5mkrB1dHd+Crk= -SIZE (swift-0.14.0.gem) = 75264 +SHA256 (swift-1.2.0.gem) = SQVxJukSyp0oYvCVhi2AIWEu1dxOht6FHDqgBRSJ5sI= +SIZE (swift-1.2.0.gem) = 68096 diff --git a/databases/ruby-swift/patches/patch-ext_extconf_rb b/databases/ruby-swift/patches/patch-ext_extconf_rb deleted file mode 100644 index 7869da89d7e..00000000000 --- a/databases/ruby-swift/patches/patch-ext_extconf_rb +++ /dev/null @@ -1,38 +0,0 @@ -$OpenBSD: patch-ext_extconf_rb,v 1.2 2012/04/06 19:26:13 jeremy Exp $ ---- ext/extconf.rb.orig Wed Dec 31 16:00:00 1969 -+++ ext/extconf.rb Wed Feb 22 13:58:58 2012 -@@ -4,14 +4,14 @@ require 'mkmf' - Config::CONFIG['CC'] = 'g++' - Config::CONFIG['CPP'] = 'g++' - --$CFLAGS = '-fPIC -Os -I/usr/include -I/opt/local/include -I/usr/local/include' -+$CFLAGS = "-fPIC -I#{ENV['LOCALBASE']}/include" - - def apt_install_hint pkg - "sudo apt-get install #{pkg}" - end - - def library_installed? name, hint -- if find_library(name, 'main', *%w(/usr/lib /usr/local/lib /opt/lib /opt/local/lib /sw/lib)) -+ if find_library(name, 'main', *%w(/usr/lib #{ENV['LOCALBASE']}/lib)) - true - else - $stderr.puts <<-ERROR -@@ -34,7 +34,7 @@ end - - def assert_dbicpp_version ver - passed = false -- header = '/usr/include/dbic++.h' -+ header = "#{ENV['LOCALBASE']}/include/dbic++.h" - message = "Swift needs dbic++ >= #{ver}. Please update your dbic++ installation." - - if File.exists?(header) && match = File.read(header).match(/DBI_VERSION\s+(.*?)\n/mi) -@@ -52,7 +52,7 @@ def assert_dbicpp_version ver - end - - exit 1 unless library_installed? 'pcrecpp', apt_install_hint('libpcre3-dev') --exit 1 unless library_installed? 'uuid', apt_install_hint('uuid-dev') -+exit 1 unless library_installed? 'e2fs-uuid', apt_install_hint('uuid-dev') - exit 1 unless library_installed? 'dbic++', apt_install_hint('dbic++-dev') - - assert_dbicpp_version '0.5.9' diff --git a/databases/ruby-swift/pkg/PLIST b/databases/ruby-swift/pkg/PLIST index 5988beb8fa3..2d6d0a1fe15 100644 --- a/databases/ruby-swift/pkg/PLIST +++ b/databases/ruby-swift/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2012/04/06 19:26:13 jeremy Exp $ +@comment $OpenBSD: PLIST,v 1.4 2013/05/25 22:22:35 jeremy Exp $ ${GEM_LIB}/cache/${DISTNAME}.gem ${GEM_LIB}/gems/${DISTNAME}/ ${GEM_LIB}/gems/${DISTNAME}/API.rdoc @@ -6,48 +6,31 @@ ${GEM_LIB}/gems/${DISTNAME}/LICENSE ${GEM_LIB}/gems/${DISTNAME}/README.md ${GEM_LIB}/gems/${DISTNAME}/Rakefile ${GEM_LIB}/gems/${DISTNAME}/VERSION -${GEM_LIB}/gems/${DISTNAME}/ext/ -${GEM_LIB}/gems/${DISTNAME}/ext/Makefile -${GEM_LIB}/gems/${DISTNAME}/ext/adapter.cc -${GEM_LIB}/gems/${DISTNAME}/ext/adapter.h -${GEM_LIB}/gems/${DISTNAME}/ext/adapter.o -${GEM_LIB}/gems/${DISTNAME}/ext/adapter_io.cc -${GEM_LIB}/gems/${DISTNAME}/ext/adapter_io.h -${GEM_LIB}/gems/${DISTNAME}/ext/adapter_io.o -${GEM_LIB}/gems/${DISTNAME}/ext/attribute.cc -${GEM_LIB}/gems/${DISTNAME}/ext/attribute.h -${GEM_LIB}/gems/${DISTNAME}/ext/attribute.o -${GEM_LIB}/gems/${DISTNAME}/ext/datetime.cc -${GEM_LIB}/gems/${DISTNAME}/ext/datetime.h -${GEM_LIB}/gems/${DISTNAME}/ext/datetime.o -${GEM_LIB}/gems/${DISTNAME}/ext/extconf.rb -${GEM_LIB}/gems/${DISTNAME}/ext/mkmf.log -${GEM_LIB}/gems/${DISTNAME}/ext/query.cc -${GEM_LIB}/gems/${DISTNAME}/ext/query.h -${GEM_LIB}/gems/${DISTNAME}/ext/query.o -${GEM_LIB}/gems/${DISTNAME}/ext/result.cc -${GEM_LIB}/gems/${DISTNAME}/ext/result.h -${GEM_LIB}/gems/${DISTNAME}/ext/result.o -${GEM_LIB}/gems/${DISTNAME}/ext/statement.cc -${GEM_LIB}/gems/${DISTNAME}/ext/statement.h -${GEM_LIB}/gems/${DISTNAME}/ext/statement.o -${GEM_LIB}/gems/${DISTNAME}/ext/swift.cc -${GEM_LIB}/gems/${DISTNAME}/ext/swift.h -${GEM_LIB}/gems/${DISTNAME}/ext/swift.o -${GEM_LIB}/gems/${DISTNAME}/ext/swift.so ${GEM_LIB}/gems/${DISTNAME}/lib/ ${GEM_LIB}/gems/${DISTNAME}/lib/swift/ ${GEM_LIB}/gems/${DISTNAME}/lib/swift.rb -${GEM_LIB}/gems/${DISTNAME}/lib/swift.so ${GEM_LIB}/gems/${DISTNAME}/lib/swift/adapter/ ${GEM_LIB}/gems/${DISTNAME}/lib/swift/adapter.rb +${GEM_LIB}/gems/${DISTNAME}/lib/swift/adapter/em/ +${GEM_LIB}/gems/${DISTNAME}/lib/swift/adapter/em/mysql.rb +${GEM_LIB}/gems/${DISTNAME}/lib/swift/adapter/em/postgres.rb +${GEM_LIB}/gems/${DISTNAME}/lib/swift/adapter/eventmachine.rb +${GEM_LIB}/gems/${DISTNAME}/lib/swift/adapter/mysql.rb +${GEM_LIB}/gems/${DISTNAME}/lib/swift/adapter/postgres.rb ${GEM_LIB}/gems/${DISTNAME}/lib/swift/adapter/sql.rb +${GEM_LIB}/gems/${DISTNAME}/lib/swift/adapter/sqlite3.rb +${GEM_LIB}/gems/${DISTNAME}/lib/swift/adapter/synchrony/ +${GEM_LIB}/gems/${DISTNAME}/lib/swift/adapter/synchrony.rb +${GEM_LIB}/gems/${DISTNAME}/lib/swift/adapter/synchrony/mysql.rb +${GEM_LIB}/gems/${DISTNAME}/lib/swift/adapter/synchrony/postgres.rb ${GEM_LIB}/gems/${DISTNAME}/lib/swift/attribute.rb -${GEM_LIB}/gems/${DISTNAME}/lib/swift/db.rb +${GEM_LIB}/gems/${DISTNAME}/lib/swift/fiber_connection_pool.rb ${GEM_LIB}/gems/${DISTNAME}/lib/swift/header.rb ${GEM_LIB}/gems/${DISTNAME}/lib/swift/identity_map.rb ${GEM_LIB}/gems/${DISTNAME}/lib/swift/migrations.rb -${GEM_LIB}/gems/${DISTNAME}/lib/swift/scheme.rb +${GEM_LIB}/gems/${DISTNAME}/lib/swift/record.rb +${GEM_LIB}/gems/${DISTNAME}/lib/swift/result.rb +${GEM_LIB}/gems/${DISTNAME}/lib/swift/statement.rb ${GEM_LIB}/gems/${DISTNAME}/lib/swift/type.rb ${GEM_LIB}/gems/${DISTNAME}/lib/swift/validations.rb ${GEM_LIB}/gems/${DISTNAME}/swift.gemspec @@ -62,8 +45,9 @@ ${GEM_LIB}/gems/${DISTNAME}/test/test_encoding.rb ${GEM_LIB}/gems/${DISTNAME}/test/test_error.rb ${GEM_LIB}/gems/${DISTNAME}/test/test_identity_map.rb ${GEM_LIB}/gems/${DISTNAME}/test/test_io.rb -${GEM_LIB}/gems/${DISTNAME}/test/test_scheme.rb +${GEM_LIB}/gems/${DISTNAME}/test/test_record.rb ${GEM_LIB}/gems/${DISTNAME}/test/test_swift.rb +${GEM_LIB}/gems/${DISTNAME}/test/test_synchrony.rb ${GEM_LIB}/gems/${DISTNAME}/test/test_timestamps.rb ${GEM_LIB}/gems/${DISTNAME}/test/test_transactions.rb ${GEM_LIB}/gems/${DISTNAME}/test/test_types.rb