Attachment #198352 for bug #232438

View | Details | Raw Unified | Return to bug 232438
Collapse All | Expand All

Lines 154-161 Link Here

(-)Mk/bsd.ruby.mk (-2 / +2 lines)
154	#	154	#
155	# Ruby 2.3	155	# Ruby 2.3
156	#	156	#
157	RUBY_RELVERSION= 2.3.7	157	RUBY_RELVERSION= 2.3.8
158	RUBY_PORTREVISION= 1	158	RUBY_PORTREVISION= 0
159	RUBY_PORTEPOCH= 1	159	RUBY_PORTEPOCH= 1
160	RUBY_PATCHLEVEL= 0	160	RUBY_PATCHLEVEL= 0
161	RUBY23= "" # PLIST_SUB helpers	161	RUBY23= "" # PLIST_SUB helpers

Lines 18-30 Link Here

(-)lang/ruby23/Makefile (-7 / +14 lines)
18	LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL	18	LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL
19	LICENSE_FILE_RUBY= ${WRKSRC}/COPYING	19	LICENSE_FILE_RUBY= ${WRKSRC}/COPYING
20		20
		21	BROKEN_SSL= openssl-devel
		22	BROKEN_SSL_REASON_openssl-devel=does not detect and buid the openssl*.rb bits
		23
