Attachment 165696 Details for Bug 192949 – regenerated patch

[patch] regenerated patch

attachment.cgi.txt (text/plain), 12.93 KB, created by Steve Wills on 2016-01-17 07:37:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2016-01-17 07:37:05 UTC

Size: 12.93 KB

patch

obsolete

>Index: Mk/bsd.ruby.mk
>===================================================================
>--- Mk/bsd.ruby.mk	(revision 392680)
>+++ Mk/bsd.ruby.mk	(working copy)
>@@ -481,6 +481,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}
>@@ -489,7 +493,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 \
>Index: accessibility/rubygem-atk/Makefile
>===================================================================
>--- accessibility/rubygem-atk/Makefile	(revision 392680)
>+++ accessibility/rubygem-atk/Makefile	(working copy)
>@@ -18,4 +18,8 @@
> USE_RUBYGEMS=	yes
> RUBYGEM_AUTOPLIST=	yes
> 
>+CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/
>+
>+GEM_ENV=	CFLAGS="${CFLAGS}"
>+
> .include <bsd.port.mk>
>Index: devel/rubygem-cairo-gobject/Makefile
>===================================================================
>--- devel/rubygem-cairo-gobject/Makefile	(revision 392680)
>+++ devel/rubygem-cairo-gobject/Makefile	(working copy)
>@@ -18,4 +18,9 @@
> USE_RUBYGEMS=	yes
> RUBYGEM_AUTOPLIST=	yes
> 
>+CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
>+		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1/
>+
>+GEM_ENV=	CFLAGS="${CFLAGS}"
>+
> .include <bsd.port.mk>
>Index: devel/rubygem-gio2/Makefile
>===================================================================
>--- devel/rubygem-gio2/Makefile	(revision 392680)
>+++ devel/rubygem-gio2/Makefile	(working copy)
>@@ -18,4 +18,9 @@
> USE_RUBYGEMS=	yes
> RUBYGEM_AUTOPLIST=	yes
> 
>+CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
>+	-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/gobject-introspection-2.2.5/
>+
>+GEM_ENV=	CFLAGS="${CFLAGS}"
>+
> .include <bsd.port.mk>
>Index: devel/rubygem-gobject-introspection/Makefile
>===================================================================
>--- devel/rubygem-gobject-introspection/Makefile	(revision 392680)
>+++ devel/rubygem-gobject-introspection/Makefile	(working copy)
>@@ -18,4 +18,8 @@
> USE_RUBYGEMS=	yes
> RUBYGEM_AUTOPLIST=	yes
> 
>+CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/
>+
>+GEM_ENV=	CFLAGS="${CFLAGS}"
>+
> .include <bsd.port.mk>
>Index: graphics/rubygem-gdk_pixbuf2/Makefile
>===================================================================
>--- graphics/rubygem-gdk_pixbuf2/Makefile	(revision 392680)
>+++ graphics/rubygem-gdk_pixbuf2/Makefile	(working copy)
>@@ -18,4 +18,8 @@
> USE_RUBYGEMS=	yes
> RUBYGEM_AUTOPLIST=	yes
> 
>+CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/
>+
>+GEM_ENV=	CFLAGS="${CFLAGS}"
>+
> .include <bsd.port.mk>
>Index: graphics/rubygem-rsvg2/Makefile
>===================================================================
>--- graphics/rubygem-rsvg2/Makefile	(revision 392680)
>+++ graphics/rubygem-rsvg2/Makefile	(working copy)
>@@ -19,4 +19,9 @@
> USE_RUBYGEMS=	yes
> RUBYGEM_AUTOPLIST=	yes
> 
>+CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
>+		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1/
>+
>+GEM_ENV=	CFLAGS="${CFLAGS}"
>+
> .include <bsd.port.mk>
>Index: multimedia/rubygem-gstreamer/Makefile
>===================================================================
>--- multimedia/rubygem-gstreamer/Makefile	(revision 392680)
>+++ multimedia/rubygem-gstreamer/Makefile	(working copy)
>@@ -19,4 +19,9 @@
> USE_RUBYGEMS=	yes
> RUBYGEM_AUTOPLIST=	yes
> 
>+CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
>+	-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/gobject-introspection-2.2.5/
>+
>+GEM_ENV=	CFLAGS="${CFLAGS}"
>+
> .include <bsd.port.mk>
>Index: x11-toolkits/rubygem-gtk2/Makefile
>===================================================================
>--- x11-toolkits/rubygem-gtk2/Makefile	(revision 392680)
>+++ x11-toolkits/rubygem-gtk2/Makefile	(working copy)
>@@ -20,4 +20,10 @@
> USE_RUBYGEMS=	yes
> RUBYGEM_AUTOPLIST=	yes
> 
>+CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
>+		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1/ \
>+		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/pango-2.2.5
>+
>+GEM_ENV=	CFLAGS="${CFLAGS}"
>+
> .include <bsd.port.mk>
>Index: x11-toolkits/rubygem-gtk3/Makefile
>===================================================================
>--- x11-toolkits/rubygem-gtk3/Makefile	(revision 392680)
>+++ x11-toolkits/rubygem-gtk3/Makefile	(working copy)
>@@ -23,4 +23,11 @@
> USE_RUBYGEMS=	yes
> RUBYGEM_AUTOPLIST=	yes
> 
>+CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
>+		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1/ \
>+		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/pango-2.2.5 \
>+		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/gdk_pixbuf2-2.2.5
>+
>+GEM_ENV=	CFLAGS="${CFLAGS}"
>+
> .include <bsd.port.mk>
>Index: x11-toolkits/rubygem-pango/Makefile
>===================================================================
>--- x11-toolkits/rubygem-pango/Makefile	(revision 392680)
>+++ x11-toolkits/rubygem-pango/Makefile	(working copy)
>@@ -19,4 +19,9 @@
> USE_RUBYGEMS=	yes
> RUBYGEM_AUTOPLIST=	yes
> 
>+CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
>+		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1/
>+
>+GEM_ENV=	CFLAGS="${CFLAGS}"
>+
> .include <bsd.port.mk>
>Index: x11-toolkits/rubygem-poppler/Makefile
>===================================================================
>--- x11-toolkits/rubygem-poppler/Makefile	(revision 392680)
>+++ x11-toolkits/rubygem-poppler/Makefile	(working copy)
>@@ -19,4 +19,9 @@
> USE_RUBYGEMS=	yes
> RUBYGEM_AUTOPLIST=	yes
> 
>+CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
>+		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1/
>+
>+GEM_ENV=	CFLAGS="${CFLAGS}"
>+
> .include <bsd.port.mk>
>Index: x11-toolkits/rubygem-gtksourceview2/Makefile
>===================================================================
>--- x11-toolkits/rubygem-gtksourceview2/Makefile	(revision 392680)
>+++ x11-toolkits/rubygem-gtksourceview2/Makefile	(working copy)
>@@ -18,4 +18,10 @@
> USE_RUBYGEMS=	yes
> RUBYGEM_AUTOPLIST=	yes
> 
>-.include <bsd.port.mk>
>+CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1/ \
>+	-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/gtk2-2.2.5 \
>+	-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5/ \
>+
>+GEM_ENV=	CFLAGS="${CFLAGS}"
>+
>+.include<bsd.port.mk>
>Index: x11-toolkits/rubygem-gtksourceview3/Makefile
>===================================================================
>--- x11-toolkits/rubygem-gtksourceview3/Makefile	(revision 392680)
>+++ x11-toolkits/rubygem-gtksourceview3/Makefile	(working copy)
>@@ -18,4 +18,10 @@
> USE_RUBYGEMS=	yes
> RUBYGEM_AUTOPLIST=	yes
> 
>+CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1 \
>+		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/gtk3-2.2.5 \
>+		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5
>+
>+GEM_ENV=	CFLAGS="${CFLAGS}"
>+
> .include <bsd.port.mk>
>Index: x11-toolkits/rubygem-vte/Makefile
>===================================================================
>--- x11-toolkits/rubygem-vte/Makefile	(revision 392680)
>+++ x11-toolkits/rubygem-vte/Makefile	(working copy)
>@@ -18,4 +18,9 @@
> USE_RUBYGEMS=	yes
> RUBYGEM_AUTOPLIST=	yes
> 
>+CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/gtk2-2.2.5 \
>+		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5
>+
>+GEM_ENV=	CFLAGS="${CFLAGS}"
>+
> .include <bsd.port.mk>
>Index: graphics/rubygem-goocanvas/Makefile
>===================================================================
>--- graphics/rubygem-goocanvas/Makefile	(revision 392680)
>+++ graphics/rubygem-goocanvas/Makefile	(working copy)
>@@ -19,4 +19,8 @@
> USE_RUBYGEMS=	yes
> RUBYGEM_AUTOPLIST=	yes
> 
>+CFLAGS=		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/cairo-1.14.1 \
>+		-I${LOCALBASE}/${EXT_DIR}/${ARCH}-${OPSYS:tl}-${OSREL:C/\..*//}/${RUBY_VER}/glib2-2.2.5
>+GEM_ENV=	CFLAGS="${CFLAGS}"
>+
> .include <bsd.port.mk>
>Index: textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb
>===================================================================
>--- textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb	(revision 0)
>+++ 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)
>
>Property changes on: textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: textproc/rubygem-nokogumbo/files/patch-ext_nokogumboc_extconf.rb
>===================================================================
>--- textproc/rubygem-nokogumbo/files/patch-ext_nokogumboc_extconf.rb	(revision 0)
>+++ 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)
>
>Property changes on: textproc/rubygem-nokogumbo/files/patch-ext_nokogumboc_extconf.rb
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 192949: 146406 | 159165 | 159278 | 165696 | 165846