Fri Oct 21 05:24:13 2011 UTC ()
Remove (trial) workaround for getaddrinfo() on Linux added over 5 years ago.
It break the feature in these days.


(obache)
diff -r1.64 -r1.65 pkgsrc/lang/ruby18-base/Makefile
diff -r1.14 -r1.15 pkgsrc/lang/ruby19-base/Makefile
cvs diff -r1.64 -r1.65 pkgsrc/lang/ruby18-base/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ruby18-base/Attic/Makefile 2011/08/12 15:33:12 1.64
+++ pkgsrc/lang/ruby18-base/Attic/Makefile 2011/10/21 05:24:13 1.65
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.64 2011/08/12 15:33:12 taca Exp $ 1# $NetBSD: Makefile,v 1.65 2011/10/21 05:24:13 obache Exp $
2# 2#
3 3
4DISTNAME= ${RUBY_DISTNAME} 4DISTNAME= ${RUBY_DISTNAME}
5PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX} 5PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX}
6CATEGORIES= lang ruby 6CATEGORIES= lang ruby
7MASTER_SITES= ${MASTER_SITE_RUBY} 7MASTER_SITES= ${MASTER_SITE_RUBY}
8 8
9MAINTAINER= taca@NetBSD.org 9MAINTAINER= taca@NetBSD.org
10HOMEPAGE= ${RUBY_HOMEPAGE} 10HOMEPAGE= ${RUBY_HOMEPAGE}
11COMMENT= Ruby 1.8 based release minimum package 11COMMENT= Ruby 1.8 based release minimum package
12LICENSE= gnu-gpl-v2 OR ruby-license 12LICENSE= gnu-gpl-v2 OR ruby-license
13 13
14RUBY_VERSION= ${RUBY18_VERSION} 14RUBY_VERSION= ${RUBY18_VERSION}
@@ -70,27 +70,27 @@ PLIST.io= yes @@ -70,27 +70,27 @@ PLIST.io= yes
70.endif 70.endif
71 71
72# 72#
73# Work around for ucontext(3). It was broken in older DragonFly 73# Work around for ucontext(3). It was broken in older DragonFly
74# versions and is slow in newer ones. 74# versions and is slow in newer ones.
75# 75#
76.if ${OPSYS} == "DragonFly" 76.if ${OPSYS} == "DragonFly"
77CONFIGURE_ENV+= ac_cv_header_ucontext_h=no 77CONFIGURE_ENV+= ac_cv_header_ucontext_h=no
78.endif 78.endif
79 79
80# 80#
81# work around for getaddrinfo(3) 81# work around for getaddrinfo(3)
82# 82#
83.if ${OPSYS} == "Linux" || (${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.[6-9])) 83.if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.[6-9])
84CONFIGURE_ARGS+= --enable-wide-getaddrinfo 84CONFIGURE_ARGS+= --enable-wide-getaddrinfo
85.endif 85.endif
86 86
87DOCS= COPYING COPYING.ja ChangeLog NEWS README \ 87DOCS= COPYING COPYING.ja ChangeLog NEWS README \
88 README.EXT README.EXT.ja README.ja ToDo \ 88 README.EXT README.EXT.ja README.ja ToDo \
89 doc/ChangeLog-1.8.0 doc/NEWS-1.8.0 \ 89 doc/ChangeLog-1.8.0 doc/NEWS-1.8.0 \
90 doc/forwardable.rd doc/forwardable.rd.ja \ 90 doc/forwardable.rd doc/forwardable.rd.ja \
91 doc/irb/irb-tools.rd.ja doc/irb/irb.rd doc/irb/irb.rd.ja \ 91 doc/irb/irb-tools.rd.ja doc/irb/irb.rd doc/irb/irb.rd.ja \
92 doc/shell.rd doc/shell.rd.ja 92 doc/shell.rd doc/shell.rd.ja
93EXT_DOCS= bigdecimal/bigdecimal_en.html bigdecimal/bigdecimal_ja.html \ 93EXT_DOCS= bigdecimal/bigdecimal_en.html bigdecimal/bigdecimal_ja.html \
94 dl/doc/dl.txt etc/etc.txt etc/etc.txt.ja syslog/syslog.txt \ 94 dl/doc/dl.txt etc/etc.txt etc/etc.txt.ja syslog/syslog.txt \
95 zlib/doc/zlib.rd 95 zlib/doc/zlib.rd
96 96
cvs diff -r1.14 -r1.15 pkgsrc/lang/ruby19-base/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ruby19-base/Attic/Makefile 2011/10/21 03:09:48 1.14
+++ pkgsrc/lang/ruby19-base/Attic/Makefile 2011/10/21 05:24:13 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.14 2011/10/21 03:09:48 taca Exp $ 1# $NetBSD: Makefile,v 1.15 2011/10/21 05:24:13 obache Exp $
2# 2#
3 3
4DISTNAME= ${RUBY_DISTNAME} 4DISTNAME= ${RUBY_DISTNAME}
5PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX} 5PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX}
6PKGREVISION= 2 6PKGREVISION= 2
7CATEGORIES= lang ruby 7CATEGORIES= lang ruby
8MASTER_SITES= ${MASTER_SITE_RUBY} 8MASTER_SITES= ${MASTER_SITE_RUBY}
9#PKGREVISION= 9#PKGREVISION=
10 10
11MAINTAINER= taca@NetBSD.org 11MAINTAINER= taca@NetBSD.org
12HOMEPAGE= ${RUBY_HOMEPAGE} 12HOMEPAGE= ${RUBY_HOMEPAGE}
13COMMENT= Ruby 1.9 based release minimum package 13COMMENT= Ruby 1.9 based release minimum package
14LICENSE= gnu-gpl-v2 OR ruby-license 14LICENSE= gnu-gpl-v2 OR ruby-license
@@ -78,27 +78,27 @@ PLIST_VARS+= io @@ -78,27 +78,27 @@ PLIST_VARS+= io
78PLIST.io= yes 78PLIST.io= yes
79.endif 79.endif
80 80
81# 81#
82# Work around for getucontext(3) 82# Work around for getucontext(3)
83# 83#
84.if ${OPSYS} == "DragonFly" && ${OS_VERSION} == "1.8.0" 84.if ${OPSYS} == "DragonFly" && ${OS_VERSION} == "1.8.0"
85CONFIGURE_ENV+= ac_cv_header_ucontext_h=no 85CONFIGURE_ENV+= ac_cv_header_ucontext_h=no
86.endif 86.endif
87 87
88# 88#
89# work around for getaddrinfo(3) 89# work around for getaddrinfo(3)
90# 90#
91.if ${OPSYS} == "Linux" || (${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.[6-9])) 91.if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.[6-9])
92CONFIGURE_ARGS+= --enable-wide-getaddrinfo 92CONFIGURE_ARGS+= --enable-wide-getaddrinfo
93.endif 93.endif
94 94
95# 95#
96# work around for Linux 96# work around for Linux
97# 97#
98.if ${OPSYS} == "Linux" 98.if ${OPSYS} == "Linux"
99CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q} 99CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q}
100.endif 100.endif
101 101
102DOCS= COPYING COPYING.ja ChangeLog NEWS README \ 102DOCS= COPYING COPYING.ja ChangeLog NEWS README \
103 README.EXT README.EXT.ja README.ja ToDo \ 103 README.EXT README.EXT.ja README.ja ToDo \
104 doc/ChangeLog-1.8.0 doc/ChangeLog-YARV doc/NEWS-1.8.7 \ 104 doc/ChangeLog-1.8.0 doc/ChangeLog-YARV doc/NEWS-1.8.7 \