Date: Wed, 4 Apr 2007 14:24:20 +1000 (YAKST) From: Alexander Logvinov <ports@logvinov.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: clsung@FreeBSD.org Subject: ports/111215: [PATCH] www/rubygem-mongrel: fix build with Ruby 1.8.6 Message-ID: <200704040424.l344OK6B032719@blg.akavia.ru> Resent-Message-ID: <200704040430.l344U53g038536@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 111215
>Category: ports
>Synopsis: [PATCH] www/rubygem-mongrel: fix build with Ruby 1.8.6
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Apr 04 04:30:05 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Alexander Logvinov
>Release: FreeBSD 6.2-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
Fix build with Ruby 1.8.6 by updating cgi_multipart_eof_fix to 2.1
Remove pre-install section
Bump PORTREVISION
>How-To-Repeat:
# cd /usr/ports/www/rubygem-mongrel
# make install clean
/usr/local/bin/gem install --no-ri --install-dir /usr/local/lib/ruby/gems/1.8 /usr/ports/distfiles/rubygem/cgi_multipart_eof_fix-1.0.0.gem
ERROR: While executing gem ... (RuntimeError)
Error instaling /usr/ports/distfiles/rubygem/cgi_multipart_eof_fix-1.0.0.gem:
cgi_multipart_eof_fix requires Ruby version <= 1.8.5
*** Error code 1
>Fix:
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/rubygem-mongrel/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile 6 Mar 2007 10:34:02 -0000 1.8
+++ Makefile 4 Apr 2007 04:13:35 -0000
@@ -6,11 +6,12 @@
PORTNAME= mongrel
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= www rubygems
MASTER_SITES= ${MASTER_SITE_RUBYFORGE} \
- http://mongrel.rubyforge.org/releases/gems/:PATCH
+ http://files.rubyforge.mmmultiworks.com/fauna/:PATCH
MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${PATCHNAME}${EXTRACT_SUFX}:PATCH
+DISTFILES= ${PATCHNAME}${EXTRACT_SUFX}:PATCH ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= clsung@FreeBSD.org
COMMENT= Fast HTTP 1.1 library and server for Ruby web applications
@@ -20,10 +21,7 @@
rubygem-fastthread>=0.6.2:${PORTSDIR}/devel/rubygem-fastthread
RUN_DEPENDS= ${BUILD_DEPENDS}
-PATCHNAME= cgi_multipart_eof_fix-1.0.0
-
-pre-install:
- ${RUBYGEMBIN} install --no-ri --install-dir ${PREFIX}/lib/ruby/gems/${REV} ${DISTDIR}/${DIST_SUBDIR}/${PATCHNAME}${EXTRACT_SUFX}
+PATCHNAME= cgi_multipart_eof_fix-2.1
post-install:
@${RM} -rf "${PREFIX}/${GEM_LIB_DIR}/ext"
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/www/rubygem-mongrel/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 6 Mar 2007 10:34:02 -0000 1.6
+++ distinfo 4 Apr 2007 04:13:35 -0000
@@ -1,6 +1,6 @@
+MD5 (rubygem/cgi_multipart_eof_fix-2.1.gem) = 02759eecbf8eecd9a811192cbc1e990b
+SHA256 (rubygem/cgi_multipart_eof_fix-2.1.gem) = 5ff42c1e33c84f13dfc577d75371655c0868c0af67efa748b03d8f7ae16dd2a2
+SIZE (rubygem/cgi_multipart_eof_fix-2.1.gem) = 10240
MD5 (rubygem/mongrel-1.0.1.gem) = e3caa5d827d0d4bf03acc7245b71694f
SHA256 (rubygem/mongrel-1.0.1.gem) = c5dd51f2a0ad7b321aa68d358bcc85488231f08ee09b7699ae86a43746186911
SIZE (rubygem/mongrel-1.0.1.gem) = 159232
-MD5 (rubygem/cgi_multipart_eof_fix-1.0.0.gem) = f21a106c951fca111a7168f106089d58
-SHA256 (rubygem/cgi_multipart_eof_fix-1.0.0.gem) = 5babae9db4068abacb9fbbba1013960afed3ca5d35998237476596f639f2eaa7
-SIZE (rubygem/cgi_multipart_eof_fix-1.0.0.gem) = 5632
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/www/rubygem-mongrel/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist 6 Mar 2007 10:34:02 -0000 1.6
+++ pkg-plist 4 Apr 2007 04:13:35 -0000
@@ -1,10 +1,20 @@
bin/mongrel_rails
-%%GEMS_DIR%%/cgi_multipart_eof_fix-1.0.0/README
-%%GEMS_DIR%%/cgi_multipart_eof_fix-1.0.0/cgi_multipart_eof_fix.patch
-%%GEMS_DIR%%/cgi_multipart_eof_fix-1.0.0/lib/cgi_multipart_eof_fix.rb
-%%GEMS_DIR%%/cgi_multipart_eof_fix-1.0.0/test_cgi_multipart_eof_fix.rb
+%%GEMS_DIR%%/cgi_multipart_eof_fix-2.1/LICENSE.txt
+%%GEMS_DIR%%/cgi_multipart_eof_fix-2.1/README.txt
+%%GEMS_DIR%%/cgi_multipart_eof_fix-2.1/Rakefile
+%%GEMS_DIR%%/cgi_multipart_eof_fix-2.1/lib/cgi_multipart_eof_fix.rb
+%%GEMS_DIR%%/cgi_multipart_eof_fix-2.1/cgi_multipart_eof_fix_test.rb
%%GEM_CACHE%%
-%%CACHE_DIR%%/cgi_multipart_eof_fix-1.0.0.gem
+%%CACHE_DIR%%/cgi_multipart_eof_fix-2.1.gem
+%%DOC_DIR%%/cgi_multipart_eof_fix-2.1/rdoc/rdoc-style.css
+%%DOC_DIR%%/cgi_multipart_eof_fix-2.1/rdoc/files/lib/cgi_multipart_eof_fix_rb.html
+%%DOC_DIR%%/cgi_multipart_eof_fix-2.1/rdoc/classes/CGI.html
+%%DOC_DIR%%/cgi_multipart_eof_fix-2.1/rdoc/classes/CGI/QueryExtension.html
+%%DOC_DIR%%/cgi_multipart_eof_fix-2.1/rdoc/fr_file_index.html
+%%DOC_DIR%%/cgi_multipart_eof_fix-2.1/rdoc/fr_class_index.html
+%%DOC_DIR%%/cgi_multipart_eof_fix-2.1/rdoc/index.html
+%%DOC_DIR%%/cgi_multipart_eof_fix-2.1/rdoc/created.rid
+%%DOC_DIR%%/cgi_multipart_eof_fix-2.1/rdoc/fr_method_index.html
%%GEM_DOC_DIR%%/rdoc/classes/IO.html
%%GEM_DOC_DIR%%/rdoc/classes/IO.src/M000003.html
%%GEM_DOC_DIR%%/rdoc/classes/IO.src/M000004.html
@@ -463,7 +473,7 @@
%%GEM_LIB_DIR%%/tools/rakehelp.rb
%%GEM_LIB_DIR%%/tools/trickletest.rb
%%GEM_SPEC%%
-%%SPEC_DIR%%/cgi_multipart_eof_fix-1.0.0.gemspec
+%%SPEC_DIR%%/cgi_multipart_eof_fix-2.1.gemspec
@dirrm %%GEM_LIB_DIR%%/tools
@dirrm %%GEM_LIB_DIR%%/test
@dirrm %%GEM_LIB_DIR%%/lib/mongrel
@@ -561,6 +571,11 @@
@dirrm %%GEM_DOC_DIR%%/rdoc/classes
@dirrm %%GEM_DOC_DIR%%/rdoc
@dirrm %%GEM_DOC_DIR%%
-@dirrm %%DOC_DIR%%/cgi_multipart_eof_fix-1.0.0
-@dirrm %%GEMS_DIR%%/cgi_multipart_eof_fix-1.0.0/lib
-@dirrm %%GEMS_DIR%%/cgi_multipart_eof_fix-1.0.0
+@dirrm %%DOC_DIR%%/cgi_multipart_eof_fix-2.1/rdoc/classes/CGI
+@dirrm %%DOC_DIR%%/cgi_multipart_eof_fix-2.1/rdoc/classes
+@dirrm %%DOC_DIR%%/cgi_multipart_eof_fix-2.1/rdoc/files/lib
+@dirrm %%DOC_DIR%%/cgi_multipart_eof_fix-2.1/rdoc/files
+@dirrm %%DOC_DIR%%/cgi_multipart_eof_fix-2.1/rdoc
+@dirrm %%DOC_DIR%%/cgi_multipart_eof_fix-2.1
+@dirrm %%GEMS_DIR%%/cgi_multipart_eof_fix-2.1/lib
+@dirrm %%GEMS_DIR%%/cgi_multipart_eof_fix-2.1
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704040424.l344OK6B032719>