making Ruby 1.9 default

[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 at freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ruby
To unsubscribe, send any mail to "freebsd-ruby-unsubscribe at 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-----
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/ruby-bdb/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- Makefile	7 Jun 2010 20:48:38 -0000	1.61
+++ Makefile	3 Apr 2011 05:56:09 -0000
@@ -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=	knu at 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 <bsd.port.pre.mk>
@@ -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
--- distinfo	20 Mar 2011 12:47:58 -0000	1.44
+++ distinfo	24 Mar 2011 03:08:00 -0000
@@ -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.c	7 May 2009 16:12:59 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- src/common.c.orig	2009-05-02 19:19:39.000000000 +0400
-+++ src/common.c	2009-05-02 19:20:04.000000000 +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);
- 	    }
- 	}
-     }
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ruby-bdb-patch2.txt.sig
Type: application/octet-stream
Size: 287 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ruby/attachments/20110403/83bf8386/ruby-bdb-patch2.txt.obj