Attachment #209586 for bug #241554

Lines 167-173 Link Here

(-)Mk/bsd.ruby.mk (-1 / +8 lines)
167	# Ruby 2.6	167	# Ruby 2.6
168	#	168	#
169	RUBY_VERSION= 2.6.5	169	RUBY_VERSION= 2.6.5
170	RUBY_PORTREVISION= 0	170	RUBY_PORTREVISION= 1
171	RUBY_PORTEPOCH= 1	171	RUBY_PORTEPOCH= 1
172	RUBY26= "" # PLIST_SUB helpers	172	RUBY26= "" # PLIST_SUB helpers
173		173
Lines 247-253 Link Here
247	RUBY_MODNAME?= ${PORTNAME}	247	RUBY_MODNAME?= ${PORTNAME}
248		248
249	# Commands	249	# Commands
		250	.if ${RUBY_VER} >= 2.6
		251	RUBY_RDOC?= ${LOCALBASE}/bin/rdoc
		252	.else
250	RUBY_RDOC?= ${LOCALBASE}/bin/rdoc${RUBY_VER:S/.//}	253	RUBY_RDOC?= ${LOCALBASE}/bin/rdoc${RUBY_VER:S/.//}
		254	.endif
251		255
252	# Ports	256	# Ports
253	RUBY_BASE_PORT?= lang/ruby${RUBY_VER:S/.//}	257	RUBY_BASE_PORT?= lang/ruby${RUBY_VER:S/.//}
Lines 298-304 Link Here
298		302
299	.if defined(USE_RUBY_RDOC)	303	.if defined(USE_RUBY_RDOC)
300	MAKE_ENV+= RUBY_RDOC=${RUBY_RDOC}	304	MAKE_ENV+= RUBY_RDOC=${RUBY_RDOC}
		305	.if ${RUBY_VER} >= 2.6
		306	BUILD_DEPENDS= rubygem-rdoc>=0:devel/rubygem-rdoc
301	.endif	307	.endif
		308	.endif
302		309
303	# require check	310	# require check
304	.if defined(RUBY_REQUIRE)	311	.if defined(RUBY_REQUIRE)




PLIST_SUB+=	IF_DEFAULT="@comment "
.endif

INSTALLED_SCRIPTS=	erb ruby
INSTALLED_MANUALS=	erb ruby

EXTSAMPLES=	bigdecimal/sample/*.rb



post-patch:
# We get these from other ports
.for d in bin/bundle* bin/gem bin/irb bin/rdoc bin/ri lib/bundler*  libexec/bundler* \
	  man/bundle* man/gemfile* man/irb.1 man/ri.1 ext/dbm ext/gdbm ext/win32ole
	  	@${RM} -r ${BUILD_WRKSRC}/${d}
.endfor


Lines 4-11 Link Here

(-)lang/ruby26/pkg-message (+2 lines)
4	Some of the standard commands are provided as separate ports for ease	4	Some of the standard commands are provided as separate ports for ease
5	of upgrading:	5	of upgrading:
6		6
		7	devel/rubygem-irb: irb - Interactive Ruby shell
7	devel/ruby-gems: gem - RubyGems package manager	8	devel/ruby-gems: gem - RubyGems package manager
8	devel/rubygem-rake: rake - Ruby Make	9	devel/rubygem-rake: rake - Ruby Make
		10	devel/rubygem-rdoc: rdoc,ri - Ruby documentation system
9		11
10	And some of the standard libraries are provided as separate ports	12	And some of the standard libraries are provided as separate ports
11	since they require extra dependencies:	13	since they require extra dependencies:




%%IF_DEFAULT%%bin/erb
bin/erb%%RUBY_SUFFIX%%
%%IF_DEFAULT%%bin/irb
bin/irb%%RUBY_SUFFIX%%
%%IF_DEFAULT%%bin/rdoc
bin/rdoc%%RUBY_SUFFIX%%
%%IF_DEFAULT%%bin/ri
bin/ri%%RUBY_SUFFIX%%
%%IF_DEFAULT%%bin/ruby
bin/%%RUBY_NAME%%
include/ruby-%%RUBY_VER%%/%%RUBY_ARCH%%/rb_mjit_min_header-%%RUBY_VERSION%%.h

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

%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db0/stret__large_8c.html
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db0/stret__large_8c_source.html
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db1/struct_y_y_l_t_y_p_e.html
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/structbitset.html
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/vm__method_8c__dep__incl.map
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/vm__method_8c__dep__incl.md5
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/vm__method_8c__dep__incl.png

%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dee/struct6_8c__incl.map
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dee/struct6_8c__incl.md5
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dee/struct6_8c__incl.png
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/def/structsock__timestamp__info.html
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/df1/cls__1__1byte_8c__incl.map
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/df1/cls__1__1byte_8c__incl.md5
%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/df1/cls__1__1byte_8c__incl.png

Return to bug 241554

Lines 118-125 Link Here

(-)lang/ruby26/Makefile (-4 / +4 lines)
118	PLIST_SUB+= IF_DEFAULT="@comment "	118	PLIST_SUB+= IF_DEFAULT="@comment "
119	.endif	119	.endif
120		120
121	INSTALLED_SCRIPTS= erb irb rdoc ri ruby	121	INSTALLED_SCRIPTS= erb ruby
122	INSTALLED_MANUALS= erb irb ri ruby	122	INSTALLED_MANUALS= erb ruby
123		123
124	EXTSAMPLES= bigdecimal/sample/*.rb	124	EXTSAMPLES= bigdecimal/sample/*.rb
125		125
Lines 133-140 Link Here
133		133
134	post-patch:	134	post-patch:
135	# We get these from other ports	135	# We get these from other ports
136	.for d in bin/bundle* lib/bundler* libexec/bundler* man/bundle* bin/gem man/gemfile* \	136	.for d in bin/bundle* bin/gem bin/irb bin/rdoc bin/ri lib/bundler* libexec/bundler* \
137	ext/dbm ext/gdbm ext/win32ole	137	man/bundle* man/gemfile* man/irb.1 man/ri.1 ext/dbm ext/gdbm ext/win32ole
138	@${RM} -r ${BUILD_WRKSRC}/${d}	138	@${RM} -r ${BUILD_WRKSRC}/${d}
139	.endfor	139	.endfor
140		140

Lines 1-11 Link Here

(-)lang/ruby26/pkg-plist (-10 / +2 lines)
1	%%IF_DEFAULT%%bin/erb	1	%%IF_DEFAULT%%bin/erb
2	bin/erb%%RUBY_SUFFIX%%	2	bin/erb%%RUBY_SUFFIX%%
3	%%IF_DEFAULT%%bin/irb
4	bin/irb%%RUBY_SUFFIX%%
5	%%IF_DEFAULT%%bin/rdoc
6	bin/rdoc%%RUBY_SUFFIX%%
7	%%IF_DEFAULT%%bin/ri
8	bin/ri%%RUBY_SUFFIX%%
9	%%IF_DEFAULT%%bin/ruby	3	%%IF_DEFAULT%%bin/ruby
10	bin/%%RUBY_NAME%%	4	bin/%%RUBY_NAME%%
11	include/ruby-%%RUBY_VER%%/%%RUBY_ARCH%%/rb_mjit_min_header-%%RUBY_VERSION%%.h	5	include/ruby-%%RUBY_VER%%/%%RUBY_ARCH%%/rb_mjit_min_header-%%RUBY_VERSION%%.h
Lines 897-906 Link Here
897	libdata/pkgconfig/ruby-%%RUBY_VER%%.pc	891	libdata/pkgconfig/ruby-%%RUBY_VER%%.pc
898	%%IF_DEFAULT%%man/man1/erb.1.gz	892	%%IF_DEFAULT%%man/man1/erb.1.gz
899	man/man1/erb%%RUBY_SUFFIX%%.1.gz	893	man/man1/erb%%RUBY_SUFFIX%%.1.gz
900	%%IF_DEFAULT%%man/man1/irb.1.gz
901	man/man1/irb%%RUBY_SUFFIX%%.1.gz
902	%%IF_DEFAULT%%man/man1/ri.1.gz
903	man/man1/ri%%RUBY_SUFFIX%%.1.gz
904	%%IF_DEFAULT%%man/man1/ruby.1.gz	894	%%IF_DEFAULT%%man/man1/ruby.1.gz
905	man/man1/%%RUBY_NAME%%.1.gz	895	man/man1/%%RUBY_NAME%%.1.gz
906	%%DOCS%%%%RUBY_DOCDIR%%/COPYING	896	%%DOCS%%%%RUBY_DOCDIR%%/COPYING
Lines 2798-2803 Link Here
2798	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db0/stret__large_8c.html	2788	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db0/stret__large_8c.html
2799	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db0/stret__large_8c_source.html	2789	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db0/stret__large_8c_source.html
2800	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db1/struct_y_y_l_t_y_p_e.html	2790	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db1/struct_y_y_l_t_y_p_e.html
		2791	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/structbitset.html
2801	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/vm__method_8c__dep__incl.map	2792	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/vm__method_8c__dep__incl.map
2802	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/vm__method_8c__dep__incl.md5	2793	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/vm__method_8c__dep__incl.md5
2803	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/vm__method_8c__dep__incl.png	2794	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d4/db3/vm__method_8c__dep__incl.png
Lines 8316-8321 Link Here
8316	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dee/struct6_8c__incl.map	8307	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dee/struct6_8c__incl.map
8317	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dee/struct6_8c__incl.md5	8308	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dee/struct6_8c__incl.md5
8318	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dee/struct6_8c__incl.png	8309	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/dee/struct6_8c__incl.png
		8310	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/def/structsock__timestamp__info.html
8319	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/df1/cls__1__1byte_8c__incl.map	8311	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/df1/cls__1__1byte_8c__incl.map
8320	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/df1/cls__1__1byte_8c__incl.md5	8312	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/df1/cls__1__1byte_8c__incl.md5
8321	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/df1/cls__1__1byte_8c__incl.png	8313	%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/df/df1/cls__1__1byte_8c__incl.png