Update to ruby-swift 0.14.0. Respect patches to respect LOCALBASE.
This commit is contained in:
jeremy
parent
e2ae866641
commit
b8d6446e2f
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.4 2011/09/16 08:48:05 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.5 2012/04/06 19:26:13 jeremy Exp $
|
||||
|
||||
COMMENT = fast database API and ORM for ruby 1.9
|
||||
|
||||
DISTNAME = swift-0.9.1
|
||||
DISTNAME = swift-0.14.0
|
||||
CATEGORIES = databases
|
||||
REVISION = 0
|
||||
|
||||
MAINTAINER = Jeremy Evans <jeremy@openbsd.org>
|
||||
|
||||
@ -19,7 +18,7 @@ FLAVOR = ruby19
|
||||
|
||||
WANTLIB = c m stdc++ e2fs-uuid pcrecpp
|
||||
BUILD_DEPENDS = ${RUN_DEPENDS}
|
||||
RUN_DEPENDS = databases/dbic++>=0.5.4
|
||||
RUN_DEPENDS = databases/dbic++>=0.6.0
|
||||
|
||||
CONFIGURE_STYLE = ruby gem ext
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (swift-0.9.1.gem) = 2eZ3H6nzdl1RjjUF+8f1Hg==
|
||||
RMD160 (swift-0.9.1.gem) = 5zGuWwYb7IOBY6m5B6bGeZ73XNY=
|
||||
SHA1 (swift-0.9.1.gem) = bfMeKhPeXpFXCDPhDf5Mr/Lfye0=
|
||||
SHA256 (swift-0.9.1.gem) = RDEu3JHYz16yjCX9E2HTASKc3cL22su/E5qxkP/Cu4U=
|
||||
SIZE (swift-0.9.1.gem) = 74752
|
||||
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
|
||||
|
||||
@ -1,15 +1,23 @@
|
||||
$OpenBSD: patch-ext_extconf_rb,v 1.1.1.1 2010/12/20 17:43:58 jeremy Exp $
|
||||
--- ext/extconf.rb.orig Thu Oct 28 17:03:48 2010
|
||||
+++ ext/extconf.rb Thu Oct 28 17:05:57 2010
|
||||
@@ -4,7 +4,7 @@ require 'mkmf'
|
||||
$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'
|
||||
+$CFLAGS = '-fPIC'
|
||||
-$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
|
||||
@ -27,4 +35,4 @@ $OpenBSD: patch-ext_extconf_rb,v 1.1.1.1 2010/12/20 17:43:58 jeremy Exp $
|
||||
+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.4.0'
|
||||
assert_dbicpp_version '0.5.9'
|
||||
|
||||
@ -1,15 +1,11 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2011/03/14 18:31:07 jeremy Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.3 2012/04/06 19:26:13 jeremy Exp $
|
||||
${GEM_LIB}/cache/${DISTNAME}.gem
|
||||
${GEM_LIB}/gems/${DISTNAME}/
|
||||
${GEM_LIB}/gems/${DISTNAME}/API.rdoc
|
||||
${GEM_LIB}/gems/${DISTNAME}/LICENSE
|
||||
${GEM_LIB}/gems/${DISTNAME}/README.rdoc
|
||||
${GEM_LIB}/gems/${DISTNAME}/README.md
|
||||
${GEM_LIB}/gems/${DISTNAME}/Rakefile
|
||||
${GEM_LIB}/gems/${DISTNAME}/VERSION
|
||||
${GEM_LIB}/gems/${DISTNAME}/examples/
|
||||
${GEM_LIB}/gems/${DISTNAME}/examples/async.rb
|
||||
${GEM_LIB}/gems/${DISTNAME}/examples/db.rb
|
||||
${GEM_LIB}/gems/${DISTNAME}/examples/scheme.rb
|
||||
${GEM_LIB}/gems/${DISTNAME}/ext/
|
||||
${GEM_LIB}/gems/${DISTNAME}/ext/Makefile
|
||||
${GEM_LIB}/gems/${DISTNAME}/ext/adapter.cc
|
||||
@ -21,17 +17,14 @@ ${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/pool.cc
|
||||
${GEM_LIB}/gems/${DISTNAME}/ext/pool.h
|
||||
${GEM_LIB}/gems/${DISTNAME}/ext/pool.o
|
||||
${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/request.cc
|
||||
${GEM_LIB}/gems/${DISTNAME}/ext/request.h
|
||||
${GEM_LIB}/gems/${DISTNAME}/ext/request.o
|
||||
${GEM_LIB}/gems/${DISTNAME}/ext/result.cc
|
||||
${GEM_LIB}/gems/${DISTNAME}/ext/result.h
|
||||
${GEM_LIB}/gems/${DISTNAME}/ext/result.o
|
||||
@ -46,13 +39,14 @@ ${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/sql.rb
|
||||
${GEM_LIB}/gems/${DISTNAME}/lib/swift/attribute.rb
|
||||
${GEM_LIB}/gems/${DISTNAME}/lib/swift/db.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/pool.rb
|
||||
${GEM_LIB}/gems/${DISTNAME}/lib/swift/scheme.rb
|
||||
${GEM_LIB}/gems/${DISTNAME}/lib/swift/type.rb
|
||||
${GEM_LIB}/gems/${DISTNAME}/lib/swift/validations.rb
|
||||
@ -60,13 +54,16 @@ ${GEM_LIB}/gems/${DISTNAME}/swift.gemspec
|
||||
${GEM_LIB}/gems/${DISTNAME}/test/
|
||||
${GEM_LIB}/gems/${DISTNAME}/test/helper.rb
|
||||
${GEM_LIB}/gems/${DISTNAME}/test/house-explode.jpg
|
||||
${GEM_LIB}/gems/${DISTNAME}/test/minitest_teardown_hack.rb
|
||||
${GEM_LIB}/gems/${DISTNAME}/test/test_adapter.rb
|
||||
${GEM_LIB}/gems/${DISTNAME}/test/test_async.rb
|
||||
${GEM_LIB}/gems/${DISTNAME}/test/test_datetime_parser.rb
|
||||
${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_pool.rb
|
||||
${GEM_LIB}/gems/${DISTNAME}/test/test_scheme.rb
|
||||
${GEM_LIB}/gems/${DISTNAME}/test/test_swift.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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user