cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a PKGSPEC entry to restrict ports depending on lang/ruby/1.9 to

Browse Source 
depend on ruby-1.9 and not ruby-1.8.  This PKGSPEC is slightly
different from the previous one used in ruby.port.mk, so all
dependent ports need to be REVISION bumped (which will happen soon).
In addition, since the subpackages depend on the -main package and
also had a slightly different pkgspec, they need to be bumped as well.

In addition, the -main package is also being bumped for the inclusion
of a patch for Addrinfo that fixes a failing IPv6 UDP regression test.

OK landry@
This commit is contained in:
jeremy 2010-11-24 21:28:04 +00:00
parent 25f37c11c5
commit 7b0a3f93b8
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lang/ruby/1.9/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2010/11/17 08:05:18 espie Exp $
# $OpenBSD: Makefile,v 1.8 2010/11/24 21:28:04 jeremy Exp $
COMMENT-main = object oriented script language with threads
COMMENT-gdbm = gdbm interface for Ruby
@ -16,7 +16,12 @@ PKGNAME-gdbm = ruby-gdbm-${VERSION}.${PATCHLEVEL}
PKGNAME-dbm = ruby-dbm-${VERSION}.${PATCHLEVEL}
PKGNAME-tk = ruby-tk-${VERSION}.${PATCHLEVEL}
REVISION-main = 0
REVISION-main = 1
REVISION-gdbm = 0
REVISION-dbm = 0
REVISION-tk = 0
PKGSPEC-main = ruby->=1.9,<1.10
CONFIGURE_ARGS = --program-suffix=19 \
--with-soname=ruby19 \
@ -43,12 +48,12 @@ MULTI_PACKAGES = -main -gdbm -dbm
WANTLIB-gdbm = c m gdbm ruby19
LIB_DEPENDS-gdbm = databases/gdbm \
ruby->=1.9,<=1.10:lang/ruby/${REV},-main
lang/ruby/${REV},-main
RUN_DEPENDS-gdbm =
WANTLIB-dbm = c m db ruby19
LIB_DEPENDS-dbm = databases/db/v4 \
ruby->=1.9,<=1.10:lang/ruby/${REV},-main
lang/ruby/${REV},-main
RUN_DEPENDS-dbm =
.if !${FLAVOR:L:Mno_x11}
@ -58,15 +63,14 @@ CONFIGURE_ARGS+= --with-tcl-include=${PREFIX}/include/tcl8.5 \
--with-X11-dir=${X11BASE}
WANTLIB-tk = X11 c m ruby19 tcl85 tk85
LIB_DEPENDS-tk = tk->=8.5,<8.6:x11/tk/8.5 \
ruby->=1.9,<=1.10:lang/ruby/${REV},-main
lang/ruby/${REV},-main
RUN_DEPENDS-tk =
.endif
# Known failure in Addrinfo IPv6 UDP loopack test on all arch
# Known threading bootstraptest failures on i386 and macppc
# Known endian issues in fiddle/dl on sparc64
# Known bugs in OpenSSL extension on sparc64
REGRESS_DEPENDS = ruby->=1.9,<=1.10:${BUILD_PKGPATH}
REGRESS_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
SUBST_VARS += RUBYLIBREV
.include <bsd.port.mk>

16
lang/ruby/1.9/patches/patch-ext_socket_lib_socket_rb Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-ext_socket_lib_socket_rb,v 1.1 2010/11/24 21:28:04 jeremy Exp $
Fix error where Socket.udp_server_sockets without a host argument
will not include sockets for IPv6 link-local addresses.
--- ext/socket/lib/socket.rb.orig Wed Oct 20 04:03:38 2010
+++ ext/socket/lib/socket.rb Wed Oct 20 04:03:45 2010
@@ -507,7 +507,7 @@ class Socket < BasicSocket
next if !a.ipv4?
ip_list << Addrinfo.new(a.to_sockaddr, :INET, :DGRAM, 0);
}
- elsif ai.ipv6? && ai.ip_address == "::" && !ipv6_recvpktinfo
+ elsif ai.ipv6? && ai.ip_address == "::"
local_addrs.each {|a|
next if !a.ipv6?
ip_list << Addrinfo.new(a.to_sockaddr, :INET6, :DGRAM, 0);