Re: making Ruby 1.9 default

2011-04-03 Thread Steve Wills
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi,

Here's an updated version of this patch. It should fix the issues
related to fetching and rdoc that have been reported to me. I believe
this is ready to commit. Please test.

With this and an upcoming change to portupgrade, portupgrade should be
ready to work with Ruby 1.9. portupgrade-devel is already there. This
should make having Ruby 1.9 default a lot easier.

If folks think it's worth it, I can do a wider Call For Testers on
ports@ since so many people use portupgrade.

Steve

On 03/23/11 23:34, Steve Wills wrote:
> Hi,
> 
> Please see the attached patch. This should get us past ruby-bdb and
> allow portupgrade to work with Ruby 1.9.
> 
> Steve
> 



___
freebsd-ruby@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ruby
To unsubscribe, send any mail to "freebsd-ruby-unsubscr...@freebsd.org"

-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.17 (FreeBSD)

iQEcBAEBAgAGBQJNmCdnAAoJEPXPYrMgexuhf0AH/3ULuoKkQy9UW0oYwTu7mLb6
WiT3yaKWgi5/6312Wg/iiBnkpuB6sKlZrFQgJQlawg0NEYxXUSKjjLx8c+D/6RrU
w5PJtl+ieYK78gjL2z27TpSu/DuHknGcZK4q0C7kv5Yg3j3cjdaJD/sVX3fzeqFz
B1X3+unIzQMG+GL+Spoxf0h/5VuF0K9APXcgZ0OgI5XApSktMCTVDsN1NjqDAds3
jVCJBtxocMp8rIKKwRSYQx1A5F/XP+L3f10w5XL7LemcO++LSDOiA2UN2z2Bovf8
jZaChvafFMOZhZ5LUACzCo6x8cuRBD6MrKuZ4DPI4fBDCfbz3GWYu4q+C7nlMLE=
=xSjV
-END PGP SIGNATURE-
Index: Makefile
===
RCS file: /home/ncvs/ports/databases/ruby-bdb/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- Makefile7 Jun 2010 20:48:38 -   1.61
+++ Makefile3 Apr 2011 05:56:09 -
@@ -7,12 +7,13 @@
 
 PORTNAME=  bdb
 PORTVERSION=   0.6.5
-PORTREVISION=  1
+PORTREVISION=  2
 CATEGORIES=databases ruby
-MASTER_SITES=  RF
+MASTER_SITES=  ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=swills
 PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
 PKGNAMESUFFIX= ${WITH_BDB_VER}
-DIST_SUBDIR=   ruby
+DISTNAME=  knu-ruby-bdb-v0.6.5-8-g6feba54
 
 MAINTAINER=k...@freebsd.org
 COMMENT=   Ruby interface to Sleepycat's Berkeley DB revision 2 or later
