Update ruby-thin to 1.3.0. Remove patch now upstream. Add

patch to allow regress testing with rspec 1.3.2.
This commit is contained in:
jeremy 2011-11-17 15:53:54 +00:00
parent e120a88b9d
commit bcfc59c106
5 changed files with 25 additions and 29 deletions

View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:09 espie Exp $
# $OpenBSD: Makefile,v 1.13 2011/11/17 15:53:54 jeremy Exp $
COMMENT = fast and very simple Ruby web server
DISTNAME = thin-1.2.7
REVISION = 1
DISTNAME = thin-1.3.0
CATEGORIES = www
HOMEPAGE = http://code.macournoyer.com/thin/
# BSD
# Ruby/GPLv2
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
@ -24,7 +23,7 @@ RUN_DEPENDS = www/ruby-rack,${MODRUBY_FLAVOR}>=1.0.0 \
MODRUBY_REGRESS = rspec
REGRESS_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
do-regress:
cd ${WRKSRC} && RUBYOPT=-I. ${RSPEC} spec/*_spec.rb
MODRUBY_REGRESS_ENV = RUBYLIB=$$(dirname `${GEM} which thin`) RUBYOPT='-I. -rubygems -rthin'
MODRUBY_REGRESS_TARGET = spec/*_spec.rb
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (thin-1.2.7.gem) = XeGatFwipbXaLJRSozwPJg==
RMD160 (thin-1.2.7.gem) = Fb/AJ1Cav/I7dSnkefsbJq7tZo8=
SHA1 (thin-1.2.7.gem) = kqEMpWDnm5hBrs0IUm2vFDV7gaA=
SHA256 (thin-1.2.7.gem) = u3dZKDR4r7wXIOl8CRx7/qt3aOWhvI1LXU/+rUf85UU=
SIZE (thin-1.2.7.gem) = 140288
MD5 (thin-1.3.0.gem) = 2aC7sG2pFCN2vWZ95rMscQ==
RMD160 (thin-1.3.0.gem) = Yi5/1uY0vQAYagD3FhpZ6V26oao=
SHA1 (thin-1.3.0.gem) = hUQLGZWLsxiIkmxk6Yu45/QVUiE=
SHA256 (thin-1.3.0.gem) = gBeKSya2QdWnEYZxcs79zzkz6UJSUAvTujEShP8booo=
SIZE (thin-1.3.0.gem) = 141824

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-lib_thin_daemonizing_rb,v 1.1 2011/03/14 17:58:06 jeremy Exp $
Backport commit 0ea95a0ddae14d65bc59 from upstream git to fix
backtrace on stop command.
--- lib/thin/daemonizing.rb.orig Wed Feb 23 17:22:10 2011
+++ lib/thin/daemonizing.rb Wed Feb 23 17:22:43 2011
@@ -5,6 +5,8 @@ module Process
# Returns +true+ the process identied by +pid+ is running.
def running?(pid)
Process.getpgid(pid) != -1
+ rescue Errno::EPERM
+ true
rescue Errno::ESRCH
false
end

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-spec_spec_helper_rb,v 1.1 2011/11/17 15:53:54 jeremy Exp $
Work with rspec 1.3.
--- spec/spec_helper.rb.orig Sun Nov 13 23:34:02 2011
+++ spec/spec_helper.rb Sun Nov 13 23:34:05 2011
@@ -1,6 +1,6 @@
require 'rubygems'
require 'thin'
-gem "rspec", "~> 1.2.9"
+gem "rspec", "~> 1.2"
require 'spec'
require 'benchmark'
require 'timeout'

View File

@ -1,9 +1,8 @@
@comment $OpenBSD: PLIST,v 1.4 2011/01/12 17:47:38 rpointel Exp $
@comment $OpenBSD: PLIST,v 1.5 2011/11/17 15:53:54 jeremy Exp $
${GEM_BIN}/thin${GEM_BIN_SUFFIX}
${GEM_LIB}/cache/${DISTNAME}.gem
${GEM_LIB}/gems/${DISTNAME}/
${GEM_LIB}/gems/${DISTNAME}/CHANGELOG
${GEM_LIB}/gems/${DISTNAME}/COPYING
${GEM_LIB}/gems/${DISTNAME}/README
${GEM_LIB}/gems/${DISTNAME}/Rakefile
${GEM_LIB}/gems/${DISTNAME}/benchmark/