Fairly simple version update.  Remove a patch now upstream.  Fix regress
tests, requiring the ruby regress related diff I sent earlier.

Tested on i386.

Jeremy

Index: www/ruby-thin/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-thin/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- www/ruby-thin/Makefile      16 Sep 2011 12:00:09 -0000      1.12
+++ www/ruby-thin/Makefile      14 Nov 2011 13:23:54 -0000
@@ -2,13 +2,12 @@
 
 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_FL
 
 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>
Index: www/ruby-thin/distinfo
===================================================================
RCS file: /cvs/ports/www/ruby-thin/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- www/ruby-thin/distinfo      12 Jan 2011 17:47:38 -0000      1.2
+++ www/ruby-thin/distinfo      14 Nov 2011 13:23:54 -0000
@@ -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
Index: www/ruby-thin/patches/patch-lib_thin_daemonizing_rb
===================================================================
RCS file: www/ruby-thin/patches/patch-lib_thin_daemonizing_rb
diff -N www/ruby-thin/patches/patch-lib_thin_daemonizing_rb
--- www/ruby-thin/patches/patch-lib_thin_daemonizing_rb 14 Mar 2011 17:58:06 
-0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -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
Index: www/ruby-thin/patches/patch-spec_spec_helper_rb
===================================================================
RCS file: www/ruby-thin/patches/patch-spec_spec_helper_rb
diff -N www/ruby-thin/patches/patch-spec_spec_helper_rb
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ www/ruby-thin/patches/patch-spec_spec_helper_rb     14 Nov 2011 13:23:54 
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+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'
Index: www/ruby-thin/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/ruby-thin/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- www/ruby-thin/pkg/PLIST     12 Jan 2011 17:47:38 -0000      1.4
+++ www/ruby-thin/pkg/PLIST     14 Nov 2011 13:23:54 -0000
@@ -3,7 +3,6 @@ ${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/

Reply via email to