Attachment #165846 for bug #192949

Lines 501-506 Link Here

(-)Mk/bsd.ruby.mk (-1 / +4 lines)
501	do-install:	501	do-install:
502	(cd ${BUILD_WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} ${GEMFILES} -- --build-args ${CONFIGURE_ARGS})	502	(cd ${BUILD_WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} ${GEMFILES} -- --build-args ${CONFIGURE_ARGS})
503	${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info/	503	${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info/
		504	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f -name '*.so' -exec ${STRIP_CMD} {} +
		505	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f $ -name mkmf.log -or -name gem_make.out $ -print -delete
		506	${RM} -rf ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext \
		507	${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null \|\| ${TRUE}
504	${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null \|\| ${TRUE}	508	${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null \|\| ${TRUE}
505	.if defined(NOPORTDOCS)	509	.if defined(NOPORTDOCS)
506	-@${RMDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}	510	-@${RMDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}
Lines 509-515 Link Here
509	. if defined(RUBYGEM_AUTOPLIST)	513	. if defined(RUBYGEM_AUTOPLIST)
510	. if !target(post-install-script)	514	. if !target(post-install-script)
511	post-install-script:	515	post-install-script:
512	@${ECHO} ${GEM_CACHE} >> ${TMPPLIST}
513	@${ECHO} ${GEM_SPEC} >> ${TMPPLIST}	516	@${ECHO} ${GEM_SPEC} >> ${TMPPLIST}
514	.if !defined(NOPORTDOCS)	517	.if !defined(NOPORTDOCS)
515	@${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print \| ${SED} -E -e \	518	@${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print \| ${SED} -E -e \

Line 0 Link Here

(-)devel/rubygem-glib2/files/patch-lib_mkmf-gnome2.rb (+11 lines)
	1	--- lib/mkmf-gnome2.rb.orig 2016-01-19 21:17:20 UTC
	2	+++ lib/mkmf-gnome2.rb
	3	@@ -152,7 +152,7 @@ end
	4	def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
	5	gem_spec = find_gem_spec(target_name)
	6	if gem_spec
	7	- target_source_dir = File.join(gem_spec.full_gem_path, "ext/#{target_name}")
	8	+ target_source_dir = File.join(gem_spec.full_gem_path, "lib")
	9	target_build_dir = target_source_dir
	10	add_depend_package_path(target_name,
	11	target_source_dir,

Line 0 Link Here

(-)devel/rubygem-cairo-gobject/files/patch-ext_cairo-gobject_extconf.rb (+11 lines)
	1	--- ext/cairo-gobject/extconf.rb.orig 2016-01-19 21:24:25 UTC
	2	+++ ext/cairo-gobject/extconf.rb
	3	@@ -45,7 +45,7 @@ rescue LoadError
	4	require "mkmf-gnome2"
	5	end
	6
	7	-["glib2"].each do \|package\|
	8	+["glib2", "cairo"].each do \|package\|
	9	directory = "#{package}#{version_suffix}"
	10	build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
	11	add_depend_package(package, "#{directory}/ext/#{package}",

Lines 13-18 Link Here

(-)graphics/rubygem-cairo/Makefile (+1 lines)
13		13
14	RUN_DEPENDS= rubygem-pkg-config>=1.1.5:${PORTSDIR}/devel/rubygem-pkg-config	14	RUN_DEPENDS= rubygem-pkg-config>=1.1.5:${PORTSDIR}/devel/rubygem-pkg-config
15		15
		16	USES= pkgconfig
16	USE_GNOME= cairo	17	USE_GNOME= cairo
17	USE_RUBY= yes	18	USE_RUBY= yes
18	USE_RUBYGEMS= yes	19	USE_RUBYGEMS= yes

Line 0 Link Here

(-)graphics/rubygem-goocanvas/files/patch-ext_goocanvas_extconf.rb (+10 lines)
	1	--- ext/goocanvas/extconf.rb.orig 2016-01-19 22:58:55 UTC
	2	+++ ext/goocanvas/extconf.rb
	3	@@ -31,6 +31,7 @@ rescue LoadError
	4	end
	5
	6	[
	7	+ "cairo",
	8	"glib2",
	9	"atk",
	10	"pango",

Line 0 Link Here

(-)graphics/rubygem-rsvg2/files/patch-ext_rsvg2_extconf.rb (+11 lines)
	1	--- ext/rsvg2/extconf.rb.orig 2016-01-19 22:20:58 UTC
	2	+++ ext/rsvg2/extconf.rb
	3	@@ -30,7 +30,7 @@ rescue LoadError
	4	require 'mkmf-gnome2'
	5	end
	6
	7	-["glib2", "gdk_pixbuf2"].each do \|package\|
	8	+["cairo", "glib2", "gdk_pixbuf2"].each do \|package\|
	9	directory = "#{package}#{version_suffix}"
	10	build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
	11	add_depend_package(package, "#{directory}/ext/#{package}",

Line 0 Link Here

(-)x11-toolkits/rubygem-gtk2/files/patch-ext_gtk2_extconf.rb (+11 lines)
	1	--- ext/gtk2/extconf.rb.orig 2016-01-19 22:27:15 UTC
	2	+++ ext/gtk2/extconf.rb
	3	@@ -33,7 +33,7 @@ end
	4
	5	have_func("rb_errinfo")
	6
	7	-["glib2", "atk", "pango", "gdk_pixbuf2"].each do \|package\|
	8	+["cairo", "glib2", "atk", "pango", "gdk_pixbuf2"].each do \|package\|
	9	directory = "#{package}#{version_suffix}"
	10	build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
	11	add_depend_package(package, "#{directory}/ext/#{package}",

Line 0 Link Here

(-)x11-toolkits/rubygem-gtk3/files/patch-ext_gtk3_extconf.rb (+11 lines)
	1	--- ext/gtk3/extconf.rb.orig 2016-01-19 22:28:28 UTC
	2	+++ ext/gtk3/extconf.rb
	3	@@ -33,7 +33,7 @@ end
	4
	5	have_func("rb_errinfo")
	6
	7	-["glib2", "cairo-gobject", "atk", "pango", "gdk_pixbuf2", "gdk3"].each do \|package\|
	8	+["cairo", "glib2", "cairo-gobject", "atk", "pango", "gdk_pixbuf2", "gdk3"].each do \|package\|
	9	depended_module_name = package.gsub(/-/, "_")
	10	directory = "#{package}#{version_suffix}"
	11	build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{depended_module_name}/#{RUBY_VERSION}"

Line 0 Link Here

(-)x11-toolkits/rubygem-gtksourceview2/files/patch-ext_gtksourceview2_extconf.rb (+11 lines)
	1	--- ext/gtksourceview2/extconf.rb.orig 2016-01-19 22:46:22 UTC
	2	+++ ext/gtksourceview2/extconf.rb
	3	@@ -30,7 +30,7 @@ rescue LoadError
	4	require 'mkmf-gnome2'
	5	end
	6
	7	-["glib2", "atk", "pango", "gdk_pixbuf2", "gtk2"].each do \|package\|
	8	+["cairo", "glib2", "atk", "pango", "gdk_pixbuf2", "gtk2"].each do \|package\|
	9	directory = "#{package}#{version_suffix}"
	10	build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
	11	add_depend_package(package, "#{directory}/ext/#{package}",

Line 0 Link Here

(-)x11-toolkits/rubygem-gtksourceview3/files/patch-ext_gtksourceview3_extconf.rb (+11 lines)
	1	--- ext/gtksourceview3/extconf.rb.orig 2016-01-19 22:59:46 UTC
	2	+++ ext/gtksourceview3/extconf.rb
	3	@@ -30,7 +30,7 @@ rescue LoadError
	4	require 'mkmf-gnome2'
	5	end
	6
	7	-["glib2", "atk", "pango", "gdk_pixbuf2", "gtk3"].each do \|package\|
	8	+["cairo", "glib2", "atk", "pango", "gdk_pixbuf2", "gtk3"].each do \|package\|
	9	directory = "#{package}#{version_suffix}"
	10	build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
	11	add_depend_package(package, "#{directory}/ext/#{package}",

Line 0 Link Here

(-)x11-toolkits/rubygem-pango/files/patch-ext_pango_extconf.rb (+11 lines)
	1	--- ext/pango/extconf.rb.orig 2016-01-19 22:13:22 UTC
	2	+++ ext/pango/extconf.rb
	3	@@ -33,7 +33,7 @@ end
	4	ruby_header = "ruby.h"
	5	have_func("rb_errinfo", ruby_header)
	6
	7	-["glib2"].each do \|package\|
	8	+["cairo", "pango", "glib2"].each do \|package\|
	9	directory = "#{package}#{version_suffix}"
	10	build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
	11	add_depend_package(package, "#{directory}/ext/#{package}",

Line 0 Link Here

(-)x11-toolkits/rubygem-poppler/files/patch-ext_poppler_extconf.rb (+11 lines)
	1	--- ext/poppler/extconf.rb.orig 2016-01-19 22:11:59 UTC
	2	+++ ext/poppler/extconf.rb
	3	@@ -30,7 +30,7 @@ rescue LoadError
	4	require 'mkmf-gnome2'
	5	end
	6
	7	-["glib2", "atk", "gdk_pixbuf2"].each do \|package\|
	8	+["cairo", "glib2", "atk", "gdk_pixbuf2"].each do \|package\|
	9	directory = "#{package}#{version_suffix}"
	10	build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
	11	add_depend_package(package, "#{directory}/ext/#{package}",




--- ext/nokogiri/extconf.rb.orig	2015-07-26 20:13:45 UTC
+++ ext/nokogiri/extconf.rb
@@ -584,6 +584,43 @@ if ENV['CPUPROFILE']
   end
 end
 
+$INSTALLFILES = [
+  ['html_document.h', '$(archdir)'],
+  ['html_element_description.h', '$(archdir)'],
+  ['html_entity_lookup.h', '$(archdir)'],
+  ['html_sax_parser_context.h', '$(archdir)'],
+  ['html_sax_push_parser.h', '$(archdir)'],
+  ['nokogiri.h', '$(archdir)'],
+  ['xml_attr.h', '$(archdir)'],
+  ['xml_attribute_decl.h', '$(archdir)'],
+  ['xml_cdata.h', '$(archdir)'],
+  ['xml_comment.h', '$(archdir)'],
+  ['xml_document.h', '$(archdir)'],
+  ['xml_document_fragment.h', '$(archdir)'],
+  ['xml_dtd.h', '$(archdir)'],
+  ['xml_element_content.h', '$(archdir)'],
+  ['xml_element_decl.h', '$(archdir)'],
+  ['xml_encoding_handler.h', '$(archdir)'],
+  ['xml_entity_decl.h', '$(archdir)'],
+  ['xml_entity_reference.h', '$(archdir)'],
+  ['xml_io.h', '$(archdir)'],
+  ['xml_libxml2_hacks.h', '$(archdir)'],
+  ['xml_namespace.h', '$(archdir)'],
+  ['xml_node.h', '$(archdir)'],
+  ['xml_node_set.h', '$(archdir)'],
+  ['xml_processing_instruction.h', '$(archdir)'],
+  ['xml_reader.h', '$(archdir)'],
+  ['xml_relax_ng.h', '$(archdir)'],
+  ['xml_sax_parser.h', '$(archdir)'],
+  ['xml_sax_parser_context.h', '$(archdir)'],
+  ['xml_sax_push_parser.h', '$(archdir)'],
+  ['xml_schema.h', '$(archdir)'],
+  ['xml_syntax_error.h', '$(archdir)'],
+  ['xml_text.h', '$(archdir)'],
+  ['xml_xpath_context.h', '$(archdir)'],
+  ['xslt_stylesheet.h', '$(archdir)'],
+]
+
 create_makefile('nokogiri/nokogiri')
 
 if enable_config('clean', true)




--- ext/nokogumboc/extconf.rb.orig	2015-07-26 21:04:54 UTC
+++ ext/nokogumboc/extconf.rb
@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'mkmf'
 $CFLAGS += " -std=c99"
 
@@ -10,7 +11,7 @@ if have_library('xml2', 'xmlNewDoc')
     select { |name| name.match(%r{gems/nokogiri-([\d.]+)/lib/nokogiri}) }.
     sort_by {|name| name[/nokogiri-([\d.]+)/,1].split('.').map(&:to_i)}.last
   if nokogiri_lib
-    nokogiri_ext = nokogiri_lib.sub(%r(lib/nokogiri(.rb)?$), 'ext/nokogiri')
+    nokogiri_ext = Gem::Specification.find_by_name('nokogiri').extension_dir + "/nokogiri"
 
     # if that doesn't work, try workarounds found in Nokogiri's extconf
     unless find_header('nokogiri.h', nokogiri_ext)

Lines 46-54 Link Here

(-)mail/milter-manager/Makefile (-2 / +3 lines)
46	.endif	46	.endif
47		47
48	post-patch:	48	post-patch:
49	${FIND} ${WRKSRC} -type f -name Makefile.in -exec \	49	@${FIND} ${WRKSRC} -type f -name Makefile.in -exec \
50	${REINPLACE_CMD} -e "s#\$$(datadir)/@PACKAGE@#${DATADIR}#" \	50	${REINPLACE_CMD} -e "s#\$$(datadir)/@PACKAGE@#${DATADIR}#" \
51	-e "s#\$$(datarootdir)/\$$(PACKAGE)#${DATADIR}#" {} +	51	-e "s#\$$(datarootdir)/\$$(PACKAGE)#${DATADIR}#" {} +
52	${REINPLACE_CMD} -e "s#\\\\\$$(pkgdatadir)/sample#${EXAMPLESDIR}#" ${WRKSRC}/configure	52	@${REINPLACE_CMD} -e "s#\\\\\$$(pkgdatadir)/sample#${EXAMPLESDIR}#" ${WRKSRC}/configure
		53	@${RM} -r ${WRKSRC}/binding/ruby/glib-2.2.5
53		54
54	.include <bsd.port.mk>	55	.include <bsd.port.mk>

Line 0 Link Here

(-)mail/milter-manager/files/patch-configure (+11 lines)
	1	--- configure.orig 2016-01-20 02:07:12 UTC
	2	+++ configure
	3	@@ -14169,7 +14169,7 @@ fi
	4	end
	5	end
	6	ruby_glib2_path = ruby_glib2_gem.full_gem_path
	7	- print("-I ", File.join(ruby_glib2_path, "ext", "glib2"))')
	8	+ print("-I ", File.join(ruby_glib2_path, "lib"))')
	9	if test $? -eq 0; then
	10	CFLAGS="$CFLAGS $RUBY_GLIB2_CFLAGS"
	11	else

Lines 3-8 Link Here

(-)devel/rubygem-rbtrace/Makefile (-3 / +2 lines)
3		3
4	PORTNAME= rbtrace	4	PORTNAME= rbtrace
5	PORTVERSION= 0.4.7	5	PORTVERSION= 0.4.7
		6	PORTREVISION= 1
6	CATEGORIES= devel rubygems	7	CATEGORIES= devel rubygems
7	MASTER_SITES= RG	8	MASTER_SITES= RG
8		9
Lines 19-26 Link Here
19	USE_RUBYGEMS= yes	20	USE_RUBYGEMS= yes
20	RUBYGEM_AUTOPLIST= yes	21	RUBYGEM_AUTOPLIST= yes
21		22
22	PLIST_FILES= bin/rbtrace \	23	PLIST_FILES= bin/rbtrace
23	%%GEM_LIB_DIR%%/ext/src/msgpack-0.5.7/src/.libs/libmsgpack.la \
24	%%GEM_LIB_DIR%%/ext/src/msgpack-0.5.7/src/.libs/libmsgpackc.la
25		24
26	.include <bsd.port.mk>	25	.include <bsd.port.mk>

Return to bug 192949

Line 0 Link Here

(-)textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb (+46 lines)
	1	--- ext/nokogiri/extconf.rb.orig 2015-07-26 20:13:45 UTC
	2	+++ ext/nokogiri/extconf.rb
	3	@@ -584,6 +584,43 @@ if ENV['CPUPROFILE']
	4	end
	5	end
	6
	7	+$INSTALLFILES = [
	8	+ ['html_document.h', '$(archdir)'],
	9	+ ['html_element_description.h', '$(archdir)'],
	10	+ ['html_entity_lookup.h', '$(archdir)'],
	11	+ ['html_sax_parser_context.h', '$(archdir)'],
	12	+ ['html_sax_push_parser.h', '$(archdir)'],
	13	+ ['nokogiri.h', '$(archdir)'],
	14	+ ['xml_attr.h', '$(archdir)'],
	15	+ ['xml_attribute_decl.h', '$(archdir)'],
	16	+ ['xml_cdata.h', '$(archdir)'],
	17	+ ['xml_comment.h', '$(archdir)'],
	18	+ ['xml_document.h', '$(archdir)'],
	19	+ ['xml_document_fragment.h', '$(archdir)'],
	20	+ ['xml_dtd.h', '$(archdir)'],
	21	+ ['xml_element_content.h', '$(archdir)'],
	22	+ ['xml_element_decl.h', '$(archdir)'],
	23	+ ['xml_encoding_handler.h', '$(archdir)'],
	24	+ ['xml_entity_decl.h', '$(archdir)'],
	25	+ ['xml_entity_reference.h', '$(archdir)'],
	26	+ ['xml_io.h', '$(archdir)'],
	27	+ ['xml_libxml2_hacks.h', '$(archdir)'],
	28	+ ['xml_namespace.h', '$(archdir)'],
	29	+ ['xml_node.h', '$(archdir)'],
	30	+ ['xml_node_set.h', '$(archdir)'],
	31	+ ['xml_processing_instruction.h', '$(archdir)'],
	32	+ ['xml_reader.h', '$(archdir)'],
	33	+ ['xml_relax_ng.h', '$(archdir)'],
	34	+ ['xml_sax_parser.h', '$(archdir)'],
	35	+ ['xml_sax_parser_context.h', '$(archdir)'],
	36	+ ['xml_sax_push_parser.h', '$(archdir)'],
	37	+ ['xml_schema.h', '$(archdir)'],
	38	+ ['xml_syntax_error.h', '$(archdir)'],
	39	+ ['xml_text.h', '$(archdir)'],
	40	+ ['xml_xpath_context.h', '$(archdir)'],
	41	+ ['xslt_stylesheet.h', '$(archdir)'],
	42	+]
	43	+
	44	create_makefile('nokogiri/nokogiri')
	45
	46	if enable_config('clean', true)

Line 0 Link Here

(-)textproc/rubygem-nokogumbo/files/patch-ext_nokogumboc_extconf.rb (+16 lines)
	1	--- ext/nokogumboc/extconf.rb.orig 2015-07-26 21:04:54 UTC
	2	+++ ext/nokogumboc/extconf.rb
	3	@@ -1,3 +1,4 @@
	4	+require 'rubygems'
	5	require 'mkmf'
	6	$CFLAGS += " -std=c99"
	7
	8	@@ -10,7 +11,7 @@ if have_library('xml2', 'xmlNewDoc')
	9	select { \|name\| name.match(%r{gems/nokogiri-([\d.]+)/lib/nokogiri}) }.
	10	sort_by {\|name\| name[/nokogiri-([\d.]+)/,1].split('.').map(&:to_i)}.last
	11	if nokogiri_lib
	12	- nokogiri_ext = nokogiri_lib.sub(%r(lib/nokogiri(.rb)?$), 'ext/nokogiri')
	13	+ nokogiri_ext = Gem::Specification.find_by_name('nokogiri').extension_dir + "/nokogiri"
	14
	15	# if that doesn't work, try workarounds found in Nokogiri's extconf
	16	unless find_header('nokogiri.h', nokogiri_ext)