21	# Using LIB_DEPENDS finds the libffi from gcc which causes problems	24	# Using LIB_DEPENDS finds the libffi from gcc which causes problems
22	BUILD_DEPENDS= libffi>=0:devel/libffi	25	BUILD_DEPENDS= libffi>=0:devel/libffi
23	LIB_DEPENDS= libyaml.so:textproc/libyaml	26	LIB_DEPENDS= libyaml.so:textproc/libyaml
24	RUN_DEPENDS= libffi>=0:devel/libffi	27	RUN_DEPENDS= libffi>=0:devel/libffi
25		28
26	BROKEN_SSL= openssl-devel	29	USES= autoreconf cpe ssl tar:xz
27	BROKEN_SSL_REASON_openssl-devel=does not detect and buid the openssl*.rb bits	30	USE_LDCONFIG= yes
28		31
29	CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \	32	CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \
30	--disable-rpath \	33	--disable-rpath \
Lines 38-45 Link Here
38	GNU_CONFIGURE= yes	41	GNU_CONFIGURE= yes
39	# Keep this, else ruby will fail to load libraries dependent of libpthread.	42	# Keep this, else ruby will fail to load libraries dependent of libpthread.
40	LIBS+= -lpthread -L${LOCALBASE}/lib	43	LIBS+= -lpthread -L${LOCALBASE}/lib
41	USE_LDCONFIG= yes
42	USES= autoreconf cpe ssl tar:xz
43	WRKSRC= ${RUBY_WRKSRC}	44	WRKSRC= ${RUBY_WRKSRC}
44		45
45	RUBY_VER= 2.3	46	RUBY_VER= 2.3
Lines 116-122 Link Here
116	.endif	117	.endif
117		118
118	.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}	119	.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
119	MLINKS= ${RUBY_NAME}.1 ruby.1
120	PLIST_SUB+= IF_DEFAULT=""	120	PLIST_SUB+= IF_DEFAULT=""
121	.else	121	.else
122	PKGNAMESUFFIX= ${RUBY_VER:C/\.//}	122	PKGNAMESUFFIX= ${RUBY_VER:C/\.//}
Lines 123-129 Link Here
123	PLIST_SUB+= IF_DEFAULT="@comment "	123	PLIST_SUB+= IF_DEFAULT="@comment "
124	.endif	124	.endif
125		125
126	INSTALLED_SCRIPTS= irb erb rdoc ri ruby	126	INSTALLED_SCRIPTS= erb irb rdoc ri ruby
		127	INSTALLED_MANUALS= erb irb ri ruby
127		128
128	EXTSAMPLES= bigdecimal/sample/*.rb	129	EXTSAMPLES= bigdecimal/sample/*.rb
129		130
Lines 197-209 Link Here
197	${MKDIR} ${STAGEDIR}${RUBY_SITERIDIR}	198	${MKDIR} ${STAGEDIR}${RUBY_SITERIDIR}
198		199
199	post-install:	200	post-install:
		201	.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
200	#	202	#
201	# Link just installed "ruby" to "ruby23", etc.	203	# Link just installed "ruby" to "ruby23", etc.
202	#	204	#
203	.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
204	. for FILE in ${INSTALLED_SCRIPTS}	205	. for FILE in ${INSTALLED_SCRIPTS}
205	${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}	206	${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
206	. endfor	207	. endfor
		208	#
		209	# Link "ruby.1.gz" to "ruby25.1.gz", etc.
		210	#
		211	. for FILE in ${INSTALLED_MANUALS}
		212	${LN} -fs ${FILE}${RUBY_SUFFIX}.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/${FILE}.1.gz
		213	. endfor
207	.endif	214	.endif
208		215
209	post-install-DEBUG-off:	216	post-install-DEBUG-off:

Lines 1-3 Link Here

(-)lang/ruby23/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1522331766	1	TIMESTAMP = 1539928948
2	SHA256 (ruby/ruby-2.3.7.tar.xz) = c61f8f2b9d3ffff5567e186421fa191f0d5e7c2b189b426bb84498825d548edb	2	SHA256 (ruby/ruby-2.3.8.tar.xz) = 910f635d84fd0d81ac9bdee0731279e6026cb4cd1315bbbb5dfb22e09c5c1dfe
3	SIZE (ruby/ruby-2.3.7.tar.xz) = 11438124	3	SIZE (ruby/ruby-2.3.8.tar.xz) = 11465792




--- configure.in.orig	2018-03-18 14:15:27 UTC
+++ configure.in
@@ -633,7 +633,7 @@ AC_DEFUN([RUBY_DTRACE_AVAILABLE],
 [AC_CACHE_CHECK(whether dtrace USDT is available, rb_cv_dtrace_available,
 [
     echo "provider conftest{ probe fire(); };" > conftest_provider.d

       AC_TRY_COMPILE([@%:@include "conftest_provider.h"], [CONFTEST_FIRE();], [
 	# DTrace is available on the system
 	rb_cv_dtrace_available=yes
@@ -657,13 +657,13 @@ AC_DEFUN([RUBY_DTRACE_POSTPROCESS],
       probe fire();
     };
 _PROBES

 	    :
 	}; then
 	    if cmp -s conftest.o conftest.${ac_objext}.save; then
@@ -1290,10 +1290,10 @@ main()
   ],
 [	LIBS="-lm $LIBS"])
 

 
 dnl Checks for header files.
 AC_HEADER_DIRENT
@@ -2450,7 +2450,7 @@ if test "$ac_cv_func_qsort_r" != no; then
   AC_CACHE_CHECK(whether qsort_r is GNU version, rb_cv_gnu_qsort_r,
     [AC_TRY_COMPILE([
 @%:@include <stdlib.h>

 	    int (*compar)(const void *, const void *, void *),
 	    void *arg);
 ],[ ],
@@ -2460,7 +2460,7 @@ void qsort_r(void *base, size_t nmemb, size_t size,
   AC_CACHE_CHECK(whether qsort_r is BSD version, rb_cv_bsd_qsort_r,
     [AC_TRY_COMPILE([
 @%:@include <stdlib.h>

 	     void *arg, int (*compar)(void *, const void *, const void *));
 ],[ ],
       [rb_cv_bsd_qsort_r=yes],
@@ -2549,7 +2549,7 @@ main(int argc, char **argv)
 if test x"$ac_cv_func_clock_gettime" != xyes; then
     # glibc 2.17 moves clock_* functions from librt to the main C library.
     # http://sourceware.org/ml/libc-announce/2012/msg00001.html

     if test x"$ac_cv_lib_rt_clock_gettime" = xyes; then
 	AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
     fi
@@ -2956,7 +2956,7 @@ else
 fi
 
 if test x"$enable_pthread" = xyes; then

 	AC_CHECK_LIB($pthread_lib, pthread_kill,
 		     rb_with_pthread=yes, rb_with_pthread=no)
 	if test "$rb_with_pthread" = "yes"; then break; fi
@@ -2970,6 +2970,7 @@ if test x"$enable_pthread" = xyes; then
 	[c],    [],
 	[root], [],
 	[c_r],  [MAINLIBS="-pthread $MAINLIBS"],

 	        [AS_CASE(["$target_os"],
 		    [openbsd*|mirbsd*], [LIBS="-pthread $LIBS"],
 		    [LIBS="-l$pthread_lib $LIBS"])])
@@ -3278,7 +3279,6 @@ if test "$with_dln_a_out" != yes; then
 			: ${LDSHARED='$(CC) -shared'}
 			if test "$rb_cv_binary_elf" = yes; then
 			    LDFLAGS="$LDFLAGS -rdynamic"

 			else
 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
 			fi
@@ -3751,6 +3751,7 @@ AS_CASE("$enable_shared", [yes], [
     [freebsd*|dragonfly*], [
 	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'

Lines 1-6 Link Here

(-)lang/ruby23/files/patch-lib_rdoc_generator_json_index.rb (-4 / +4 lines)
1	--- ./lib/rdoc/generator/json_index.rb.orig 2017-11-12 19:38:46.598341000 -0500	1	--- lib/rdoc/generator/json_index.rb.orig 2015-12-22 12:08:13 UTC
2	+++ ./lib/rdoc/generator/json_index.rb 2017-11-12 19:38:59.759125000 -0500	2	+++ lib/rdoc/generator/json_index.rb
3	@@ -175,7 +175,7 @@	3	@@ -175,7 +175,7 @@ class RDoc::Generator::JsonIndex
4	debug_msg "Writing gzipped search index to %s" % outfile	4	debug_msg "Writing gzipped search index to %s" % outfile
5		5
6	Zlib::GzipWriter.open(outfile) do \|gz\|	6	Zlib::GzipWriter.open(outfile) do \|gz\|
Lines 9-15 Link Here
9	gz.orig_name = search_index_file.basename.to_s	9	gz.orig_name = search_index_file.basename.to_s
10	gz.write search_index	10	gz.write search_index
11	gz.close	11	gz.close
12	@@ -193,7 +193,7 @@	12	@@ -193,7 +193,7 @@ class RDoc::Generator::JsonIndex
13	debug_msg "Writing gzipped file to %s" % outfile	13	debug_msg "Writing gzipped file to %s" % outfile
14		14
15	Zlib::GzipWriter.open(outfile) do \|gz\|	15	Zlib::GzipWriter.open(outfile) do \|gz\|

Lines 1-6 Link Here

(-)lang/ruby23/files/patch-thread__pthread.c (-2 / +2 lines)
1	--- thread_pthread.c.orig 2016-04-15 16:07:07 UTC	1	--- thread_pthread.c.orig 2018-03-18 15:27:34 UTC
2	+++ thread_pthread.c	2	+++ thread_pthread.c
3	@@ -1154,7 +1154,7 @@ native_sleep(rb_thread_t *th, struct tim	3	@@ -1155,7 +1155,7 @@ native_sleep(rb_thread_t th, struct timeval timeout_
4	}	4	}
5		5
6	#ifdef USE_UBF_LIST	6	#ifdef USE_UBF_LIST




     install pc, pkgconfigdir, :mode => $data_mode
   end
 end
@@ -694,93 +695,6 @@ class Gem::Installer
 end
 
 # :startdoc:
-
-install?(:ext, :comm, :gem) do
-  gem_dir = Gem.default_dir
-  directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)

-    puts "skip installing bundle gems because of lacking zlib"
-  end
-end
 
 parse_args()
 
 include FileUtils




%%RUBY_LIBDIR%%/yaml/dbm.rb
%%RUBY_LIBDIR%%/yaml/store.rb
libdata/pkgconfig/ruby-%%RUBY_VER%%.pc
%%IF_DEFAULT%%man/man1/erb.1.gz
man/man1/erb%%RUBY_SUFFIX%%.1.gz
%%IF_DEFAULT%%man/man1/irb.1.gz
man/man1/irb%%RUBY_SUFFIX%%.1.gz
%%IF_DEFAULT%%man/man1/ri.1.gz
man/man1/ri%%RUBY_SUFFIX%%.1.gz
%%IF_DEFAULT%%man/man1/ruby.1.gz
man/man1/%%RUBY_NAME%%.1.gz
%%DOCS%%%%RUBY_DOCDIR%%/COPYING
%%DOCS%%%%RUBY_DOCDIR%%/COPYING.ja

Return to bug 232438

Lines 1-6 Link Here

(-)lang/ruby23/files/patch-configure.in (-11 / +11 lines)
1	--- configure.in.orig 2017-03-27 17:59:49 UTC	1	--- configure.in.orig 2018-03-18 14:15:27 UTC
2	+++ configure.in	2	+++ configure.in
3	@@ -633,7 +633,7 @@	3	@@ -633,7 +633,7 @@ AC_DEFUN([RUBY_DTRACE_AVAILABLE],
4	[AC_CACHE_CHECK(whether dtrace USDT is available, rb_cv_dtrace_available,	4	[AC_CACHE_CHECK(whether dtrace USDT is available, rb_cv_dtrace_available,
5	[	5	[
6	echo "provider conftest{ probe fire(); };" > conftest_provider.d	6	echo "provider conftest{ probe fire(); };" > conftest_provider.d
Lines 9-15 Link Here
9	AC_TRY_COMPILE([@%:@include "conftest_provider.h"], [CONFTEST_FIRE();], [	9	AC_TRY_COMPILE([@%:@include "conftest_provider.h"], [CONFTEST_FIRE();], [
10	# DTrace is available on the system	10	# DTrace is available on the system
11	rb_cv_dtrace_available=yes	11	rb_cv_dtrace_available=yes
12	@@ -657,13 +657,13 @@	12	@@ -657,13 +657,13 @@ AC_DEFUN([RUBY_DTRACE_POSTPROCESS],
13	probe fire();	13	probe fire();
14	};	14	};
15	_PROBES	15	_PROBES
Lines 25-31 Link Here
25	:	25	:
26	}; then	26	}; then
27	if cmp -s conftest.o conftest.${ac_objext}.save; then	27	if cmp -s conftest.o conftest.${ac_objext}.save; then
28	@@ -1290,10 +1290,10 @@	28	@@ -1290,10 +1290,10 @@ main()
29	],	29	],
30	[ LIBS="-lm $LIBS"])	30	[ LIBS="-lm $LIBS"])
31		31
Lines 40-46 Link Here
40		40
41	dnl Checks for header files.	41	dnl Checks for header files.
42	AC_HEADER_DIRENT	42	AC_HEADER_DIRENT
43	@@ -2450,7 +2450,7 @@	43	@@ -2450,7 +2450,7 @@ if test "$ac_cv_func_qsort_r" != no; then
44	AC_CACHE_CHECK(whether qsort_r is GNU version, rb_cv_gnu_qsort_r,	44	AC_CACHE_CHECK(whether qsort_r is GNU version, rb_cv_gnu_qsort_r,
45	[AC_TRY_COMPILE([	45	[AC_TRY_COMPILE([
46	@%:@include <stdlib.h>	46	@%:@include <stdlib.h>
Lines 49-55 Link Here
49	int (compar)(const void , const void , void ),	49	int (compar)(const void , const void , void ),
50	void *arg);	50	void *arg);
51	],[ ],	51	],[ ],
52	@@ -2460,7 +2460,7 @@	52	@@ -2460,7 +2460,7 @@ void qsort_r(void *base, size_t nmemb, size_t size,
53	AC_CACHE_CHECK(whether qsort_r is BSD version, rb_cv_bsd_qsort_r,	53	AC_CACHE_CHECK(whether qsort_r is BSD version, rb_cv_bsd_qsort_r,
54	[AC_TRY_COMPILE([	54	[AC_TRY_COMPILE([
55	@%:@include <stdlib.h>	55	@%:@include <stdlib.h>
Lines 58-64 Link Here
58	void arg, int (compar)(void , const void , const void *));	58	void arg, int (compar)(void , const void , const void *));
59	],[ ],	59	],[ ],
60	[rb_cv_bsd_qsort_r=yes],	60	[rb_cv_bsd_qsort_r=yes],
61	@@ -2549,7 +2549,7 @@	61	@@ -2549,7 +2549,7 @@ main(int argc, char **argv)
62	if test x"$ac_cv_func_clock_gettime" != xyes; then	62	if test x"$ac_cv_func_clock_gettime" != xyes; then
63	# glibc 2.17 moves clock_* functions from librt to the main C library.	63	# glibc 2.17 moves clock_* functions from librt to the main C library.
64	# http://sourceware.org/ml/libc-announce/2012/msg00001.html	64	# http://sourceware.org/ml/libc-announce/2012/msg00001.html
Lines 67-73 Link Here
67	if test x"$ac_cv_lib_rt_clock_gettime" = xyes; then	67	if test x"$ac_cv_lib_rt_clock_gettime" = xyes; then
68	AC_DEFINE(HAVE_CLOCK_GETTIME, 1)	68	AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
69	fi	69	fi
70	@@ -2956,7 +2956,7 @@	70	@@ -2956,7 +2956,7 @@ else
71	fi	71	fi
72		72
73	if test x"$enable_pthread" = xyes; then	73	if test x"$enable_pthread" = xyes; then
Lines 76-82 Link Here
76	AC_CHECK_LIB($pthread_lib, pthread_kill,	76	AC_CHECK_LIB($pthread_lib, pthread_kill,
77	rb_with_pthread=yes, rb_with_pthread=no)	77	rb_with_pthread=yes, rb_with_pthread=no)
78	if test "$rb_with_pthread" = "yes"; then break; fi	78	if test "$rb_with_pthread" = "yes"; then break; fi
79	@@ -2970,6 +2970,7 @@	79	@@ -2970,6 +2970,7 @@ if test x"$enable_pthread" = xyes; then
80	[c], [],	80	[c], [],
81	[root], [],	81	[root], [],
82	[c_r], [MAINLIBS="-pthread $MAINLIBS"],	82	[c_r], [MAINLIBS="-pthread $MAINLIBS"],
Lines 84-90 Link Here
84	[AS_CASE(["$target_os"],	84	[AS_CASE(["$target_os"],
85	[openbsd\|mirbsd], [LIBS="-pthread $LIBS"],	85	[openbsd\|mirbsd], [LIBS="-pthread $LIBS"],
86	[LIBS="-l$pthread_lib $LIBS"])])	86	[LIBS="-l$pthread_lib $LIBS"])])
87	@@ -3278,7 +3279,6 @@	87	@@ -3278,7 +3279,6 @@ if test "$with_dln_a_out" != yes; then
88	: ${LDSHARED='$(CC) -shared'}	88	: ${LDSHARED='$(CC) -shared'}
89	if test "$rb_cv_binary_elf" = yes; then	89	if test "$rb_cv_binary_elf" = yes; then
90	LDFLAGS="$LDFLAGS -rdynamic"	90	LDFLAGS="$LDFLAGS -rdynamic"
Lines 92-98 Link Here
92	else	92	else
93	test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes \|\| LDSHARED='$(LD) -Bshareable'	93	test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes \|\| LDSHARED='$(LD) -Bshareable'
94	fi	94	fi
95	@@ -3751,6 +3751,7 @@	95	@@ -3751,6 +3751,7 @@ AS_CASE("$enable_shared", [yes], [
96	[freebsd\|dragonfly], [	96	[freebsd\|dragonfly], [
97	SOLIBS='$(LIBS)'	97	SOLIBS='$(LIBS)'
98	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'	98	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'

Lines 17-26 Link Here

(-)lang/ruby23/files/patch-tool_rbinstall.rb (-4 / +4 lines)
17	install pc, pkgconfigdir, :mode => $data_mode	17	install pc, pkgconfigdir, :mode => $data_mode
18	end	18	end
19	end	19	end
20	@@ -695,93 +696,6 @@ end	20	@@ -694,93 +695,6 @@ class Gem::Installer
		21	end
21		22
22	# :startdoc:	23	# :startdoc:
23		24	-
24	-install?(:ext, :comm, :gem) do	25	-install?(:ext, :comm, :gem) do
25	- gem_dir = Gem.default_dir	26	- gem_dir = Gem.default_dir
26	- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)	27	- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
Lines 107-113 Link Here
107	- puts "skip installing bundle gems because of lacking zlib"	108	- puts "skip installing bundle gems because of lacking zlib"
108	- end	109	- end
109	-end	110	-end
110	-	111
111	parse_args()	112	parse_args()
112		113
113	include FileUtils

Lines 877-885 Link Here

(-)lang/ruby23/pkg-plist (+4 lines)
877	%%RUBY_LIBDIR%%/yaml/dbm.rb	877	%%RUBY_LIBDIR%%/yaml/dbm.rb
878	%%RUBY_LIBDIR%%/yaml/store.rb	878	%%RUBY_LIBDIR%%/yaml/store.rb
879	libdata/pkgconfig/ruby-%%RUBY_VER%%.pc	879	libdata/pkgconfig/ruby-%%RUBY_VER%%.pc
		880	%%IF_DEFAULT%%man/man1/erb.1.gz
880	man/man1/erb%%RUBY_SUFFIX%%.1.gz	881	man/man1/erb%%RUBY_SUFFIX%%.1.gz
		882	%%IF_DEFAULT%%man/man1/irb.1.gz
881	man/man1/irb%%RUBY_SUFFIX%%.1.gz	883	man/man1/irb%%RUBY_SUFFIX%%.1.gz
		884	%%IF_DEFAULT%%man/man1/ri.1.gz
882	man/man1/ri%%RUBY_SUFFIX%%.1.gz	885	man/man1/ri%%RUBY_SUFFIX%%.1.gz
		886	%%IF_DEFAULT%%man/man1/ruby.1.gz
883	man/man1/%%RUBY_NAME%%.1.gz	887	man/man1/%%RUBY_NAME%%.1.gz
884	%%DOCS%%%%RUBY_DOCDIR%%/COPYING	888	%%DOCS%%%%RUBY_DOCDIR%%/COPYING
885	%%DOCS%%%%RUBY_DOCDIR%%/COPYING.ja	889	%%DOCS%%%%RUBY_DOCDIR%%/COPYING.ja