Revert, broken at runtime.

Fix dependencies while here.
2017-08-28 07:28:23 +00:00 · 2017-08-28 07:28:23 +00:00 · 15267914eb
commit 15267914eb
parent d3b900efbb
8 changed files with 71 additions and 90 deletions
--- a/databases/ruby-redis-namespace/Makefile
+++ b/databases/ruby-redis-namespace/Makefile
@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2017/08/28 05:16:33 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.8 2017/08/28 07:28:23 dcoppa Exp $

 COMMENT=		Redis::Namespace class for namespacing calls to Redis

 DISTNAME=		redis-namespace-1.5.3
+REVISION=		0
 CATEGORIES=		databases

 HOMEPAGE=		https://github.com/resque/redis-namespace
@ -14,10 +15,7 @@ MODULES=		lang/ruby

 CONFIGURE_STYLE=	ruby gem

-# XXX until gemspec is fixed
-GEM_FLAGS=		--ignore-dependencies
-
 BUILD_DEPENDS=		${RUN_DEPENDS}
-RUN_DEPENDS=		databases/ruby-redis,${MODRUBY_FLAVOR}
+RUN_DEPENDS=		databases/ruby-redis,${MODRUBY_FLAVOR}>=3.0.4v1,<4.0.0v1

 .include <bsd.port.mk>
--- a/databases/ruby-redis/Makefile
+++ b/databases/ruby-redis/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.26 2017/08/28 05:21:22 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.27 2017/08/28 07:28:23 dcoppa Exp $

 COMMENT =	client library for the Redis key-value store

-VERSION =	4.0.0
-EPOCH =		0
+VERSION =	3.3.3
+EPOCH =		1
 DISTNAME =	redis-${VERSION}
 CATEGORIES =	databases

@ -16,28 +16,22 @@ PERMIT_PACKAGE_CDROM =	Yes

 MODULES =		lang/ruby

-USE_GMAKE =		Yes
-
 CONFIGURE_STYLE =	ruby gem

-MODRUBY_TEST =		ruby
+MODRUBY_TEST =		rake

-TEST_ENV +=		LC_CTYPE="en_US.UTF-8" \
-			BINARY=${LOCALBASE}/sbin/redis-server
+MODRUBY_TEST_ENV +=	LC_CTYPE="en_US.UTF-8" \
+			REDIS_BINARY=${LOCALBASE}/sbin/redis-server
+
+MODRUBY_TEST_TARGET =	run

 TEST_DEPENDS +=		databases/redis

 pre-configure:
-	${SUBST_CMD} ${WRKSRC}/makefile \
-		${WRKSRC}/test/publish_subscribe_test.rb
+	${SUBST_CMD} ${WRKSRC}/test/publish_subscribe_test.rb

 post-install:
 	@find ${PREFIX}/${GEM_LIB}/ -name '.git*' -print0 | xargs -r0 rm
