--- Mk/bsd.ruby.mk	(revision 406191)
+++ Mk/bsd.ruby.mk	(working copy)
@@ -501,6 +501,10 @@ 
 do-install:
 	(cd ${BUILD_WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} ${GEMFILES} -- --build-args ${CONFIGURE_ARGS})
 	${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info/
+	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f -name '*.so' -exec ${STRIP_CMD} {} +
+	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f \( -name mkmf.log -or -name gem_make.out \) -print -delete
+	${RM} -rf ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext \
+		${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null || ${TRUE}
 	${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null || ${TRUE}
 .if defined(NOPORTDOCS)
 	-@${RMDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}
@@ -509,7 +513,6 @@ 
 . if defined(RUBYGEM_AUTOPLIST)
 .  if !target(post-install-script)
 post-install-script:
-	@${ECHO} ${GEM_CACHE} >> ${TMPPLIST}
 	@${ECHO} ${GEM_SPEC} >> ${TMPPLIST}
 .if !defined(NOPORTDOCS)
 	@${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print | ${SED} -E -e \
--- devel/rubygem-glib2/files/patch-lib_mkmf-gnome2.rb	(nonexistent)
+++ devel/rubygem-glib2/files/patch-lib_mkmf-gnome2.rb	(working copy)
@@ -0,0 +1,11 @@ 
+--- lib/mkmf-gnome2.rb.orig	2016-01-19 21:17:20 UTC
++++ lib/mkmf-gnome2.rb
+@@ -152,7 +152,7 @@ end
+ def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
+   gem_spec = find_gem_spec(target_name)
+   if gem_spec
+-    target_source_dir = File.join(gem_spec.full_gem_path, "ext/#{target_name}")
++    target_source_dir = File.join(gem_spec.full_gem_path, "lib")
+     target_build_dir = target_source_dir
+     add_depend_package_path(target_name,
+                             target_source_dir,
--- devel/rubygem-cairo-gobject/files/patch-ext_cairo-gobject_extconf.rb	(nonexistent)
+++ devel/rubygem-cairo-gobject/files/patch-ext_cairo-gobject_extconf.rb	(working copy)
@@ -0,0 +1,11 @@ 
+--- ext/cairo-gobject/extconf.rb.orig	2016-01-19 21:24:25 UTC
++++ ext/cairo-gobject/extconf.rb
+@@ -45,7 +45,7 @@ rescue LoadError
+   require "mkmf-gnome2"
+ end
+ 
+-["glib2"].each do |package|
++["glib2", "cairo"].each do |package|
+   directory = "#{package}#{version_suffix}"
+   build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
+   add_depend_package(package, "#{directory}/ext/#{package}",
--- graphics/rubygem-cairo/Makefile	(revision 406191)
+++ graphics/rubygem-cairo/Makefile	(working copy)
@@ -13,6 +13,7 @@ 
 
 RUN_DEPENDS=	rubygem-pkg-config>=1.1.5:${PORTSDIR}/devel/rubygem-pkg-config
 
+USES=		pkgconfig
 USE_GNOME=	cairo
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
--- graphics/rubygem-goocanvas/files/patch-ext_goocanvas_extconf.rb	(nonexistent)
+++ graphics/rubygem-goocanvas/files/patch-ext_goocanvas_extconf.rb	(working copy)
@@ -0,0 +1,10 @@ 
+--- ext/goocanvas/extconf.rb.orig	2016-01-19 22:58:55 UTC
++++ ext/goocanvas/extconf.rb
+@@ -31,6 +31,7 @@ rescue LoadError
+ end
+ 
+ [
++  "cairo",
+   "glib2",
+   "atk",
+   "pango",
--- graphics/rubygem-rsvg2/files/patch-ext_rsvg2_extconf.rb	(nonexistent)
+++ graphics/rubygem-rsvg2/files/patch-ext_rsvg2_extconf.rb	(working copy)
@@ -0,0 +1,11 @@ 
+--- ext/rsvg2/extconf.rb.orig	2016-01-19 22:20:58 UTC
++++ ext/rsvg2/extconf.rb
+@@ -30,7 +30,7 @@ rescue LoadError
+   require 'mkmf-gnome2'
+ end
+ 
+-["glib2", "gdk_pixbuf2"].each do |package|
++["cairo", "glib2", "gdk_pixbuf2"].each do |package|
+   directory = "#{package}#{version_suffix}"
+   build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
+   add_depend_package(package, "#{directory}/ext/#{package}",
--- x11-toolkits/rubygem-gtk2/files/patch-ext_gtk2_extconf.rb	(nonexistent)
+++ x11-toolkits/rubygem-gtk2/files/patch-ext_gtk2_extconf.rb	(working copy)
@@ -0,0 +1,11 @@ 
+--- ext/gtk2/extconf.rb.orig	2016-01-19 22:27:15 UTC
++++ ext/gtk2/extconf.rb
+@@ -33,7 +33,7 @@ end
+ 
+ have_func("rb_errinfo")
+ 
+-["glib2", "atk", "pango", "gdk_pixbuf2"].each do |package|
++["cairo", "glib2", "atk", "pango", "gdk_pixbuf2"].each do |package|
+   directory = "#{package}#{version_suffix}"
+   build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
+   add_depend_package(package, "#{directory}/ext/#{package}",
--- x11-toolkits/rubygem-gtk3/files/patch-ext_gtk3_extconf.rb	(nonexistent)
+++ x11-toolkits/rubygem-gtk3/files/patch-ext_gtk3_extconf.rb	(working copy)
@@ -0,0 +1,11 @@ 
+--- ext/gtk3/extconf.rb.orig	2016-01-19 22:28:28 UTC
++++ ext/gtk3/extconf.rb
+@@ -33,7 +33,7 @@ end
+ 
+ have_func("rb_errinfo")
+ 
+-["glib2", "cairo-gobject", "atk", "pango", "gdk_pixbuf2", "gdk3"].each do |package|
++["cairo", "glib2", "cairo-gobject", "atk", "pango", "gdk_pixbuf2", "gdk3"].each do |package|
+   depended_module_name = package.gsub(/-/, "_")
+   directory = "#{package}#{version_suffix}"
+   build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{depended_module_name}/#{RUBY_VERSION}"
--- x11-toolkits/rubygem-gtksourceview2/files/patch-ext_gtksourceview2_extconf.rb	(nonexistent)
+++ x11-toolkits/rubygem-gtksourceview2/files/patch-ext_gtksourceview2_extconf.rb	(working copy)
@@ -0,0 +1,11 @@ 
+--- ext/gtksourceview2/extconf.rb.orig	2016-01-19 22:46:22 UTC
++++ ext/gtksourceview2/extconf.rb
+@@ -30,7 +30,7 @@ rescue LoadError
+   require 'mkmf-gnome2'
+ end
+ 
+-["glib2", "atk", "pango", "gdk_pixbuf2", "gtk2"].each do |package|
++["cairo", "glib2", "atk", "pango", "gdk_pixbuf2", "gtk2"].each do |package|
+   directory = "#{package}#{version_suffix}"
+   build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
+   add_depend_package(package, "#{directory}/ext/#{package}",
--- x11-toolkits/rubygem-gtksourceview3/files/patch-ext_gtksourceview3_extconf.rb	(nonexistent)
+++ x11-toolkits/rubygem-gtksourceview3/files/patch-ext_gtksourceview3_extconf.rb	(working copy)
@@ -0,0 +1,11 @@ 
+--- ext/gtksourceview3/extconf.rb.orig	2016-01-19 22:59:46 UTC
++++ ext/gtksourceview3/extconf.rb
+@@ -30,7 +30,7 @@ rescue LoadError
+   require 'mkmf-gnome2'
+ end
+ 
+-["glib2", "atk", "pango", "gdk_pixbuf2", "gtk3"].each do |package|
++["cairo", "glib2", "atk", "pango", "gdk_pixbuf2", "gtk3"].each do |package|
+   directory = "#{package}#{version_suffix}"
+   build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
+   add_depend_package(package, "#{directory}/ext/#{package}",
--- x11-toolkits/rubygem-pango/files/patch-ext_pango_extconf.rb	(nonexistent)
+++ x11-toolkits/rubygem-pango/files/patch-ext_pango_extconf.rb	(working copy)
@@ -0,0 +1,11 @@ 
+--- ext/pango/extconf.rb.orig	2016-01-19 22:13:22 UTC
++++ ext/pango/extconf.rb
+@@ -33,7 +33,7 @@ end
+ ruby_header = "ruby.h"
+ have_func("rb_errinfo", ruby_header)
+ 
+-["glib2"].each do |package|
++["cairo", "pango", "glib2"].each do |package|
+   directory = "#{package}#{version_suffix}"
+   build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
+   add_depend_package(package, "#{directory}/ext/#{package}",
--- x11-toolkits/rubygem-poppler/files/patch-ext_poppler_extconf.rb	(nonexistent)
+++ x11-toolkits/rubygem-poppler/files/patch-ext_poppler_extconf.rb	(working copy)
@@ -0,0 +1,11 @@ 
+--- ext/poppler/extconf.rb.orig	2016-01-19 22:11:59 UTC
++++ ext/poppler/extconf.rb
+@@ -30,7 +30,7 @@ rescue LoadError
+   require 'mkmf-gnome2'
+ end
+ 
+-["glib2", "atk", "gdk_pixbuf2"].each do |package|
++["cairo", "glib2", "atk", "gdk_pixbuf2"].each do |package|
+   directory = "#{package}#{version_suffix}"
+   build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
+   add_depend_package(package, "#{directory}/ext/#{package}",
--- textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb	(nonexistent)
+++ textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb	(working copy)
@@ -0,0 +1,46 @@ 
+--- 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)
--- textproc/rubygem-nokogumbo/files/patch-ext_nokogumboc_extconf.rb	(nonexistent)
+++ textproc/rubygem-nokogumbo/files/patch-ext_nokogumboc_extconf.rb	(working copy)
@@ -0,0 +1,16 @@ 
+--- 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)
--- mail/milter-manager/Makefile	(revision 406191)
+++ mail/milter-manager/Makefile	(working copy)
@@ -46,9 +46,10 @@ 
 .endif
 
 post-patch:
-	${FIND} ${WRKSRC} -type f -name Makefile.in -exec \
+	@${FIND} ${WRKSRC} -type f -name Makefile.in -exec \
 	${REINPLACE_CMD} -e "s#\$$(datadir)/@PACKAGE@#${DATADIR}#" \
 			 -e "s#\$$(datarootdir)/\$$(PACKAGE)#${DATADIR}#" {} +
-	${REINPLACE_CMD} -e "s#\\\\\$$(pkgdatadir)/sample#${EXAMPLESDIR}#" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s#\\\\\$$(pkgdatadir)/sample#${EXAMPLESDIR}#" ${WRKSRC}/configure
+	@${RM} -r ${WRKSRC}/binding/ruby/glib-2.2.5
 
 .include <bsd.port.mk>
--- mail/milter-manager/files/patch-configure	(nonexistent)
+++ mail/milter-manager/files/patch-configure	(working copy)
@@ -0,0 +1,11 @@ 
+--- configure.orig	2016-01-20 02:07:12 UTC
++++ configure
+@@ -14169,7 +14169,7 @@ fi
+ 	  end
+ 	end
+ 	ruby_glib2_path = ruby_glib2_gem.full_gem_path
+-	print("-I ", File.join(ruby_glib2_path, "ext", "glib2"))')
++	print("-I ", File.join(ruby_glib2_path, "lib"))')
+       if test $? -eq 0; then
+         CFLAGS="$CFLAGS $RUBY_GLIB2_CFLAGS"
+       else
--- devel/rubygem-rbtrace/Makefile	(revision 406191)
+++ devel/rubygem-rbtrace/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	rbtrace
 PORTVERSION=	0.4.7
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -19,8 +20,6 @@ 
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
 
-PLIST_FILES=	bin/rbtrace \
-		%%GEM_LIB_DIR%%/ext/src/msgpack-0.5.7/src/.libs/libmsgpack.la \
-		%%GEM_LIB_DIR%%/ext/src/msgpack-0.5.7/src/.libs/libmsgpackc.la
+PLIST_FILES=	bin/rbtrace
 
 .include <bsd.port.mk>