@@ -30,11 +31,11 @@
--with-db-version=${BDB_LIB_NAME:S/^db//}
 INSTALL_TARGET=site-install
 
+WRKSRC=${WRKDIR}/knu-ruby-bdb-6feba54
+
 DOCS=  Changes \
README.en \
-   bdb.html \
bdb.rd \
-   docs/*.html \
docs/*.rd
 
 .include 
@@ -53,14 +54,13 @@
 post-build:
 .if !defined(NOPORTDOCS)
( cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} \
-   ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} rdoc )
+   ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${RUBY_RDOC} )
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}/doc
(cd ${WRKSRC} && ${INSTALL_MAN} ${DOCS} ${DOCSDIR})
-   (cd ${WRKSRC}/docs/doc && ${COPYTREE_SHARE} \* ${DOCSDIR}/doc)
 .endif
 .if !defined(NOPORTEXAMPLES)
${MKDIR} ${EXAMPLESDIR}/
Index: distinfo
===
RCS file: /home/ncvs/ports/databases/ruby-bdb/distinfo,v
retrieving revision 1.44
diff -u -r1.44 distinfo
--- distinfo20 Mar 2011 12:47:58 -  1.44
+++ distinfo24 Mar 2011 03:08:00 -
@@ -1,2 +1,2 @@
-SHA256 (ruby/bdb-0.6.5.tar.gz) = 
edba29bb720fa32a93a80b2746667d52a30d63e418e89958b17896ef0f25889d
-SIZE (ruby/bdb-0.6.5.tar.gz) = 321865
+SHA256 (knu-ruby-bdb-v0.6.5-8-g6feba54.tar.gz) = 
88582a29003fa0fb61c9136187db9cca575f5d11d64d5f5eec6e0c49f5416067
+SIZE (knu-ruby-bdb-v0.6.5-8-g6feba54.tar.gz) = 286058
Index: files/patch-src_common.c
===
RCS file: files/patch-src_common.c
diff -N files/patch-src_common.c
--- files/patch-src_common.c7 May 2009 16:12:59 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,20 +0,0 @@
 src/common.c.orig  2009-05-02 19:19:39.0 +0400
-+++ src/common.c   2009-05-02 19:20:04.0 +0400
-@@ -941,7 +941,7 @@
-   }
-   }
-   if (!(dbst->options & BDB_NOT_OPEN)) {
--  bdb_test_error(dbst->dbp->close(dbst->dbp, flags));
-+  dbst->dbp->close(dbst->dbp, flags);
-   }
-   }
-   else {
-@@ -950,7 +950,7 @@
-   bdb_ary_delete(&envst->db_ary, dbst->ori_val);
-   }
-   if (!(dbst->options & BDB_NOT_OPEN)) {
--  bdb_test_error(dbst->dbp->close(dbst->dbp, flags));
-+  dbst->dbp->close(dbst->dbp, flags);
-   }
-   }
- }


ruby-bdb-patch2.txt.sig
Description: Binary data
___
freebsd-ruby@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ruby
To unsubscribe, send any mail to "freebsd-ruby-unsubscr...@freebsd.org"


Re: ports/156155: [PATCH] update devel/ruby-ncurses to 1.2.4

2011-04-03 Thread edwin
Synopsis: [PATCH] update devel/ruby-ncurses to 1.2.4

Responsible-Changed-From-To: freebsd-ports-bugs->ruby
Responsible-Changed-By: edwin
Responsible-Changed-When: Sun Apr 3 17:40:18 UTC 2011
Responsible-Changed-Why: 
ruby@ wants this port PRs (via the GNATS Auto Assign Tool)

http://www.freebsd.org/cgi/query-pr.cgi?pr=156155
___
freebsd-ruby@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ruby
To unsubscribe, send any mail to "freebsd-ruby-unsubscr...@freebsd.org"


Re: ports/156155: [PATCH] update devel/ruby-ncurses to 1.2.4

2011-04-03 Thread edwin
Synopsis: [PATCH] update devel/ruby-ncurses to 1.2.4

State-Changed-From-To: open->feedback
State-Changed-By: edwin
State-Changed-When: Sun Apr 3 17:40:22 UTC 2011
State-Changed-Why: 
Awaiting maintainers feedback (via the GNATS Auto Assign Tool)

http://www.freebsd.org/cgi/query-pr.cgi?pr=156155
___
freebsd-ruby@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ruby
To unsubscribe, send any mail to "freebsd-ruby-unsubscr...@freebsd.org"


Re: ports/156155: [PATCH] update devel/ruby-ncurses to 1.2.4

2011-04-03 Thread Edwin Groothuis
The following reply was made to PR ports/156155; it has been noted by GNATS.

From: Edwin Groothuis 
To: saurb...@math.uni-bielefeld.de
Cc: bug-follo...@freebsd.org
Subject: Re: ports/156155: [PATCH] update devel/ruby-ncurses to 1.2.4
Date: Sun, 3 Apr 2011 17:40:20 UT

 Maintainer of devel/ruby-ncurses,
 
 Please note that PR ports/156155 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
 http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/156155
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 ed...@freebsd.org
___
freebsd-ruby@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ruby
To unsubscribe, send any mail to "freebsd-ruby-unsubscr...@freebsd.org"


Re: ports/156158: [PATCH] update devel/rubygem-ffi to work with Ruby 1.9

2011-04-03 Thread edwin
Synopsis: [PATCH] update devel/rubygem-ffi to work with Ruby 1.9

Responsible-Changed-From-To: freebsd-ports-bugs->ruby
Responsible-Changed-By: edwin
Responsible-Changed-When: Sun Apr 3 20:20:17 UTC 2011
Responsible-Changed-Why: 
ruby@ wants this port PRs (via the GNATS Auto Assign Tool)

http://www.freebsd.org/cgi/query-pr.cgi?pr=156158
___
freebsd-ruby@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ruby
To unsubscribe, send any mail to "freebsd-ruby-unsubscr...@freebsd.org"


Re: ports/156158: [PATCH] update devel/rubygem-ffi to work with Ruby 1.9

2011-04-03 Thread edwin
Synopsis: [PATCH] update devel/rubygem-ffi to work with Ruby 1.9

State-Changed-From-To: open->feedback
State-Changed-By: edwin
State-Changed-When: Sun Apr 3 20:20:21 UTC 2011
State-Changed-Why: 
Awaiting maintainers feedback (via the GNATS Auto Assign Tool)

http://www.freebsd.org/cgi/query-pr.cgi?pr=156158
___
freebsd-ruby@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ruby
To unsubscribe, send any mail to "freebsd-ruby-unsubscr...@freebsd.org"


Re: ports/156158: [PATCH] update devel/rubygem-ffi to work with Ruby 1.9

2011-04-03 Thread Edwin Groothuis
The following reply was made to PR ports/156158; it has been noted by GNATS.

From: Edwin Groothuis 
To: kick.christ...@googlemail.com
Cc: bug-follo...@freebsd.org
Subject: Re: ports/156158: [PATCH] update devel/rubygem-ffi to work with Ruby 
1.9
Date: Sun, 3 Apr 2011 20:20:19 UT

 Maintainer of devel/rubygem-ffi,
 
 Please note that PR ports/156158 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
 http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/156158
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 ed...@freebsd.org
___
freebsd-ruby@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ruby
To unsubscribe, send any mail to "freebsd-ruby-unsubscr...@freebsd.org"


Re: ports/156158: [PATCH] update devel/rubygem-ffi to work with Ruby 1.9

2011-04-03 Thread swills
Synopsis: [PATCH] update devel/rubygem-ffi to work with Ruby 1.9

Responsible-Changed-From-To: ruby->swills
Responsible-Changed-By: swills
Responsible-Changed-When: Sun Apr 3 22:48:18 UTC 2011
Responsible-Changed-Why: 
I'll take it.

http://www.freebsd.org/cgi/query-pr.cgi?pr=156158
___
freebsd-ruby@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ruby
To unsubscribe, send any mail to "freebsd-ruby-unsubscr...@freebsd.org"


marking ports that don't work with 1.9

2011-04-03 Thread Steve Wills
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi,

In preparation for more 1.9 testing, here's a patch that marks all ports
that are maintained by ruby@ or ports@ and that don't work with 1.9. Any
objections or other comments?

Thanks,
Steve

-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.17 (FreeBSD)

iQEcBAEBAgAGBQJNmSW/AAoJEPXPYrMgexuhUjIH/itnhSCQz5HzUweMXaN0HBDf
pekoEZs1JSgUSlDviKSjiIGwzAikwvEzV+SFfYao7M4Co2yIIjOYselnKnTmZLLW
zVVyfV3UuObfUVDGo1v5Ek+pQJAE27Gj/bPNaeiTu4NEcRHGpXqpx1Ip8yp8JeHp
nUER47PwpeLgfcyScOJ8gjTMtGmhrD7O5bTugo3roIDGB5dORg7YG5LtBp+IDSzE
wlmrA0einrSN62AqbgaUUg+s1hMfwUVqj2F4HodqpzuvOW7SdtHiedo6z5kMnzAB
HZB2zWbXPQe3RqNYy27nnlvR9XF044MvzlhsovRz/0kP1pjkoNwVS8Q/2fPUz2s=
=rPv0
-END PGP SIGNATURE-
Index: audio/ruby-shout/Makefile
===
RCS file: /home/ncvs/ports/audio/ruby-shout/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- audio/ruby-shout/Makefile   7 Jun 2010 20:48:38 -   1.12
+++ audio/ruby-shout/Makefile   3 Apr 2011 23:30:45 -
@@ -32,6 +32,10 @@
 BROKEN=does not build
 .endif
 
+.if ${RUBY_VER} == 1.9
+BROKEN=does not compile with ruby 1.9
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
${MKDIR} ${RUBY_MODEXAMPLESDIR}
Index: audio/ruby-vorbisfile/Makefile
===
RCS file: /home/ncvs/ports/audio/ruby-vorbisfile/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- audio/ruby-vorbisfile/Makefile  6 Jun 2010 20:43:39 -   1.9
+++ audio/ruby-vorbisfile/Makefile  3 Apr 2011 23:38:22 -
@@ -36,4 +36,8 @@
 .endfor
 .endif
 
-.include 
+.include 
+.if ${RUBY_VER} == 1.9
+BROKEN=does not compile with ruby 1.9
+.endif
+.include 
Index: audio/ruby-xmms/Makefile
===
RCS file: /home/ncvs/ports/audio/ruby-xmms/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- audio/ruby-xmms/Makefile16 Jun 2009 15:53:05 -  1.15
+++ audio/ruby-xmms/Makefile3 Apr 2011 23:39:04 -
@@ -38,4 +38,8 @@
 .endfor
 .endif
 
-.include 
+.include 
+.if ${RUBY_VER} == 1.9
+BROKEN=does not compile with ruby 1.9
+.endif
+.include 
Index: comms/ruby-serialport/Makefile
===
RCS file: /home/ncvs/ports/comms/ruby-serialport/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- comms/ruby-serialport/Makefile  17 Aug 2009 08:29:06 -  1.8
+++ comms/ruby-serialport/Makefile  3 Apr 2011 23:39:29 -
@@ -41,4 +41,8 @@
 .endfor
 .endif
 
-.include 
+.include 
+.if ${RUBY_VER} == 1.9
+BROKEN=does not compile with ruby 1.9
+.endif
+.include 
Index: databases/ruby-search-namazu/Makefile
===
RCS file: /home/ncvs/ports/databases/ruby-search-namazu/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- databases/ruby-search-namazu/Makefile   16 Jun 2009 15:53:06 -  
1.16
+++ databases/ruby-search-namazu/Makefile   3 Apr 2011 23:39:41 -
@@ -42,4 +42,8 @@
 .endfor
 .endif
 
-.include 
+.include 
+.if ${RUBY_VER} == 1.9
+BROKEN=does not compile with ruby 1.9
+.endif
+.include 
Index: databases/ruby-sqlite/Makefile
===
RCS file: /home/ncvs/ports/databases/ruby-sqlite/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- databases/ruby-sqlite/Makefile  7 Jun 2010 20:48:39 -   1.9
+++ databases/ruby-sqlite/Makefile  3 Apr 2011 23:39:56 -
@@ -41,4 +41,8 @@
 .endfor
 .endif
 
-.include 
+.include 
+.if ${RUBY_VER} == 1.9
+BROKEN=does not compile with ruby 1.9
+.endif
+.include 
Index: databases/rubygem-kirbybase/Makefile
===
RCS file: /home/ncvs/ports/databases/rubygem-kirbybase/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- databases/rubygem-kirbybase/Makefile26 Aug 2010 23:55:18 -  
1.4
+++ databases/rubygem-kirbybase/Makefile3 Apr 2011 23:40:12 -
@@ -19,4 +19,8 @@
 RUBYGEM_AUTOPLIST= yes
 PLIST_FILES=   bin/kbserver.rb
 
-.include 
+.include 
+.if ${RUBY_VER} == 1.9
+BROKEN=does not compile with ruby 1.9
+.endif
+.include 
Index: devel/ruby-eet/Makefile
===
RCS file: /home/ncvs/ports/devel/ruby-eet/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- devel/ruby-eet/Makefile 16 Dec 2010 03:37:18 -  1.9
+++ devel/ruby-eet/Makefile 3 Apr 2011 23:42:13 -
@@ -22,6 +22,10 @@
 
 .include 
 
+.if ${RUBY_VER} == 1.9
+BROKEN=does not compile with ruby 1.9
+.endif
+
 do-build:
@cd ${WRKSRC} && ${RAKE_BIN} PREFIX=${PREFIX}/
 
Index: devel/ruby-filelock/Makefile