Looks like I imported www/ruby-rack-test during the upgrade to
www/ruby-rails without noticing that devel/ruby-rack-test already
existed.  Because the devel version is older and the www version
is the one being depended on, and there isn't any useful information in
the CVS log for the devel version, remove the devel version and add the
devel pkgpath to the www version's PLIST so that the devel version will
update to the www version.

Discovered by claudio@.  Looking for OKs.

Jeremy

Index: devel/Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.924
diff -u -p -r1.924 Makefile
--- devel/Makefile      19 Apr 2011 19:31:31 -0000      1.924
+++ devel/Makefile      22 Apr 2011 15:28:24 -0000
@@ -1034,7 +1034,6 @@
      SUBDIR += ruby-polyglot
      SUBDIR += ruby-prof
      SUBDIR += ruby-prof,ruby19
-     SUBDIR += ruby-rack-test
      SUBDIR += ruby-rake
      SUBDIR += ruby-rake-compiler
      SUBDIR += ruby-rcov
Index: devel/ruby-rack-test/Makefile
===================================================================
RCS file: devel/ruby-rack-test/Makefile
diff -N devel/ruby-rack-test/Makefile
--- devel/ruby-rack-test/Makefile       6 Jan 2011 04:24:23 -0000       1.6
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-# $OpenBSD: Makefile,v 1.6 2011/01/06 04:24:23 jeremy Exp $
-
-COMMENT =      small, simple testing API for Rack apps
-
-DISTNAME =     rack-test-0.3.0
-REVISION =     3
-CATEGORIES =   devel www
-
-HOMEPAGE =     http://github.com/brynary/rack-test
-
-# MIT
-PERMIT_PACKAGE_CDROM = Yes
-PERMIT_PACKAGE_FTP = Yes
-PERMIT_DISTFILES_CDROM = Yes
-PERMIT_DISTFILES_FTP = Yes
-
-MODULES =              lang/ruby
-
-CONFIGURE_STYLE =      ruby gem
-
-.include <bsd.port.mk>
Index: devel/ruby-rack-test/distinfo
===================================================================
RCS file: devel/ruby-rack-test/distinfo
diff -N devel/ruby-rack-test/distinfo
--- devel/ruby-rack-test/distinfo       19 May 2009 21:49:11 -0000      1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-MD5 (rack-test-0.3.0.gem) = vbx6KidltelCj+zEK2Slew==
-RMD160 (rack-test-0.3.0.gem) = 0iVzTGJb82BqD2QQ4TS1VY4WTBM=
-SHA1 (rack-test-0.3.0.gem) = ICie4b9Ov+EgUZpAH21+IQKs+7k=
-SHA256 (rack-test-0.3.0.gem) = r+8MFY/MbqlhuTvEG7WFkyxRD9JE3BCgwREqDS8MhKE=
-SIZE (rack-test-0.3.0.gem) = 10752
Index: devel/ruby-rack-test/pkg/DESCR
===================================================================
RCS file: devel/ruby-rack-test/pkg/DESCR
diff -N devel/ruby-rack-test/pkg/DESCR
--- devel/ruby-rack-test/pkg/DESCR      19 May 2009 21:49:11 -0000      1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-Rack::Test is a small, simple testing API for Rack apps.
-It can be used on its own or as a reusable starting point
-for Web frameworks and testing libraries to build on.
-Most of its initial functionality is an extraction of
-Merb 1.0's request helpers feature.
Index: devel/ruby-rack-test/pkg/PLIST
===================================================================
RCS file: devel/ruby-rack-test/pkg/PLIST
diff -N devel/ruby-rack-test/pkg/PLIST
--- devel/ruby-rack-test/pkg/PLIST      8 Nov 2010 23:24:40 -0000       1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.2 2010/11/08 23:24:40 jeremy Exp $
-${GEM_LIB}/cache/${DISTNAME}.gem
-${GEM_LIB}/gems/${DISTNAME}/
-${GEM_LIB}/gems/${DISTNAME}/History.txt
-${GEM_LIB}/gems/${DISTNAME}/MIT-LICENSE.txt
-${GEM_LIB}/gems/${DISTNAME}/README.rdoc
-${GEM_LIB}/gems/${DISTNAME}/Rakefile
-${GEM_LIB}/gems/${DISTNAME}/lib/
-${GEM_LIB}/gems/${DISTNAME}/lib/rack/
-${GEM_LIB}/gems/${DISTNAME}/lib/rack/mock_session.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/rack/test/
-${GEM_LIB}/gems/${DISTNAME}/lib/rack/test.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/rack/test/cookie_jar.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/rack/test/methods.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/rack/test/mock_digest_request.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/rack/test/uploaded_file.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/rack/test/utils.rb
-${GEM_LIB}/specifications/${DISTNAME}.gemspec
Index: www/ruby-rack-test/Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-rack-test/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- www/ruby-rack-test/Makefile 6 Jan 2011 04:24:25 -0000       1.2
+++ www/ruby-rack-test/Makefile 22 Apr 2011 15:36:06 -0000
@@ -3,7 +3,7 @@
 COMMENT=               small, simple testing API for Rack apps
 
 DISTNAME=              rack-test-0.5.6
-REVISION =             0
+REVISION =             1
 CATEGORIES=            www
 
 HOMEPAGE=              https://github.com/brynary/rack-test
Index: www/ruby-rack-test/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/ruby-rack-test/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- www/ruby-rack-test/pkg/PLIST        8 Dec 2010 21:28:33 -0000       1.1.1.1
+++ www/ruby-rack-test/pkg/PLIST        22 Apr 2011 15:35:39 -0000
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2010/12/08 21:28:33 jeremy Exp $
+@pkgpath devel/ruby-rack-test
 ${GEM_LIB}/cache/${DISTNAME}.gem
 ${GEM_LIB}/gems/${DISTNAME}/
 ${GEM_LIB}/gems/${DISTNAME}/.document

Reply via email to