-	@rm ${PREFIX}/${GEM_LIB}/gems/${DISTNAME}/*.beforesubst \
-		${PREFIX}/${GEM_LIB}/gems/${DISTNAME}/test/*.beforesubst
-
-do-test:
-	cd ${WRKBUILD} && ${SETENV} ${ALL_TEST_ENV} ${MAKE_PROGRAM} \
-		${ALL_TEST_FLAGS} ${TEST_TARGET}
+	@rm ${PREFIX}/${GEM_LIB}/gems/${DISTNAME}/test/*.beforesubst

 .include <bsd.port.mk>
--- a/databases/ruby-redis/distinfo
+++ b/databases/ruby-redis/distinfo
@ -1,2 +1,2 @@
-SHA256 (redis-4.0.0.gem) = mNZWBUR/NK0/rmQpqjU6x8b04Iaj2ApfXZ1IhvYg7mk=
-SIZE (redis-4.0.0.gem) = 91136
+SHA256 (redis-3.3.3.gem) = z3RsavfHrYB1e4CURZyZdyBGgOHz8Kgq3ngaGkI5sk0=
+SIZE (redis-3.3.3.gem) = 92672
--- a/databases/ruby-redis/patches/patch-Rakefile
+++ b/databases/ruby-redis/patches/patch-Rakefile
@ -0,0 +1,42 @@
+$OpenBSD: patch-Rakefile,v 1.4 2017/08/28 07:28:23 dcoppa Exp $
+--- Rakefile.orig	Wed Feb 11 13:21:18 2015
+++ Rakefile	Fri Feb 13 09:39:06 2015
+@@ -1,14 +1,12 @@
+ require "rake/testtask"
+ 
+-ENV["REDIS_BRANCH"] ||= "unstable"
+-
+ REDIS_DIR = File.expand_path(File.join("..", "test"), __FILE__)
+ REDIS_CNF = File.join(REDIS_DIR, "test.conf")
+ REDIS_CNF_TEMPLATE = File.join(REDIS_DIR, "test.conf.erb")
+ REDIS_PID = File.join(REDIS_DIR, "db", "redis.pid")
+ REDIS_LOG = File.join(REDIS_DIR, "db", "redis.log")
+ REDIS_SOCKET = File.join(REDIS_DIR, "db", "redis.sock")
+-BINARY = "tmp/redis-#{ENV["REDIS_BRANCH"]}/src/redis-server"
+BINARY = ENV.fetch("REDIS_BINARY")
+ 
+ task :default => :run
+ 
+@@ -48,22 +46,7 @@ end
+ 
+ desc "Clean up testing artifacts"
+ task :clean do
+-  FileUtils.rm_f(BINARY)
+   FileUtils.rm_f(REDIS_CNF)
+-end
+-
+-file BINARY do
+-  branch = ENV.fetch("REDIS_BRANCH")
+-
+-  sh <<-SH
+-  mkdir -p tmp;
+-  cd tmp;
+-  rm -rf redis-#{branch};
+-  wget https://github.com/antirez/redis/archive/#{branch}.tar.gz -O #{branch}.tar.gz;
+-  tar xf #{branch}.tar.gz;
+-  cd redis-#{branch};
+-  make
+-  SH
+ end
+ 
+ file REDIS_CNF => [REDIS_CNF_TEMPLATE, __FILE__] do |t|
--- a/databases/ruby-redis/patches/patch-makefile
+++ b/databases/ruby-redis/patches/patch-makefile
@ -1,53 +0,0 @@
-$OpenBSD: patch-makefile,v 1.1 2017/08/28 05:21:22 dcoppa Exp $
-
-Index: makefile
--- makefile.orig
-+++ makefile
-@@ -1,9 +1,7 @@
- TEST_FILES   := $(shell find test -name *_test.rb -type f)
-REDIS_BRANCH := unstable
- TMP          := tmp
-BUILD_DIR    := ${TMP}/redis-${REDIS_BRANCH}
-TARBALL      := ${TMP}/redis-${REDIS_BRANCH}.tar.gz
-BINARY       := ${BUILD_DIR}/src/redis-server
-+BUILD_DIR    := ${TMP}
-+BINARY       ?= ${LOCALBASE}/sbin/redis-server
- PID_PATH     := ${BUILD_DIR}/redis.pid
- SOCKET_PATH  := ${BUILD_DIR}/redis.sock
- PORT         := 6381
-@@ -11,25 +9,16 @@ PORT         := 6381
- test: ${TEST_FILES}
- 	make start
- 	env SOCKET_PATH=${SOCKET_PATH} \
-		ruby -v $$(echo $? | tr ' ' '\n' | awk '{ print "-r./" $$0 }') -e ''
-+		${LOCALBASE}/bin/ruby${GEM_BIN_SUFFIX} -v $$(echo $? | tr ' ' '\n' | awk '{ print "-r./" $$0 }') -e ''
- 	make stop
- 
- ${TMP}:
- 	mkdir $@
- 
-${TARBALL}: ${TMP}
-	wget https://github.com/antirez/redis/archive/${REDIS_BRANCH}.tar.gz -O $@
-
-${BINARY}: ${TARBALL} ${TMP}
-	rm -rf ${BUILD_DIR}
-	mkdir -p ${BUILD_DIR}
-	tar xf ${TARBALL} -C ${TMP}
-	cd ${BUILD_DIR} && make
-
- stop:
- 	(test -f ${PID_PATH} && (kill $$(cat ${PID_PATH}) || true) && rm -f ${PID_PATH}) || true
- 
-start: ${BINARY}
-+start: ${TMP} ${BINARY}
- 	${BINARY}                     \
- 		--daemonize  yes            \
- 		--pidfile    ${PID_PATH}    \
-@@ -37,6 +26,6 @@ start: ${BINARY}
- 		--unixsocket ${SOCKET_PATH}
- 
- clean:
-	(test -d ${BUILD_DIR} && cd ${BUILD_DIR}/src && make clean distclean) || true
-+	true
- 
- .PHONY: test start stop
--- a/databases/ruby-redis/patches/patch-test_publish_subscribe_test_rb
+++ b/databases/ruby-redis/patches/patch-test_publish_subscribe_test_rb
@ -1,8 +1,7 @@
-$OpenBSD: patch-test_publish_subscribe_test_rb,v 1.5 2017/08/28 05:21:22 dcoppa Exp $
-Index: test/publish_subscribe_test.rb
--- test/publish_subscribe_test.rb.orig
-+++ test/publish_subscribe_test.rb
-@@ -233,7 +233,7 @@ class TestPublishSubscribe < Test::Unit::TestCase
+$OpenBSD: patch-test_publish_subscribe_test_rb,v 1.6 2017/08/28 07:28:23 dcoppa Exp $
+--- test/publish_subscribe_test.rb.orig	Wed Feb 11 13:21:18 2015
+++ test/publish_subscribe_test.rb	Fri Feb 13 08:25:04 2015
+@@ -235,7 +235,7 @@ class TestPublishSubscribe < Test::Unit::TestCase
   def test_subscribe_past_a_timeout
     # For some reason, a thread here doesn't reproduce the issue.
     sleep = %{sleep #{OPTIONS[:timeout] * 2}}
--- a/databases/ruby-redis/pkg/PLIST
+++ b/databases/ruby-redis/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.13 2017/08/28 05:21:22 dcoppa Exp $
+@comment $OpenBSD: PLIST,v 1.14 2017/08/28 07:28:23 dcoppa Exp $
 ${GEM_LIB}/cache/${DISTNAME}.gem
 ${GEM_LIB}/gems/${DISTNAME}/
 ${GEM_LIB}/gems/${DISTNAME}/.travis/
@ -9,13 +9,13 @@ ${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.md
 ${GEM_LIB}/gems/${DISTNAME}/Gemfile
 ${GEM_LIB}/gems/${DISTNAME}/LICENSE
 ${GEM_LIB}/gems/${DISTNAME}/README.md
+${GEM_LIB}/gems/${DISTNAME}/Rakefile
 ${GEM_LIB}/gems/${DISTNAME}/benchmarking/
 ${GEM_LIB}/gems/${DISTNAME}/benchmarking/logging.rb
 ${GEM_LIB}/gems/${DISTNAME}/benchmarking/pipeline.rb
 ${GEM_LIB}/gems/${DISTNAME}/benchmarking/speed.rb
 ${GEM_LIB}/gems/${DISTNAME}/benchmarking/suite.rb
 ${GEM_LIB}/gems/${DISTNAME}/benchmarking/worker.rb
-${GEM_LIB}/gems/${DISTNAME}/bors.toml
 ${GEM_LIB}/gems/${DISTNAME}/examples/
 ${GEM_LIB}/gems/${DISTNAME}/examples/basic.rb
 ${GEM_LIB}/gems/${DISTNAME}/examples/consistency.rb
@ -48,7 +48,6 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/redis/hash_ring.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/redis/pipeline.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/redis/subscribe.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/redis/version.rb
-${GEM_LIB}/gems/${DISTNAME}/makefile
 ${GEM_LIB}/gems/${DISTNAME}/redis.gemspec
 ${GEM_LIB}/gems/${DISTNAME}/test/
 ${GEM_LIB}/gems/${DISTNAME}/test/bitpos_test.rb
--- a/databases/ruby-resque/Makefile
+++ b/databases/ruby-resque/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2017/08/28 06:23:31 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.8 2017/08/28 07:28:23 dcoppa Exp $

 COMMENT=		Redis-backed library to create jobs and place them on queues

 DISTNAME=		resque-1.23.1
-REVISION=		0
+REVISION=		1
 CATEGORIES=		databases www

 HOMEPAGE=		https://github.com/resque/resque
@ -15,17 +15,19 @@ MODULES=		lang/ruby

 CONFIGURE_STYLE=	ruby gem

-# XXX until redis-namespace's gemspec is fixed
-GEM_FLAGS=		--ignore-dependencies
-
 BUILD_DEPENDS=		${RUN_DEPENDS}
 RUN_DEPENDS=		converters/ruby-multi_json,${MODRUBY_FLAVOR} \
+			databases/ruby-redis,${MODRUBY_FLAVOR}>=3.0.4v1,<4.0.0v1 \
 			databases/ruby-redis-namespace,${MODRUBY_FLAVOR} \
 			www/ruby-sinatra,${MODRUBY_FLAVOR} \
 			www/ruby-vegas,${MODRUBY_FLAVOR}

 MODRUBY_TEST=		rake
-TEST_DEPENDS=		databases/redis
+TEST_DEPENDS=		databases/redis \
+			devel/ruby-bundler,${MODRUBY_FLAVOR} \
+			devel/ruby-mocha,${MODRUBY_FLAVOR} \
+			www/ruby-rack-test,${MODRUBY_FLAVOR}
+
 MODRUBY_TEST_ENV+=	PATH=${PATH}

 pre-test: